summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-24 12:37:28 +0200
committerNoel Grandin <noel@peralex.com>2016-08-25 08:40:00 +0200
commit271bd3522e1148c0260688a42fd78959225db8cb (patch)
tree4bed1e26667e9609a0973205420e1e26c666da8b /svx
parent6cb3884898a39f57bcb30b2663a258e3971083fe (diff)
convert DataAccessDescriptorProperty to scoped enum
Change-Id: Ifb8fb1d28464f0638ec1485d77ad333b1acc667c
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx74
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx34
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx63
-rw-r--r--svx/source/form/fmview.cxx6
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/form/tabwin.cxx18
7 files changed, 105 insertions, 102 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index d166af11b394..df75d54d5546 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -58,14 +58,14 @@ namespace svx
:m_nFormatFlags(_nFormats)
{
OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName;
- if ( _rDescriptor.has( daDataSource ) ) _rDescriptor[ daDataSource ] >>= sDataSource;
- if ( _rDescriptor.has( daDatabaseLocation ) ) _rDescriptor[ daDatabaseLocation ] >>= sDatabaseLocation;
- if ( _rDescriptor.has( daConnectionResource ) ) _rDescriptor[ daConnectionResource ] >>= sConnectionResource;
- if ( _rDescriptor.has( daCommand ) ) _rDescriptor[ daCommand ] >>= sCommand;
- if ( _rDescriptor.has( daColumnName ) ) _rDescriptor[ daColumnName ] >>= sFieldName;
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::DataSource ) ) _rDescriptor[ DataAccessDescriptorProperty::DataSource ] >>= sDataSource;
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::DatabaseLocation ) ) _rDescriptor[ DataAccessDescriptorProperty::DatabaseLocation ] >>= sDatabaseLocation;
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::ConnectionResource ) ) _rDescriptor[ DataAccessDescriptorProperty::ConnectionResource ] >>= sConnectionResource;
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::Command ) ) _rDescriptor[ DataAccessDescriptorProperty::Command ] >>= sCommand;
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::ColumnName ) ) _rDescriptor[ DataAccessDescriptorProperty::ColumnName ] >>= sFieldName;
sal_Int32 nCommandType = CommandType::TABLE;
- OSL_VERIFY( _rDescriptor[ daCommandType ] >>= nCommandType );
+ OSL_VERIFY( _rDescriptor[ DataAccessDescriptorProperty::CommandType ] >>= nCommandType );
implConstruct(
@@ -74,10 +74,10 @@ namespace svx
if ( m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR )
{
- if ( _rDescriptor.has( daConnection ) )
- m_aDescriptor[ daConnection ] = _rDescriptor[ daConnection ];
- if ( _rDescriptor.has( daColumnObject ) )
- m_aDescriptor[ daColumnObject ] = _rDescriptor[ daColumnObject ];
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::Connection ) )
+ m_aDescriptor[ DataAccessDescriptorProperty::Connection ] = _rDescriptor[ DataAccessDescriptorProperty::Connection ];
+ if ( _rDescriptor.has( DataAccessDescriptorProperty::ColumnObject ) )
+ m_aDescriptor[ DataAccessDescriptorProperty::ColumnObject ] = _rDescriptor[ DataAccessDescriptorProperty::ColumnObject ];
}
}
@@ -141,9 +141,9 @@ namespace svx
if ((m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) == ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)
{
if (_rxColumn.is())
- m_aDescriptor[daColumnObject] <<= _rxColumn;
+ m_aDescriptor[DataAccessDescriptorProperty::ColumnObject] <<= _rxColumn;
if (_rxConnection.is())
- m_aDescriptor[daConnection] <<= _rxConnection;
+ m_aDescriptor[DataAccessDescriptorProperty::Connection] <<= _rxConnection;
}
}
@@ -197,11 +197,11 @@ namespace svx
{
m_aDescriptor.setDataSource(_rDatasource);
if ( !_rConnectionResource.isEmpty() )
- m_aDescriptor[daConnectionResource] <<= _rConnectionResource;
+ m_aDescriptor[DataAccessDescriptorProperty::ConnectionResource] <<= _rConnectionResource;
- m_aDescriptor[daCommand] <<= _rCommand;
- m_aDescriptor[daCommandType] <<= _nCommandType;
- m_aDescriptor[daColumnName] <<= _rFieldName;
+ m_aDescriptor[DataAccessDescriptorProperty::Command] <<= _rCommand;
+ m_aDescriptor[DataAccessDescriptorProperty::CommandType] <<= _nCommandType;
+ m_aDescriptor[DataAccessDescriptorProperty::ColumnName] <<= _rFieldName;
}
}
@@ -290,15 +290,15 @@ namespace svx
{
// and build an own descriptor
if ( !sDatasource.isEmpty() )
- aDescriptor[daDataSource] <<= sDatasource;
+ aDescriptor[DataAccessDescriptorProperty::DataSource] <<= sDatasource;
if ( !sDatabaseLocation.isEmpty() )
- aDescriptor[daDatabaseLocation] <<= sDatabaseLocation;
+ aDescriptor[DataAccessDescriptorProperty::DatabaseLocation] <<= sDatabaseLocation;
if ( !sConnectionResource.isEmpty() )
- aDescriptor[daConnectionResource] <<= sConnectionResource;
+ aDescriptor[DataAccessDescriptorProperty::ConnectionResource] <<= sConnectionResource;
- aDescriptor[daCommand] <<= sCommand;
- aDescriptor[daCommandType] <<= nCommandType;
- aDescriptor[daColumnName] <<= sFieldName;
+ aDescriptor[DataAccessDescriptorProperty::Command] <<= sCommand;
+ aDescriptor[DataAccessDescriptorProperty::CommandType] <<= nCommandType;
+ aDescriptor[DataAccessDescriptorProperty::ColumnName] <<= sFieldName;
}
return aDescriptor;
}
@@ -315,16 +315,16 @@ namespace svx
if ( _rData.HasFormat(getDescriptorFormatId()) )
{
ODataAccessDescriptor aDescriptor = extractColumnDescriptor(_rData);
- if ( aDescriptor.has(daDataSource) )
- aDescriptor[daDataSource] >>= _rDatasource;
- if ( aDescriptor.has(daDatabaseLocation) )
- aDescriptor[daDatabaseLocation] >>= _rDatabaseLocation;
- if ( aDescriptor.has(daConnectionResource) )
- aDescriptor[daConnectionResource] >>= _rConnectionResource;
-
- aDescriptor[daCommand] >>= _rCommand;
- aDescriptor[daCommandType] >>= _nCommandType;
- aDescriptor[daColumnName] >>= _rFieldName;
+ if ( aDescriptor.has(DataAccessDescriptorProperty::DataSource) )
+ aDescriptor[DataAccessDescriptorProperty::DataSource] >>= _rDatasource;
+ if ( aDescriptor.has(DataAccessDescriptorProperty::DatabaseLocation) )
+ aDescriptor[DataAccessDescriptorProperty::DatabaseLocation] >>= _rDatabaseLocation;
+ if ( aDescriptor.has(DataAccessDescriptorProperty::ConnectionResource) )
+ aDescriptor[DataAccessDescriptorProperty::ConnectionResource] >>= _rConnectionResource;
+
+ aDescriptor[DataAccessDescriptorProperty::Command] >>= _rCommand;
+ aDescriptor[DataAccessDescriptorProperty::CommandType] >>= _nCommandType;
+ aDescriptor[DataAccessDescriptorProperty::ColumnName] >>= _rFieldName;
return true;
}
@@ -436,7 +436,7 @@ namespace svx
void ODataAccessObjectTransferable::AddSupportedFormats()
{
sal_Int32 nObjectType = CommandType::COMMAND;
- m_aDescriptor[daCommandType] >>= nObjectType;
+ m_aDescriptor[DataAccessDescriptorProperty::CommandType] >>= nObjectType;
switch (nObjectType)
{
case CommandType::TABLE:
@@ -559,11 +559,11 @@ namespace svx
m_aDescriptor.setDataSource(_rDatasource);
// build the descriptor (the property sequence)
if ( !_rConnectionResource.isEmpty() )
- m_aDescriptor[daConnectionResource] <<= _rConnectionResource;
+ m_aDescriptor[DataAccessDescriptorProperty::ConnectionResource] <<= _rConnectionResource;
if ( _rxConnection.is() )
- m_aDescriptor[daConnection] <<= _rxConnection;
- m_aDescriptor[daCommand] <<= _rCommand;
- m_aDescriptor[daCommandType] <<= _nCommandType;
+ m_aDescriptor[DataAccessDescriptorProperty::Connection] <<= _rxConnection;
+ m_aDescriptor[DataAccessDescriptorProperty::Command] <<= _rCommand;
+ m_aDescriptor[DataAccessDescriptorProperty::CommandType] <<= _nCommandType;
// extract the single values from the sequence
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 59d0bbcef3bf..52641245b1b2 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -47,7 +47,7 @@ namespace svx
,const Reference< XContent>& _xContent)
{
m_aDescriptor.setDataSource(_rDatasourceOrLocation);
- m_aDescriptor[daComponent] <<= _xContent;
+ m_aDescriptor[DataAccessDescriptorProperty::Component] <<= _xContent;
}
@@ -75,7 +75,7 @@ namespace svx
try
{
Reference<XPropertySet> xProp;
- m_aDescriptor[daComponent] >>= xProp;
+ m_aDescriptor[DataAccessDescriptorProperty::Component] >>= xProp;
if ( xProp.is() )
xProp->getPropertyValue("IsForm") >>= bForm;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 61192c074666..6b3e88bbc03d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -253,14 +253,14 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
Reference< XConnection > xConnection;
ODataAccessDescriptor aColumn = OColumnTransferable::extractColumnDescriptor(aDroppedData);
- if (aColumn.has(daDataSource)) aColumn[daDataSource] >>= sDatasource;
- if (aColumn.has(daDatabaseLocation)) aColumn[daDatabaseLocation] >>= sDatabaseLocation;
- if (aColumn.has(daConnectionResource)) aColumn[daConnectionResource] >>= sConnnectionResource;
- if (aColumn.has(daCommand)) aColumn[daCommand] >>= sCommand;
- if (aColumn.has(daCommandType)) aColumn[daCommandType] >>= nCommandType;
- if (aColumn.has(daColumnName)) aColumn[daColumnName] >>= sFieldName;
- if (aColumn.has(daColumnObject))aColumn[daColumnObject] >>= xField;
- if (aColumn.has(daConnection)) aColumn[daConnection] >>= xConnection;
+ if (aColumn.has(DataAccessDescriptorProperty::DataSource)) aColumn[DataAccessDescriptorProperty::DataSource] >>= sDatasource;
+ if (aColumn.has(DataAccessDescriptorProperty::DatabaseLocation)) aColumn[DataAccessDescriptorProperty::DatabaseLocation] >>= sDatabaseLocation;
+ if (aColumn.has(DataAccessDescriptorProperty::ConnectionResource)) aColumn[DataAccessDescriptorProperty::ConnectionResource] >>= sConnnectionResource;
+ if (aColumn.has(DataAccessDescriptorProperty::Command)) aColumn[DataAccessDescriptorProperty::Command] >>= sCommand;
+ if (aColumn.has(DataAccessDescriptorProperty::CommandType)) aColumn[DataAccessDescriptorProperty::CommandType] >>= nCommandType;
+ if (aColumn.has(DataAccessDescriptorProperty::ColumnName)) aColumn[DataAccessDescriptorProperty::ColumnName] >>= sFieldName;
+ if (aColumn.has(DataAccessDescriptorProperty::ColumnObject))aColumn[DataAccessDescriptorProperty::ColumnObject] >>= xField;
+ if (aColumn.has(DataAccessDescriptorProperty::Connection)) aColumn[DataAccessDescriptorProperty::Connection] >>= xConnection;
if ( sFieldName.isEmpty()
|| sCommand.isEmpty()
@@ -355,8 +355,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
// do the drop asynchronously
// (85957 - UI actions within the drop are not allowed, but we want to open a popup menu)
m_pImpl->aDropData = aColumn;
- m_pImpl->aDropData[daConnection] <<= xConnection;
- m_pImpl->aDropData[daColumnObject] <<= xField;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::Connection] <<= xConnection;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::ColumnObject] <<= xField;
m_pImpl->nDropAction = _rEvt.mnAction;
m_pImpl->aDropPosPixel = _rEvt.maPosPixel;
@@ -383,13 +383,13 @@ IMPL_LINK_NOARG_TYPED( FmGridHeader, OnAsyncExecuteDrop, void*, void )
Reference< XConnection > xConnection;
OUString sDatasource = m_pImpl->aDropData.getDataSource();
- if ( sDatasource.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) )
- m_pImpl->aDropData[daConnectionResource] >>= sURL;
- m_pImpl->aDropData[daCommand] >>= sCommand;
- m_pImpl->aDropData[daCommandType] >>= nCommandType;
- m_pImpl->aDropData[daColumnName] >>= sFieldName;
- m_pImpl->aDropData[daConnection] >>= xConnection;
- m_pImpl->aDropData[daColumnObject] >>= xField;
+ if ( sDatasource.isEmpty() && m_pImpl->aDropData.has(DataAccessDescriptorProperty::ConnectionResource) )
+ m_pImpl->aDropData[DataAccessDescriptorProperty::ConnectionResource] >>= sURL;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::Command] >>= sCommand;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::CommandType] >>= nCommandType;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::ColumnName] >>= sFieldName;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::Connection] >>= xConnection;
+ m_pImpl->aDropData[DataAccessDescriptorProperty::ColumnObject] >>= xField;
try
{
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 29915af33312..3e6a6132557d 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/dataaccessdescriptor.hxx>
-#include <comphelper/propertysetinfo.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/sdbc/XConnection.hpp>
@@ -34,6 +33,15 @@ namespace svx
using namespace ::com::sun::star::ucb;
using namespace ::comphelper;
+ struct PropertyMapEntry
+ {
+ OUString maName;
+ DataAccessDescriptorProperty mnHandle;
+ css::uno::Type maType;
+ sal_Int16 mnAttributes;
+ sal_uInt8 mnMemberId;
+ };
+
class ODADescriptorImpl
{
protected:
@@ -175,29 +183,24 @@ namespace svx
{
static PropertyMapEntry const s_aDesriptorProperties[] =
{
- { OUString("ActiveConnection"), daConnection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("BookmarkSelection"), daBookmarkSelection, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Column"), daColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("ColumnName"), daColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Command"), daCommand, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("CommandType"), daCommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Component"), daComponent, cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("ConnectionResource"), daConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Cursor"), daCursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("DataSourceName"), daDataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("DatabaseLocation"), daDatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("EscapeProcessing"), daEscapeProcessing, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Filter"), daFilter, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Selection"), daSelection, cppu::UnoType<Sequence< Any >>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString(), 0, css::uno::Type(), 0, 0 }
+ { OUString("ActiveConnection"), DataAccessDescriptorProperty::Connection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("BookmarkSelection"), DataAccessDescriptorProperty::BookmarkSelection, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Column"), DataAccessDescriptorProperty::ColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("ColumnName"), DataAccessDescriptorProperty::ColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Command"), DataAccessDescriptorProperty::Command, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("CommandType"), DataAccessDescriptorProperty::CommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Component"), DataAccessDescriptorProperty::Component, cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("ConnectionResource"), DataAccessDescriptorProperty::ConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Cursor"), DataAccessDescriptorProperty::Cursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("DataSourceName"), DataAccessDescriptorProperty::DataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("DatabaseLocation"), DataAccessDescriptorProperty::DatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("EscapeProcessing"), DataAccessDescriptorProperty::EscapeProcessing, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Filter"), DataAccessDescriptorProperty::Filter, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Selection"), DataAccessDescriptorProperty::Selection, cppu::UnoType<Sequence< Any >>::get(), PropertyAttribute::TRANSIENT, 0 }
};
- PropertyMapEntry const * pEntry = s_aDesriptorProperties;
- while ( !pEntry->maName.isEmpty() )
- {
- s_aProperties[ pEntry->maName ] = pEntry;
- ++pEntry;
- }
+ for (unsigned i=0; i<SAL_N_ELEMENTS(s_aDesriptorProperties); ++i)
+ s_aProperties[ s_aDesriptorProperties[i].maName ] = &s_aDesriptorProperties[i];
}
return s_aProperties;
@@ -207,7 +210,7 @@ namespace svx
{
const MapString2PropertyEntry& rProperties = getPropertyMap();
- sal_Int32 nNeededHandle = (sal_Int32)(_rPos->first);
+ DataAccessDescriptorProperty nNeededHandle = _rPos->first;
for ( MapString2PropertyEntry::const_iterator loop = rProperties.begin();
loop != rProperties.end();
@@ -228,7 +231,7 @@ namespace svx
// build the property value
PropertyValue aReturn;
aReturn.Name = pProperty->maName;
- aReturn.Handle = pProperty->mnHandle;
+ aReturn.Handle = (sal_Int32)pProperty->mnHandle;
aReturn.Value = _rPos->second;
aReturn.State = PropertyState_DIRECT_VALUE;
@@ -351,10 +354,10 @@ namespace svx
OUString ODataAccessDescriptor::getDataSource() const
{
OUString sDataSourceName;
- if ( has(daDataSource) )
- (*this)[daDataSource] >>= sDataSourceName;
- else if ( has(daDatabaseLocation) )
- (*this)[daDatabaseLocation] >>= sDataSourceName;
+ if ( has(DataAccessDescriptorProperty::DataSource) )
+ (*this)[DataAccessDescriptorProperty::DataSource] >>= sDataSourceName;
+ else if ( has(DataAccessDescriptorProperty::DatabaseLocation) )
+ (*this)[DataAccessDescriptorProperty::DatabaseLocation] >>= sDataSourceName;
return sDataSourceName;
}
@@ -363,10 +366,10 @@ namespace svx
if ( !_sDataSourceNameOrLocation.isEmpty() )
{
INetURLObject aURL(_sDataSourceNameOrLocation);
- (*this)[ (( aURL.GetProtocol() == INetProtocol::File ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation;
+ (*this)[ (( aURL.GetProtocol() == INetProtocol::File ) ? DataAccessDescriptorProperty::DatabaseLocation : DataAccessDescriptorProperty::DataSource)] <<= _sDataSourceNameOrLocation;
}
else
- (*this)[ daDataSource ] <<= OUString();
+ (*this)[ DataAccessDescriptorProperty::DataSource ] <<= OUString();
}
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index f40e773cda69..bbf494b2f47b 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -418,9 +418,9 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const
ODataAccessDescriptor aColumnDescriptor;
aColumnDescriptor.setDataSource(sDataSource);
- aColumnDescriptor[ daCommand ] <<= sObjectName;
- aColumnDescriptor[ daCommandType ] <<= nObjectType;
- aColumnDescriptor[ daColumnName ] <<= sFieldName;
+ aColumnDescriptor[ DataAccessDescriptorProperty::Command ] <<= sObjectName;
+ aColumnDescriptor[ DataAccessDescriptorProperty::CommandType ] <<= nObjectType;
+ aColumnDescriptor[ DataAccessDescriptorProperty::ColumnName ] <<= sFieldName;
return pImpl->implCreateFieldControl( aColumnDescriptor );
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index d572c3f333a0..db36769096fb 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1158,12 +1158,12 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor
SharedConnection xConnection;
OUString sDataSource = _rColumnDescriptor.getDataSource();
- _rColumnDescriptor[ daCommand ] >>= sCommand;
- _rColumnDescriptor[ daColumnName ] >>= sFieldName;
- _rColumnDescriptor[ daCommandType ] >>= nCommandType;
+ _rColumnDescriptor[ DataAccessDescriptorProperty::Command ] >>= sCommand;
+ _rColumnDescriptor[ DataAccessDescriptorProperty::ColumnName ] >>= sFieldName;
+ _rColumnDescriptor[ DataAccessDescriptorProperty::CommandType ] >>= nCommandType;
{
Reference< XConnection > xExternalConnection;
- _rColumnDescriptor[ daConnection ] >>= xExternalConnection;
+ _rColumnDescriptor[ DataAccessDescriptorProperty::Connection ] >>= xExternalConnection;
xConnection.reset( xExternalConnection, SharedConnection::NoTakeOwnership );
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 6e507f95bb3d..27c9c5b4922c 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -152,12 +152,12 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
return;
svx::ODataAccessDescriptor aDescriptor;
- aDescriptor[ daDataSource ] <<= pTabWin->GetDatabaseName();
- aDescriptor[ daConnection ] <<= pTabWin->GetConnection().getTyped();
- aDescriptor[ daCommand ] <<= pTabWin->GetObjectName();
- aDescriptor[ daCommandType ]<<= pTabWin->GetObjectType();
+ aDescriptor[ DataAccessDescriptorProperty::DataSource ] <<= pTabWin->GetDatabaseName();
+ aDescriptor[ DataAccessDescriptorProperty::Connection ] <<= pTabWin->GetConnection().getTyped();
+ aDescriptor[ DataAccessDescriptorProperty::Command ] <<= pTabWin->GetObjectName();
+ aDescriptor[ DataAccessDescriptorProperty::CommandType ]<<= pTabWin->GetObjectType();
ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData());
- aDescriptor[ daColumnName ] <<= pInfo->sColumnName;
+ aDescriptor[ DataAccessDescriptorProperty::ColumnName ] <<= pInfo->sColumnName;
TransferableHelper* pTransferColumn = new OColumnTransferable(
aDescriptor, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR
@@ -219,12 +219,12 @@ bool FmFieldWin::createSelectionControls( )
ODataAccessDescriptor aDescr;
aDescr.setDataSource(GetDatabaseName());
- aDescr[ daConnection ] <<= GetConnection().getTyped();
+ aDescr[ DataAccessDescriptorProperty::Connection ] <<= GetConnection().getTyped();
- aDescr[ daCommand ] <<= GetObjectName();
- aDescr[ daCommandType ] <<= GetObjectType();
+ aDescr[ DataAccessDescriptorProperty::Command ] <<= GetObjectName();
+ aDescr[ DataAccessDescriptorProperty::CommandType ] <<= GetObjectType();
ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData());
- aDescr[ daColumnName ] <<= pInfo->sColumnName;//OUString( pListBox->GetEntryText( pSelected) );
+ aDescr[ DataAccessDescriptorProperty::ColumnName ] <<= pInfo->sColumnName;//OUString( pListBox->GetEntryText( pSelected) );
// transfer this to the SFX world
SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) );