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

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

8 files changed, 112 insertions, 119 deletions

diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 709fbbdb09de..d173f7ba9525 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -571,26 +571,26 @@ namespace com { namespace sun { namespace star {
 
 struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >   mXConnector;
-    ::com::sun::star::awt::Point            maPointA;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >   mXConnectToA;
-    ::com::sun::star::awt::Point            maPointB;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >   mXConnectToB;
+    css::uno::Reference< css::drawing::XShape >   mXConnector;
+    css::awt::Point                               maPointA;
+    css::uno::Reference< css::drawing::XShape >   mXConnectToA;
+    css::awt::Point                               maPointB;
+    css::uno::Reference< css::drawing::XShape >   mXConnectToB;
 
     sal_uInt32      GetConnectorRule( bool bFirst );
 
-                    EscherConnectorListEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rC,
-                                        const ::com::sun::star::awt::Point& rPA,
-                                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSA ,
-                                        const ::com::sun::star::awt::Point& rPB,
-                                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSB ) :
+                    EscherConnectorListEntry( const css::uno::Reference< css::drawing::XShape > & rC,
+                                        const css::awt::Point& rPA,
+                                        css::uno::Reference< css::drawing::XShape > & rSA ,
+                                        const css::awt::Point& rPB,
+                                        css::uno::Reference< css::drawing::XShape > & rSB ) :
                                             mXConnector ( rC ),
                                             maPointA    ( rPA ),
                                             mXConnectToA( rSA ),
                                             maPointB    ( rPB ),
                                             mXConnectToB( rSB ) {}
 
-                    static sal_uInt32 GetClosestPoint( const tools::Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
+                    static sal_uInt32 GetClosestPoint( const tools::Polygon& rPoly, const css::awt::Point& rP );
 };
 
 struct MSFILTER_DLLPUBLIC EscherExContainer
@@ -614,14 +614,14 @@ struct MSFILTER_DLLPUBLIC EscherExAtom
 struct EscherPropertyValueHelper
 {
     static bool GetPropertyValue(
-        ::com::sun::star::uno::Any& rAny,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+        css::uno::Any& rAny,
+        const css::uno::Reference< css::beans::XPropertySet > &,
         const OUString& rPropertyName,
         bool bTestPropertyAvailability = false
     );
 
-    static ::com::sun::star::beans::PropertyState GetPropertyState(
-        const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &,
+    static css::beans::PropertyState GetPropertyState(
+        const css::uno::Reference < css::beans::XPropertySet > &,
         const OUString& rPropertyName
     );
 };
@@ -692,7 +692,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider
     sal_uInt32              mnBlibBufSize;
     sal_uInt32              mnBlibEntrys;
 
-    OUString           maBaseURI;
+    OUString                maBaseURI;
 
 protected:
 
@@ -708,7 +708,7 @@ public:
                     SvStream& rPicOutStream,
                     const OString& rGraphicId,
                     const Rectangle& rBoundRect,
-                    const com::sun::star::awt::Rectangle* pVisArea = NULL,
+                    const css::awt::Rectangle* pVisArea = NULL,
                     const GraphicAttr* pGrafikAttr = NULL,
                     const bool ooxmlExport = false
                 );
@@ -735,20 +735,20 @@ class MSFILTER_DLLPUBLIC EscherSolverContainer
 public:
 
     sal_uInt32      GetShapeId(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape
+                        const css::uno::Reference< css::drawing::XShape > & rShape
                     ) const;
 
     void            AddShape(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &,
+                        const css::uno::Reference< css::drawing::XShape > &,
                         sal_uInt32 nId
                     );
 
     void            AddConnector(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &,
-                        const ::com::sun::star::awt::Point& rA,
-                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &,
-                        const ::com::sun::star::awt::Point& rB,
-                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConB
+                        const css::uno::Reference< css::drawing::XShape > &,
+                        const css::awt::Point& rA,
+                        css::uno::Reference< css::drawing::XShape > &,
+                        const css::awt::Point& rB,
+                        css::uno::Reference< css::drawing::XShape > & rConB
                     );
 
     void            WriteSolver( SvStream& );
@@ -794,7 +794,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
 
     static sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
     void        ImplCreateGraphicAttributes(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                    const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
                     sal_uInt32 nBlibId,
                     bool bCreateCroppingAttributes
                 );
@@ -841,27 +841,27 @@ public:
     void        Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT );
 
     bool        CreateShapeProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape
+                    const css::uno::Reference< css::drawing::XShape > & rXShape
                 );
     bool        CreateOLEGraphicProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject
