com::sun::star->css in include/linguistic to include/sfx2

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

4 files changed, 130 insertions, 169 deletions

diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 7c5f7fe19571..32d187570525 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -29,10 +29,7 @@ namespace linguistic
 {
 
 class HyphenatedWord :
-    public cppu::WeakImplHelper
-    <
-        ::com::sun::star::linguistic2::XHyphenatedWord
-    >
+    public cppu::WeakImplHelper< css::linguistic2::XHyphenatedWord >
 {
     OUString     aWord;
     OUString     aHyphenatedWord;
@@ -52,24 +49,24 @@ public:
     // XHyphenatedWord
     virtual OUString SAL_CALL
         getWord()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL
+            throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL
         getLocale()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Int16 SAL_CALL
         getHyphenationPos()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL
         getHyphenatedWord()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Int16 SAL_CALL
         getHyphenPos()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL
         isAlternativeSpelling()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
-    static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
+    static css::uno::Reference <css::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
         const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
         const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
 };
@@ -78,12 +75,12 @@ public:
 class PossibleHyphens :
     public cppu::WeakImplHelper
     <
-        ::com::sun::star::linguistic2::XPossibleHyphens
+        css::linguistic2::XPossibleHyphens
     >
 {
     OUString             aWord;
     OUString             aWordWithHyphens;
-    ::com::sun::star::uno::Sequence< sal_Int16 >    aOrigHyphenPos;
+    css::uno::Sequence< sal_Int16 > aOrigHyphenPos;
     sal_Int16                       nLanguage;
 
     PossibleHyphens(const PossibleHyphens &) = delete;
@@ -92,27 +89,27 @@ class PossibleHyphens :
 public:
     PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
             const OUString &rHyphWord,
-            const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
+            const css::uno::Sequence< sal_Int16 > &rPositions);
     virtual ~PossibleHyphens();
 
     // XPossibleHyphens
     virtual OUString SAL_CALL
         getWord()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL
+            throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL
         getLocale()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL
         getPossibleHyphens()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
+            throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL
         getHyphenationPositions()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
-    static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
+    static css::uno::Reference < css::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
         (const OUString &rWord, sal_Int16 nLang,
          const OUString &rHyphWord,
-         const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
+         const css::uno::Sequence< sal_Int16 > &rPositions);
 };
 } // namespace linguistic
 
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 2ac4aff1560c..6039555734cb 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -51,19 +51,17 @@ namespace linguistic
 
 typedef cppu::WeakImplHelper
 <
-    ::com::sun::star::beans::XPropertyChangeListener,
-    ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster
+    css::beans::XPropertyChangeListener,
+    css::linguistic2::XLinguServiceEventBroadcaster
 > PropertyChgHelperBase;
 
 class PropertyChgHelper :
     public PropertyChgHelperBase
 {
-    ::com::sun::star::uno::Sequence< OUString >  aPropNames;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XInterface >             xMyEvtObj;
+    css::uno::Sequence< OUString >                      aPropNames;
+    css::uno::Reference< css::uno::XInterface >         xMyEvtObj;
     ::cppu::OInterfaceContainerHelper                   aLngSvcEvtListeners;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >         xPropSet;
+    css::uno::Reference< css::beans::XPropertySet >     xPropSet;
 
     int     nEvtFlags;  // flags for event types allowed to be launched
 
@@ -82,63 +80,55 @@ protected:
     virtual void    SetDefaultValues();
     virtual void    GetCurrentValues();
 
-    ::com::sun::star::uno::Sequence< OUString > &
+    css::uno::Sequence< OUString > &
             GetPropNames()  { return aPropNames; }
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > &
+    css::uno::Reference<
+        css::beans::XPropertySet > &
             GetPropSet()    { return xPropSet; }
 
     void    AddPropNames( const char *pNewNames[], sal_Int32 nCount );
 
-    virtual bool    propertyChange_Impl(
-                            const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
+    virtual bool    propertyChange_Impl( const css::beans::PropertyChangeEvent& rEvt );
 
 public:
     PropertyChgHelper(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet,
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet,
             int nAllowedEvents );
     virtual ~PropertyChgHelper();
 
-    virtual void    SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    virtual void    SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
 
     // XEventListener
     virtual void SAL_CALL
-        disposing( const ::com::sun::star::lang::EventObject& rSource )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& rSource )
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XLinguServiceEventBroadcaster
     virtual sal_Bool SAL_CALL
         addLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL
         removeLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // non-UNO functions
     void    LNG_DLLPUBLIC AddAsPropListener();
     void    LNG_DLLPUBLIC RemoveAsPropListener();
-    void    LaunchEvent(
-                const ::com::sun::star::linguistic2::LinguServiceEvent& rEvt );
+    void    LaunchEvent( const css::linguistic2::LinguServiceEvent& rEvt );
 
-    const ::com::sun::star::uno::Sequence< OUString > &
+    const css::uno::Sequence< OUString > &
             GetPropNames() const    { return aPropNames; }
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > &
+    const css::uno::Reference< css::beans::XPropertySet > &
             GetPropSet() const      { return xPropSet; }
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XInterface > &
+    const css::uno::Reference< css::uno::XInterface > &
             GetEvtObj() const       { return xMyEvtObj; }
 };
 
