strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#161865 Base Table Design View not editable

Browse source 
we had an ODR violation with a constant named PROPERTY_DATASOURCE which
is also defined inside dbaccess

regression from
commit bacb92275c
"add dbu to --enable-mergelibs=more"

Change-Id: I315ba82e0bccc49e01bd6a438b7e671b971410dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170939
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Noel Grandin 2024-07-24 14:06:26 +02:00
parent 3e99775689
commit ab704c00fd
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
forms/source/component/DatabaseForm.cxx
View file

@ -1274,7 +1274,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
// we remove and re-declare the DataSourceName property, 'cause we want it to be constrained, and the
// original property of our aggregate isn't
RemoveProperty( _rAggregateProps, PROPERTY_DATASOURCE );
RemoveProperty( _rAggregateProps, PROPERTY_DATASOURCENAME );
// for connection sharing, we need to override the ActiveConnection property, too
RemoveProperty( _rAggregateProps, PROPERTY_ACTIVE_CONNECTION );
@ -1294,7 +1294,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
*pProperties++ = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_MASTERFIELDS, PROPERTY_ID_MASTERFIELDS, cppu::UnoType<Sequence< OUString >>::get(), css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_DETAILFIELDS, PROPERTY_ID_DETAILFIELDS, cppu::UnoType<Sequence< OUString >>::get(), css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_DATASOURCE, PROPERTY_ID_DATASOURCE, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::CONSTRAINED);
*pProperties++ = css::beans::Property(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCE, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::CONSTRAINED);
*pProperties++ = css::beans::Property(PROPERTY_CYCLE, PROPERTY_ID_CYCLE, cppu::UnoType<TabulatorCycle>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID | css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_FILTER, PROPERTY_ID_FILTER, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_HAVINGCLAUSE, PROPERTY_ID_HAVINGCLAUSE, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT);
@ -1452,7 +1452,7 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
break;
case PROPERTY_ID_DATASOURCE:
rValue = m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCE );
rValue = m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCENAME );
break;
case PROPERTY_ID_TARGET_URL:
@ -1646,7 +1646,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
try
{
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, rValue);
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCENAME, rValue);
}
catch(const Exception&)
{
@ -2360,7 +2360,7 @@ void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInte
bool bIsEmbedded = ::dbtools::isEmbeddedInDatabase( Parent, xOuterConnection );
if ( bIsEmbedded )
xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, Any( OUString() ) );
xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCENAME, Any( OUString() ) );
}
@ -2605,14 +2605,14 @@ bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rxPare
{
// our own data source
OUString sOwnDatasource;
m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= sOwnDatasource;
m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sOwnDatasource;
// our parents data source
OUString sParentDataSource;
OSL_ENSURE( _rxParentProps.is() && _rxParentProps->getPropertySetInfo().is() && _rxParentProps->getPropertySetInfo()->hasPropertyByName( PROPERTY_DATASOURCE ),
OSL_ENSURE( _rxParentProps.is() && _rxParentProps->getPropertySetInfo().is() && _rxParentProps->getPropertySetInfo()->hasPropertyByName( PROPERTY_DATASOURCENAME ),
"ODatabaseForm::doShareConnection: invalid parent form!" );
if ( _rxParentProps.is() )
_rxParentProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sParentDataSource;
_rxParentProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sParentDataSource;
bool bCanShareConnection = false;
@ -3744,7 +3744,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
OUString sDataSource;
if (m_xAggregateSet.is())
m_xAggregateSet->getPropertyValue(PROPERTY_DATASOURCE) >>= sDataSource;
m_xAggregateSet->getPropertyValue(PROPERTY_DATASOURCENAME) >>= sDataSource;
_rxOutStream << sDataSource;
// former CursorSource
@ -3864,7 +3864,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
OUString sAggregateProp;
_rxInStream >> sAggregateProp;
if (m_xAggregateSet.is())
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, Any(sAggregateProp));
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCENAME, Any(sAggregateProp));
_rxInStream >> sAggregateProp;
if (m_xAggregateSet.is())
m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND, Any(sAggregateProp));

2
forms/source/inc/frm_strings.hxx
View file

@ -190,7 +190,7 @@ inline constexpr OUString PROPERTY_TITLE = u"Title"_ustr;
inline constexpr OUString PROPERTY_ACTIVE_CONNECTION = u"ActiveConnection"_ustr;
inline constexpr OUString PROPERTY_SCALE = u"Scale"_ustr;
inline constexpr OUString PROPERTY_SORT = u"Order"_ustr;
inline constexpr OUString PROPERTY_DATASOURCE = u"DataSourceName"_ustr;
inline constexpr OUString PROPERTY_DATASOURCENAME = u"DataSourceName"_ustr;
inline constexpr OUString PROPERTY_DETAILFIELDS = u"DetailFields"_ustr;
inline constexpr OUString PROPERTY_COLUMNSERVICENAME = u"ColumnServiceName"_ustr;

2
forms/source/misc/property.cxx
View file

@ -116,7 +116,7 @@ void PropertyInfoService::initialize()
{ PROPERTY_DECIMALS, PROPERTY_ID_DECIMALS },
{ PROPERTY_REFVALUE, PROPERTY_ID_REFVALUE },
{ PROPERTY_STRICTFORMAT, PROPERTY_ID_STRICTFORMAT },
{ PROPERTY_DATASOURCE, PROPERTY_ID_DATASOURCE },
{ PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCE },
{ PROPERTY_ALLOWADDITIONS, PROPERTY_ID_ALLOWADDITIONS },
{ PROPERTY_ALLOWEDITS, PROPERTY_ID_ALLOWEDITS },
{ PROPERTY_ALLOWDELETIONS, PROPERTY_ID_ALLOWDELETIONS },