+                    const css::uno::Reference< css::drawing::XShape > & rXOleObject
                 );
     bool        CreateGraphicProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
+                    const css::uno::Reference< css::drawing::XShape > & rXShape,
                     const GraphicObject& rGraphicObj
                 );
     bool        CreateMediaGraphicProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXMediaObject
+                    const css::uno::Reference< css::drawing::XShape > & rXMediaObject
                 );
 
     /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */
     bool        CreateEmbeddedBitmapProperties(
                     const OUString& rBitmapUrl,
-                    ::com::sun::star::drawing::BitmapMode eBitmapMode
+                    css::drawing::BitmapMode eBitmapMode
                 );
     /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */
     bool        CreateEmbeddedHatchProperties(
-                    const ::com::sun::star::drawing::Hatch& rHatch,
+                    const css::drawing::Hatch& rHatch,
                     const Color& rBackColor,
                     bool bFillBackground
                 );
@@ -870,7 +870,7 @@ public:
                     // DR: #99897# if no GraphicProvider is present, a complex ESCHER_Prop_fillBlip
                     //             will be created, containing the BLIP directly (e.g. for Excel charts).
     bool        CreateGraphicProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                    const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
                     const OUString& rSource,
                     const bool bCreateFillBitmap,
                     const bool bCreateCroppingAttributes = false,
@@ -878,50 +878,50 @@ public:
                     const bool bOOxmlExport = false
                 );
 
-    bool        CreateBlipPropertiesforOLEControl( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape);
+    bool        CreateBlipPropertiesforOLEControl( const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::drawing::XShape > & rXShape);
 
     bool        CreatePolygonProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                    const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
                     sal_uInt32 nFlags,
                     bool bBezier,
-                    ::com::sun::star::awt::Rectangle& rGeoRect,
+                    css::awt::Rectangle& rGeoRect,
                     tools::Polygon* pPolygon = NULL
                 );
 
     static sal_uInt32 GetGradientColor(
-                    const ::com::sun::star::awt::Gradient* pGradient,
+                    const css::awt::Gradient* pGradient,
                     sal_uInt32 nStartColor
                 );
 
-    void        CreateGradientProperties( const ::com::sun::star::awt::Gradient & rGradient );
+    void        CreateGradientProperties( const css::awt::Gradient & rGradient );
     void        CreateGradientProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                    const css::uno::Reference< css::beans::XPropertySet > &,
                     bool bTransparentGradient = false
                 );
 
     void        CreateLineProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                    const css::uno::Reference< css::beans::XPropertySet > &,
                     bool bEdge
                 );
     void        CreateFillProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                    const css::uno::Reference< css::beans::XPropertySet > &,
                     bool bEdge,
                     bool bTransparentGradient = false );
     void        CreateFillProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                    const css::uno::Reference< css::beans::XPropertySet > &,
                     bool bEdge,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape );
+                    const css::uno::Reference< css::drawing::XShape > & rXShape );
     void        CreateTextProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                    const css::uno::Reference< css::beans::XPropertySet > &,
                     sal_uInt32 nText,
                     const bool bIsCustomShape = false,
                     const bool bIsTextFrame = true
                 );
 
     bool        CreateConnectorProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
+                    const css::uno::Reference< css::drawing::XShape > & rXShape,
                     EscherSolverContainer& rSolver,
-                    ::com::sun::star::awt::Rectangle& rGeoRect,
+                    css::awt::Rectangle& rGeoRect,
                     sal_uInt16& rShapeType,
                     sal_uInt16& rShapeFlags
                 );
@@ -929,25 +929,25 @@ public:
                 // Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last.
                 // It activ only when at least a FillStyle or LineStyle is set.
     bool        CreateShadowProperties(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &
+                    const css::uno::Reference< css::beans::XPropertySet > &
                 );
 
