com::sun::star->css in include/framework

Change-Id: I60874ab8d3cc9adaea8757d6888e341accce2083
Reviewed-on: https://gerrit.libreoffice.org/19494
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

16 files changed, 95 insertions, 96 deletions

diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx
index fd7f7a6cbd80..392e5dceae2b 100644
--- a/include/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
@@ -37,9 +37,9 @@ namespace framework
             static void
                 CreateMenuFromActionTriggerContainer(
                     Menu* pNewMenu,
-                    const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer );
+                    const css::uno::Reference< css::container::XIndexContainer >& rActionTriggerContainer );
 
-            // Creates a "com::sun::star::ui::ActionTriggerContainer" with the structure of the menu
+            // Creates a "css::ui::ActionTriggerContainer" with the structure of the menu
             // provided as a parameter. The implementation class stores the menu pointer
             // to optimize the time of creation of a menu from a actiontrigger structure.
             // IMPORTANT: The caller must ensure that the menu pointer is valid through the
@@ -47,7 +47,7 @@ namespace framework
             // @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on
             //                   the above mentioned restriction!!!
 
-            static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
+            static css::uno::Reference< css::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
                 const Menu* pMenu, const OUString* pMenuIdentifier );
 
             // Fills the submitted rActionTriggerContainer with the structure of the menu
@@ -56,7 +56,7 @@ namespace framework
             // @param pNewMenu = must be a valid menu
             static void
                 FillActionTriggerContainerFromMenu(
-                    com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer,
+                    css::uno::Reference< css::container::XIndexContainer >& rActionTriggerContainer,
                     const Menu* pMenu );
 
     };
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index b92d71698024..b909d61099e8 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -37,11 +37,11 @@ namespace framework
 class FWE_DLLPUBLIC AddonMenu : public PopupMenu
 {
     public:
-        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame );
         virtual ~AddonMenu();
 
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
+        css::uno::Reference< css::frame::XFrame > m_xFrame;
 };
 
 class AddonMenuManager;
@@ -57,7 +57,7 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
         void               SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
 
     private:
-        AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+        AddonPopupMenu( const css::uno::Reference< css::frame::XFrame >& rFrame );
 
         OUString               m_aCommandURL;
 
@@ -81,7 +81,7 @@ class FWE_DLLPUBLIC AddonMenuManager
         static bool IsCorrectContext(const OUString& rModuleIdentifier, const OUString& rContext);
 
         // Factory method to create different Add-On menu types
-        static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+        static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const css::uno::Reference< css::frame::XFrame >& rFrame );
 
         // Create the Add-Ons menu
         static AddonMenu* CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -106,18 +106,18 @@ class FWE_DLLPUBLIC AddonMenuManager
                                      MenuType    nSubMenuType,
                                      sal_uInt16      nInsPos,
                                      sal_uInt16&     nUniqueMenuId,
-                                     const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& aAddonMenuDefinition,
-                                     const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+                                     const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition,
+                                     const css::uno::Reference< css::frame::XFrame >& rFrame,
                                      const ::rtl::OUString& rModuleIdentifier );
 
         // Retrieve the menu entry property values from a sequence
-        static void       GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry,
+        static void       GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry,
                                         OUString& rTitle,
                                         OUString& rURL,
                                         OUString& rTarget,
                                         OUString& rImageId,
                                         OUString& rContext,
-                                        com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu );
+                                        css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonSubMenu );
 };
 
 } // namespace framework
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 92bf9048e96e..8241f324815b 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -51,7 +51,7 @@ struct FWE_DLLPUBLIC MergeMenuInstruction
     OUString     aMergeCommandParameter;
     OUString     aMergeFallback;
     OUString     aMergeContext;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeMenu;
+    css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeMenu;
 };
 typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer;
 
@@ -63,7 +63,7 @@ struct FWE_DLLPUBLIC MergeToolbarInstruction
     OUString     aMergeCommandParameter;
     OUString     aMergeFallback;
     OUString     aMergeContext;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeToolbarItems;
+    css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeToolbarItems;
 };
 
 typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer;
