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

Change-Id: Ib217c24614d09817e4d7f8c545bd75345250a874
Reviewed-on: https://gerrit.libreoffice.org/19493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 46 insertions, 48 deletions

diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 867d4f161bf3..8e5007e998f4 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -167,13 +167,12 @@ public:
         void putExternalSoftly( const OUString & rSymbol, const OUString & rAddIn );
 
         /// Core implementation of XFormulaOpCodeMapper::getMappings()
-        ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >
+        css::uno::Sequence< css::sheet::FormulaToken >
             createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,
-                    const ::com::sun::star::uno::Sequence< OUString >& rNames ) const;
+                    const css::uno::Sequence< OUString >& rNames ) const;
 
         /// Core implementation of XFormulaOpCodeMapper::getAvailableMappings()
-        ::com::sun::star::uno::Sequence<
-            ::com::sun::star::sheet::FormulaOpCodeMapEntry >
+        css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry >
             createSequenceOfAvailableMappings( const FormulaCompiler& _rCompiler,const sal_Int32 nGroup ) const;
 
         /** The value used in createSequenceOfAvailableMappings() and thus in
@@ -195,7 +194,7 @@ public:
 
     /** Get OpCodeMap for formula language.
         @param nLanguage
-            One of ::com::sun::star::sheet::FormulaLanguage constants.
+            One of css::sheet::FormulaLanguage constants.
         @return Map for nLanguage. If nLanguage is unknown, a NULL map is returned.
      */
     OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage ) const;
@@ -205,8 +204,7 @@ public:
             Use English number parser / formatter instead of native.
      */
     static OpCodeMapPtr CreateOpCodeMap(
-            const ::com::sun::star::uno::Sequence<
-            const ::com::sun::star::sheet::FormulaOpCodeMapEntry > & rMapping,
+            const css::uno::Sequence< const css::sheet::FormulaOpCodeMapEntry > & rMapping,
             bool bEnglish );
 
     /** Get current OpCodeMap in effect. */
@@ -278,7 +276,7 @@ protected:
     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, FormulaGrammar::Grammar _eGrammar ) const;
     virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const;
-    virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const;
+    virtual void fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry >& _rVec, bool _bIsEnglish) const;
 
     virtual void SetError(sal_uInt16 nError);
     virtual FormulaTokenRef ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef );
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index f813bf413451..1cfc40cc70a9 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -33,14 +33,14 @@ namespace formula
 {
 
 class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
-                            ::com::sun::star::sheet::XFormulaOpCodeMapper,
-                            ::com::sun::star::lang::XServiceInfo >
+                            css::sheet::XFormulaOpCodeMapper,
+                            css::lang::XServiceInfo >
 {
     ::std::unique_ptr<FormulaCompiler> m_pCompiler;
 public:
     static OUString  getImplementationName_Static();
-    static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
+    static css::uno::Sequence< OUString> getSupportedServiceNames_Static();
+    static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >& _xContext);
 
 protected:
                             FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler> && _pCompiler);
@@ -49,26 +49,26 @@ protected:
 private:
                             // XFormulaOpCodeMapper
                             // Attributes
