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 | |
| parent | d883c12556a71c5d3719454b1f95809a505f0ace (diff) | |
Get rid of initial :: for the svx namespace
Change-Id: I03e428a749bca409ebac9c142acaddafcbfeca23
103 files changed, 273 insertions, 273 deletions
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index e7a37c4dbfa4..0c9d91e34051 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,7 +51,7 @@ namespace svx VclPtr<PushButton> m_pEdit; VclPtr<PushButton> m_pDelete; - VclPtr< ::svx::OptHeaderTabListBox> pPathBox; + VclPtr<svx::OptHeaderTabListBox> pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; bool m_bModified; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 0e94b7304153..a394d095f6a9 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -46,7 +46,7 @@ private: VclPtr<PushButton> m_pStandardBtn; VclPtr<PushButton> m_pPathBtn; - VclPtr< ::svx::OptHeaderTabListBox> pPathBox; + VclPtr<svx::OptHeaderTabListBox> pPathBox; OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 5d834e297cdf..2d7e8a58916a 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -125,7 +125,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons Size aBoxSize = m_pPathCtrl->GetOutputSizePixel(); WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP; - pPathBox = new ::svx::OptHeaderTabListBox( *m_pPathCtrl, nBits ); + pPathBox = new svx::OptHeaderTabListBox( *m_pPathCtrl, nBits ); HeaderBar &rBar = pPathBox->GetTheHeaderBar(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 2267d16775ad..37680845ac73 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -318,7 +318,7 @@ VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, c case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; - case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; + case SID_SB_DBREGISTEROPTIONS: fnCreate = &svx::DbRegistrationOptionsPage::Create; break; case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; @@ -1306,7 +1306,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER, 0 ); ::offapp::ConnectionPoolConfig::GetOptions(*pRet); - ::svx::DbRegisteredNamesConfig::GetOptions(*pRet); + svx::DbRegisteredNamesConfig::GetOptions(*pRet); break; case SID_SCH_EDITOPTIONS: @@ -1383,7 +1383,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet case SID_SB_STARBASEOPTIONS: ::offapp::ConnectionPoolConfig::SetOptions( rSet ); - ::svx::DbRegisteredNamesConfig::SetOptions(rSet); + svx::DbRegisteredNamesConfig::SetOptions(rSet); break; case SID_SCH_EDITOPTIONS: diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index c97494f41fda..6d101ca3382a 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -95,7 +95,7 @@ namespace dbmm get(m_pStartMigration, "startmigrate"); get(m_pBrowseSaveAsLocation, "browse"); get(m_pSaveAsLocation, "location"); - m_pLocationController = new ::svx::DatabaseLocationInputController( + m_pLocationController = new svx::DatabaseLocationInputController( _rParentDialog.getComponentContext(), *m_pSaveAsLocation, *m_pBrowseSaveAsLocation); m_pSaveAsLocation->SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 90a5e5e2100b..f9ee4d60dc4e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -86,7 +86,7 @@ namespace dbmm VclPtr< ::svt::OFileURLControl> m_pSaveAsLocation; VclPtr<PushButton> m_pBrowseSaveAsLocation; VclPtr<FixedText> m_pStartMigration; - ::svx::DatabaseLocationInputController* m_pLocationController; + svx::DatabaseLocationInputController* m_pLocationController; protected: // IWizardPageController overridables diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 959f8c0b38f1..e02281d2f102 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -273,7 +273,7 @@ namespace dbaui @return <TRUE/> if the paste opertions was successful, otherwise <FALSE/>. */ - bool paste( ElementType _eType, const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder = OUString(), bool _bMove = false); + bool paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder = OUString(), bool _bMove = false); /// returns the system clipboard. const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; } diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index f18b2d010b85..4381e55cbdfa 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -578,7 +578,7 @@ TransferableHelper* OApplicationController::copyObject() return NULL; } -bool OApplicationController::paste( ElementType _eType, const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove) +bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove) { try { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index e546a4a7b33e..a98919ffa0db 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1070,7 +1070,7 @@ void SbaTableQueryBrowser::checkDocumentDataSource() implCheckExternalSlot(ID_BROWSER_DOCUMENT_DATASOURCE); } -void SbaTableQueryBrowser::extractDescriptorProps(const ::svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing) +void SbaTableQueryBrowser::extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing) { _rDataSource = _rDescriptor.getDataSource(); if ( _rDescriptor.has(daCommand) ) @@ -1253,7 +1253,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour return pObject; } -SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, +SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const svx::ODataAccessDescriptor& _rDescriptor, SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry, bool _bExpandAncestors) { @@ -1860,7 +1860,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue break; case ID_TREE_ADMINISTRATE: - ::svx::administrateDatabaseRegistration( getView() ); + svx::administrateDatabaseRegistration( getView() ); break; case ID_BROWSER_REFRESH: @@ -1911,7 +1911,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue else { Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY); - implSelect(::svx::ODataAccessDescriptor(xProp)); + implSelect(svx::ODataAccessDescriptor(xProp)); } } break; @@ -2350,7 +2350,7 @@ bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry ) return bSuccess; } -bool SbaTableQueryBrowser::implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect) +bool SbaTableQueryBrowser::implSelect(const svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect) { // extract the props OUString sDataSource; @@ -3675,7 +3675,7 @@ bool SbaTableQueryBrowser::preReloadForm() getBrowserView()->getGridControl()->setDesignMode(sal_True); // we had an invalid statement so we need to connect the column models Reference<XPropertySet> xRowSetProps(getRowSet(),UNO_QUERY); - ::svx::ODataAccessDescriptor aDesc(xRowSetProps); + svx::ODataAccessDescriptor aDesc(xRowSetProps); // extract the props OUString sDataSource; OUString sCommand; diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index d7795d12f26d..512132e7f68a 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -70,7 +70,7 @@ namespace dbaui // is needed to describe the drop target struct DropDescriptor { - ::svx::ODataAccessDescriptor aDroppedData; + svx::ODataAccessDescriptor aDroppedData; //for transfor the tablename OUString sDefaultTableName; @@ -168,7 +168,7 @@ namespace dbaui The name of the dest data source. */ void pasteTable( - const ::svx::ODataAccessDescriptor& _rPasteData, + const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sDestDataSourceName, const SharedConnection& _xDestConnection ); diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 35b81ad01ea4..d1b87f0ddc70 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -86,7 +86,7 @@ namespace dbaui bool m_bCheckOnly; // export data - ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ODatabaseImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); @@ -108,7 +108,7 @@ namespace dbaui virtual bool Write(); // Export virtual bool Read(); // Import - void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor); + void initialize(const svx::ODataAccessDescriptor& _aDataDescriptor); void dispose(); void enableCheckOnly() { m_bCheckOnly = true; } @@ -116,7 +116,7 @@ namespace dbaui private: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); + void impl_initFromDescriptor( const svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; // RTF Import and Export @@ -126,7 +126,7 @@ namespace dbaui void appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data - ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ORTFImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()) @@ -170,7 +170,7 @@ namespace dbaui public: // export data - OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + OHTMLImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); @@ -207,7 +207,7 @@ namespace dbaui // export data ORowSetImportExport(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, - const ::svx::ODataAccessDescriptor& _aDataDescriptor, + const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const OUString& rExchange = OUString()); diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 47dfd7a35c14..8e856b941f93 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -41,7 +41,7 @@ namespace dbaui class ORTFImportExport; class OHTMLImportExport; - class ODataClipboard : public ::svx::ODataAccessObjectTransferable + class ODataClipboard : public svx::ODataAccessObjectTransferable { ::rtl::Reference< OHTMLImportExport > m_pHtml; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 25292c90231e..4b9bd43d5c84 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -214,7 +214,7 @@ namespace dbaui // Attributes protected: - ::svx::ODataAccessDescriptor m_aDataDescriptor; + svx::ODataAccessDescriptor m_aDataDescriptor; SbaGridListener* m_pMasterListener; ImplSVEvent * m_nAsyncDropEvent; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 18cb4322295c..fc592a3977af 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -88,7 +88,7 @@ namespace dbaui typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less< sal_uInt16 > > ExternalFeaturesMap; ExternalFeaturesMap m_aExternalFeatures; - ::svx::ODataAccessDescriptor m_aDocumentDataSource; + svx::ODataAccessDescriptor m_aDocumentDataSource; // if we're part of a document, this is the state of the DocumentDataSource slot ::cppu::OInterfaceContainerHelper m_aSelectionListeners; @@ -358,7 +358,7 @@ namespace dbaui void implRemoveStatusListeners(); - bool implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect = false); + bool implSelect(const svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect = false); bool implSelect( SvTreeListEntry* _pEntry ); /// selects the entry given and loads the grid control with the object's data @@ -394,7 +394,7 @@ namespace dbaui @param _bExpandAncestors If <TRUE/>, all ancestor on the way to the entry will be expanded */ - SvTreeListEntry* getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, + SvTreeListEntry* getObjectEntry(const svx::ODataAccessDescriptor& _rDescriptor, SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, bool _bExpandAncestors = true ); @@ -424,7 +424,7 @@ namespace dbaui /// checks if m_aDocumentDataSource describes a known object void checkDocumentDataSource(); - void extractDescriptorProps(const ::svx::ODataAccessDescriptor& _rDescriptor, + void extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing); void transferChangedControlProperty(const OUString& _rProperty, const ::com::sun::star::uno::Any& _rNewValue); diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 1d2316ad3d02..a1f5f4b936ac 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; // export data ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, - const ::svx::ODataAccessDescriptor& _aDataDescriptor, + const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, const OUString& rExchange ) diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index b9ad29c123d8..aa4d7527239f 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -134,7 +134,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R } } -void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, +void OTableCopyHelper::pasteTable( const svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, const SharedConnection& i_rDestConnection ) { OUString sSrcDataSourceName = _rPasteData.getDataSource(); @@ -186,7 +186,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId { if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(_rTransData.GetDataFlavorExVector()) ) { - ::svx::ODataAccessDescriptor aPasteData = ODataAccessObjectTransferable::extractObjectDescriptor(_rTransData); + svx::ODataAccessDescriptor aPasteData = ODataAccessObjectTransferable::extractObjectDescriptor(_rTransData); pasteTable( aPasteData,i_rDestDataSource,_xConnection); } } diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a8797550e04a..a05a3f88c9de 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -82,7 +82,7 @@ const static char sFontSize[] = "font-size: "; #define SBA_FORMAT_SELECTION_COUNT 4 #define CELL_X 1437 -ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, +ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange) @@ -636,7 +636,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\ #define TAG_ON_LF( tag ) (TAG_ON( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) #define TAG_OFF_LF( tag ) (TAG_OFF( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) -OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, +OHTMLImportExport::OHTMLImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index e62e29de8353..1b760958dba2 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2175,7 +2175,7 @@ void EditEngine::StartSpelling(EditView& rEditView, bool bMultipleDoc) pImpEditEngine->StartSpelling(rEditView, bMultipleDoc); } -bool EditEngine::SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ) +bool EditEngine::SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ) { return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking ); } @@ -2185,7 +2185,7 @@ void EditEngine::PutSpellingToSentenceStart( EditView& rEditView ) pImpEditEngine->PutSpellingToSentenceStart( rEditView ); } -void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck ) +void EditEngine::ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ) { pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck ); } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index fccd6d8e99af..301b6f92ea08 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -161,7 +161,7 @@ struct SpellInfo EditPaM aCurSentenceStart; bool bSpellToEnd; bool bMultipleDoc; - ::svx::SpellPortions aLastSpellPortions; + svx::SpellPortions aLastSpellPortions; SpellContentSelections aLastSpellContentSelections; SpellInfo() { bSpellToEnd = true; eState = EE_SPELL_OK; bMultipleDoc = false; } @@ -951,22 +951,22 @@ public: //initialize sentence spelling void StartSpelling(EditView& rEditView, bool bMultipleDoc); //spell and return a sentence - bool SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); + bool SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); //put spelling back to start of current sentence - needed after switch of grammar support void PutSpellingToSentenceStart( EditView& rEditView ); //applies a changed sentence - void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck ); + void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ); //adds one or more portions of text to the SpellPortions depending on language changes void AddPortionIterated( EditView& rEditView, const EditSelection &rSel, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > xAlt, - ::svx::SpellPortions& rToFill); + svx::SpellPortions& rToFill); //adds one portion to the SpellPortions void AddPortion( const EditSelection &rSel, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > xAlt, - ::svx::SpellPortions& rToFill, + svx::SpellPortions& rToFill, bool bIsField ); bool Search( const SvxSearchItem& rSearchItem, EditView* pView ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 39c147ef2747..20c411e03d86 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1954,7 +1954,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r } bool ImpEditEngine::SpellSentence(EditView& rEditView, - ::svx::SpellPortions& rToFill, + svx::SpellPortions& rToFill, bool /*bIsGrammarChecking*/ ) { bool bRet = false; @@ -2017,7 +2017,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView, void ImpEditEngine::AddPortion( const EditSelection& rSel, uno::Reference< XSpellAlternatives > xAlt, - ::svx::SpellPortions& rToFill, + svx::SpellPortions& rToFill, bool bIsField) { if(rSel.HasRange()) @@ -2041,7 +2041,7 @@ void ImpEditEngine::AddPortionIterated( EditView& rEditView, const EditSelection& rSel, Reference< XSpellAlternatives > xAlt, - ::svx::SpellPortions& rToFill) + svx::SpellPortions& rToFill) { if (rSel.HasRange()) { @@ -2106,7 +2106,7 @@ void ImpEditEngine::AddPortionIterated( } void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, - const ::svx::SpellPortions& rNewPortions, + const svx::SpellPortions& rNewPortions, bool bRecheck ) { // Note: rNewPortions.size() == 0 is valid and happens when the whole diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 13b17442bdbe..18a27e1c5826 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -587,7 +587,7 @@ void Outliner::StartSpelling(EditView& rEditView, bool bMultipleDoc) pEditEngine->StartSpelling(rEditView, bMultipleDoc); } -bool Outliner::SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ) +bool Outliner::SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ) { return pEditEngine->SpellSentence(rEditView, rToFill, bIsGrammarChecking ); } @@ -597,7 +597,7 @@ void Outliner::PutSpellingToSentenceStart( EditView& rEditView ) pEditEngine->PutSpellingToSentenceStart( rEditView ); } -void Outliner::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck ) +void Outliner::ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ) { pEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck ); } diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index d1e74a74c9bd..a16ba31407af 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -53,7 +53,7 @@ namespace abp get(m_pNameLabel, "nameft"); get(m_pName, "name"); get(m_pDuplicateNameError, "warning"); - m_pLocationController = new ::svx::DatabaseLocationInputController(_pParent->getORB(), + m_pLocationController = new svx::DatabaseLocationInputController(_pParent->getORB(), *m_pLocation, *m_pBrowse); m_pName->SetModifyHdl( LINK(this, FinalPage, OnNameModified) ); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index d87af05f7d0b..9f0453cb9bdf 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -46,7 +46,7 @@ namespace abp VclPtr<Edit> m_pName; VclPtr<FixedText> m_pDuplicateNameError; - ::svx::DatabaseLocationInputController* + svx::DatabaseLocationInputController* m_pLocationController; StringBag m_aInvalidDataSourceNames; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index d38536878977..65c57db23329 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -441,11 +441,11 @@ public: //initialize sentence spelling void StartSpelling(EditView& rEditView, bool bMultipleDoc); //spell and return a sentence - bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); + bool SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); // put spell position to start of current sentence void PutSpellingToSentenceStart( EditView& rEditView ); //applies a changed sentence - void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck ); + void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ); // for text conversion (see also HasSpellErrors) bool HasConvertibleTextPortion( LanguageType nLang ); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 9bfb4b4552c8..81fb3561575d 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -982,11 +982,11 @@ public: void StartSpelling(EditView& rEditView, bool bMultipleDoc); // spell and return a sentence - bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); + bool SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); // put spell position to start of current sentence void PutSpellingToSentenceStart( EditView& rEditView ); // applies a changed sentence - void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck ); + void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ); /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 51b0c31fbf77..db9e95361a75 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -63,7 +63,7 @@ public: void SetPreSelectHdl( const Link& rHdl ) { aPreSelectHdl = rHdl; } static sal_uInt32& getSelectedChar(); - ::svx::SvxShowCharSetItem* ImplGetItem( int _nPos ); + svx::SvxShowCharSetItem* ImplGetItem( int _nPos ); int FirstInView() const; int LastInView() const; int PixelToMapIndex( const Point&) const; @@ -104,7 +104,7 @@ private: Link aSelectHdl; Link aHighHdl; Link aPreSelectHdl; - ::svx::SvxShowCharSetVirtualAcc* m_pAccessible; + svx::SvxShowCharSetVirtualAcc* m_pAccessible; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible; long nX; long nY; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 8249ef9c46b7..01f91198d3cb 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -158,7 +158,7 @@ public: OutputDevice& i_rDevice ) const; - static ::std::unique_ptr< ::svx::ISdrObjectFilter > + static ::std::unique_ptr< svx::ISdrObjectFilter > CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 76b88ab457c3..165f3c07afcd 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -76,11 +76,11 @@ public: /** create a control pair (label/bound control) for the database field description given. */ - SdrObject* CreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ); + SdrObject* CreateFieldControl( const svx::ODataAccessDescriptor& _rColumnDescriptor ); /** create a control pair (label/bound control) for the xforms description given. */ - SdrObject* CreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ); + SdrObject* CreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ); virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void AddWindowToPaintView(OutputDevice* pNewWin) SAL_OVERRIDE; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 844105db21dd..e3d77ccae081 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -906,7 +906,7 @@ public: // There already exists an SvxShape instance associated with the SdrObject // @throws ::com::sun::star::uno::RuntimeException // if there does nt yet exists an SvxShape instance associated with the SdrObject. - ::svx::PropertyChangeNotifier& + svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); // notifies a change in the given property, to all applicable listeners registered at the associated SvxShape @@ -914,7 +914,7 @@ public: // This method is equivalent to calling getShapePropertyChangeNotifier().notifyPropertyChange( _eProperty ), // exception that it is allowed to be called when there does not yet exist an associated SvxShape - in which // case the method will silently return without doing anything. - void notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty ) const; + void notifyShapePropertyChange( const svx::ShapeProperty _eProperty ) const; // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 67fb2e347682..9ca963b9e545 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -191,7 +191,7 @@ public: ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const throw (css::uno::RuntimeException, std::exception); - ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); + svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); void setShapeKind( sal_uInt32 nKind ); sal_uInt32 getShapeKind() const; 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(); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 179f2784a7c0..f7c0aa6d11eb 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -220,13 +220,13 @@ private: OUString sDatabaseName; OUString sConRes; - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(aParam.aDBName); - if (aDescriptor.has(::svx::daDataSource)) + if (aDescriptor.has(svx::daDataSource)) { sDatabaseName = aParam.aDBName; } - else if (aDescriptor.has(::svx::daConnectionResource)) + else if (aDescriptor.has(svx::daConnectionResource)) { sConRes = aParam.aDBName; } diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index df197e37db44..f45baa6a6029 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -86,7 +86,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : sdb::CommandType::TABLE ); - ::svx::ODataAccessDescriptor aSelection; + svx::ODataAccessDescriptor aSelection; aSelection.setDataSource(rParam.aDBName); aSelection[svx::daCommand] <<= rParam.aStatement; aSelection[svx::daCommandType] <<= nType; diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index d880f372433c..bed84079a08e 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -403,7 +403,7 @@ void ScDrawShell::Activate (const bool bMDI) ::rtl::OUString ScDrawShell::GetSidebarContextName() { return sfx2::sidebar::EnumContext::GetContextName( - ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC( + svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC( GetDrawView()->GetMarkedObjectList())); } diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 4e26f31c0165..3291f64b048b 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -33,11 +33,11 @@ class ScDocument; /** Specialized spell check dialog child window for Calc. - This derivation of the ::svx::SpellDialogChildWindow base class provides + This derivation of the svx::SpellDialogChildWindow base class provides Calc specific implementations of the virtual functions GetNextWrongSentence() and ApplyChangedSentence(). */ -class ScSpellDialogChildWindow : public ::svx::SpellDialogChildWindow +class ScSpellDialogChildWindow : public svx::SpellDialogChildWindow { public: SFX_DECL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow ); @@ -56,12 +56,12 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; + virtual svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence( const ::svx::SpellPortions& rChanged, bool bRecheck ) SAL_OVERRIDE; + virtual void ApplyChangedSentence( const svx::SpellPortions& rChanged, bool bRecheck ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index af24ed43c6fc..0401547b8725 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -176,7 +176,7 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable } - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index cf99598f3f49..6afd072b986a 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -241,7 +241,7 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport { rEvent.IsEnabled = rParam.bImport; - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; if ( rParam.bImport ) { sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 432950168a53..0b35f4c361d3 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -84,8 +84,8 @@ namespace { void lcl_initializeNotifier( SdrObject& _rSdrObj, ::cppu::OWeakObject& _rShape ) { - ::svx::PPropertyValueProvider pProvider( new ::svx::PropertyValueProvider( _rShape, "Anchor" ) ); - _rSdrObj.getShapePropertyChangeNotifier().registerProvider( ::svx::eSpreadsheetAnchor, pProvider ); + svx::PPropertyValueProvider pProvider( new svx::PropertyValueProvider( _rShape, "Anchor" ) ); + _rSdrObj.getShapePropertyChangeNotifier().registerProvider( svx::eSpreadsheetAnchor, pProvider ); } } diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 359876bcb9fe..714ab370a494 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -41,7 +41,7 @@ SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG ) ScSpellDialogChildWindow::ScSpellDialogChildWindow( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : - ::svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ), + svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ), mpViewShell( 0 ), mpViewData( 0 ), mpDocShell( 0 ), @@ -59,19 +59,19 @@ ScSpellDialogChildWindow::~ScSpellDialogChildWindow() SfxChildWinInfo ScSpellDialogChildWindow::GetInfo() const { - return ::svx::SpellDialogChildWindow::GetInfo(); + return svx::SpellDialogChildWindow::GetInfo(); } void ScSpellDialogChildWindow::InvalidateSpellDialog() { - ::svx::SpellDialogChildWindow::InvalidateSpellDialog(); + svx::SpellDialogChildWindow::InvalidateSpellDialog(); } // protected ------------------------------------------------------------------ -::svx::SpellPortions ScSpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) +svx::SpellPortions ScSpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) { - ::svx::SpellPortions aPortions; + svx::SpellPortions aPortions; if( mxEngine.get() && mpViewData ) { if( EditView* pEditView = mpViewData->GetSpellingView() ) @@ -93,7 +93,7 @@ void ScSpellDialogChildWindow::InvalidateSpellDialog() return aPortions; } -void ScSpellDialogChildWindow::ApplyChangedSentence( const ::svx::SpellPortions& rChanged, bool bRecheck ) +void ScSpellDialogChildWindow::ApplyChangedSentence( const svx::SpellPortions& rChanged, bool bRecheck ) { if( mxEngine.get() && mpViewData ) if( EditView* pEditView = mpViewData->GetSpellingView() ) diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index edf6eed9103b..f861b7bbd84e 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -387,7 +387,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) SdrPageView* pPageView = pDrView ? pDrView->GetSdrPageView() : NULL; if(pPageView) { - ::svx::ODataAccessDescriptor aDescriptor(pDescriptorItem->GetValue()); + svx::ODataAccessDescriptor aDescriptor(pDescriptorItem->GetValue()); SdrObject* pNewDBField = pDrView->CreateFieldControl(aDescriptor); if(pNewDBField) diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index a7e4052576e9..c220b234d523 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -416,11 +416,11 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, { // insert database field control - if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE ) ) + if ( svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE ) ) { MakeDrawLayer(); ScDrawView* pScDrawView = GetScDrawView(); - SdrObject* pObj = pScDrawView->CreateFieldControl( ::svx::OColumnTransferable::extractColumnDescriptor( aDataHelper ) ); + SdrObject* pObj = pScDrawView->CreateFieldControl( svx::OColumnTransferable::extractColumnDescriptor( aDataHelper ) ); if (pObj) { Point aInsPos = aPos; diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 2d5acaf454c5..6d3e247a1e55 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -142,7 +142,7 @@ public: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - ::svx::SpellPortions GetNextSpellSentence(); + svx::SpellPortions GetNextSpellSentence(); /** Release all resources that have been created during the find&replace or spell check. diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index e3b6c961f99d..e52e3dbd269d 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -42,7 +42,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) - : ::svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), + : svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), mpSdOutliner (NULL), mbOwnOutliner (false) { @@ -60,17 +60,17 @@ SpellDialogChildWindow::~SpellDialogChildWindow() SfxChildWinInfo SpellDialogChildWindow::GetInfo() const { - return ::svx::SpellDialogChildWindow::GetInfo(); + return svx::SpellDialogChildWindow::GetInfo(); } void SpellDialogChildWindow::InvalidateSpellDialog() { - ::svx::SpellDialogChildWindow::InvalidateSpellDialog(); + svx::SpellDialogChildWindow::InvalidateSpellDialog(); } -::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) +svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) { - ::svx::SpellPortions aResult; + svx::SpellPortions aResult; if (mpSdOutliner != NULL) { @@ -94,7 +94,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog() } void SpellDialogChildWindow::ApplyChangedSentence ( - const ::svx::SpellPortions& rChanged, bool bRecheck ) + const svx::SpellPortions& rChanged, bool bRecheck ) { if (mpSdOutliner != NULL) { diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index db658e8ffb61..7ac5230152a8 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -26,12 +26,12 @@ namespace sd { class Outliner; -/** This derivation of the ::svx::SpellDialogChildWindow base class +/** This derivation of the svx::SpellDialogChildWindow base class provides Draw and Impress specific implementations of GetNextWrongSentence() and ApplyChangedSentence(). */ class SpellDialogChildWindow - : public ::svx::SpellDialogChildWindow + : public svx::SpellDialogChildWindow { public: SpellDialogChildWindow ( @@ -53,12 +53,12 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; + virtual svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; + virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 17aadc84ac7b..ca5b6dd66fb5 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -390,9 +390,9 @@ bool Outliner::SpellNextDocument() /** * check next text object */ -::svx::SpellPortions Outliner::GetNextSpellSentence() +svx::SpellPortions Outliner::GetNextSpellSentence() { - ::svx::SpellPortions aResult; + svx::SpellPortions aResult; DetectChange(); // Iterate over sentences and text shapes until a sentence with a diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 34fca249cb20..d7c1a55d1dc1 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -803,24 +803,24 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) ::rtl::OUString DrawViewShell::GetSidebarContextName() const { - ::svx::sidebar::SelectionAnalyzer::ViewType eViewType (::svx::sidebar::SelectionAnalyzer::VT_Standard); + svx::sidebar::SelectionAnalyzer::ViewType eViewType (svx::sidebar::SelectionAnalyzer::VT_Standard); switch (mePageKind) { case PK_HANDOUT: - eViewType = ::svx::sidebar::SelectionAnalyzer::VT_Handout; + eViewType = svx::sidebar::SelectionAnalyzer::VT_Handout; break; case PK_NOTES: - eViewType = ::svx::sidebar::SelectionAnalyzer::VT_Notes; + eViewType = svx::sidebar::SelectionAnalyzer::VT_Notes; break; case PK_STANDARD: if (meEditMode == EM_MASTERPAGE) - eViewType = ::svx::sidebar::SelectionAnalyzer::VT_Master; + eViewType = svx::sidebar::SelectionAnalyzer::VT_Master; else - eViewType = ::svx::sidebar::SelectionAnalyzer::VT_Standard; + eViewType = svx::sidebar::SelectionAnalyzer::VT_Standard; break; } return EnumContext::GetContextName( - ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SD( + svx::sidebar::SelectionAnalyzer::GetContextForSelection_SD( mpDrawView->GetMarkedObjectList(), eViewType)); } diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 5a13836699eb..5b945c5a39b5 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -275,7 +275,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if(pPageView) { - ::svx::ODataAccessDescriptor aDescriptor(pDescriptorItem->GetValue()); + svx::ODataAccessDescriptor aDescriptor(pDescriptorItem->GetValue()); SdrObject* pNewDBField = pFormView->CreateFieldControl(aDescriptor); if(pNewDBField) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index a620624fbd7f..7f5aea19e4cf 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1596,12 +1596,12 @@ SfxShell* ViewShellObjectBarFactory::CreateShell ( break; case RID_SVX_EXTRUSION_BAR: - pShell = new ::svx::ExtrusionBar( + pShell = new svx::ExtrusionBar( &mrViewShell.GetViewShellBase()); break; case RID_SVX_FONTWORK_BAR: - pShell = new ::svx::FontworkBar( + pShell = new svx::FontworkBar( &mrViewShell.GetViewShellBase()); break; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index e3466fc11580..1a7a09812eb1 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -557,7 +557,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In { OExternalLockGuard aGuard( this ); ensureAlive(); - ::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( + svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) )); if ( !pItem ) throw IndexOutOfBoundsException(); diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index dc52b9f301c4..6e6118e88553 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -41,53 +41,53 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory ( { Reference< XSingleServiceFactory > xFactory; - if( ::svx::ExtrusionDepthController_getImplementationName().equalsAscii( pImplName ) ) + if( svx::ExtrusionDepthController_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::ExtrusionDepthController_getImplementationName(), - ::svx::ExtrusionDepthController_createInstance, - ::svx::ExtrusionDepthController_getSupportedServiceNames() ); + svx::ExtrusionDepthController_getImplementationName(), + svx::ExtrusionDepthController_createInstance, + svx::ExtrusionDepthController_getSupportedServiceNames() ); } - else if( ::svx::ExtrusionDirectionControl_getImplementationName().equalsAscii( pImplName ) ) + else if( svx::ExtrusionDirectionControl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::ExtrusionDirectionControl_getImplementationName(), - ::svx::ExtrusionDirectionControl_createInstance, - ::svx::ExtrusionDirectionControl_getSupportedServiceNames() ); + svx::ExtrusionDirectionControl_getImplementationName(), + svx::ExtrusionDirectionControl_createInstance, + svx::ExtrusionDirectionControl_getSupportedServiceNames() ); } - else if( ::svx::ExtrusionLightingControl_getImplementationName().equalsAscii( pImplName ) ) + else if( svx::ExtrusionLightingControl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::ExtrusionLightingControl_getImplementationName(), - ::svx::ExtrusionLightingControl_createInstance, - ::svx::ExtrusionLightingControl_getSupportedServiceNames() ); + svx::ExtrusionLightingControl_getImplementationName(), + svx::ExtrusionLightingControl_createInstance, + svx::ExtrusionLightingControl_getSupportedServiceNames() ); } - else if( ::svx::ExtrusionSurfaceControl_getImplementationName().equalsAscii( pImplName ) ) + else if( svx::ExtrusionSurfaceControl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::ExtrusionSurfaceControl_getImplementationName(), - ::svx::ExtrusionSurfaceControl_createInstance, - ::svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); + svx::ExtrusionSurfaceControl_getImplementationName(), + svx::ExtrusionSurfaceControl_createInstance, + svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); } - else if( ::svx::FontworkAlignmentControl_getImplementationName().equalsAscii( pImplName ) ) + else if( svx::FontworkAlignmentControl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::FontworkAlignmentControl_getImplementationName(), - ::svx::FontworkAlignmentControl_createInstance, - ::svx::FontworkAlignmentControl_getSupportedServiceNames() ); + svx::FontworkAlignmentControl_getImplementationName(), + svx::FontworkAlignmentControl_createInstance, + svx::FontworkAlignmentControl_getSupportedServiceNames() ); } - else if( ::svx::FontworkCharacterSpacingControl_getImplementationName().equalsAscii( pImplName ) ) + else if( svx::FontworkCharacterSpacingControl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - ::svx::FontworkCharacterSpacingControl_getImplementationName(), - ::svx::FontworkCharacterSpacingControl_createInstance, - ::svx::FontworkCharacterSpacingControl_getSupportedServiceNames() ); + svx::FontworkCharacterSpacingControl_getImplementationName(), + svx::FontworkCharacterSpacingControl_createInstance, + svx::FontworkCharacterSpacingControl_getSupportedServiceNames() ); } if( xFactory.is()) { xFactory->acquire(); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 26508ad425e9..02117daf658c 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -620,7 +620,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) getSelectedChar() = mpFontCharMap->GetCharFromIndex( nSelectedIndex ); if( m_pAccessible ) { - ::svx::SvxShowCharSetItem* pItem = ImplGetItem(nSelectedIndex); + svx::SvxShowCharSetItem* pItem = ImplGetItem(nSelectedIndex); // Don't fire the focus event. if ( bFocus ) m_pAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), makeAny(pItem->GetAccessible()) ); // this call asures that m_pItem is set @@ -712,12 +712,12 @@ void SvxShowCharSet::ReleaseAccessible() ::com::sun::star::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() { OSL_ENSURE(!m_pAccessible,"Accessible already created!"); - m_pAccessible = new ::svx::SvxShowCharSetVirtualAcc(this); + m_pAccessible = new svx::SvxShowCharSetVirtualAcc(this); m_xAccessible = m_pAccessible; return m_xAccessible; } -::svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) +svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) { ItemsMap::iterator aFind = m_aItems.find(_nPos); if ( aFind == m_aItems.end() ) diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 0ea76ae0c44e..99995c5a76a6 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -36,7 +36,7 @@ OSystemParseContext::OSystemParseContext() : IParseContext() { SolarMutexGuard aGuard; - ::svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) ); + svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) ); aKeywords.get( m_aLocalizedKeywords ); } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 7a7f73817718..6cd4924afd5e 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -262,7 +262,7 @@ bool FmFormShell::PrepareClose(bool bUI) // Wenn alles glatt gelaufen ist, werden die modifizierten Datensaetze gespeichert if ( GetImpl()->getActiveController().is() ) { - const ::svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures(); + const svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures(); if ( rController->commitCurrentControl() ) { bool bModified = rController->isModifiedRow(); @@ -702,7 +702,7 @@ void FmFormShell::Execute(SfxRequest &rReq) break; case SID_FM_SEARCH: { - const ::svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures(); + const svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures(); if ( rController->commitCurrentControl() && rController->commitCurrentRecord() ) GetImpl()->ExecuteSearch(); rReq.Done(); @@ -733,7 +733,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_RECORD_ABSOLUTE: { - const ::svx::ControllerFeatures& rController = GetImpl()->getNavControllerFeatures(); + const svx::ControllerFeatures& rController = GetImpl()->getNavControllerFeatures(); sal_Int32 nRecord = -1; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1351,7 +1351,7 @@ void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrVi namespace { - class FocusableControlsFilter : public ::svx::ISdrObjectFilter + class FocusableControlsFilter : public svx::ISdrObjectFilter { public: FocusableControlsFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) @@ -1378,9 +1378,9 @@ namespace } -::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) +::std::unique_ptr< svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) { - ::std::unique_ptr< ::svx::ISdrObjectFilter > pFilter; + ::std::unique_ptr< svx::ISdrObjectFilter > pFilter; if ( !i_rView.IsDesignMode() ) pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 3b13e0402c15..fe0c4d78d47a 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -632,7 +632,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) ,m_nInvalidationEvent( 0 ) ,m_nActivationEvent( 0 ) ,m_pShell( &_rShell ) - ,m_pTextShell( new ::svx::FmTextControlShell( _pViewFrame ) ) + ,m_pTextShell( new svx::FmTextControlShell( _pViewFrame ) ) ,m_aActiveControllerFeatures( this ) ,m_aNavControllerFeatures( this ) ,m_eDocumentType( eUnknownDocumentType ) @@ -1775,7 +1775,7 @@ namespace bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState ) { - const ::svx::ControllerFeatures& rController = + const svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() : getActiveControllerFeatures(); @@ -1790,7 +1790,7 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) { - const ::svx::ControllerFeatures& rController = + const svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() : getActiveControllerFeatures(); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 2b0b410d21fb..a28064a46152 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1111,7 +1111,7 @@ namespace } -SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ) +SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor& _rColumnDescriptor ) { // not if we're in design mode if ( !m_pView->IsDesignMode() ) @@ -1344,7 +1344,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript } -SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ) +SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ) { // not if we're in design mode if ( !m_pView->IsDesignMode() ) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 5efd2607b49d..30f3278ca726 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -507,7 +507,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > { bool operator()( const Reference< XDispatch >& _rxDispatcher ) const { - static_cast< ::svx::OSingleFeatureDispatcher* >( _rxDispatcher.get() )->updateAllListeners(); + static_cast< svx::OSingleFeatureDispatcher* >( _rxDispatcher.get() )->updateAllListeners(); // the return is a dummy only so we can use this struct in a o3tl::compose1 call return true; } @@ -4091,8 +4091,8 @@ FormController::interceptedQueryDispatch( const URL& aURL, if ( !xReturn.is() && m_xFormOperations.is() ) { // find the slot id which corresponds to the URL - sal_Int32 nFeatureSlotId = ::svx::FeatureSlotTranslation::getControllerFeatureSlotIdForURL( aURL.Main ); - sal_Int16 nFormFeature = ( nFeatureSlotId != -1 ) ? ::svx::FeatureSlotTranslation::getFormFeatureForSlotId( nFeatureSlotId ) : -1; + sal_Int32 nFeatureSlotId = svx::FeatureSlotTranslation::getControllerFeatureSlotIdForURL( aURL.Main ); + sal_Int16 nFormFeature = ( nFeatureSlotId != -1 ) ? svx::FeatureSlotTranslation::getFormFeatureForSlotId( nFeatureSlotId ) : -1; if ( nFormFeature > 0 ) { // get the dispatcher for this feature, create if necessary @@ -4100,7 +4100,7 @@ FormController::interceptedQueryDispatch( const URL& aURL, if ( aDispatcherPos == m_aFeatureDispatchers.end() ) { aDispatcherPos = m_aFeatureDispatchers.insert( - DispatcherContainer::value_type( nFormFeature, new ::svx::OSingleFeatureDispatcher( aURL, nFormFeature, m_xFormOperations, m_aMutex ) ) + DispatcherContainer::value_type( nFormFeature, new svx::OSingleFeatureDispatcher( aURL, nFormFeature, m_xFormOperations, m_aMutex ) ) ).first; } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 49e2e4ec3d73..2055f438a3ff 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -153,7 +153,7 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi // no drag without a field return; - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; aDescriptor[ daDataSource ] <<= pTabWin->GetDatabaseName(); aDescriptor[ daConnection ] <<= pTabWin->GetConnection().getTyped(); aDescriptor[ daCommand ] <<= pTabWin->GetObjectName(); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 70aadfab6f38..61ddbf23d301 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -145,7 +145,7 @@ class FmFormView; class FmFormObj; class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE ,public FmXFormShell_CFGBASE - ,public ::svx::IControllerFeatureInvalidation + ,public svx::IControllerFeatureInvalidation { friend class FmFormView; friend class FmXFormView; @@ -187,10 +187,10 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE m_aLoadingPages; FmFormShell* m_pShell; - ::svx::FmTextControlShell* m_pTextShell; + svx::FmTextControlShell* m_pTextShell; - ::svx::ControllerFeatures m_aActiveControllerFeatures; - ::svx::ControllerFeatures m_aNavControllerFeatures; + svx::ControllerFeatures m_aActiveControllerFeatures; + svx::ControllerFeatures m_aNavControllerFeatures; // aktuelle Form, Controller // nur im alive mode verfuegbar @@ -349,9 +349,9 @@ public: SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;} SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;} - SAL_DLLPRIVATE inline const ::svx::ControllerFeatures& getActiveControllerFeatures() const + SAL_DLLPRIVATE inline const svx::ControllerFeatures& getActiveControllerFeatures() const { return m_aActiveControllerFeatures; } - SAL_DLLPRIVATE inline const ::svx::ControllerFeatures& getNavControllerFeatures() const + SAL_DLLPRIVATE inline const svx::ControllerFeatures& getNavControllerFeatures() const { return m_aNavControllerFeatures.isAssigned() ? m_aNavControllerFeatures : m_aActiveControllerFeatures; } /** announces a new "current selection" diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 31a6adc3f444..6dd1c861ed01 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -250,8 +250,8 @@ private: void Activate(bool bSync = false); void Deactivate(bool bDeactivateController = true); - SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ); - SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ); + SdrObject* implCreateFieldControl( const svx::ODataAccessDescriptor& _rColumnDescriptor ); + SdrObject* implCreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ); static bool createControlLabelPair( OutputDevice& _rOutDev, diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index b41b12672d05..3e7f0859983d 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -51,7 +51,7 @@ private: void Fill(); }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index c39eb4ba2355..10cfb3c606fb 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -65,6 +65,6 @@ void EmptyPanel::Resize() } -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index 36e0c7b1d9e9..e85edba32a0a 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -44,7 +44,7 @@ private: VclPtr<FixedText> maMessageControl; }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index f46350d2b08f..91611c2d7aa2 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -493,6 +493,6 @@ bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType) -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index 14af720d76bd..bf89ae3f1fea 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -163,7 +163,7 @@ private: }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 6b8a3d11d68d..35aa1b6e3c9c 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -486,6 +486,6 @@ void GraphicPropertyPanel::NotifyItemUpdate( // namespace close -}} // end of namespace ::svx::sidebar +}} // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 83024d3f028e..749070b91c66 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -107,7 +107,7 @@ private: }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index 2539695313bf..01ce363d5e02 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -53,7 +53,7 @@ private: }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 2a0ac3b0165c..3d88a1e08c5d 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -133,7 +133,7 @@ private: void InitToolBoxSpacing(); }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index 583300dc4b70..c646fdb3a893 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -116,7 +116,7 @@ private: void InitToolBoxSpacing(); }; -} } // end of namespace ::svx::sidebar +} } // end of namespace svx::sidebar #endif diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index e829dffac9d0..220d103c86ee 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2854,10 +2854,10 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR switch ( eUserCall ) { case SDRUSERCALL_RESIZE: - notifyShapePropertyChange( ::svx::eShapeSize ); + notifyShapePropertyChange( svx::eShapeSize ); // fall through - RESIZE might also imply a change of the position case SDRUSERCALL_MOVEONLY: - notifyShapePropertyChange( ::svx::eShapePosition ); + notifyShapePropertyChange( svx::eShapePosition ); break; default: // not interested in @@ -2966,7 +2966,7 @@ void SdrObject::setUnoShape(const uno::Reference<uno::XInterface >& _rxUnoShape) impl_setUnoShape( _rxUnoShape ); } -::svx::PropertyChangeNotifier& SdrObject::getShapePropertyChangeNotifier() +svx::PropertyChangeNotifier& SdrObject::getShapePropertyChangeNotifier() { DBG_TESTSOLARMUTEX(); @@ -2975,7 +2975,7 @@ void SdrObject::setUnoShape(const uno::Reference<uno::XInterface >& _rxUnoShape) return pSvxShape->getShapePropertyChangeNotifier(); } -void SdrObject::notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty ) const +void SdrObject::notifyShapePropertyChange( const svx::ShapeProperty _eProperty ) const { DBG_TESTSOLARMUTEX(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 94dd822d5b1c..e84b027fd233 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2580,7 +2580,7 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( else rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) ); - m_xBtnUpdater.reset( new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) ); + m_xBtnUpdater.reset( new svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) ); mPaletteManager.SetBtnUpdater( m_xBtnUpdater.get() ); } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 693cae055133..614fcef5d2ad 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -39,7 +39,7 @@ #include <boost/scoped_ptr.hpp> #include <officecfg/Office/Recovery.hxx> -namespace svxdr = ::svx::DocRecovery; +namespace svxdr = svx::DocRecovery; using namespace ::osl; namespace { diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 5b7d9a15d2b5..1e6af1a8b5a4 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -33,7 +33,7 @@ namespace struct ShapePropertyHash { - size_t operator()( ::svx::ShapeProperty __x ) const + size_t operator()( svx::ShapeProperty __x ) const { return size_t( __x ); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1c37eabbb299..5a376d3e3335 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -102,8 +102,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -using ::svx::PropertyValueProvider; -using ::svx::IPropertyValueProvider; +using svx::PropertyValueProvider; +using svx::IPropertyValueProvider; class GDIMetaFile; @@ -125,7 +125,7 @@ struct SvxShapeImpl // for xComponent ::cppu::OInterfaceContainerHelper maDisposeListeners; - ::svx::PropertyChangeNotifier maPropertyNotifier; + svx::PropertyChangeNotifier maPropertyNotifier; SvxShapeImpl( SvxShape& _rAntiImpl, ::osl::Mutex& _rMutex ) :mrAntiImpl( _rAntiImpl ) @@ -328,7 +328,7 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence } -::svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier() +svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier() { return mpImpl->maPropertyNotifier; } @@ -336,10 +336,10 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence void SvxShape::impl_construct() { - mpImpl->maPropertyNotifier.registerProvider( ::svx::eShapePosition, - ::svx::PPropertyValueProvider( new ShapePositionProvider( *mpImpl ) ) ); - mpImpl->maPropertyNotifier.registerProvider( ::svx::eShapeSize, - ::svx::PPropertyValueProvider( new ShapeSizeProvider( *mpImpl ) ) ); + mpImpl->maPropertyNotifier.registerProvider( svx::eShapePosition, + svx::PPropertyValueProvider( new ShapePositionProvider( *mpImpl ) ) ); + mpImpl->maPropertyNotifier.registerProvider( svx::eShapeSize, + svx::PPropertyValueProvider( new ShapeSizeProvider( *mpImpl ) ) ); if ( mpObj.is() ) impl_initFromSdrObject(); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 30aa2875d7ea..3cfafbb591bd 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -138,7 +138,7 @@ struct SwMergeDescriptor { DBManagerOptions nMergeType; SwWrtShell& rSh; - const ::svx::ODataAccessDescriptor& rDescriptor; + const svx::ODataAccessDescriptor& rDescriptor; OUString sSaveToFilter; ///< export filter to save resulting files OUString sSaveToFilterOptions; css::uno::Sequence< css::beans::PropertyValue > aSaveToFilterData; @@ -163,7 +163,7 @@ struct SwMergeDescriptor ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintOptions; - SwMergeDescriptor( DBManagerOptions nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) : + SwMergeDescriptor( DBManagerOptions nType, SwWrtShell& rShell, svx::ODataAccessDescriptor& rDesc ) : nMergeType(nType), rSh(rShell), rDescriptor(rDesc), diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 6f16adf37099..4e3ca7e02aca 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -732,7 +732,7 @@ public: /** Spells on a sentence basis - the SpellPortions are needed @return false if no error could be found. */ - bool SpellSentence(::svx::SpellPortions& rToFill, bool bIsGrammarCheck ); + bool SpellSentence(svx::SpellPortions& rToFill, bool bIsGrammarCheck ); /// Make SpellIter start with the current sentence when called next time. void PutSpellingToSentenceStart(); @@ -741,7 +741,7 @@ public: void MoveContinuationPosToEndOfCheckedSentence(); /// Applies a changed sentence. - void ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bRecheck); + void ApplyChangedSentence(const svx::SpellPortions& rNewPortions, bool bRecheck); /// Check SwSpellIter data to see if the last sentence got grammar checked. bool HasLastSentenceGotGrammarChecked() const; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index cac6a468386b..0a54a79e3500 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -467,7 +467,7 @@ public: bool GetObjAttr( SfxItemSet &rSet ) const; bool SetObjAttr( const SfxItemSet &rSet ); - const SdrObject* GetBestObject( bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, bool bFlat = true, const ::svx::ISdrObjectFilter* pFilter = NULL ); + const SdrObject* GetBestObject( bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, bool bFlat = true, const svx::ISdrObjectFilter* pFilter = NULL ); bool GotoObj( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); /// Set DragMode (e.g. Rotate), but do nothing when frame is selected. diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index dcf788a7b3a7..b0fe5b69c8a3 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1484,7 +1484,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { // --> #i102752# // assure that a ShapePropertyChangeNotifier exists - maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( ::svx::eTextShapeAnchorType ); + maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( svx::eTextShapeAnchorType ); } } } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 06dae1436a9c..edd5d3217845 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -110,7 +110,7 @@ typedef std::vector<SpellContentPosition> SpellContentPositions; class SwSpellIter : public SwLinguIter { uno::Reference< XSpellChecker1 > xSpeller; - ::svx::SpellPortions aLastPortions; + svx::SpellPortions aLastPortions; SpellContentPositions aLastPositions; bool bBackToStartOfSentence; @@ -131,9 +131,9 @@ public: uno::Any Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); - bool SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck); + bool SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck); void ToSentenceStart(); - const ::svx::SpellPortions GetLastPortions() const { return aLastPortions;} + const svx::SpellPortions GetLastPortions() const { return aLastPortions;} SpellContentPositions GetLastPositions() const {return aLastPositions;} void ContinueAfterThisSentence() { bMoveToEndOfSentence = true; } }; @@ -576,7 +576,7 @@ bool SwEditShell::HasLastSentenceGotGrammarChecked() const bool bTextWasGrammarChecked = false; if (pSpellIter) { - ::svx::SpellPortions aLastPortions( pSpellIter->GetLastPortions() ); + svx::SpellPortions aLastPortions( pSpellIter->GetLastPortions() ); for (size_t i = 0; i < aLastPortions.size() && !bTextWasGrammarChecked; ++i) { // bIsGrammarError is also true if the text was only checked but no @@ -1052,7 +1052,7 @@ bool SwEditShell::GetGrammarCorrection( return bRes; } -bool SwEditShell::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck) +bool SwEditShell::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck) { OSL_ENSURE( pSpellIter, "SpellIter missing" ); if(!pSpellIter) @@ -1075,7 +1075,7 @@ void SwEditShell::PutSpellingToSentenceStart() pSpellIter->ToSentenceStart(); } -static sal_uInt32 lcl_CountRedlines(const ::svx::SpellPortions& rLastPortions) +static sal_uInt32 lcl_CountRedlines(const svx::SpellPortions& rLastPortions) { sal_uInt32 nRet = 0; SpellPortions::const_iterator aIter = rLastPortions.begin(); @@ -1098,7 +1098,7 @@ void SwEditShell::MoveContinuationPosToEndOfCheckedSentence() } } -void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bRecheck) +void SwEditShell::ApplyChangedSentence(const svx::SpellPortions& rNewPortions, bool bRecheck) { // Note: rNewPortions.size() == 0 is valid and happens when the whole // sentence got removed in the dialog @@ -1328,7 +1328,7 @@ static SpellContentPosition lcl_FindNextDeletedRedline( return aRet; } -bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck) +bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck) { bool bRet = false; aLastPortions.clear(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 6278931cc37c..9ba3d34cb2e9 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1188,7 +1188,7 @@ static bool lcl_IsControlGroup( const SdrObject *pObj ) namespace { - class MarkableObjectsOnly : public ::svx::ISdrObjectFilter + class MarkableObjectsOnly : public svx::ISdrObjectFilter { public: MarkableObjectsOnly( SdrPageView* i_pPV ) @@ -1206,7 +1206,7 @@ namespace }; } -const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, bool bFlat, const ::svx::ISdrObjectFilter* pFilter ) +const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, bool bFlat, const svx::ISdrObjectFilter* pFilter ) { if( !Imp()->HasDrawView() ) return NULL; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 4e671b3d7560..31d7266b119e 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -919,8 +919,8 @@ namespace { static void lcl_addShapePropertyEventFactories( SdrObject& _rObj, SwXShape& _rShape ) { - ::svx::PPropertyValueProvider pProvider( new ::svx::PropertyValueProvider( _rShape, "AnchorType" ) ); - _rObj.getShapePropertyChangeNotifier().registerProvider( ::svx::eTextShapeAnchorType, pProvider ); + svx::PPropertyValueProvider pProvider( new svx::PropertyValueProvider( _rShape, "AnchorType" ) ); + _rObj.getShapePropertyChangeNotifier().registerProvider( svx::eTextShapeAnchorType, pProvider ); } } diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 702b26b156b1..0c5cf3cc19c5 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -135,7 +135,7 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl) aArgs[6].Name = "Cursor"; aArgs[6].Value <<= rConfigItem.GetResultSet(); - ::svx::ODataAccessDescriptor aDescriptor(aArgs); + svx::ODataAccessDescriptor aDescriptor(aArgs); SwWrtShell& rSh = m_pWizard->GetSwView()->GetWrtShell(); SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor ); rSh.GetDBManager()->MergeNew(aMergeDesc); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index e6bd8b2e3f1a..b467db4483c1 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -812,7 +812,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) return bNextDoc; } -bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellPortions& rPortions) +bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPortions& rPortions) { bool bRet = false; SdrView* pSdrView = rSh.GetDrawView(); diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index b2b80c24a821..462bca68d334 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -26,7 +26,7 @@ class SwWrtShell; struct SpellState; class SwSpellDialogChildWindow - : public ::svx::SpellDialogChildWindow + : public svx::SpellDialogChildWindow { bool m_bIsGrammarCheckingOn; SpellState* m_pSpellState; @@ -34,7 +34,7 @@ class SwSpellDialogChildWindow SwWrtShell* GetWrtShell_Impl(); bool MakeTextSelection_Impl(SwWrtShell& rSh, ShellModes eSelMode); bool FindNextDrawTextError_Impl(SwWrtShell& rSh); - bool SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellPortions& rPortions); + bool SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPortions& rPortions); void LockFocusNotification(bool bLock); protected: diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index d7b857162f2f..0ea4d346762b 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -328,7 +328,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) if ( !pFormShell || !pDrawView || !pWindow ) break; - std::unique_ptr< ::svx::ISdrObjectFilter > pFilter( FmFormShell::CreateFocusableControlFilter( + std::unique_ptr< svx::ISdrObjectFilter > pFilter( FmFormShell::CreateFocusableControlFilter( *pDrawView, *pWindow ) ); if ( !pFilter.get() ) break; diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 4bec55f89fc3..d73654b7d0fb 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -36,8 +36,8 @@ PageColumnControl::PageColumnControl( PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) ) - , mpColumnValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) ) + , mpColumnValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) ) , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_COLUMN_MORE) ) ) , mnColumnType( nColumnType ) , mrPagePropPanel(rPanel) @@ -84,7 +84,7 @@ void PageColumnControl::dispose() { mpColumnValueSet.disposeAndClear(); maMoreButton.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index a7286d6ef849..955323c10159 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -35,7 +35,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageColumnControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageColumnControl( @@ -48,7 +48,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpColumnValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpColumnValueSet; VclPtr<PushButton> maMoreButton; sal_uInt16 mnColumnType; diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index aee46d43e074..66ff08c66ec5 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -48,8 +48,8 @@ PageMarginControl::PageMarginControl( const bool bLandscape, const FieldUnit eFUnit, const SfxMapUnit eUnit ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) - , mpMarginValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) + , mpMarginValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) ) , maCustom(VclPtr<FixedText>::Create(this, SW_RES(FT_CUSTOM))) , maLeft(VclPtr<FixedText>::Create(this, SW_RES(FT_LEFT))) , maInner(VclPtr<FixedText>::Create(this, SW_RES(FT_INNER))) @@ -154,7 +154,7 @@ void PageMarginControl::dispose() maBottom.disposeAndClear(); maBottomMarginEdit.disposeAndClear(); maWidthHeightField.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } void PageMarginControl::SetMetricFieldMaxValues(const Size& rPageSize) diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 26d5df3d47d3..12a6754b83aa 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -47,7 +47,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageMarginControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageMarginControl( @@ -64,7 +64,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpMarginValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpMarginValueSet; VclPtr<FixedText> maCustom; VclPtr<FixedText> maLeft; diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 9e1b284a7328..8dede92c9980 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -32,8 +32,8 @@ PageOrientationControl::PageOrientationControl( vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) - , mpOrientationValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) + , mpOrientationValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) ) , mbLandscape( bLandscape ) , mrPagePropPanel(rPanel) { @@ -69,7 +69,7 @@ PageOrientationControl::~PageOrientationControl() void PageOrientationControl::dispose() { mpOrientationValueSet.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index c08a944b4f07..a2ceecff2a5a 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -30,7 +30,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageOrientationControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageOrientationControl( @@ -41,7 +41,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet; bool mbLandscape; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 045ffe8d3e11..89ac394d3443 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -295,7 +295,7 @@ void PagePropertyPanel::Initialize() mpBindings->Update( SID_ATTR_PAGE_SIZE ); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageOrientationControl>::Create( pParent, *this , mpPageItem->IsLandscape() ); } @@ -372,7 +372,7 @@ void PagePropertyPanel::ClosePageOrientationPopup() maOrientationPopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageMarginControl>::Create( @@ -423,7 +423,7 @@ void PagePropertyPanel::ClosePageMarginPopup() maMarginPopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageSizeControl>::Create( @@ -458,7 +458,7 @@ void PagePropertyPanel::ClosePageSizePopup() maSizePopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageColumnControl>::Create( diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 19d391deaaf6..81721360d0bc 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -72,11 +72,11 @@ namespace sw { namespace sidebar { return mpBindings; } - VclPtr< ::svx::sidebar::PopupControl> CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent ); void ExecuteOrientationChange( const bool bLandscape ); void ClosePageOrientationPopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageMarginControl( svx::sidebar::PopupContainer* pParent ); void ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ); @@ -86,11 +86,11 @@ namespace sw { namespace sidebar { void ExecutePageLayoutChange( const bool bMirrored ); void ClosePageMarginPopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageSizeControl( svx::sidebar::PopupContainer* pParent ); void ExecuteSizeChange( const Paper ePaper ); void ClosePageSizePopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageColumnControl( svx::sidebar::PopupContainer* pParent ); void ExecuteColumnChange( const sal_uInt16 nColumnType ); void ClosePageColumnPopup(); @@ -190,10 +190,10 @@ namespace sw { namespace sidebar { ::sfx2::sidebar::ControllerItem m_aSwPagePgMetricControl; // popups - ::svx::sidebar::Popup maOrientationPopup; - ::svx::sidebar::Popup maMarginPopup; - ::svx::sidebar::Popup maSizePopup; - ::svx::sidebar::Popup maColumnPopup; + svx::sidebar::Popup maOrientationPopup; + svx::sidebar::Popup maMarginPopup; + svx::sidebar::Popup maSizePopup; + svx::sidebar::Popup maColumnPopup; const css::uno::Reference< css::document::XUndoManager > mxUndoManager; diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index bc9c0b9be335..5ff924683c21 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -41,8 +41,8 @@ PageSizeControl::PageSizeControl( const Paper ePaper, const bool bLandscape, const FieldUnit eFUnit ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) ) - , mpSizeValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) ) + , mpSizeValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) ) , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_SIZE_MORE) ) ) , maWidthHeightField( VclPtr<MetricField>::Create( this, SW_RES(FLD_WIDTH_HEIGHT) ) ) , mePaper( ePaper ) @@ -151,7 +151,7 @@ void PageSizeControl::dispose() mpSizeValueSet.disposeAndClear(); maMoreButton.disposeAndClear(); maWidthHeightField.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index f2875cccc013..ae4756af6604 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -38,7 +38,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageSizeControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageSizeControl( @@ -51,7 +51,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpSizeValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpSizeValueSet; VclPtr<PushButton> maMoreButton; // hidden metric field VclPtr<MetricField> maWidthHeightField; diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 2e845614323e..add57844f094 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -135,7 +135,7 @@ void SwView::ExecDraw(SfxRequest& rReq) OSL_ENSURE( pDescriptorItem, "SwView::ExecDraw(SID_FM_CREATE_FIELDCONTROL): invalid request args!" ); if( pDescriptorItem ) { - ::svx::ODataAccessDescriptor aDescriptor( pDescriptorItem->GetValue() ); + svx::ODataAccessDescriptor aDescriptor( pDescriptorItem->GetValue() ); SdrObject* pObj = pFormView->CreateFieldControl( aDescriptor ); if ( pObj ) diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 8ec7d51eea4d..e97edd17881c 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -217,7 +217,7 @@ void SwXDispatch::dispatch(const util::URL& aURL, SwDBManager* pDBManager = rSh.GetDBManager(); if(aURL.Complete.equalsAscii(cURLInsertContent)) { - ::svx::ODataAccessDescriptor aDescriptor(aArgs); + svx::ODataAccessDescriptor aDescriptor(aArgs); SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor ); pDBManager->MergeNew(aMergeDesc); } @@ -245,10 +245,10 @@ void SwXDispatch::dispatch(const util::URL& aURL, aEvent.Source = *(cppu::OWeakObject*)this; const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc(); - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(rData.sDataSource); - aDescriptor[::svx::daCommand] <<= rData.sCommand; - aDescriptor[::svx::daCommandType] <<= rData.nCommandType; + aDescriptor[svx::daCommand] <<= rData.sCommand; + aDescriptor[svx::daCommandType] <<= rData.nCommandType; aEvent.State <<= aDescriptor.createPropertyValueSequence(); aEvent.IsEnabled = !rData.sDataSource.isEmpty(); @@ -291,10 +291,10 @@ void SwXDispatch::addStatusListener( { const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc(); - ::svx::ODataAccessDescriptor aDescriptor; + svx::ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(rData.sDataSource); - aDescriptor[::svx::daCommand] <<= rData.sCommand; - aDescriptor[::svx::daCommandType] <<= rData.nCommandType; + aDescriptor[svx::daCommand] <<= rData.sCommand; + aDescriptor[svx::daCommandType] <<= rData.nCommandType; aEvent.State <<= aDescriptor.createPropertyValueSequence(); aEvent.IsEnabled = !rData.sDataSource.isEmpty(); |