@@ -75,7 +75,7 @@ struct FWE_DLLPUBLIC MergeStatusbarInstruction
     ::rtl::OUString     aMergeCommandParameter;
     ::rtl::OUString     aMergeFallback;
     ::rtl::OUString     aMergeContext;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeStatusbarItems;
+    css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeStatusbarItems;
 };
 
 typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer;
@@ -140,7 +140,7 @@ class FWE_DLLPUBLIC AddonsOptions
             @onerror    We return an empty list.
         *//*-*****************************************************************************************************/
 
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const;
+        const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& GetAddonsMenu() const;
 
         /*-****************************************************************************************************
             @short      Gets the menu bar part of all addon components registered
@@ -149,7 +149,7 @@ class FWE_DLLPUBLIC AddonsOptions
             @onerror    We return sal_False
         *//*-*****************************************************************************************************/
 
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenuBarPart() const;
+        const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& GetAddonsMenuBarPart() const;
 
         /*-****************************************************************************************************
             @short      Gets a toolbar part of an single addon
@@ -158,7 +158,7 @@ class FWE_DLLPUBLIC AddonsOptions
             @onerror    We return sal_False
         *//*-*****************************************************************************************************/
 
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsToolBarPart( sal_uInt32 nIndex ) const;
+        const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& GetAddonsToolBarPart( sal_uInt32 nIndex ) const;
 
         /*-****************************************************************************************************
             @short      Gets a unique toolbar resource name of an single addon
@@ -192,7 +192,7 @@ class FWE_DLLPUBLIC AddonsOptions
 
             @onerror    We return sal_False
         *//*-*****************************************************************************************************/
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsHelpMenu() const;
+        const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& GetAddonsHelpMenu() const;
 
         const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const;
 
diff --git a/include/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx
index 79c8c92baab4..54c4075be542 100644
--- a/include/framework/bmkmenu.hxx
+++ b/include/framework/bmkmenu.hxx
@@ -44,9 +44,7 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu
             BMK_WIZARDMENU
         };
 
-        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                 BmkMenuType nType
-        );
+        BmkMenu( css::uno::Reference< css::frame::XFrame >& rFrame, BmkMenuType nType );
 
         virtual ~BmkMenu();
 
diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx
index 776c94405db9..c35e8d6428b5 100644
--- a/include/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
@@ -34,10 +34,10 @@ namespace framework
     {
         public:
             static bool ImportCustomToolbars(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 >& rContainerFactory,
-                        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer,
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rToolbarStorage );
+                        const css::uno::Reference< css::ui::XUIConfigurationManager2 >& rContainerFactory,
+                        css::uno::Sequence< css::uno::Reference< css::container::XIndexContainer > >& rSeqContainer,
+                        const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                        const css::uno::Reference< css::embed::XStorage >& rToolbarStorage );
     };
 
 } // namespace framework
diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx
index ab2f1c91b3b0..dc1fb5ff60b8 100644
--- a/include/framework/documentundoguard.hxx
+++ b/include/framework/documentundoguard.hxx
@@ -37,13 +37,13 @@ namespace framework
         the XUndoManagerSupplier interface). When entering the scope (i.e. when the <code>DocumentUndoGuard</code>
         instances is constructed), the current state of the undo contexts of the undo manager is examined.
         Upon leaving the scope (i.e. when the <code>DocumentUndoGuard</code> is destructed), the guard will execute
-        as many calls to <member scope="com::sun::star::document">XUndoManager::leaveUndoContext</member> as are
+        as many calls to <member scope="css::document">XUndoManager::leaveUndoContext</member> as are
         necessary to restore the manager's initial state.
     */
     class FWE_DLLPUBLIC DocumentUndoGuard
     {
     public:
-        DocumentUndoGuard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_undoSupplierComponent );
+        DocumentUndoGuard( const css::uno::Reference< css::uno::XInterface >& i_undoSupplierComponent );
         ~DocumentUndoGuard();
 
     private:
