[Libreoffice-commits] core.git: framework/inc framework/source

Noel Grandin noel at peralex.com
Tue Oct 13 23:37:38 PDT 2015


 framework/inc/classes/actiontriggercontainer.hxx                   |   32 -
 framework/inc/classes/actiontriggerpropertyset.hxx                 |   72 +--
 framework/inc/classes/actiontriggerseparatorpropertyset.hxx        |   44 +-
 framework/inc/classes/imagewrapper.hxx                             |   14 
 framework/inc/classes/propertysethelper.hxx                        |    2 
 framework/inc/classes/rootactiontriggercontainer.hxx               |   72 +--
 framework/inc/dispatch/popupmenudispatcher.hxx                     |    8 
 framework/inc/helper/dockingareadefaultacceptor.hxx                |    2 
 framework/inc/helper/mischelper.hxx                                |  112 ++---
 framework/inc/helper/ocomponentaccess.hxx                          |    2 
 framework/inc/helper/ocomponentenumeration.hxx                     |    2 
 framework/inc/helper/oframes.hxx                                   |    2 
 framework/inc/helper/propertysetcontainer.hxx                      |   32 -
 framework/inc/helper/uiconfigelementwrapperbase.hxx                |   72 +--
 framework/inc/helper/uielementwrapperbase.hxx                      |   56 +-
 framework/inc/jobs/helponstartup.hxx                               |    2 
 framework/inc/jobs/jobresult.hxx                                   |    2 
 framework/inc/jobs/shelljob.hxx                                    |    2 
 framework/inc/macros/registration.hxx                              |    6 
 framework/inc/macros/xinterface.hxx                                |   10 
 framework/inc/macros/xtypeprovider.hxx                             |   26 -
 framework/inc/recording/dispatchrecorder.hxx                       |   10 
 framework/inc/services/desktop.hxx                                 |    4 
 framework/inc/services/dispatchhelper.hxx                          |    2 
 framework/inc/services/layoutmanager.hxx                           |  198 ++++-----
 framework/inc/services/mediatypedetectionhelper.hxx                |    2 
 framework/inc/services/uriabbreviation.hxx                         |   10 
 framework/inc/tabwin/tabwindow.hxx                                 |   92 ++--
 framework/inc/tabwin/tabwinfactory.hxx                             |   12 
 framework/inc/uiconfiguration/globalsettings.hxx                   |    6 
 framework/inc/uiconfiguration/graphicnameaccess.hxx                |   28 -
 framework/inc/uiconfiguration/imagemanager.hxx                     |   40 -
 framework/inc/uiconfiguration/moduleimagemanager.hxx               |   38 -
 framework/inc/uielement/addonstoolbarmanager.hxx                   |    8 
 framework/inc/uielement/addonstoolbarwrapper.hxx                   |   16 
 framework/inc/uielement/buttontoolbarcontroller.hxx                |   52 +-
 framework/inc/uielement/comboboxtoolbarcontroller.hxx              |   10 
 framework/inc/uielement/complextoolbarcontroller.hxx               |   46 +-
 framework/inc/uielement/constitemcontainer.hxx                     |   52 +-
 framework/inc/uielement/dropdownboxtoolbarcontroller.hxx           |   10 
 framework/inc/uielement/edittoolbarcontroller.hxx                  |   10 
 framework/inc/uielement/fontmenucontroller.hxx                     |   16 
 framework/inc/uielement/fontsizemenucontroller.hxx                 |   22 -
 framework/inc/uielement/footermenucontroller.hxx                   |    2 
 framework/inc/uielement/genericstatusbarcontroller.hxx             |   24 -
 framework/inc/uielement/generictoolbarcontroller.hxx               |   28 -
 framework/inc/uielement/headermenucontroller.hxx                   |   14 
 framework/inc/uielement/imagebuttontoolbarcontroller.hxx           |    8 
 framework/inc/uielement/itemcontainer.hxx                          |   38 -
 framework/inc/uielement/langselectionmenucontroller.hxx            |   42 +-
 framework/inc/uielement/macrosmenucontroller.hxx                   |   22 -
 framework/inc/uielement/menubarmanager.hxx                         |  158 +++----
 framework/inc/uielement/menubarmerger.hxx                          |    4 
 framework/inc/uielement/menubarwrapper.hxx                         |   30 -
 framework/inc/uielement/newmenucontroller.hxx                      |   46 +-
 framework/inc/uielement/progressbarwrapper.hxx                     |   26 -
 framework/inc/uielement/rootitemcontainer.hxx                      |   62 +-
 framework/inc/uielement/spinfieldtoolbarcontroller.hxx             |   12 
 framework/inc/uielement/statusbaritem.hxx                          |   40 -
 framework/inc/uielement/statusbarmanager.hxx                       |   56 +-
 framework/inc/uielement/statusbarwrapper.hxx                       |   14 
 framework/inc/uielement/statusindicatorinterfacewrapper.hxx        |   16 
 framework/inc/uielement/togglebuttontoolbarcontroller.hxx          |   14 
 framework/inc/uielement/toolbarmanager.hxx                         |   96 ++--
 framework/inc/uielement/toolbarmerger.hxx                          |   12 
 framework/inc/uielement/toolbarsmenucontroller.hxx                 |   52 +-
 framework/inc/uielement/toolbarwrapper.hxx                         |   26 -
 framework/inc/uielement/uicommanddescription.hxx                   |   38 -
 framework/inc/uielement/uielement.hxx                              |   18 
 framework/inc/uifactory/configurationaccessfactorymanager.hxx      |   30 -
 framework/inc/uifactory/factoryconfiguration.hxx                   |   24 -
 framework/inc/uifactory/menubarfactory.hxx                         |   12 
 framework/inc/xml/imagesconfiguration.hxx                          |    8 
 framework/inc/xml/imagesdocumenthandler.hxx                        |  108 ++---
 framework/inc/xml/menudocumenthandler.hxx                          |  188 ++++----
 framework/inc/xml/saxnamespacefilter.hxx                           |   48 +-
 framework/inc/xml/statusbardocumenthandler.hxx                     |   80 +--
 framework/inc/xml/toolboxdocumenthandler.hxx                       |  122 ++---
 framework/inc/xml/xmlnamespaces.hxx                                |   12 
 framework/source/accelerators/acceleratorconfiguration.cxx         |    4 
 framework/source/accelerators/documentacceleratorconfiguration.cxx |    2 
 framework/source/accelerators/globalacceleratorconfiguration.cxx   |    2 
 framework/source/accelerators/moduleacceleratorconfiguration.cxx   |    4 
 framework/source/dispatch/menudispatcher.cxx                       |    6 
 framework/source/dispatch/oxt_handler.cxx                          |    4 
 framework/source/fwe/classes/actiontriggercontainer.cxx            |    4 
 framework/source/fwe/classes/addonmenu.cxx                         |    4 
 framework/source/fwe/classes/imagewrapper.cxx                      |    6 
 framework/source/fwe/classes/rootactiontriggercontainer.cxx        |    8 
 framework/source/fwe/classes/sfxhelperfunctions.cxx                |    8 
 framework/source/fwe/dispatch/interaction.cxx                      |   28 -
 framework/source/fwe/helper/imageproducer.cxx                      |    2 
 framework/source/fwe/helper/propertysetcontainer.cxx               |    6 
 framework/source/fwe/xml/menuconfiguration.cxx                     |    6 
 framework/source/fwe/xml/menudocumenthandler.cxx                   |   32 -
 framework/source/fwe/xml/statusbarconfiguration.cxx                |    4 
 framework/source/fwe/xml/statusbardocumenthandler.cxx              |    2 
 framework/source/fwe/xml/toolboxconfiguration.cxx                  |   16 
 framework/source/fwe/xml/toolboxdocumenthandler.cxx                |   50 +-
 framework/source/fwi/helper/mischelper.cxx                         |    8 
 framework/source/fwi/uielement/constitemcontainer.cxx              |   44 +-
 framework/source/fwi/uielement/itemcontainer.cxx                   |    6 
 framework/source/fwi/uielement/rootitemcontainer.cxx               |   36 -
 framework/source/helper/uiconfigelementwrapperbase.cxx             |   62 +-
 framework/source/helper/uielementwrapperbase.cxx                   |   38 -
 framework/source/inc/accelerators/acceleratorconfiguration.hxx     |    6 
 framework/source/inc/accelerators/presethandler.hxx                |   12 
 framework/source/inc/loadenv/actionlockguard.hxx                   |    2 
 framework/source/jobs/jobexecutor.cxx                              |    2 
 framework/source/layoutmanager/helpers.cxx                         |   10 
 framework/source/layoutmanager/helpers.hxx                         |   30 -
 framework/source/layoutmanager/toolbarlayoutmanager.hxx            |  122 ++---
 framework/source/recording/dispatchrecorder.cxx                    |   34 -
 framework/source/services/desktop.cxx                              |    2 
 framework/source/services/frame.cxx                                |    2 
 framework/source/services/pathsettings.cxx                         |    4 
 framework/source/services/sessionlistener.cxx                      |   14 
 framework/source/services/substitutepathvars.cxx                   |   26 -
 framework/source/services/uriabbreviation.cxx                      |    2 
 framework/source/tabwin/tabwindow.cxx                              |   16 
 framework/source/tabwin/tabwinfactory.cxx                          |    2 
 framework/source/uiconfiguration/globalsettings.cxx                |   42 +-
 framework/source/uiconfiguration/graphicnameaccess.cxx             |    4 
 framework/source/uiconfiguration/imagemanager.cxx                  |   54 +-
 framework/source/uiconfiguration/imagemanagerimpl.cxx              |   82 +--
 framework/source/uiconfiguration/imagemanagerimpl.hxx              |   84 ++--
 framework/source/uiconfiguration/moduleimagemanager.cxx            |   52 +-
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx  |  210 +++++-----
 framework/source/uiconfiguration/uicategorydescription.cxx         |   42 +-
 framework/source/uiconfiguration/uiconfigurationmanager.cxx        |  158 +++----
 framework/source/uiconfiguration/windowstateconfiguration.cxx      |   80 +--
 framework/source/uielement/addonstoolbarmanager.cxx                |    2 
 framework/source/uielement/addonstoolbarwrapper.cxx                |    4 
 framework/source/uielement/buttontoolbarcontroller.cxx             |   52 +-
 framework/source/uielement/comboboxtoolbarcontroller.cxx           |   18 
 framework/source/uielement/complextoolbarcontroller.cxx            |   18 
 framework/source/uielement/controlmenucontroller.cxx               |   12 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx        |   16 
 framework/source/uielement/edittoolbarcontroller.cxx               |   14 
 framework/source/uielement/fontmenucontroller.cxx                  |   20 
 framework/source/uielement/fontsizemenucontroller.cxx              |   14 
 framework/source/uielement/footermenucontroller.cxx                |    2 
 framework/source/uielement/generictoolbarcontroller.cxx            |   10 
 framework/source/uielement/headermenucontroller.cxx                |   12 
 framework/source/uielement/imagebuttontoolbarcontroller.cxx        |    2 
 framework/source/uielement/langselectionmenucontroller.cxx         |    8 
 framework/source/uielement/langselectionstatusbarcontroller.cxx    |    4 
 framework/source/uielement/macrosmenucontroller.cxx                |    2 
 framework/source/uielement/menubarmanager.cxx                      |   56 +-
 framework/source/uielement/menubarmerger.cxx                       |    4 
 framework/source/uielement/menubarwrapper.cxx                      |   58 +-
 framework/source/uielement/newmenucontroller.cxx                   |    4 
 framework/source/uielement/objectmenucontroller.cxx                |   10 
 framework/source/uielement/progressbarwrapper.cxx                  |    4 
 framework/source/uielement/recentfilesmenucontroller.cxx           |   10 
 framework/source/uielement/saveasmenucontroller.cxx                |    4 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx          |    2 
 framework/source/uielement/statusbaritem.cxx                       |    6 
 framework/source/uielement/statusbarmanager.cxx                    |   26 -
 framework/source/uielement/statusbarwrapper.cxx                    |    6 
 framework/source/uielement/statusindicatorinterfacewrapper.cxx     |   12 
 framework/source/uielement/togglebuttontoolbarcontroller.cxx       |    4 
 framework/source/uielement/toolbarmanager.cxx                      |   70 +--
 framework/source/uielement/toolbarmerger.cxx                       |    6 
 framework/source/uielement/toolbarsmenucontroller.cxx              |   20 
 framework/source/uielement/toolbarwrapper.cxx                      |   18 
 framework/source/uielement/uicommanddescription.cxx                |   52 +-
 framework/source/uifactory/addonstoolbarfactory.cxx                |   12 
 framework/source/uifactory/factoryconfiguration.cxx                |    4 
 framework/source/uifactory/menubarfactory.cxx                      |   12 
 framework/source/uifactory/statusbarfactory.cxx                    |    6 
 framework/source/uifactory/toolbarfactory.cxx                      |    6 
 framework/source/uifactory/uielementfactorymanager.cxx             |    6 
 framework/source/uifactory/windowcontentfactorymanager.cxx         |    4 
 framework/source/xml/imagesconfiguration.cxx                       |   12 
 175 files changed, 2458 insertions(+), 2458 deletions(-)

