diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:15:55 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 09:11:40 +0300 |
commit | c07a3b0396ab131bef7ef23305180c8f27bf5c9b (patch) | |
tree | 31b1dca0adcd846db2a7d9fde354f7bee3ab263e /reportdesign | |
parent | d883c12556a71c5d3719454b1f95809a505f0ace (diff) |
Get rid of initial :: for the svx namespace
Change-Id: I03e428a749bca409ebac9c142acaddafcbfeca23
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 16 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/AddField.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 12 |
7 files changed, 26 insertions, 26 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 7a7c03b0b331..6ba139216869 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -90,7 +90,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe while( pSelected ) { // build a descriptor for the currently selected field - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; m_pTabWin->fillDescriptor(pSelected,aDescriptor); aArgs[i++].Value <<= aDescriptor.createPropertyValueSequence(); pSelected = NextSelected(pSelected); @@ -433,7 +433,7 @@ uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const return uno::Reference< sdbc::XConnection>(m_xRowSet->getPropertyValue( PROPERTY_ACTIVECONNECTION ),uno::UNO_QUERY); } -void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor) +void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAccessDescriptor& _rDescriptor) { if ( _pSelected && m_xColumns.is() ) { @@ -449,15 +449,15 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAcc } } - _rDescriptor[ ::svx::daCommand ] <<= GetCommand(); - _rDescriptor[ ::svx::daCommandType ] <<= GetCommandType(); - _rDescriptor[ ::svx::daEscapeProcessing ] <<= GetEscapeProcessing(); - _rDescriptor[ ::svx::daConnection ] <<= getConnection(); + _rDescriptor[ svx::daCommand ] <<= GetCommand(); + _rDescriptor[ svx::daCommandType ] <<= GetCommandType(); + _rDescriptor[ svx::daEscapeProcessing ] <<= GetEscapeProcessing(); + _rDescriptor[ svx::daConnection ] <<= getConnection(); ColumnInfo* pInfo = static_cast<ColumnInfo*>(_pSelected->GetUserData()); - _rDescriptor[ ::svx::daColumnName ] <<= pInfo->sColumnName; + _rDescriptor[ svx::daColumnName ] <<= pInfo->sColumnName; if ( m_xColumns->hasByName( pInfo->sColumnName ) ) - _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); + _rDescriptor[ svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); } } diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 1ef8d1e7bf90..3ba9044521af 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -280,9 +280,9 @@ Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, m_nFontColorId = m_pActions->GetItemId(".uno:FontColor"); m_nFontDialogId = m_pActions->GetItemId(".uno:FontDialog"); - m_pBtnUpdaterBackgroundColor = new ::svx::ToolboxButtonColorUpdater( + m_pBtnUpdaterBackgroundColor = new svx::ToolboxButtonColorUpdater( SID_BACKGROUND_COLOR, m_nBackgroundColorId, m_pActions ); - m_pBtnUpdaterFontColor = new ::svx::ToolboxButtonColorUpdater( + m_pBtnUpdaterFontColor = new svx::ToolboxButtonColorUpdater( SID_ATTR_CHAR_COLOR2, m_nFontColorId, m_pActions ); Show(); diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 01a3b8cb29cf..506cba302f4f 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -91,8 +91,8 @@ namespace rptui VclPtr<PushButton> m_pRemoveCondition; VclPtr<OColorPopup> m_pColorFloat; - ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterFontColor; // updates the color below the toolbar icon - ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterBackgroundColor; + svx::ToolboxButtonColorUpdater* m_pBtnUpdaterFontColor; // updates the color below the toolbar icon + svx::ToolboxButtonColorUpdater* m_pBtnUpdaterBackgroundColor; size_t m_nCondIndex; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 0854653fb21c..819fabb1d597 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -228,9 +228,9 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) { uno::Sequence< beans::PropertyValue > aValue; aArgs[0].Value >>= aValue; - ::svx::ODataAccessDescriptor aDescriptor(aValue); + svx::ODataAccessDescriptor aDescriptor(aValue); OUString sName; - aDescriptor[ ::svx::daColumnName ] >>= sName; + aDescriptor[ svx::daColumnName ] >>= sName; if ( !sName.isEmpty() ) { sName = "[" + sName + "]"; diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 6a30ee88da2e..7685b447fef6 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -113,7 +113,7 @@ public: * \param _pSelected the currently selected * \param _rDescriptor the descriptor will be filled */ - void fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor); + void fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAccessDescriptor& _rDescriptor); private: // FmXChangeListener diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 24f274ee56dd..4398c00949bd 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3364,7 +3364,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) bHandleOnlyOne = true; aValue = aArgs; } - ::svx::ODataAccessDescriptor aDescriptor(aValue); + svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault("Section",xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); @@ -3394,16 +3394,16 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // clear all selections getDesignView()->unmarkAllObjects(NULL); - uno::Reference< beans::XPropertySet > xField( aDescriptor[ ::svx::daColumnObject ], uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::daColumnObject ], 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::daCommand ] >>= sCommand ); + OSL_VERIFY( aDescriptor[ svx::daColumnName ] >>= sColumnName ); + OSL_VERIFY( aDescriptor[ svx::daCommandType ] >>= nCommandType ); uno::Reference< container::XNameAccess > xColumns; uno::Reference< sdbc::XConnection > xConnection( getConnection() ); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index a01b1c2fa5bc..d8e97db06131 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -766,8 +766,8 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) else { const DataFlavorExVector& rFlavors = GetDataFlavorExVector(); - if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors) - || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) ) + if ( svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors) + || svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) ) return _rEvt.mnAction; const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE; @@ -789,7 +789,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; const TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable); DataFlavorExVector& rFlavors = aDropped.GetDataFlavorExVector(); - bool bMultipleFormat = ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors); + bool bMultipleFormat = svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors); if ( OReportExchange::canExtract(rFlavors) ) { OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aDropped); @@ -799,7 +799,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) m_pParent->getViewsWindow()->unmarkAllObjects(m_pView); } else if ( bMultipleFormat - || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) ) + || svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) ) { m_pParent->getViewsWindow()->getView()->setMarked(m_pView, true); m_pView->UnmarkAll(); @@ -815,13 +815,13 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) uno::Sequence<beans::PropertyValue> aValues; if ( !bMultipleFormat ) { - ::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped); + svx::ODataAccessDescriptor aDescriptor = svx::OColumnTransferable::extractColumnDescriptor(aDropped); aValues.realloc(1); aValues[0].Value <<= aDescriptor.createPropertyValueSequence(); } else - aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped); + aValues = svx::OMultiColumnTransferable::extractDescriptor(aDropped); beans::PropertyValue* pIter = aValues.getArray(); beans::PropertyValue* pEnd = pIter + aValues.getLength(); |