diff --git a/include/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx
index 7a4dd3d9ac00..45e8b2d5357f 100644
--- a/include/framework/eventsconfiguration.hxx
+++ b/include/framework/eventsconfiguration.hxx
@@ -32,8 +32,8 @@ namespace framework
 
 struct FWE_DLLPUBLIC EventsConfig
 {
-    ::com::sun::star::uno::Sequence< OUString >              aEventNames;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >   aEventsProperties;
+    css::uno::Sequence< OUString >              aEventNames;
+    css::uno::Sequence< css::uno::Any >         aEventsProperties;
 };
 
 } // namespace framework
diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx
index 43d2b28c13a0..cdceae22559b 100644
--- a/include/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
@@ -61,10 +61,10 @@ class FWE_DLLPUBLIC FrameListAnalyzer
     public:
 
         /** provides access to the frame container, which should be analyzed. */
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier;
+        const css::uno::Reference< css::frame::XFramesSupplier >& m_xSupplier;
 
         /** hold the reference frame, which is used e.g. to detect other frames with the same model. */
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame;
+        const css::uno::Reference< css::frame::XFrame >& m_xReferenceFrame;
 
         /** enable/disable some special analyzing steps.
             see impl_analyze() for further information. */
@@ -73,19 +73,19 @@ class FWE_DLLPUBLIC FrameListAnalyzer
         /** contains all frames, which uses the same model like the reference frame.
             Will be filled only if m_eDetectMode has set the flag E_MODEL.
             The reference frame is never part of this list! */
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames;
+        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lModelFrames;
 
         /** contains all frames, which does not contain the same model like the reference frame.
             Filling of it can't be suppressed by m_eDetectMode.
             The reference frame is never part of this list!
             All frames inside this list are visible ones. */
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames;
+        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherVisibleFrames;
 
         /** contains all frames, which does not contain the same model like the reference frame.
             Filling of it can't be suppressed by m_eDetectMode.
             The reference frame is never part of this list!
             All frames inside this list are hidden ones. */
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames;
+        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherHiddenFrames;
 
         /** points to the help frame.
             Will be set only, if any other frame (means different from the reference frame)
@@ -110,7 +110,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer
             Analyzing of the help frame ignores the visible state of any frame.
             But note: a hidden help frame indicates a wrong state!
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp;
+        css::uno::Reference< css::frame::XFrame > m_xHelp;
 
         /** points to the frame, which contains the backing component.
             Will be set only, if any other frame (means different from the reference frame)
@@ -136,7 +136,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer
             Analyzing of the help frame ignores the visible state of any frame.
             But note: a hidden backing mode frame indicates a wrong state!
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent;
+        css::uno::Reference< css::frame::XFrame > m_xBackingComponent;
 
         /** is set to true only, if the reference frame is a hidden one.
             This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */
@@ -173,8 +173,8 @@ class FWE_DLLPUBLIC FrameListAnalyzer
                     analyze steps. Note: Some member values will be undefined, if
                     an analyze step will be disabled.
          */
-                 FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier       ,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&          xReferenceFrame ,
+                 FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier       ,
+                                    const css::uno::Reference< css::frame::XFrame >&          xReferenceFrame ,
                                           sal_uInt32                                          eDetectMode     );
         virtual ~FrameListAnalyzer();
 
diff --git a/include/framework/imageproducer.hxx b/include/framework/imageproducer.hxx
index 876c635462e3..dd165433fffd 100644
--- a/include/framework/imageproducer.hxx
+++ b/include/framework/imageproducer.hxx
@@ -30,7 +30,7 @@ namespace framework
 {
 
 typedef Image ( *pfunc_getImage)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& aURL,
     bool bBig
 );
@@ -38,7 +38,7 @@ typedef Image ( *pfunc_getImage)(
 pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
 Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& aURL,
     bool bBig
 );
diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx
index f3cbe3d1b3e4..a57b3edc0e28 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -62,12 +62,12 @@ class FWE_DLLPUBLIC RequestFilterSelect
 {
     RequestFilterSelect_Impl* pImp;
 
-    public:
-        RequestFilterSelect( const OUString& sURL );
-        ~RequestFilterSelect();
-        bool     isAbort  () const;
-        OUString getFilter() const;
-    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+public:
+    RequestFilterSelect( const OUString& sURL );
+    ~RequestFilterSelect();
+    bool     isAbort  () const;
+    OUString getFilter() const;
+    css::uno::Reference < css::task::XInteractionRequest > GetRequest();
 };
 
 /*-************************************************************************************************************
@@ -84,9 +84,9 @@ class FWE_DLLPUBLIC RequestFilterSelect
 class FWE_DLLPUBLIC InteractionRequest
 {
 public:
-    static com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >
-        CreateRequest( const ::com::sun::star::uno::Any& aRequest,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations );
+    static css::uno::Reference < css::task::XInteractionRequest > CreateRequest(
+        const css::uno::Any& aRequest,
+        const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations );
 };
 
 
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index c2350e9d530d..25e26f3447a7 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -102,26 +102,27 @@ public:
 
 class FWE_DLLPUBLIC MenuConfiguration
 {
-    public:
+public:
         MenuConfiguration(
             // use const when giving a uno reference by reference
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
         virtual ~MenuConfiguration();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > CreateMenuBarConfigurationFromXML(
-            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream )
+        css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML(
+            css::uno::Reference< css::io::XInputStream >& rInputStream )
             throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
 
         PopupMenu* CreateBookmarkMenu(css::uno::Reference<css::frame::XFrame >& rFrame, const OUString& aURL)
             throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-        void StoreMenuBarConfigurationToXML( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rMenuBarConfiguration,
-                      ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
+        void StoreMenuBarConfigurationToXML(
+                      css::uno::Reference< css::container::XIndexAccess >& rMenuBarConfiguration,
+                      css::uno::Reference< css::io::XOutputStream >& rOutputStream )
             throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext;
+private:
+        css::uno::Reference< css::uno::XComponentContext> m_xContext;
 };
 
 }
diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index c2137cd70fa9..cf6ac0058eda 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -135,8 +135,8 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 
             @threadsafe yes
         */
-        virtual sal_Bool SAL_CALL handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
+            throw (css::uno::RuntimeException, std::exception) override;
 
 
         /**
@@ -146,8 +146,8 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 
             @threadsafe yes
         */
-        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;
 
     // c++ interface
     public:
diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx
index bad672f1b009..e88e1708a05a 100644
--- a/include/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
@@ -29,30 +29,30 @@
 #include <svtools/statusbarcontroller.hxx>
 
 typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     ToolBox* pToolbox,
     unsigned short nID,
     const OUString& aCommandURL );
 
 typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     StatusBar* pStatusBar,
     unsigned short nID,
     const OUString& aCommandURL );
 
 typedef void ( *pfunc_getRefreshToolbars)(
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+    css::uno::Reference< css::frame::XFrame >& rFrame );
 
 typedef void ( *pfunc_createDockingWindow)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& rResourceURL );
 
 typedef bool ( *pfunc_isDockingWindowVisible)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& rResourceURL );
 
 typedef void ( *pfunc_activateToolPanel)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+    const css::uno::Reference< css::frame::XFrame >& i_rFrame,
     const OUString& i_rPanelURL );
 
 
@@ -60,35 +60,35 @@ namespace framework
 {
 FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
 FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     ToolBox* pToolbox,
     unsigned short nID,
     const OUString& aCommandURL );
 
 FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
 FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     StatusBar* pStatusBar,
     unsigned short nID,
      const OUString& aCommandURL );
 
 FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
 FWE_DLLPUBLIC void SAL_CALL RefreshToolbars(
-     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+     css::uno::Reference< css::frame::XFrame >& rFrame );
 
 FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
 FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& rResourceURL );
 
 FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
 FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const css::uno::Reference< css::frame::XFrame >& rFrame,
     const OUString& rResourceURL );
 
 FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
 FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+    const css::uno::Reference< css::frame::XFrame >& i_rFrame,
     const OUString& i_rPanelURL );
 }
 
diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx
index 402f56fc936b..7abcc145d7d9 100644
--- a/include/framework/statusbarconfiguration.hxx
+++ b/include/framework/statusbarconfiguration.hxx
@@ -36,14 +36,14 @@ class FWE_DLLPUBLIC StatusBarConfiguration
 {
     public:
         static bool LoadStatusBar(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration );
+            const css::uno::Reference< css::uno::XComponentContext >& xContext,
+            const css::uno::Reference< css::io::XInputStream >& xInputStream,
+            const css::uno::Reference< css::container::XIndexContainer >& rStatusbarConfiguration );
 
         static bool StoreStatusBar(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration );
+            const css::uno::Reference< css::uno::XComponentContext >& xContext,
+            const css::uno::Reference< css::io::XOutputStream >& xOutputStream,
+            const css::uno::Reference< css::container::XIndexAccess >& rStatusbarConfiguration );
 };
 
 } // namespace framework
diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx
index f19410cf0ea6..16bc30400bda 100644
--- a/include/framework/toolboxconfiguration.hxx
+++ b/include/framework/toolboxconfiguration.hxx
@@ -35,14 +35,14 @@ class FWE_DLLPUBLIC ToolBoxConfiguration
 {
     public:
         static bool LoadToolBox(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::io::XInputStream >& rInputStream,
+            const css::uno::Reference< css::container::XIndexContainer >& rToolbarConfiguration );
 
         static bool StoreToolBox(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration );
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::io::XOutputStream >& rOutputStream,
+            const css::uno::Reference< css::container::XIndexAccess >& rToolbarConfiguration );
 };
 
 } // namespace framework
diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx
index 1b94e3bf0251..6a33919c43fd 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -66,17 +66,17 @@ namespace framework
     public:
         /** returns the IUndoManager interface to the actual Undo stack
 
-            @throws com::sun::star::lang::DisposedException
+            @throws css::lang::DisposedException
                 when the instance is already disposed, and no IUndoManager can be provided
 
-            @throws com::sun::star::lang::NotInitializedException
+            @throws css::lang::NotInitializedException
                 when the instance is not initialized, yet, and no IUndoManager can be provided
         */
         virtual ::svl::IUndoManager&    getImplUndoManager() = 0;
 
         /** provides access to an UNO interface for the XUndoManager implementation. Used when throwing exceptions.
         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >
+        virtual css::uno::Reference< css::document::XUndoManager >
                                         getThis() = 0;
 
     protected:
@@ -123,22 +123,22 @@ namespace framework
         void            enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock );
         void            enterHiddenUndoContext( IMutexGuard& i_instanceLock );
         void            leaveUndoContext( IMutexGuard& i_instanceLock );
-        void            addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock );
+        void            addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock );
         void            undo( IMutexGuard& i_instanceLock );
         void            redo( IMutexGuard& i_instanceLock );
         bool            isUndoPossible() const;
         bool            isRedoPossible() const;
         OUString getCurrentUndoActionTitle() const;
         OUString getCurrentRedoActionTitle() const;
-        ::com::sun::star::uno::Sequence< OUString >
+        css::uno::Sequence< OUString >
                         getAllUndoActionTitles() const;
-        ::com::sun::star::uno::Sequence< OUString >
+        css::uno::Sequence< OUString >
                         getAllRedoActionTitles() const;
         void            clear( IMutexGuard& i_instanceLock );
         void            clearRedo( IMutexGuard& i_instanceLock );
         void            reset( IMutexGuard& i_instanceLock );
-        void            addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener );
-        void            removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener );
+        void            addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener );
+        void            removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener );
 
         // XLockable, base of XUndoManager, equivalents
         void            lock();
@@ -146,8 +146,8 @@ namespace framework
         bool            isLocked();
 
         // XModifyBroadcaster equivalents
-        void            addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& i_listener );
-        void            removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& i_listener );
+        void            addModifyListener( const css::uno::Reference< css::util::XModifyListener >& i_listener );
+        void            removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& i_listener );
 
     private:
         std::unique_ptr< UndoManagerHelper_Impl >   m_xImpl;