New commits:
commit d191d1f9b684c6229f3651361c92ff39ffb350f1
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Oct 13 16:59:57 2015 +0200

    com::sun::star->css in framework
    
    Change-Id: If5a77db83fcbef5ed436f2043ddeb7c515a840dc
    Reviewed-on: https://gerrit.libreoffice.org/19356
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 3f01ce9..778f6c3 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -33,36 +33,36 @@ namespace framework
 {
 
 class FWE_DLLPUBLIC ActionTriggerContainer :    public PropertySetContainer,
-                                public com::sun::star::lang::XMultiServiceFactory,
-                                public com::sun::star::lang::XServiceInfo,
-                                public com::sun::star::lang::XTypeProvider
+                                public css::lang::XMultiServiceFactory,
+                                public css::lang::XServiceInfo,
+                                public css::lang::XTypeProvider
 {
     public:
         ActionTriggerContainer();
         virtual ~ActionTriggerContainer();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XMultiServiceFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
 }
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index e3ab5cf..0b90142 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -39,8 +39,8 @@ namespace framework
 {
 
 class ActionTriggerPropertySet :  private cppu::BaseMutex,
-                                    public ::com::sun::star::lang::XServiceInfo ,
-                                    public ::com::sun::star::lang::XTypeProvider,
+                                    public css::lang::XServiceInfo ,
+                                    public css::lang::XTypeProvider,
                                     public ::cppu::OBroadcastHelper             ,
                                     public ::cppu::OPropertySetHelper           ,   // -> XPropertySet, XFastPropertySet, XMultiPropertySet
                                     public ::cppu::OWeakObject
@@ -50,67 +50,67 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
         FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet();
 
         // XInterface
-        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw () override;
         virtual FWE_DLLPUBLIC void SAL_CALL release() throw () override;
 
         // XServiceInfo
-        virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
-        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     private:
 
         //  OPropertySetHelper
 
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any&       aConvertedValue,
-                                                            com::sun::star::uno::Any&       aOldValue,
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&       aConvertedValue,
+                                                            css::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
-                                                            const com::sun::star::uno::Any& aValue          )
-            throw( com::sun::star::lang::IllegalArgumentException ) override;
+                                                            const css::uno::Any& aValue          )
+            throw( css::lang::IllegalArgumentException ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
-            throw( com::sun::star::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue )
+            throw( css::uno::Exception, std::exception ) override;
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const override;
+        virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override;
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
-        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+            throw (css::uno::RuntimeException, std::exception) override;
 
-        static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
         //  helper
 
-        bool impl_tryToChangeProperty(  const   OUString&              aCurrentValue   ,
-                                            const   com::sun::star::uno::Any&   aNewValue       ,
-                                            com::sun::star::uno::Any&           aOldValue       ,
-                                            com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
+        bool impl_tryToChangeProperty(  const   OUString&            aCurrentValue   ,
+                                        const   css::uno::Any&       aNewValue       ,
+                                            css::uno::Any&           aOldValue       ,
+                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        bool impl_tryToChangeProperty(  const   com::sun::star::uno::Reference< com::sun::star::awt::XBitmap >  xBitmap,
-                                            const   com::sun::star::uno::Any&   aNewValue       ,
-                                            com::sun::star::uno::Any&           aOldValue       ,
-                                            com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
+        bool impl_tryToChangeProperty(  const   css::uno::Reference< css::awt::XBitmap >  xBitmap,
+                                            const   css::uno::Any&   aNewValue       ,
+                                            css::uno::Any&           aOldValue       ,
+                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        bool impl_tryToChangeProperty(  const   com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface,
-                                            const   com::sun::star::uno::Any&   aNewValue       ,
-                                            com::sun::star::uno::Any&           aOldValue       ,
-                                            com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
+        bool impl_tryToChangeProperty(  const   css::uno::Reference< css::uno::XInterface > xInterface,
+                                            const   css::uno::Any&   aNewValue       ,
+                                            css::uno::Any&           aOldValue       ,
+                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
         //  members
 
-        OUString                                                         m_aCommandURL;
-        OUString                                                         m_aHelpURL;
-        OUString                                                         m_aText;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >    m_xBitmap;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xActionTriggerContainer;
+        OUString                                    m_aCommandURL;
+        OUString                                    m_aHelpURL;
+        OUString                                    m_aText;
+        css::uno::Reference< css::awt::XBitmap >    m_xBitmap;
+        css::uno::Reference< css::uno::XInterface > m_xActionTriggerContainer;
 };
 
 }
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 3a70279..c505556 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -37,8 +37,8 @@ namespace framework
 {
 
 class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
-                                            public ::com::sun::star::lang::XServiceInfo ,
-                                            public ::com::sun::star::lang::XTypeProvider,
+                                            public css::lang::XServiceInfo ,
+                                            public css::lang::XTypeProvider,
                                             public ::cppu::OBroadcastHelper             ,
                                             public ::cppu::OPropertySetHelper           ,   // -> XPropertySet, XFastPropertySet, XMultiPropertySet
                                             public ::cppu::OWeakObject
@@ -48,49 +48,49 @@ class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
         virtual ~ActionTriggerSeparatorPropertySet();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     private:
 
         //  OPropertySetHelper
 
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any&       aConvertedValue,
-                                                            com::sun::star::uno::Any&       aOldValue,
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&       aConvertedValue,
+                                                            css::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
-                                                            const com::sun::star::uno::Any& aValue          )
-            throw( com::sun::star::lang::IllegalArgumentException ) override;
+                                                            const css::uno::Any& aValue          )
+            throw( css::lang::IllegalArgumentException ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
-            throw( com::sun::star::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue )
+            throw( css::uno::Exception, std::exception ) override;
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const override;
+        virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override;
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
-        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+            throw (css::uno::RuntimeException, std::exception) override;
 
-        static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
         //  helper
 
         bool impl_tryToChangeProperty(  sal_Int16                           aCurrentValue   ,
-                                            const   com::sun::star::uno::Any&   aNewValue       ,
-                                            com::sun::star::uno::Any&           aOldValue       ,
-                                            com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
+                                            const   css::uno::Any&   aNewValue       ,
+                                            css::uno::Any&           aOldValue       ,
+                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
         //  members
 
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 46239fb..964907c 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -31,8 +31,8 @@ namespace framework
 {
 
 class FWE_DLLPUBLIC ImageWrapper :
-                     public ::cppu::WeakImplHelper< ::com::sun::star::awt::XBitmap,
-                                                    ::com::sun::star::lang::XUnoTunnel >
+                     public ::cppu::WeakImplHelper< css::awt::XBitmap,
+                                                    css::lang::XUnoTunnel >
 {
     public:
         ImageWrapper( const Image& aImage );
@@ -43,15 +43,15 @@ class FWE_DLLPUBLIC ImageWrapper :
             return m_aImage;
         }
 
-        static ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId();
+        static css::uno::Sequence< sal_Int8 > GetUnoTunnelId();
 
         // XBitmap
-        virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (css::uno::RuntimeException, std::exception) override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
 
     private:
         Image   m_aImage;
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index ac7b6a3..f843e98 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -100,7 +100,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
          *  @param  aProperty
          *          describes the new property.
          *
-         *  @throw  [com::sun::star::beans::PropertyExistException]
+         *  @throw  [css::beans::PropertyExistException]
          *          if a property with the same name already exists.
          *
          *  Note:   The consistence of the whole set of properties is not checked here.
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index b8a2097..bc0fa2b 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -35,78 +35,78 @@ namespace framework
 {
 
 class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
-                                    public com::sun::star::lang::XMultiServiceFactory,
-                                    public com::sun::star::lang::XServiceInfo,
-                                    public com::sun::star::lang::XUnoTunnel,
-                                    public com::sun::star::lang::XTypeProvider,
-                                    public com::sun::star::container::XNamed
+                                    public css::lang::XMultiServiceFactory,
+                                    public css::lang::XServiceInfo,
+                                    public css::lang::XUnoTunnel,
+                                    public css::lang::XTypeProvider,
+                                    public css::container::XNamed
 {
     public:
         RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier);
         virtual ~RootActionTriggerContainer();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XMultiServiceFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
+            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
+            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XIndexAccess
         virtual sal_Int32 SAL_CALL getCount()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
+            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XElementAccess
-        virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType()
+            throw (css::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL hasElements()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XNamed
-        virtual OUString SAL_CALL getName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
 
     private:
         void FillContainer();
 
-        bool    m_bContainerCreated;
-        bool    m_bContainerChanged;
-        bool    m_bInContainerCreation;
-        const Menu* m_pMenu;
+        bool            m_bContainerCreated;
+        bool            m_bContainerChanged;
+        bool            m_bInContainerCreation;
+        const Menu*     m_pMenu;
         const OUString* m_pMenuIdentifier;
 };
 
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 7761e26..fcd5718 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -88,11 +88,11 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception       ,
                                                                                                          css::uno::RuntimeException, std::exception) override;
         // XDispatchProvider
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(
-            const ::com::sun::star::util::URL&  aURL        ,
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+            const css::util::URL&  aURL        ,
             const OUString& sTarget     ,
             sal_Int32              nFlags      )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(
             const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
@@ -128,7 +128,7 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         css::uno::Reference< css::container::XNameAccess >      m_xPopupCtrlQuery;   /// reference to query for popup controller
         css::uno::Reference< css::uri::XUriReferenceFactory >   m_xUriRefFactory;   /// reference to the uri reference factory
         css::uno::Reference< css::uno::XComponentContext >      m_xContext;   /// factory shared with our owner to create new services!
-        osl::Mutex m_mutex;
+        osl::Mutex                                              m_mutex;
         IMPL_ListenerHashContainer                              m_aListenerContainer;   /// hash table for listener at specified URLs
         bool                                                    m_bAlreadyDisposed;   /// Protection against multiple disposing calls.
         bool                                                    m_bActivateListener;   /// dispatcher is listener for frame activation
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 3b99e6d..683f9b1 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -33,7 +33,7 @@
 
 namespace framework{
 
-class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< ::com::sun::star::ui::XDockingAreaAcceptor >
+class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::XDockingAreaAcceptor >
 {
     public:
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index fd9c517..4f5cf40 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -112,25 +112,25 @@ inline void RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUStr
 
 class FWI_DLLPUBLIC LanguageGuessingHelper
 {
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+    mutable css::uno::Reference< css::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
+    css::uno::Reference< css::uno::XComponentContext >                    m_xContext;
 
 public:
-    LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext) : m_xContext(_xContext){}
+    LanguageGuessingHelper(const css::uno::Reference< css::uno::XComponentContext >& _xContext) : m_xContext(_xContext){}
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;
+    css::uno::Reference< css::linguistic2::XLanguageGuessing >  GetGuesser() const;
 };
 
 FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&    _xContext
-            ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
+            ,const css::uno::Reference< css::uno::XComponentContext >&    _xContext
+            ,css::uno::Reference< css::container::XNameAccess >&        _xUICommandLabels
+            ,const css::uno::Reference< css::frame::XFrame >& _xFrame
             ,OUString& _rModuleIdentifier
             ,bool& _rIni
             ,const sal_Char* _pName);
 
 FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
+        const css::uno::Reference< css::frame::XFrame > &rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
         SvtScriptType    nScriptType,
         const OUString & rCurLang,
@@ -150,13 +150,13 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
 //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
 //which forwards the events to the OriginalListener without taking ownership of
 //it.
-class WeakContainerListener : public ::cppu::WeakImplHelper<com::sun::star::container::XContainerListener>
+class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XContainerListener>
 {
     private:
-        com::sun::star::uno::WeakReference<com::sun::star::container::XContainerListener> mxOwner;
+        css::uno::WeakReference<css::container::XContainerListener> mxOwner;
 
     public:
-        WeakContainerListener(com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner)
+        WeakContainerListener(css::uno::Reference<css::container::XContainerListener> xOwner)
             : mxOwner(xOwner)
         {
         }
@@ -166,52 +166,52 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<com::sun::star::cont
         }
 
         // container.XContainerListener
-        virtual void SAL_CALL elementInserted(const com::sun::star::container::ContainerEvent& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->elementInserted(rEvent);
         }
 
-        virtual void SAL_CALL elementRemoved(const com::sun::star::container::ContainerEvent& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->elementRemoved(rEvent);
         }
 
-        virtual void SAL_CALL elementReplaced(const com::sun::star::container::ContainerEvent& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->elementReplaced(rEvent);
         }
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->disposing(rEvent);
 
         }
 };
 
-class WeakChangesListener : public ::cppu::WeakImplHelper<com::sun::star::util::XChangesListener>
+class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesListener>
 {
     private:
-        com::sun::star::uno::WeakReference<com::sun::star::util::XChangesListener> mxOwner;
+        css::uno::WeakReference<css::util::XChangesListener> mxOwner;
 
     public:
-        WeakChangesListener(com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner)
+        WeakChangesListener(css::uno::Reference<css::util::XChangesListener> xOwner)
             : mxOwner(xOwner)
         {
         }
@@ -221,34 +221,34 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<com::sun::star::util::
         }
 
         // util.XChangesListener
-        virtual void SAL_CALL changesOccurred(const com::sun::star::util::ChangesEvent& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::util::XChangesListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->changesOccurred(rEvent);
         }
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::util::XChangesListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->disposing(rEvent);
 
         }
 };
 
-class WeakEventListener : public ::cppu::WeakImplHelper<com::sun::star::lang::XEventListener>
+class WeakEventListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
 {
     private:
-        com::sun::star::uno::WeakReference<com::sun::star::lang::XEventListener> mxOwner;
+        css::uno::WeakReference<css::lang::XEventListener> mxOwner;
 
     public:
-        WeakEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner)
+        WeakEventListener(css::uno::Reference<css::lang::XEventListener> xOwner)
             : mxOwner(xOwner)
         {
         }
@@ -258,24 +258,24 @@ class WeakEventListener : public ::cppu::WeakImplHelper<com::sun::star::lang::XE
         }
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::lang::XEventListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->disposing(rEvent);
 
         }
 };
 
-class WeakDocumentEventListener : public ::cppu::WeakImplHelper<com::sun::star::document::XDocumentEventListener>
+class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
 {
     private:
-        com::sun::star::uno::WeakReference<com::sun::star::document::XDocumentEventListener> mxOwner;
+        css::uno::WeakReference<css::document::XDocumentEventListener> mxOwner;
 
     public:
-        WeakDocumentEventListener(com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner)
+        WeakDocumentEventListener(css::uno::Reference<css::document::XDocumentEventListener> xOwner)
             : mxOwner(xOwner)
         {
         }
@@ -284,22 +284,22 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper<com::sun::star::
         {
         }
 
-        virtual void SAL_CALL documentEventOccured(const com::sun::star::document::DocumentEvent& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::document::XDocumentEventListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->documentEventOccured(rEvent);
 
         }
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
-            throw(com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
+            throw(css::uno::RuntimeException, std::exception) override
         {
-            com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(),
-                com::sun::star::uno::UNO_QUERY);
+            css::uno::Reference<css::document::XDocumentEventListener> xOwner(mxOwner.get(),
+                css::uno::UNO_QUERY);
             if (xOwner.is())
                 xOwner->disposing(rEvent);
 
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 78ff38d..6056298 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -54,7 +54,7 @@ namespace framework{
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class OComponentAccess  :   public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumerationAccess >
+class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnumerationAccess >
 {
 
     //  public methods
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index 77533e3..6b2acd7 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -50,7 +50,7 @@ namespace framework{
     @threadsafe     yes
 *//*-*************************************************************************************************************/
 
-class OComponentEnumeration :   public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener >
+class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::XEnumeration,css::lang::XEventListener >
 {
 
     //  public methods
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index cde5d55..8664dde 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -54,7 +54,7 @@ namespace framework{
 
     @devstatus      deprecated
 *//*-*************************************************************************************************************/
-class OFrames   :   public ::cppu::WeakImplHelper< ::com::sun::star::frame::XFrames >
+class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
 {
     public:
 
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 6dc5890..a04f202 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -32,7 +32,7 @@
 namespace framework
 {
 
-class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer    ,
+class FWE_DLLPUBLIC PropertySetContainer : public css::container::XIndexContainer    ,
                              public ::cppu::OWeakObject
 {
     public:
@@ -40,41 +40,41 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn
         virtual ~PropertySetContainer();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
+            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
+            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XIndexAccess
         virtual sal_Int32 SAL_CALL getCount()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
+            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XElementAccess
-        virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override
+        virtual css::uno::Type SAL_CALL getElementType()
+            throw (css::uno::RuntimeException, std::exception) override
         {
-            return cppu::UnoType<com::sun::star::beans::XPropertySet>::get();
+            return cppu::UnoType<css::beans::XPropertySet>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     private:
-        typedef std::vector< com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > > PropertySetVector;
+        typedef std::vector< css::uno::Reference< css::beans::XPropertySet > > PropertySetVector;
         PropertySetVector                                                               m_aPropertySetVector;
 
 };
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 7e427e9..100a7b2 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -43,12 +43,12 @@ namespace framework
 {
 
 typedef ::cppu::WeakImplHelper<
-           ::com::sun::star::ui::XUIElement,
-           ::com::sun::star::ui::XUIElementSettings,
-           ::com::sun::star::lang::XInitialization,
-           ::com::sun::star::lang::XComponent,
-           ::com::sun::star::util::XUpdatable,
-           ::com::sun::star::ui::XUIConfigurationListener > UIConfigElementWrapperBase_BASE;
+           css::ui::XUIElement,
+           css::ui::XUIElementSettings,
+           css::lang::XInitialization,
+           css::lang::XComponent,
+           css::util::XUpdatable,
+           css::ui::XUIConfigurationListener > UIConfigElementWrapperBase_BASE;
 
 class UIConfigElementWrapperBase : private cppu::BaseMutex,
                                    public ::cppu::OBroadcastHelper                               ,
@@ -67,62 +67,62 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
-        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual  void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XUIElementSettings
-        virtual  void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
-        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual  css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL setSettings( const css::uno::Reference< css::container::XIndexAccess >& UISettings ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XUIElement
-        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0;
 
         // XUpdatable
-        virtual  void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
 
         //  XUIConfigurationListener
-        virtual  void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        virtual  void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
 
     //  protected methods
 
     protected:
 
         //  OPropertySetHelper
-        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
-                                                                                                               com::sun::star::uno::Any&        aOldValue       ,
+        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
+                                                                                                               css::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
-                                                                                                               const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException ) override;
+                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
         virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual  void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual  void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual  ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
 
         virtual  void impl_fillNewData();
 
-        static  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static  const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
         sal_Int16                                                                               m_nType;
         bool                                                                                    m_bPersistent : 1,
@@ -132,11 +132,11 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex,
                                                                                                 m_bDisposed : 1,
                                                                                                 m_bNoClose : 1;
         OUString                                                                                m_aResourceURL;
-        com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >         m_xConfigSource;
-        com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >               m_xConfigData;
-        com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame >                     m_xWeakFrame;
-        com::sun::star::uno::Reference< com::sun::star::awt::XMenuBar >                         m_xMenuBar;
-        ::cppu::OMultiTypeInterfaceContainerHelper                                              m_aListenerContainer;   /// container for ALL Listener
+        css::uno::Reference< css::ui::XUIConfigurationManager >         m_xConfigSource;
+        css::uno::Reference< css::container::XIndexAccess >             m_xConfigData;
+        css::uno::WeakReference< css::frame::XFrame >                   m_xWeakFrame;
+        css::uno::Reference< css::awt::XMenuBar >                       m_xMenuBar;
+        ::cppu::OMultiTypeInterfaceContainerHelper                      m_aListenerContainer;   /// container for ALL Listener
 };
 
 } // namespace framework
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index 89ef32c..92473f8 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -39,10 +39,10 @@ namespace framework
 {
 
 typedef ::cppu::WeakImplHelper<
-           ::com::sun::star::ui::XUIElement,
-           ::com::sun::star::lang::XInitialization,
-           ::com::sun::star::lang::XComponent,
-           ::com::sun::star::util::XUpdatable > UIElementWrapperBase_BASE;
+           css::ui::XUIElement,
+           css::lang::XInitialization,
+           css::lang::XComponent,
+           css::util::XUpdatable > UIElementWrapperBase_BASE;
 
 class UIElementWrapperBase : private cppu::BaseMutex,
                              public ::cppu::OBroadcastHelper                    ,
@@ -61,53 +61,53 @@ class UIElementWrapperBase : private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
-        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual  void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XUpdatable
-        virtual  void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
 
         // XUIElement
-        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0;
 
     //  protected methods
 
     protected:
 
         //  OPropertySetHelper
-        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
-                                                                                                               com::sun::star::uno::Any&        aOldValue       ,
+        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
+                                                                                                               css::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
-                                                                                                               const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException ) override;
+                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
         virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual  void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual  void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual  ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
 
-        static  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static  const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
-        ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListenerContainer;   /// container for ALL Listener
-        OUString                                                       m_aResourceURL;
-        com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame;
-        sal_Int16                                                           m_nType;
-        bool                                                            m_bInitialized : 1,
-                                                                            m_bDisposed;
+        ::cppu::OMultiTypeInterfaceContainerHelper             m_aListenerContainer;   /// container for ALL Listener
+        OUString                                               m_aResourceURL;
+        css::uno::WeakReference< css::frame::XFrame >          m_xWeakFrame;
+        sal_Int16                                              m_nType;
+        bool                                                   m_bInitialized : 1,
+                                                               m_bDisposed;
 };
 
 } // namespace framework
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 8076f97..6b9841d 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -41,7 +41,7 @@ namespace framework{
 
     @author as96863
  */
-class HelpOnStartup : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob >
+class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::lang::XEventListener,css::task::XJob >
 {
 
     // member
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 86b67b9..89ebaa8 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -105,7 +105,7 @@ class JobResult
     public:
 
                  JobResult(                                         );
-                 JobResult( const com::sun::star::uno::Any& aResult );
+                 JobResult( const css::uno::Any& aResult );
                  JobResult( const JobResult&                rCopy   );
         virtual ~JobResult(                                         );
 
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index a75cb48..aa54eaf 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -45,7 +45,7 @@ namespace framework{
 
     @author as96863
  */
-class ShellJob : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
+class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::task::XJob >
 {
 
     // member
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 836e097..44273cd 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -64,9 +64,9 @@ ________________________________________________________________________________
             )                                                                                                                           \
         {                                                                                                                               \
             /* Define variables which are used in following macros. */                                                                  \
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   xFactory;                   \
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    xServiceManager;                   \
-            xServiceManager = static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager );                   \
+            css::uno::Reference< css::uno::XInterface >             xFactory;                                                           \
+            css::uno::Reference< css::lang::XMultiServiceFactory >  xServiceManager;                                                    \
+            xServiceManager = static_cast< css::lang::XMultiServiceFactory* >( pServiceManager );                                       \
             /* These parameter will expand to      */                                                                                   \
             /* "IF_NAME_CREATECOMPONENTFACTORY(a)  */                                                                                   \
             /*  else                               */                                                                                   \
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 041ead5..4adf324 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -66,11 +66,11 @@ ________________________________________________________________________________
 //  implementation of XInterface::queryInterface() with max. 12 other interfaces!
 
 #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES )                                                                            \
-    ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
+    css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception )  \
     {                                                                                                                                                       \
         /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */                                                              \
         /* Ask for my own supported interfaces ...                                          */                                                              \
-        ::com::sun::star::uno::Any aReturn  ( ::cppu::queryInterface INTERFACES                                                                             \
+        css::uno::Any aReturn  ( ::cppu::queryInterface INTERFACES                                                                             \
                                             );                                                                                                              \
         /* If searched interface not supported by this class ... */                                                                                         \
         if ( !aReturn.hasValue() )                                                                                                                          \
@@ -86,11 +86,11 @@ ________________________________________________________________________________
 //  implementation of XInterface::queryInterface() with more than 12 other interfaces!
 
 #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )                                             \
-    ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
+    css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception )  \
     {                                                                                                                                                       \
         /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */                                                              \
         /* Ask for my own supported interfaces ...                                          */                                                              \
-        ::com::sun::star::uno::Any aReturn  ( ::cppu::queryInterface INTERFACES_FIRST                                                                       \
+        css::uno::Any aReturn  ( ::cppu::queryInterface INTERFACES_FIRST                                                                       \
                                             );                                                                                                              \
         /* If searched interface not supported by first group ... */                                                                                        \
         if ( !aReturn.hasValue() )                                                                                                                          \
@@ -189,7 +189,7 @@ ________________________________________________________________________________
 //  declaration of XInterface
 
 #define FWK_DECLARE_XINTERFACE                                                                                                                                      \
-    virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType   ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; \
+    virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException, std::exception ) override; \
     virtual void                        SAL_CALL acquire       (                                            ) throw() override;  \
     virtual void                        SAL_CALL release       (                                            ) throw() override;
 
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 4f28728..f977c6b 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -53,7 +53,7 @@ ________________________________________________________________________________
 //  implementation of XTypeProvider::getImplementationId()
 
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                               \
-    ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception )          \
+    css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( css::uno::RuntimeException, std::exception )          \
     {                                                                                                                                           \
         return css::uno::Sequence<sal_Int8>();                                                                                                  \
     }
@@ -62,7 +62,7 @@ ________________________________________________________________________________
 //  implementation of XTypeProvider::getTypes() with max. 12 interfaces!
 
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES )                                                                                   \
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
+    css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception )  \
     {                                                                                                                                           \
         /* Optimize this method !                                       */                                                                      \
         /* We initialize a static variable only one time.               */                                                                      \
@@ -91,14 +91,14 @@ ________________________________________________________________________________
 //  implementation of XTypeProvider::getTypes() with more than 12 interfaces!
 
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND )                                                         \
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
+    css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception )  \
     {                                                                                                                                           \
         /* Optimize this method !                                       */                                                                      \
         /* We initialize a static variable only one time.               */                                                                      \
         /* And we don't must use a mutex at every call!                 */                                                                      \
         /* For the first call; pTypeCollection is NULL -                */                                                                      \
         /* for the second call pTypeCollection is different from NULL!  */                                                                      \
-        static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL;                                         \
+        static css::uno::Sequence< css::uno::Type >* pTypeCollection = NULL;                                         \
         if ( pTypeCollection == NULL )                                                                                                          \
         {                                                                                                                                       \
             /* Ready for multithreading; get global mutex for first call of this method only! see before   */                                   \
@@ -111,13 +111,13 @@ ________________________________________________________________________________
                 ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST;                                                                       \
                 ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND;                                                                       \
                 /* Copy all items from both sequences to one result list! */                                                                    \
-                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >          seqTypes1   = aTypeCollection1.getTypes();              \
-                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >          seqTypes2   = aTypeCollection2.getTypes();              \
-                sal_Int32                                                               nCount1     = seqTypes1.getLength();                    \
-                sal_Int32                                                               nCount2     = seqTypes2.getLength();                    \
-                static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >   seqResult   ( nCount1+nCount2 );                        \
-                sal_Int32                                                               nSource     = 0;                                        \
-                sal_Int32                                                               nDestination= 0;                                        \
+                css::uno::Sequence< css::uno::Type >          seqTypes1   = aTypeCollection1.getTypes();              \
+                css::uno::Sequence< css::uno::Type >          seqTypes2   = aTypeCollection2.getTypes();              \
+                sal_Int32                                     nCount1     = seqTypes1.getLength();                    \
+                sal_Int32                                     nCount2     = seqTypes2.getLength();                    \
+                static css::uno::Sequence< css::uno::Type >   seqResult   ( nCount1+nCount2 );                        \
+                sal_Int32                                     nSource     = 0;                                        \
+                sal_Int32                                     nDestination= 0;                                        \
                 while( nSource<nCount1 )                                                                                                        \
                 {                                                                                                                               \
                     seqResult[nDestination] = seqTypes1[nSource];                                                                               \
@@ -203,8 +203,8 @@ ________________________________________________________________________________
 //  declaration of XTypeProvider
 
 #define FWK_DECLARE_XTYPEPROVIDER                                                                                                                               \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes           () throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;\
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes           () throw( css::uno::RuntimeException, std::exception ) override;\
+    virtual css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
 
 //  public
 //  implementation of XTypeProvider
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 16a1b3f..0c3389b 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -72,15 +72,15 @@ class DispatchRecorder
         virtual void SAL_CALL            endRecording           () throw( css::uno::RuntimeException, std::exception ) override;
         virtual OUString SAL_CALL getRecordedMacro       () throw( css::uno::RuntimeException, std::exception ) override;
 
-        virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual sal_Bool SAL_CALL hasElements()  throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements()  throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32)  throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32)  throw (css::uno::RuntimeException, css::lang::WrappedTargetException, css::lang::IndexOutOfBoundsException, std::exception) override;
 
-        virtual void SAL_CALL replaceByIndex(sal_Int32, const com::sun::star::uno::Any&)  throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex(sal_Int32, const css::uno::Any&)  throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // private functions
     private:
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index e73f0e6..6379e41 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -131,10 +131,10 @@ class Desktop : private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
 
         /**
             @interface  XDesktop
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 359798bb..05f6dd1 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -45,7 +45,7 @@ namespace framework{
                 All these steps are done inside one method call here.
 */
 
-class DispatchHelper : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
+class DispatchHelper : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::frame::XDispatchHelper,css::frame::XDispatchResultListener >
 {
 
     // member
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 11ff3d3..767186d 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -67,9 +67,9 @@ namespace framework
     {
         class InfoHelperBuilder;
     }
-    typedef ::cppu::WeakImplHelper <   ::com::sun::star::lang::XServiceInfo
-                                    ,   ::com::sun::star::frame::XLayoutManager2
-                                    ,   ::com::sun::star::awt::XWindowListener
+    typedef ::cppu::WeakImplHelper <   css::lang::XServiceInfo
+                                    ,   css::frame::XLayoutManager2
+                                    ,   css::awt::XWindowListener
                                     >   LayoutManager_Base;
     typedef ::comphelper::OPropertyContainer    LayoutManager_PBase;
     class LayoutManager : public  LayoutManager_Base                    ,
@@ -86,7 +86,7 @@ namespace framework
             };
             enum { DOCKINGAREAS_COUNT = 4 };
 
-            LayoutManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
+            LayoutManager( const css::uno::Reference< css::uno::XComponentContext >& xContext );
             virtual ~LayoutManager();
 
             /** declaration of XInterface, XTypeProvider, XServiceInfo */
@@ -113,43 +113,43 @@ namespace framework
             }
 
             // XLayoutManager
-            virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDockingAreaAcceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL createElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL destroyElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > SAL_CALL getElements(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list