@@ -151,22 +141,20 @@ class PropertyHelper_Thes :
 
 public:
     PropertyHelper_Thes(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
     virtual ~PropertyHelper_Thes();
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
+            throw(css::uno::RuntimeException, std::exception) override;
 };
 
 class LNG_DLLPUBLIC PropertyHelper_Thesaurus
 {
     PropertyHelper_Thes* pInst;
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
+    css::uno::Reference< css::beans::XPropertyChangeListener >    xPropHelper;
 
     // disallow use of copy-constructor and assignment-operator
     PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
@@ -174,14 +162,12 @@ class LNG_DLLPUBLIC PropertyHelper_Thesaurus
 
 public:
     PropertyHelper_Thesaurus(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
     ~PropertyHelper_Thesaurus();
     void    AddAsPropListener();
     void    RemoveAsPropListener();
-    void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
 };
 
 
@@ -207,22 +193,20 @@ protected:
     virtual void    SetDefaultValues() override;
     virtual void    GetCurrentValues() override;
     virtual bool    propertyChange_Impl(
-                            const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
+                            const css::beans::PropertyChangeEvent& rEvt ) override;
 
 public:
     PropertyHelper_Spell(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
     virtual ~PropertyHelper_Spell();
 
-    virtual void    SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
+    virtual void    SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
+            throw(css::uno::RuntimeException, std::exception) override;
 
     static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
 
@@ -235,7 +219,7 @@ public:
 class LNG_DLLPUBLIC PropertyHelper_Spelling
 {
     PropertyHelper_Spell* pInst;
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
+    css::uno::Reference< css::beans::XPropertyChangeListener >    xPropHelper;
 
     // disallow use of copy-constructor and assignment-operator
     PropertyHelper_Spelling( const PropertyHelper_Spell & );
@@ -243,26 +227,22 @@ class LNG_DLLPUBLIC PropertyHelper_Spelling
 
 public:
     PropertyHelper_Spelling(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
     ~PropertyHelper_Spelling();
 
     void    AddAsPropListener();
     void    RemoveAsPropListener();
-    void    SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    void    SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
     bool    IsSpellUpperCase() const;
     bool    IsSpellWithDigits() const;
     bool    IsSpellCapitalization() const;
     bool addLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException);
     bool removeLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException);
 };
 
 
@@ -287,22 +267,20 @@ protected:
     virtual void    SetDefaultValues() override;
     virtual void    GetCurrentValues() override;
     virtual bool    propertyChange_Impl(
-                            const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
+                            const css::beans::PropertyChangeEvent& rEvt ) override;
 
 public:
     PropertyHelper_Hyphen(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet);
     virtual ~PropertyHelper_Hyphen();
 
-    virtual void    SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
+    virtual void    SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
+            throw(css::uno::RuntimeException, std::exception) override;
 
     sal_Int16   GetMinLeading() const               { return nResHyphMinLeading; }
     sal_Int16   GetMinTrailing() const              { return nResHyphMinTrailing; }
@@ -312,7 +290,7 @@ public:
 class LNG_DLLPUBLIC PropertyHelper_Hyphenation
 {
     PropertyHelper_Hyphen* pInst;
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >    xPropHelper;
+    css::uno::Reference< css::beans::XPropertyChangeListener >    xPropHelper;
 
     // disallow use of copy-constructor and assignment-operator
     PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
@@ -320,26 +298,22 @@ class LNG_DLLPUBLIC PropertyHelper_Hyphenation
 
 public:
     PropertyHelper_Hyphenation(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > &rxSource,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
+            const css::uno::Reference< css::uno::XInterface > &rxSource,
+            css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet);
     ~PropertyHelper_Hyphenation();
 
     void    AddAsPropListener();
     void    RemoveAsPropListener();
-    void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+    void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
     sal_Int16   GetMinLeading() const;
     sal_Int16   GetMinTrailing() const;
     sal_Int16   GetMinWordLength() const;
     bool addLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException);
     bool removeLinguServiceEventListener(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(::com::sun::star::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
+            throw(css::uno::RuntimeException);
 };
 
 }   // namespace linguistic
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index d746e0421864..1a3f4679a5db 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -88,13 +88,13 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 );
     Linguistic specific handling of an empty locale denoting LANGUAGE_NONE.
     Does not resolve empty locale as system locale.
  */
-LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale );
+LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const css::lang::Locale& rLocale );
 
 /** Convert LanguageType to Locale for legacy handling.
     Linguistic specific handling of LANGUAGE_NONE resulting in an empty locale.
     Avoid use!
  */
-LNG_DLLPUBLIC ::com::sun::star::lang::Locale LinguLanguageToLocale( LanguageType nLanguage );
+LNG_DLLPUBLIC css::lang::Locale LinguLanguageToLocale( LanguageType nLanguage );
 
 /** Checks if a LanguageType is one of the values that denote absence of
     language or undetermined language or multiple languages, in short all
@@ -106,9 +106,8 @@ LNG_DLLPUBLIC bool LinguIsUnspecified( LanguageType nLanguage );
     tag string instead. */
 LNG_DLLPUBLIC bool LinguIsUnspecified( const OUString & rBcp47 );
 
-::com::sun::star::uno::Sequence< sal_Int16 >
-    LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence<
-        ::com::sun::star::lang::Locale > &rLocaleSeq );
+css::uno::Sequence< sal_Int16 >
+    LocaleSeqToLangSeq( css::uno::Sequence< css::lang::Locale > &rLocaleSeq );
 
 // checks if file pointed to by rURL is readonly
 // and may also check return if such a file exists or not
@@ -119,7 +118,7 @@ bool    FileExists( const OUString &rURL );
 
 
 OUString     GetDictionaryWriteablePath();
-::com::sun::star::uno::Sequence< OUString > GetDictionaryPaths();
+css::uno::Sequence< OUString > GetDictionaryPaths();
 
 /// @returns an URL for a new and writable dictionary rDicName.
 ///     The URL will point to the path given by 'GetDictionaryWriteablePath'
@@ -127,11 +126,10 @@ LNG_DLLPUBLIC OUString  GetWritableDictionaryURL( const OUString &rDicName );
 
 LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos );
 
-::com::sun::star::uno::Reference<
-    ::com::sun::star::linguistic2::XHyphenatedWord >
-            RebuildHyphensAndControlChars( const OUString &rOrigWord,
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord );
+css::uno::Reference< css::linguistic2::XHyphenatedWord >
+            RebuildHyphensAndControlChars(
+                const OUString &rOrigWord,
+                css::uno::Reference< css::linguistic2::XHyphenatedWord > &rxHyphWord );
 
 
 LNG_DLLPUBLIC bool        IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, sal_Int16 nLanguage );
@@ -144,46 +142,40 @@ LNG_DLLPUBLIC bool      HasDigits( const OUString &rText );
 LNG_DLLPUBLIC bool      IsNumeric( const OUString &rText );
 
 
-LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > GetLinguProperties();
-::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList();
-::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList();
+LNG_DLLPUBLIC css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguProperties();
+css::uno::Reference< css::linguistic2::XSearchableDictionaryList > GetDictionaryList();
+css::uno::Reference< css::linguistic2::XDictionary > GetIgnoreAllList();
 
 
-bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > &rxPropSet );
+bool IsUseDicList( const css::beans::PropertyValues &rProperties,
+        const css::uno::Reference< css::beans::XPropertySet > &rxPropSet );
 
-bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > &rxPropSet );
+bool IsIgnoreControlChars( const css::beans::PropertyValues &rProperties,
+        const css::uno::Reference< css::beans::XPropertySet > &rxPropSet );
 