-        sal_Int32   GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter,
+    sal_Int32   GetValueForEnhancedCustomShapeParameter( const css::drawing::EnhancedCustomShapeParameter& rParameter,
                             const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans = false );
         // creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties
     void        CreateCustomShapeProperties(
                     const MSO_SPT eShapeType,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &
+                    const css::uno::Reference< css::drawing::XShape > &
                 );
     bool        IsFontWork() const;
 
     // helper functions which are also used by the escher import
     static tools::PolyPolygon  GetPolyPolygon(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape
+                            const css::uno::Reference< css::drawing::XShape > & rXShape
                         );
-    static tools::PolyPolygon  GetPolyPolygon( const ::com::sun::star::uno::Any& rSource );
+    static tools::PolyPolygon  GetPolyPolygon( const css::uno::Any& rSource );
     static MSO_SPT      GetCustomShapeType(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
+                            const css::uno::Reference< css::drawing::XShape > & rXShape,
                             sal_uInt32& nMirrorFlags,
                             OUString& rShapeType,
                             bool bOOXML = false
@@ -956,7 +956,7 @@ public:
     // helper functions which are also used in ooxml export
     static bool         GetLineArrow(
                             const bool bLineStart,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                            const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
                             ESCHER_LineEnd& reLineEnd,
                             sal_Int32& rnArrowLength,
                             sal_Int32& rnArrowWidth
@@ -966,7 +966,7 @@ public:
                             const MSO_SPT eShapeType,
                             sal_Int32& nAdjustmentsWhichNeedsToBeConverted
                         );
-    static bool         GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue );
+    static bool         GetAdjustmentValue( const css::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue );
 };
 
 
@@ -1282,7 +1282,7 @@ public:
                 // ...Sdr... implemented in eschesdo.cxx
 
     void    AddSdrPage( const SdrPage& rPage );
-    void    AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+    void    AddUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes );
 
                 /// returns the ShapeID
     sal_uInt32  AddSdrObject( const SdrObject& rObj, bool ooxmlExport = false );
@@ -1300,7 +1300,7 @@ public:
                 /// ClientRecords. May set AppData::bDontWriteShape so the
                 /// shape is ignored.
     virtual EscherExHostAppData* StartShape(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape,
+                            const css::uno::Reference< css::drawing::XShape >& rShape,
                             const Rectangle* pChildAnchor );
 
                 /// Called after a shape is written to inform the application
@@ -1326,11 +1326,11 @@ public:
     virtual EscherExHostAppData*    EnterAdditionalTextGroup();
 
                 /// Called if an ESCHER_Prop_lTxid shall be written
-    virtual sal_uInt32  QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, sal_uInt32 nShapeId );
+    virtual sal_uInt32  QueryTextID( const css::uno::Reference< css::drawing::XShape >&, sal_uInt32 nShapeId );
             // add an dummy rectangle shape into the escher stream
         sal_uInt32  AddDummyShape();
 
