diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-24 12:37:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-25 08:40:00 +0200 |
| commit | 271bd3522e1148c0260688a42fd78959225db8cb (patch) | |
| tree | 4bed1e26667e9609a0973205420e1e26c666da8b /reportdesign/source | |
| parent | 6cb3884898a39f57bcb30b2663a258e3971083fe (diff) | |
convert DataAccessDescriptorProperty to scoped enum
Change-Id: Ifb8fb1d28464f0638ec1485d77ad333b1acc667c
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 14 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 3d7ee4f7f7c0..4a2e21a69ead 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -444,19 +444,19 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAcces { uno::Reference<frame::XModel> xModel(xDocument->getDatabaseDocument(),uno::UNO_QUERY); if ( xModel.is() ) - _rDescriptor[ daDatabaseLocation ] <<= xModel->getURL(); + _rDescriptor[ DataAccessDescriptorProperty::DatabaseLocation ] <<= xModel->getURL(); } } - _rDescriptor[ svx::daCommand ] <<= GetCommand(); - _rDescriptor[ svx::daCommandType ] <<= GetCommandType(); - _rDescriptor[ svx::daEscapeProcessing ] <<= GetEscapeProcessing(); - _rDescriptor[ svx::daConnection ] <<= getConnection(); + _rDescriptor[ svx::DataAccessDescriptorProperty::Command ] <<= GetCommand(); + _rDescriptor[ svx::DataAccessDescriptorProperty::CommandType ] <<= GetCommandType(); + _rDescriptor[ svx::DataAccessDescriptorProperty::EscapeProcessing ] <<= GetEscapeProcessing(); + _rDescriptor[ svx::DataAccessDescriptorProperty::Connection ] <<= getConnection(); ColumnInfo* pInfo = static_cast<ColumnInfo*>(_pSelected->GetUserData()); - _rDescriptor[ svx::daColumnName ] <<= pInfo->sColumnName; + _rDescriptor[ svx::DataAccessDescriptorProperty::ColumnName ] <<= pInfo->sColumnName; if ( m_xColumns->hasByName( pInfo->sColumnName ) ) - _rDescriptor[ svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); + _rDescriptor[ svx::DataAccessDescriptorProperty::ColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); } } diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 77c9cb0f05e3..1df8dbd9268e 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -227,7 +227,7 @@ IMPL_LINK_TYPED( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, voi aArgs[0].Value >>= aValue; svx::ODataAccessDescriptor aDescriptor(aValue); OUString sName; - aDescriptor[ svx::daColumnName ] >>= sName; + aDescriptor[ svx::DataAccessDescriptorProperty::ColumnName ] >>= sName; if ( !sName.isEmpty() ) { sName = "[" + sName + "]"; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 60b8ddca3777..a62fdadc3271 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3364,16 +3364,16 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // clear all selections getDesignView()->unmarkAllObjects(); - uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::daColumnObject ], uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::DataAccessDescriptorProperty::ColumnObject ], uno::UNO_QUERY ); uno::Reference< lang::XComponent > xHoldAlive; if ( !xField.is() ) { OUString sCommand; OUString sColumnName; sal_Int32 nCommandType( -1 ); - OSL_VERIFY( aDescriptor[ svx::daCommand ] >>= sCommand ); - OSL_VERIFY( aDescriptor[ svx::daColumnName ] >>= sColumnName ); - OSL_VERIFY( aDescriptor[ svx::daCommandType ] >>= nCommandType ); + OSL_VERIFY( aDescriptor[ svx::DataAccessDescriptorProperty::Command ] >>= sCommand ); + OSL_VERIFY( aDescriptor[ svx::DataAccessDescriptorProperty::ColumnName ] >>= sColumnName ); + OSL_VERIFY( aDescriptor[ svx::DataAccessDescriptorProperty::CommandType ] >>= nCommandType ); uno::Reference< container::XNameAccess > xColumns; uno::Reference< sdbc::XConnection > xConnection( getConnection() ); |