diff options
Diffstat (limited to 'sw/source/uibase/app/apphdl.cxx')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index fc088df0496b..0610f8cc587d 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -287,18 +287,18 @@ std::shared_ptr<SwMailMergeConfigItem> SwView::EnsureMailMergeConfigItem(const S { SwDBData aDBData; svx::ODataAccessDescriptor aDescriptor(aDBValues); - aDescriptor[svx::daDataSource] >>= aDBData.sDataSource; - aDescriptor[svx::daCommand] >>= aDBData.sCommand; - aDescriptor[svx::daCommandType] >>= aDBData.nCommandType; + aDescriptor[svx::DataAccessDescriptorProperty::DataSource] >>= aDBData.sDataSource; + aDescriptor[svx::DataAccessDescriptorProperty::Command] >>= aDBData.sCommand; + aDescriptor[svx::DataAccessDescriptorProperty::CommandType] >>= aDBData.nCommandType; uno::Sequence< uno::Any > aSelection; uno::Reference< sdbc::XConnection> xConnection; uno::Reference< sdbc::XDataSource> xSource; uno::Reference< sdbcx::XColumnsSupplier> xColumnsSupplier; - if (aDescriptor.has(svx::daSelection)) - aDescriptor[svx::daSelection] >>= aSelection; - if (aDescriptor.has(svx::daConnection)) - aDescriptor[svx::daConnection] >>= xConnection; + if (aDescriptor.has(svx::DataAccessDescriptorProperty::Selection)) + aDescriptor[svx::DataAccessDescriptorProperty::Selection] >>= aSelection; + if (aDescriptor.has(svx::DataAccessDescriptorProperty::Connection)) + aDescriptor[svx::DataAccessDescriptorProperty::Connection] >>= xConnection; uno::Reference<container::XChild> xChild(xConnection, uno::UNO_QUERY); if (xChild.is()) xSource.set(xChild->getParent(), uno::UNO_QUERY); |