diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-13 16:59:57 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-14 06:37:16 +0000 |
commit | d191d1f9b684c6229f3651361c92ff39ffb350f1 (patch) | |
tree | e670ba0105d974b3a68c17b42366eec1d35ebae4 /framework/inc/uifactory/factoryconfiguration.hxx | |
parent | ba974ccc8c49766542ddd727c95ecc5db1cff198 (diff) |
com::sun::star->css in framework
Change-Id: If5a77db83fcbef5ed436f2043ddeb7c515a840dc
Reviewed-on: https://gerrit.libreoffice.org/19356
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/inc/uifactory/factoryconfiguration.hxx')
-rw-r--r-- | framework/inc/uifactory/factoryconfiguration.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index a2d51a862368..a9b2f12a5d9b 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -43,10 +43,10 @@ namespace framework // Configuration access class for PopupMenuControllerFactory implementation class ConfigurationAccess_ControllerFactory : // interfaces - public ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener> + public ::cppu::WeakImplHelper< css::container::XContainerListener> { public: - ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& _sRoot ); + ConfigurationAccess_ControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& _sRoot ); virtual ~ConfigurationAccess_ControllerFactory(); void readConfigurationData(); @@ -58,12 +58,12 @@ public: void removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // lang.XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: struct ControllerInfo @@ -80,18 +80,18 @@ private: { }; - bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; + bool impl_getElementProps( const css::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; - mutable osl::Mutex m_mutex; + mutable osl::Mutex m_mutex; OUString m_aPropCommand; OUString m_aPropModule; OUString m_aPropController; OUString m_aPropValue; OUString m_sRoot; - MenuControllerMap m_aMenuControllerMap; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigAccessListener; + MenuControllerMap m_aMenuControllerMap; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; + css::uno::Reference< css::container::XContainerListener > m_xConfigAccessListener; bool m_bConfigAccessInitialized; }; |