diff options
author | Stefan Weiberg <stefan.weiberg@germandev.org> | 2014-09-05 15:34:48 +0000 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-09-08 03:02:57 -0500 |
commit | 481cd6368bd1af2b4a51be57bcedfb8fc631bf0e (patch) | |
tree | 5ad82755ca6c11db9d47ac5034b1562c4bfb96ab /dbaccess | |
parent | 34a68f0aa92de05123c1e951899c08eed5a55543 (diff) |
Related #82088: removed last css aliases in hxx
* Only unfixed header namespace alias in
ConnectionLog.hxx:
LogLevel = ::com::sun::star::logging::LogLevel
Change-Id: I48c941a4762830f2265c8241f4c1695a43ec891a
Reviewed-on: https://gerrit.libreoffice.org/11333
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/recovery/dbdocrecovery.cxx | 58 | ||||
-rw-r--r-- | dbaccess/source/core/recovery/subcomponentrecovery.cxx | 71 | ||||
-rw-r--r-- | dbaccess/source/core/recovery/subcomponentrecovery.hxx | 38 | ||||
-rw-r--r-- | dbaccess/source/core/recovery/subcomponents.hxx | 10 |
4 files changed, 88 insertions, 89 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 2708589c030b..94cdb4942be4 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -43,35 +43,35 @@ namespace dbaccess { - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::embed::XStorage; - using ::com::sun::star::frame::XController; - using ::com::sun::star::sdb::application::XDatabaseDocumentUI; - using ::com::sun::star::lang::XComponent; - using ::com::sun::star::document::XStorageBasedDocument; - using ::com::sun::star::beans::PropertyValue; - using ::com::sun::star::io::XStream; - using ::com::sun::star::io::XTextOutputStream; - using ::com::sun::star::io::XActiveDataSource; - using ::com::sun::star::io::TextInputStream; - using ::com::sun::star::io::XTextInputStream2; - using ::com::sun::star::io::XActiveDataSink; - using ::com::sun::star::frame::XModel; - using ::com::sun::star::util::XModifiable; - using ::com::sun::star::beans::XPropertySet; - - namespace ElementModes = ::com::sun::star::embed::ElementModes; + using css::uno::Reference; + using css::uno::XInterface; + using css::uno::UNO_QUERY; + using css::uno::UNO_QUERY_THROW; + using css::uno::UNO_SET_THROW; + using css::uno::Exception; + using css::uno::RuntimeException; + using css::uno::Any; + using css::uno::makeAny; + using css::uno::Sequence; + using css::uno::Type; + using css::uno::XComponentContext; + using css::embed::XStorage; + using css::frame::XController; + using css::sdb::application::XDatabaseDocumentUI; + using css::lang::XComponent; + using css::document::XStorageBasedDocument; + using css::beans::PropertyValue; + using css::io::XStream; + using css::io::XTextOutputStream; + using css::io::XActiveDataSource; + using css::io::TextInputStream; + using css::io::XTextInputStream2; + using css::io::XActiveDataSink; + using css::frame::XModel; + using css::util::XModifiable; + using css::beans::XPropertySet; + + namespace ElementModes = css::embed::ElementModes; // helpers namespace diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index c5b977e66d75..f50d1754b7a0 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -42,40 +42,41 @@ namespace dbaccess { - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::lang::XMultiServiceFactory; - using ::com::sun::star::embed::XStorage; - using ::com::sun::star::sdb::application::XDatabaseDocumentUI; - using ::com::sun::star::beans::Pair; - using ::com::sun::star::frame::ModuleManager; - using ::com::sun::star::frame::XModuleManager2; - using ::com::sun::star::lang::XComponent; - using ::com::sun::star::frame::XModel; - using ::com::sun::star::frame::XController; - using ::com::sun::star::beans::XPropertySet; - using ::com::sun::star::beans::PropertyValue; - using ::com::sun::star::document::XStorageBasedDocument; - using ::com::sun::star::ucb::XCommandProcessor; - using ::com::sun::star::container::XHierarchicalNameAccess; - using ::com::sun::star::sdb::XFormDocumentsSupplier; - using ::com::sun::star::sdb::XReportDocumentsSupplier; - using ::com::sun::star::xml::sax::SAXException; - using ::com::sun::star::xml::sax::XLocator; - using ::com::sun::star::xml::sax::XDocumentHandler; - using ::com::sun::star::xml::sax::XAttributeList; - - namespace ElementModes = ::com::sun::star::embed::ElementModes; + using css::uno::Reference; + using css::uno::XInterface; + using css::uno::UNO_QUERY; + using css::uno::UNO_QUERY_THROW; + using css::uno::UNO_SET_THROW; + using css::uno::Exception; + using css::uno::RuntimeException; + using css::uno::Any; + using css::uno::makeAny; + using css::uno::Sequence; + using css::uno::Type; + using css::uno::XComponentContext; + using css::lang::XMultiServiceFactory; + using css::embed::XStorage; + using css::sdb::application::XDatabaseDocumentUI; + using css::beans::Pair; + using css::frame::ModuleManager; + using css::frame::XModuleManager2; + using css::lang::XComponent; + using css::frame::XModel; + using css::frame::XController; + using css::beans::XPropertySet; + using css::beans::PropertyValue; + using css::document::XStorageBasedDocument; + using css::ucb::XCommandProcessor; + using css::container::XHierarchicalNameAccess; + using css::sdb::XFormDocumentsSupplier; + using css::sdb::XReportDocumentsSupplier; + using css::xml::sax::SAXException; + using css::xml::sax::XLocator; + using css::xml::sax::XDocumentHandler; + using css::xml::sax::XAttributeList; + + namespace ElementModes = css::embed::ElementModes; + namespace DatabaseObject = css::sdb::application::DatabaseObject; // helper namespace @@ -200,7 +201,7 @@ namespace dbaccess virtual void EndElement ( const bool i_bIgnoreWhitespace ) SAL_OVERRIDE; virtual void Characters( const OUString& i_rCharacters ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + virtual css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const SAL_OVERRIDE; private: diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 788149dfd312..263d2cb24219 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -34,11 +34,11 @@ namespace dbaccess { public: SubComponentRecovery( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent ) + const css::uno::Reference< css::uno::XComponentContext >& i_rContext, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rController, + const css::uno::Reference< css::lang::XComponent >& i_rComponent ) :m_rContext( i_rContext ) - ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW ) + ,m_xDocumentUI( i_rController, css::uno::UNO_SET_THROW ) ,m_xComponent( i_rComponent ) ,m_eType( UNKNOWN ) ,m_aCompDesc() @@ -47,11 +47,11 @@ namespace dbaccess } SubComponentRecovery( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController, + const css::uno::Reference< css::uno::XComponentContext >& i_rContext, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rController, const SubComponentType i_eType ) :m_rContext( i_rContext ) - ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW ) + ,m_xDocumentUI( i_rController, css::uno::UNO_SET_THROW ) ,m_xComponent() ,m_eType( i_eType ) ,m_aCompDesc() @@ -60,14 +60,14 @@ namespace dbaccess // only to be used after being constructed with a component void saveToRecoveryStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, + const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage, MapCompTypeToCompDescs& io_mapCompDescs ); // only to be used after being constructed with a type - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > recoverFromStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, + const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage, const OUString& i_rComponentName, const bool i_bForEditing ); @@ -76,23 +76,23 @@ namespace dbaccess private: void impl_saveSubDocument_throw( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rObjectStorage + const css::uno::Reference< css::embed::XStorage >& i_rObjectStorage ); void impl_saveQueryDesign_throw( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rObjectStorage + const css::uno::Reference< css::embed::XStorage >& i_rObjectStorage ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > impl_recoverSubDocument_throw( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, + const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage, const OUString& i_rComponentName, const bool i_bForEditing ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > impl_recoverQueryDesign_throw( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, + const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage, const OUString& i_rComponentName, const bool i_bForEditing ); @@ -100,11 +100,11 @@ namespace dbaccess void impl_identifyComponent_throw(); private: - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& + const css::uno::Reference< css::uno::XComponentContext >& m_rContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > + css::uno::Reference< css::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + const css::uno::Reference< css::lang::XComponent > m_xComponent; SubComponentType m_eType; SubComponentDescriptor m_aCompDesc; diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index f0a3a53f8ed3..dfa944e19ddb 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -32,14 +32,12 @@ namespace dbaccess { - namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; - enum SubComponentType { - TABLE = DatabaseObject::TABLE, - QUERY = DatabaseObject::QUERY, - FORM = DatabaseObject::FORM, - REPORT = DatabaseObject::REPORT, + TABLE = css::sdb::application::DatabaseObject::TABLE, + QUERY = css::sdb::application::DatabaseObject::QUERY, + FORM = css::sdb::application::DatabaseObject::FORM, + REPORT = css::sdb::application::DatabaseObject::REPORT, RELATION_DESIGN = 1000, |