-    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (css::uno::RuntimeException, std::exception) override;
                             // Methods
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings(
-                                    const ::com::sun::star::uno::Sequence< OUString >& rNames,
+    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getMappings(
+                                    const css::uno::Sequence< OUString >& rNames,
                                     sal_Int32 nLanguage )
-                                throw ( ::com::sun::star::lang::IllegalArgumentException,
-                                        ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(
+                                throw ( css::lang::IllegalArgumentException,
+                                        css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(
                                     sal_Int32 nLanguage, sal_Int32 nGroups )
-                                throw ( ::com::sun::star::lang::IllegalArgumentException,
-                                        ::com::sun::star::uno::RuntimeException, std::exception) override;
+                                throw ( css::lang::IllegalArgumentException,
+                                        css::uno::RuntimeException, std::exception) override;
 
                             // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-                                throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                                throw(css::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;
+                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 78920babd827..0d93429fd867 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -132,11 +132,11 @@ namespace formula
         virtual void setReferenceInput(const FormEditData* _pData) = 0;
 
         virtual IFunctionManager*   getFunctionManager() = 0;
-        virtual ::std::unique_ptr<FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) = 0;
+        virtual ::std::unique_ptr<FormulaTokenArray> convertToTokenArray(const css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const = 0;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
-        virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
+        virtual css::uno::Reference< css::sheet::XFormulaParser> getFormulaParser() const = 0;
+        virtual css::uno::Reference< css::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
+        virtual css::table::CellAddress getReferencePosition() const = 0;
 
         virtual void setDispatcherLock( bool bLock ) = 0;
         virtual void dispatch(bool _bOK, bool _bMatrixChecked) = 0;
diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 618db98c1143..91ca7ae1171a 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -68,77 +68,77 @@ public:
         /// Used only in ScCompiler ctor and in some XML import API context.
         GRAM_UNSPECIFIED    = -1,
         /// ODFF with default ODF A1 bracketed references.
-        GRAM_ODFF           = ::com::sun::star::sheet::FormulaLanguage::ODFF    |
+        GRAM_ODFF           = css::sheet::FormulaLanguage::ODFF                 |
                                 ((CONV_ODF           +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// ODF 1.1 with default ODF A1 bracketed references.
-        GRAM_PODF           = ::com::sun::star::sheet::FormulaLanguage::ODF_11  |
+        GRAM_PODF           = css::sheet::FormulaLanguage::ODF_11               |
                                 ((CONV_ODF           +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// English with default A1 reference style.
-        GRAM_ENGLISH        = ::com::sun::star::sheet::FormulaLanguage::ENGLISH |
+        GRAM_ENGLISH        = css::sheet::FormulaLanguage::ENGLISH              |
                                 ((CONV_OOO           +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// Native with default A1 reference style.
-        GRAM_NATIVE         = ::com::sun::star::sheet::FormulaLanguage::NATIVE  |
+        GRAM_NATIVE         = css::sheet::FormulaLanguage::NATIVE               |
                                 ((CONV_OOO           +
                                   kConventionOffset) << kConventionShift),
         /// ODFF with reference style as set in UI, may be A1 or R1C1.
-        GRAM_ODFF_UI        = ::com::sun::star::sheet::FormulaLanguage::ODFF    |
+        GRAM_ODFF_UI        = css::sheet::FormulaLanguage::ODFF                 |
                                 ((CONV_UNSPECIFIED   +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// ODFF with A1 reference style, unbracketed.
-        GRAM_ODFF_A1        = ::com::sun::star::sheet::FormulaLanguage::ODFF    |
+        GRAM_ODFF_A1        = css::sheet::FormulaLanguage::ODFF                 |
                                 ((CONV_OOO           +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// ODF 1.1 with reference style as set in UI, may be A1 or R1C1.
-        GRAM_PODF_UI        = ::com::sun::star::sheet::FormulaLanguage::ODF_11  |
+        GRAM_PODF_UI        = css::sheet::FormulaLanguage::ODF_11               |
                                 ((CONV_UNSPECIFIED   +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// ODF 1.1 with A1 reference style, unbracketed.
-        GRAM_PODF_A1        = ::com::sun::star::sheet::FormulaLanguage::ODF_11  |
+        GRAM_PODF_A1        = css::sheet::FormulaLanguage::ODF_11               |
                                 ((CONV_OOO           +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
         /// Native with reference style as set in UI, may be A1 or R1C1.
-        GRAM_NATIVE_UI      = ::com::sun::star::sheet::FormulaLanguage::NATIVE  |
+        GRAM_NATIVE_UI      = css::sheet::FormulaLanguage::NATIVE               |
                                 ((CONV_UNSPECIFIED   +
                                   kConventionOffset) << kConventionShift),
         /// Native with ODF A1 bracketed references. Not very useful but supported.
-        GRAM_NATIVE_ODF     = ::com::sun::star::sheet::FormulaLanguage::NATIVE  |
+        GRAM_NATIVE_ODF     = css::sheet::FormulaLanguage::NATIVE               |
                                 ((CONV_ODF           +
                                   kConventionOffset) << kConventionShift),
         /// Native with Excel A1 reference style.
-        GRAM_NATIVE_XL_A1   = ::com::sun::star::sheet::FormulaLanguage::NATIVE  |
+        GRAM_NATIVE_XL_A1   = css::sheet::FormulaLanguage::NATIVE               |
                                 ((CONV_XL_A1         +
                                   kConventionOffset) << kConventionShift),
         /// Native with Excel R1C1 reference style.
-        GRAM_NATIVE_XL_R1C1 = ::com::sun::star::sheet::FormulaLanguage::NATIVE  |
+        GRAM_NATIVE_XL_R1C1 = css::sheet::FormulaLanguage::NATIVE               |
                                 ((CONV_XL_R1C1       +
                                   kConventionOffset) << kConventionShift),
         /// English with Excel A1 reference style.
-        GRAM_ENGLISH_XL_A1   = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH  |
+        GRAM_ENGLISH_XL_A1   = css::sheet::FormulaLanguage::XL_ENGLISH               |
                                 ((CONV_XL_A1         +
                                   kConventionOffset) << kConventionShift)            |
                                 kEnglishBit,
         /// English with Excel R1C1 reference style.
-        GRAM_ENGLISH_XL_R1C1 = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH  |
+        GRAM_ENGLISH_XL_R1C1 = css::sheet::FormulaLanguage::XL_ENGLISH               |
                                 ((CONV_XL_R1C1       +
                                   kConventionOffset) << kConventionShift)            |
                                 kEnglishBit,
         /// English with Excel OOXML reference style.
-        GRAM_ENGLISH_XL_OOX  = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH  |
+        GRAM_ENGLISH_XL_OOX  = css::sheet::FormulaLanguage::XL_ENGLISH               |
                                 ((CONV_XL_OOX        +
                                   kConventionOffset) << kConventionShift)            |
                                 kEnglishBit,
         /// Excel OOXML with Excel OOXML reference style.
-        GRAM_OOXML           = ::com::sun::star::sheet::FormulaLanguage::OOXML  |
+        GRAM_OOXML           = css::sheet::FormulaLanguage::OOXML               |
                                 ((CONV_XL_OOX        +
                                   kConventionOffset) << kConventionShift)       |
                                 kEnglishBit,
@@ -186,21 +186,21 @@ public:
     static inline bool isPODF( const Grammar eGrammar )
     {
         return extractFormulaLanguage( eGrammar) ==
-            ::com::sun::star::sheet::FormulaLanguage::ODF_11;
+            css::sheet::FormulaLanguage::ODF_11;
     }
 
     /// If grammar is of ODFF
     static inline bool isODFF( const Grammar eGrammar )
     {
         return extractFormulaLanguage( eGrammar) ==
-            ::com::sun::star::sheet::FormulaLanguage::ODFF;
+            css::sheet::FormulaLanguage::ODFF;
     }
 
     /// If grammar is of OOXML
     static inline bool isOOXML( const Grammar eGrammar )
     {
         return extractFormulaLanguage( eGrammar) ==
-            ::com::sun::star::sheet::FormulaLanguage::OOXML;
+            css::sheet::FormulaLanguage::OOXML;
     }
 
 };