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

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

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.

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
     );

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

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 );
 };
 
 

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;
 };

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;
 };

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 );
 };