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 /dbaccess/source | |
parent | d883c12556a71c5d3719454b1f95809a505f0ace (diff) |
Get rid of initial :: for the svx namespace
Change-Id: I03e428a749bca409ebac9c142acaddafcbfeca23
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppControllerDnD.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableCopyHelper.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbexchange.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/unodatbr.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/RowSetDrop.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/TableCopyHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 4 |
13 files changed, 29 insertions, 29 deletions
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) |