-::com::sun::star::uno::Reference<
-    ::com::sun::star::linguistic2::XDictionaryEntry >
+css::uno::Reference<
+    css::linguistic2::XDictionaryEntry >
         SearchDicList(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList,
+            const css::uno::Reference< css::linguistic2::XSearchableDictionaryList >& rDicList,
             const OUString& rWord, sal_Int16 nLanguage,
             bool bSearchPosDics, bool bSearchSpellEntry );
 
 LNG_DLLPUBLIC DictionaryError AddEntryToDic(
-    ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >  &rxDic,
+    css::uno::Reference< css::linguistic2::XDictionary >  &rxDic,
     const OUString &rWord, bool bIsNeg,
     const OUString &rRplcTxt, sal_Int16 nRplcLang,
     bool bStripDot = true );
 
-LNG_DLLPUBLIC bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList );
+LNG_DLLPUBLIC bool SaveDictionaries( const css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList );
 
 // AppExitLstnr:
 // virtual base class that calls it AtExit function when the application
 // (ie the Desktop) is about to terminate
 
 class AppExitListener :
-    public cppu::WeakImplHelper
-    <
-        ::com::sun::star::frame::XTerminateListener
-    >
+    public cppu::WeakImplHelper< css::frame::XTerminateListener >
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::frame::XDesktop2 >     xDesktop;
+    css::uno::Reference< css::frame::XDesktop2 >     xDesktop;
 
 public:
     AppExitListener();
@@ -195,11 +187,11 @@ public:
     void            Deactivate();
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
 };
 
 }   // namespace linguistic
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index fe381384d7f5..5e56574f09dd 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -38,64 +38,62 @@ namespace com { namespace sun { namespace star {
 namespace linguistic
 {
 
-::com::sun::star::uno::Sequence< OUString >
+css::uno::Sequence< OUString >
         MergeProposalSeqs(
-                ::com::sun::star::uno::Sequence< OUString > &rAlt1,
-                ::com::sun::star::uno::Sequence< OUString > &rAlt2,
+                css::uno::Sequence< OUString > &rAlt1,
+                css::uno::Sequence< OUString > &rAlt2,
                 bool bAllowDuplicates );
 
 void    SeqRemoveNegEntries(
-                ::com::sun::star::uno::Sequence< OUString > &rSeq,
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList,
+                css::uno::Sequence< OUString > &rSeq,
+                css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rxDicList,
                 sal_Int16 nLanguage );
 
 bool    SeqHasEntry(
-                const ::com::sun::star::uno::Sequence< OUString > &rSeq,
+                const css::uno::Sequence< OUString > &rSeq,
                 const OUString &rTxt);
 
 void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList,
+        css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList,
         std::vector< OUString > & rDicListProps );
 
 
 class SpellAlternatives
     : public cppu::WeakImplHelper
     <
-        ::com::sun::star::linguistic2::XSpellAlternatives,
-        ::com::sun::star::linguistic2::XSetSpellAlternatives
+        css::linguistic2::XSpellAlternatives,
+        css::linguistic2::XSetSpellAlternatives
     >
     , private ::boost::noncopyable
 {
-    ::com::sun::star::uno::Sequence< OUString >  aAlt;   // list of alternatives, may be empty.
-    OUString         aWord;
-    sal_Int16                   nType;          // type of failure
-    sal_Int16                   nLanguage;
+    css::uno::Sequence< OUString >  aAlt;   // list of alternatives, may be empty.
+    OUString                        aWord;
+    sal_Int16                       nType;          // type of failure
+    sal_Int16                       nLanguage;
 
 public:
     LNG_DLLPUBLIC SpellAlternatives();
     SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
-                      const ::com::sun::star::uno::Sequence< OUString > &rAlternatives );
+                      const css::uno::Sequence< OUString > &rAlternatives );
     virtual ~SpellAlternatives();
 
     // XSpellAlternatives
-    virtual OUString SAL_CALL getWord(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getFailureType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getAlternativesCount(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getWord(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getFailureType(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getAlternativesCount(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAlternatives(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XSetSpellAlternatives
-    virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAlternatives( const css::uno::Sequence< OUString >& aAlternatives ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (css::uno::RuntimeException, std::exception) override;
 
     // non-interface specific functions
     void    LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);
     void    LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP);
-    void    LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< OUString > &rAlt );
-    static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
-        const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt );
+    void    LNG_DLLPUBLIC SetAlternatives( const css::uno::Sequence< OUString > &rAlt );
+    static css::uno::Reference < css::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
+        const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt );
 };
 
 }   // namespace linguistic