-    static const SdrObject* GetSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape );
+    static const SdrObject* GetSdrObject( const css::uno::Reference< css::drawing::XShape >& rXShape );
 
     void SetHellLayerId( sal_uInt16 nId )       { mnHellLayerId = nId; }
     sal_uInt16 GetHellLayerId() const           { return mnHellLayerId; }
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 5ad8ff81f2ec..4f5676b7f045 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -53,7 +53,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    bool                InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+    bool                InitCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
 
     /** Retrieves the encryption data
 
@@ -61,7 +61,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData();
+    css::uno::Sequence< css::beans::NamedValue > GetEncryptionData();
 
 
     /** Verifies the validity of the password using the passed key and hash.
@@ -127,7 +127,7 @@ private:
 
     sal_uInt16          mnKey;          /// Base key from password.
     sal_uInt16          mnHash;         /// Hash value from password.
-    int         mnRotateDistance;
+    int                 mnRotateDistance;
 };
 
 /** Encodes and decodes data from protected MSO XLS 95- documents.
@@ -193,7 +193,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    bool                InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+    bool                InitCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
 
     /** Retrieves the encryption data
 
@@ -201,7 +201,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData();
+    css::uno::Sequence< css::beans::NamedValue > GetEncryptionData();
 
 
     /** Initializes the algorithm with the specified password and document ID.
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 6d2fe9056e84..2a9a644c3bb8 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -465,9 +465,9 @@ protected:
                                   const Rectangle& rVisArea,
                                   const int _nCalledByGroup,
                                   sal_Int64 nAspect ) const;
-    static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj(
+    static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj(
                 sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
-                const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
+                const css::uno::Reference < css::embed::XStorage >& xDestStg,
                 const Graphic& rGrf,
                 const Rectangle& rVisArea );
 
@@ -496,9 +496,9 @@ protected:
 
 // the following method needs to be overridden for the import of OLE objects
     virtual bool GetOLEStorageName( long nOLEId,
-                                        OUString& rStorageName,
-                                        tools::SvRef<SotStorage>& rSrcStorage,
-                      com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg
+                                      OUString& rStorageName,
+                                      tools::SvRef<SotStorage>& rSrcStorage,
+                                      css::uno::Reference < css::embed::XStorage >& xDestStg
                                     ) const;
 
     /** Prevent that (rounded) rectangles with wrapped text will always be
@@ -684,7 +684,7 @@ public:
 
     static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName,
                                                 tools::SvRef<SotStorage>& rSrcStorage,
-                                                const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
+                                                const css::uno::Reference < css::embed::XStorage >& xDestStg,
                                                 const Graphic& rGraf,
                                                 const Rectangle& rBoundRect,
                                                 const Rectangle& rVisArea,
@@ -702,8 +702,8 @@ public:
     static void SolveSolver( const SvxMSDffSolverContainer& rSolver );
 
     static bool SetPropValue(
-        const ::com::sun::star::uno::Any& rAny,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+        const css::uno::Any& rAny,
+        const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
         const OUString& rPropertyName,
         bool bTestPropertyAvailability = false
     );
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index f0dd8510ae1d..9bc8f9aa3c1a 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -61,42 +61,35 @@ class SfxObjectShell;
 class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
 {
 public:
-    SvxMSConvertOCXControls( const  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+    SvxMSConvertOCXControls( const  css::uno::Reference< css::frame::XModel >& xModel );
     virtual ~SvxMSConvertOCXControls();
 
     virtual bool InsertControl(
-        const com::sun::star::uno::Reference<
-        com::sun::star::form::XFormComponent >& /*rFComp*/,
-        const com::sun::star::awt::Size& /*rSize*/,
-        com::sun::star::uno::Reference<
-        com::sun::star::drawing::XShape >* /*pShape*/,
+        const css::uno::Reference<
+        css::form::XFormComponent >& /*rFComp*/,
+        const css::awt::Size& /*rSize*/,
+        css::uno::Reference<
+        css::drawing::XShape >* /*pShape*/,
         bool /*bFloatingCtrl*/ ) {return false;}
 
     /*begin: Backwards compatibility with office 95 import, modify later*/
-    const com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory > & GetServiceFactory();
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & GetServiceFactory();
 protected:
-    const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > &
-        GetShapes();
+    const css::uno::Reference< css::drawing::XShapes > &  GetShapes();
 
-    const com::sun::star::uno::Reference<
-        com::sun::star::container::XIndexContainer > &  GetFormComps();
+    const css::uno::Reference< css::container::XIndexContainer > &  GetFormComps();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
+    css::uno::Reference< css::frame::XModel >               mxModel;
 
     // gecachte Interfaces
-    com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >
-        xDrawPage;
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >
-        xShapes;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >        xServiceFactory;
+    css::uno::Reference< css::drawing::XDrawPage >          xDrawPage;
+    css::uno::Reference< css::drawing::XShapes >            xShapes;
+    css::uno::Reference< css::lang::XMultiServiceFactory >  xServiceFactory;
 
     // das einzige Formular
-    com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >
-        xFormComps;
+    css::uno::Reference< css::container::XIndexContainer >  xFormComps;
 
-    virtual const com::sun::star::uno::Reference<
-        com::sun::star::drawing::XDrawPage > & GetDrawPage();
+    virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage();
 };
 
 #endif
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index 99b9b6b959c0..e1e257f32755 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -41,7 +41,7 @@ public:
     sal_uInt32 GetFlags() const         { return nConvertFlags; }
 
     void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg );
-    void ExportOLEObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg );
+    void ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg );
 };
 
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index e44d6bf64bde..fe380bbfd3d3 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -46,15 +46,15 @@ MSFILTER_DLLPUBLIC OUString extractMacroName( const OUString& rMacroUrl );
 MSFILTER_DLLPUBLIC OUString getDefaultProjectName( SfxObjectShell* pShell );
 MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell* pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName );
 MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& rMacroName, bool bSearchGlobalTemplates = false );
-MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
-MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (::com::sun::star::uno::RuntimeException);
-MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, css::uno::Sequence< css::uno::Any >& aArgs, css::uno::Any& aRet, const css::uno::Any& aCaller );
+MSFILTER_DLLPUBLIC css::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (css::uno::RuntimeException);
+MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const css::uno::Reference< css::frame::XModel >& rxDoc, const css::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (css::uno::RuntimeException, std::exception);
 
 
 typedef ::cppu::WeakImplHelper<
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::lang::XInitialization,
-    ::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
+    css::lang::XServiceInfo,
+    css::lang::XInitialization,
+    css::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
 
 class VBAMacroResolver : public VBAMacroResolverBase
 {
@@ -65,33 +65,33 @@ public:
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
     virtual OUString SAL_CALL
-                        getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                        getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
                         supportsService( const OUString& rService )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::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 css::uno::Sequence< OUString > SAL_CALL
+                        getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
     virtual void SAL_CALL initialize(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
-                            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            const css::uno::Sequence< css::uno::Any >& rArgs )
+                            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // com.sun.star.script.vba.XVBAMacroResolver interface --------------------
 
     virtual OUString SAL_CALL
                         resolveVBAMacroToScriptURL( const OUString& rVBAMacroName )
-                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL
                         resolveScriptURLtoVBAMacro( const OUString& rScriptURL )
-                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
+    css::uno::Reference< css::frame::XModel > mxModel;
     SfxObjectShell*     mpObjShell;
     OUString            maProjectName;
 };
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 90fb0eb62e2d..752b99240e3d 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -632,7 +632,7 @@ public:
                                 sal_uInt32* pTableArry,
                                 SvxMSDffSolverContainer*
                             );
-    virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0;
+    virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rFormComp ) const = 0;
 };
 
 struct PPTTextCharacterStyleAtomInterpreter
@@ -1289,26 +1289,26 @@ public:
 
 class PPTConvertOCXControls : public SvxMSConvertOCXControls
 {
-    virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() override;
+    virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage() override;
     PptPageKind     ePageKind;
     const SdrPowerPointImport* mpPPTImporter;
-    com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm;
+    css::uno::Reference< css::io::XInputStream > mxInStrm;
 public:
 
-    PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, PptPageKind ePKind ) :
+    PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, css::uno::Reference< css::io::XInputStream >& rxInStrm, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) :
         SvxMSConvertOCXControls ( rxModel ),
         ePageKind               ( ePKind ),
         mpPPTImporter           ( pPPTImporter ),
         mxInStrm                ( rxInStrm )
     {};
     bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
-        com::sun::star::uno::Reference<
-        com::sun::star::drawing::XShape > *pShapeRef=0,
+        css::uno::Reference<
+        css::drawing::XShape > *pShapeRef=0,
         bool bFloatingCtrl=false );
     virtual bool InsertControl(
-        const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > &rFComp,
-        const com::sun::star::awt::Size& rSize,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape,
+        const css::uno::Reference< css::form::XFormComponent > &rFComp,
+        const css::awt::Size& rSize,
+        css::uno::Reference< css::drawing::XShape > *pShape,
         bool bFloatingCtrl
     ) override;
 };
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 0d855889a6d5..1d482aa4019c 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -25,7 +25,7 @@ namespace util {
 /// Returns the best-fit default 8bit encoding for a given locale
 /// i.e. useful when dealing with legacy formats which use legacy text encodings without recording
 /// what the encoding is, but you know or can guess the language
-MSFILTER_DLLPUBLIC rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Locale &rLocale);
+MSFILTER_DLLPUBLIC rtl_TextEncoding getBestTextEncodingFromLocale(const css::lang::Locale &rLocale);
 
 /// Convert a color in BGR format to RGB.
 MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour);
@@ -82,7 +82,7 @@ struct MSFILTER_DLLPUBLIC ApiPaperSize
 class MSFILTER_DLLPUBLIC PaperSizeConv
 {
 public:
-    static sal_Int32 getMSPaperSizeIndex( const com::sun::star::awt::Size& rSize );
+    static sal_Int32 getMSPaperSizeIndex( const css::awt::Size& rSize );
     static const ApiPaperSize& getApiSizeForMSPaperSizeIndex( sal_Int32 nMSOPaperIndex );
 };