editeng: com::sun::star->css

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

8 files changed, 91 insertions, 101 deletions

diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index bbc1fc15bb98..07189ce3f138 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -27,10 +27,10 @@ using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
 SvXMLAutoCorrectExport::SvXMLAutoCorrectExport(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
+    const css::uno::Reference< css::uno::XComponentContext > xContext,
     const SvxAutocorrWordList *  pNewAutocorr_List,
     const OUString &rFileName,
-    com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler)
+    css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler)
 :   SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     pAutocorr_List( pNewAutocorr_List )
 {
@@ -71,10 +71,10 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/)
 }
 
 SvXMLExceptionListExport::SvXMLExceptionListExport(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
+    const css::uno::Reference< css::uno::XComponentContext > xContext,
     const SvStringsISortDtor &rNewList,
     const OUString &rFileName,
-    com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler)
+    css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler)
 :   SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     rList( rNewList )
 {
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index c1dadc45a4f0..a3b0d3259ed4 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -31,10 +31,10 @@ private:
     const SvxAutocorrWordList   *pAutocorr_List;
 public:
     SvXMLAutoCorrectExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
+        const css::uno::Reference< css::uno::XComponentContext > xContext,
         const SvxAutocorrWordList * pNewAutocorr_List,
         const OUString &rFileName,
-        com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
+        css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLAutoCorrectExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
@@ -51,10 +51,10 @@ private:
     const SvStringsISortDtor & rList;
 public:
     SvXMLExceptionListExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
+        const css::uno::Reference< css::uno::XComponentContext > xContext,
         const SvStringsISortDtor &rNewList,
         const OUString &rFileName,
-        com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
+        css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLExceptionListExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index c389d5e5f169..d2c14a2f5714 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -27,7 +27,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport(
     const uno::Reference< uno::XComponentContext > xContext,
     SvxAutocorrWordList *pNewAutocorr_List,
     SvxAutoCorrect &rNewAutoCorrect,
-    const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage)
+    const css::uno::Reference < css::embed::XStorage >& rNewStorage)
 :   SvXMLImport( xContext, "" ),
     pAutocorr_List (pNewAutocorr_List),
     rAutoCorrect ( rNewAutoCorrect ),
@@ -51,15 +51,14 @@ SvXMLImportContext *SvXMLAutoCorrectImport::CreateFastContext( sal_Int32 Element
 SvXMLWordListContext::SvXMLWordListContext(
    SvXMLAutoCorrectImport& rImport,
    sal_Int32 /*Element*/,
-   const com::sun::star::uno::Reference<
-   com::sun::star::xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
+   const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
 {
     rLocalRef.rAutoCorrect.refreshBlockList( rLocalRef.xStorage );
 }
 
-com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext(
+css::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext(
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
@@ -76,8 +75,7 @@ SvXMLWordListContext::~SvXMLWordListContext()
 SvXMLWordContext::SvXMLWordContext(
    SvXMLAutoCorrectImport& rImport,
    sal_Int32 /*Element*/,
-   const com::sun::star::uno::Reference<
-   com::sun::star::xml::sax::XFastAttributeList > & xAttrList ) :
+   const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
 {
@@ -133,14 +131,13 @@ SvXMLImportContext *SvXMLExceptionListImport::CreateFastContext(sal_Int32 Elemen
 SvXMLExceptionListContext::SvXMLExceptionListContext(
    SvXMLExceptionListImport& rImport,
    sal_Int32 /*Element*/,
-   const com::sun::star::uno::Reference<
-   com::sun::star::xml::sax::XFastAttributeList > & /* xAttrList */ ) :
+   const css::uno::Reference< css::xml::sax::XFastAttributeList > & /* xAttrList */ ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
 {
 }
 
-com::sun::star::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext(
+css::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext(
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
     throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
@@ -157,8 +154,7 @@ SvXMLExceptionListContext::~SvXMLExceptionListContext()
 SvXMLExceptionContext::SvXMLExceptionContext(
    SvXMLExceptionListImport& rImport,
    sal_Int32 /*Element*/,
-   const com::sun::star::uno::Reference<
-   com::sun::star::xml::sax::XFastAttributeList > & xAttrList ) :
+   const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
 {
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 533a84b1700b..0965f67b4112 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -36,13 +36,13 @@ protected:
 public:
     SvxAutocorrWordList     *pAutocorr_List;
     SvxAutoCorrect          &rAutoCorrect;
-    com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStorage;
+    css::uno::Reference < css::embed::XStorage > xStorage;
 
     SvXMLAutoCorrectImport(
         const ::css::uno::Reference< ::css::uno::XComponentContext > xContext,
         SvxAutocorrWordList *pNewAutocorr_List,
         SvxAutoCorrect &rNewAutoCorrect,
-        const ::css::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage);
+        const ::css::uno::Reference < css::embed::XStorage >& rNewStorage);
 
     virtual ~SvXMLAutoCorrectImport() throw ();
 };
@@ -55,7 +55,7 @@ public:
     SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList );
 
-    virtual com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
+    virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList )
         throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
@@ -100,7 +100,7 @@ public:
     SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList );
 
-    virtual com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
+    virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList )
         throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 56bdbe80d1af..082f894b0b50 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -25,14 +25,14 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext)
+SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const css::uno::Reference< css::uno::XComponentContext >& rxContext)
 {
     m_xContext = rxContext;
 }
 
-const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault )
+const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault )
 {
-    com::sun::star::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
+    css::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
     Map::iterator it = maMap.find( nLanguage );
     if ( it != maMap.end() )
         pForbiddenCharacters = &(it->second);
@@ -45,7 +45,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge
     return pForbiddenCharacters;
 }
 
-void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
+void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars )
 {
     maMap[ nLanguage ] = rForbiddenChars;
 }
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 735eb6168001..660d14d3a9a2 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -593,9 +593,9 @@ namespace editeng
             {
                 // get the break iterator service
                 Reference< XBreakIterator > xBreakIter = i18n::BreakIterator::create( m_xContext );
-                sal_Int32 nNextAsianScript = xBreakIter->beginOfScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN );
+                sal_Int32 nNextAsianScript = xBreakIter->beginOfScript( m_sCurrentPortion, m_nCurrentStartIndex, css::i18n::ScriptType::ASIAN );
                 if ( -1 == nNextAsianScript )
-                    nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN );
+                    nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, css::i18n::ScriptType::ASIAN );
                 if ( ( nNextAsianScript >= m_nCurrentStartIndex ) && ( nNextAsianScript < m_sCurrentPortion.getLength() ) )
                 {   // found asian text
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 04226e4fbb66..4f1cde233efa 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -104,13 +104,13 @@ static inline bool IsWordDelim( const sal_Unicode c )
 static inline bool IsLowerLetter( sal_Int32 nCharType )
 {
     return CharClass::isLetterType( nCharType ) &&
-            0 == ( ::com::sun::star::i18n::KCharacterType::UPPER & nCharType);
+            0 == ( css::i18n::KCharacterType::UPPER & nCharType);
 }
 
 static inline bool IsUpperLetter( sal_Int32 nCharType )
 {
     return CharClass::isLetterType( nCharType ) &&
-            0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
+            0 == ( css::i18n::KCharacterType::LOWER & nCharType);
 }
 
 bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const OUString& rTxt,
@@ -121,19 +121,19 @@ bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const OUString& rTxt,
         short nScript = rCC.getScript( rTxt, nStt );
         switch( nScript )
         {
-            case ::com::sun::star::i18n::UnicodeScript_kCJKRadicalsSupplement:
-            case ::com::sun::star::i18n::UnicodeScript_kHangulJamo:
-            case ::com::sun::star::i18n::UnicodeScript_kCJKSymbolPunctuation:
-            case ::com::sun::star::i18n::UnicodeScript_kHiragana:
-            case ::com::sun::star::i18n::UnicodeScript_kKatakana:
-            case ::com::sun::star::i18n::UnicodeScript_kHangulCompatibilityJamo:
-            case ::com::sun::star::i18n::UnicodeScript_kEnclosedCJKLetterMonth:
-            case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibility:
-            case ::com::sun::star::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA:
-            case ::com::sun::star::i18n::UnicodeScript_kCJKUnifiedIdeograph:
-            case ::com::sun::star::i18n::UnicodeScript_kHangulSyllable:
-            case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibilityIdeograph:
-            case ::com::sun::star::i18n::UnicodeScript_kHalfwidthFullwidthForm:
+            case css::i18n::UnicodeScript_kCJKRadicalsSupplement:
+            case css::i18n::UnicodeScript_kHangulJamo:
+            case css::i18n::UnicodeScript_kCJKSymbolPunctuation:
+            case css::i18n::UnicodeScript_kHiragana:
+            case css::i18n::UnicodeScript_kKatakana:
+            case css::i18n::UnicodeScript_kHangulCompatibilityJamo:
+            case css::i18n::UnicodeScript_kEnclosedCJKLetterMonth:
+            case css::i18n::UnicodeScript_kCJKCompatibility:
+            case css::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA:
+            case css::i18n::UnicodeScript_kCJKUnifiedIdeograph:
+            case css::i18n::UnicodeScript_kHangulSyllable:
+            case css::i18n::UnicodeScript_kCJKCompatibilityIdeograph:
+            case css::i18n::UnicodeScript_kHalfwidthFullwidthForm:
                 return true;
             default: ; //do nothing
         }
@@ -146,8 +146,7 @@ static bool lcl_IsSymbolChar( CharClass& rCC, const OUString& rTxt,
 {
     for( ; nStt < nEnd; ++nStt )
     {
-        if( ::com::sun::star::i18n::UnicodeType::PRIVATE_USE ==
-                rCC.getType( rTxt, nStt ))
+        if( css::i18n::UnicodeType::PRIVATE_USE == rCC.getType( rTxt, nStt ))
             return true;
     }
     return false;
@@ -201,8 +200,8 @@ static TransliterationWrapper& GetIgnoreTranslWrapper()
 {
     static int bIsInit = 0;
     static TransliterationWrapper aWrp( ::comphelper::getProcessComponentContext(),
-                ::com::sun::star::i18n::TransliterationModules_IGNORE_KANA |
-                ::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH );
+                css::i18n::TransliterationModules_IGNORE_KANA |
+                css::i18n::TransliterationModules_IGNORE_WIDTH );
     if( !bIsInit )
     {
         aWrp.loadModuleIfNeeded( GetAppLang().getLanguageType() );
@@ -403,12 +402,11 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString& r
             if( !FindInWrdSttExceptList(eLang, sWord) )
             {
                 // Check that word isn't correctly spelled before correcting:
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller =
+                css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller =
                     SvxGetSpellChecker();
                 if( xSpeller->hasLanguage(eLang) )
                 {
-                    Sequence< ::com::sun::star::beans::PropertyValue > aEmptySeq;
+                    Sequence< css::beans::PropertyValue > aEmptySeq;
                     if (!xSpeller->spell(sWord, eLang, aEmptySeq).is())
                     {
                         return false;
@@ -1640,7 +1638,7 @@ void SvxAutoCorrect::refreshBlockList( const uno::Reference< embed::XStorage >&
 }
 
 // Text with attribution (only the SWG - SWG format!)
-bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
+bool SvxAutoCorrect::PutText( const css::uno::Reference < css::embed::XStorage >&,
                               const OUString&, const OUString&, SfxObjectShell&, OUString& )
 {
     return false;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index a90090fee639..7a8fa910eba5 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -86,23 +86,21 @@ public:
     virtual ~ThesDummy_Impl();
 
     // XSupportedLocales
-    virtual ::com::sun::star::uno::Sequence<
-            ::com::sun::star::lang::Locale > SAL_CALL
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
         getLocales()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL
-        hasLocale( const ::com::sun::star::lang::Locale& rLocale )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        hasLocale( const css::lang::Locale& rLocale )
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XThesaurus
-    virtual ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
+    virtual css::uno::Sequence<
+            css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
         queryMeanings( const OUString& rTerm,
-                const ::com::sun::star::lang::Locale& rLocale,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                const css::lang::Locale& rLocale,
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
@@ -213,25 +211,24 @@ class SpellDummy_Impl :
 public:
 
     // XSupportedLanguages (for XSpellChecker1)
-    virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL
         getLanguages()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL
         hasLanguage( sal_Int16 nLanguage )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
     virtual sal_Bool SAL_CALL
         isValid( const OUString& rWord, sal_Int16 nLanguage,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL
         spell( const OUString& rWord, sal_Int16 nLanguage,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
@@ -310,39 +307,39 @@ class HyphDummy_Impl :
 public:
 
     // XSupportedLocales
-    virtual ::com::sun::star::uno::Sequence<
-            ::com::sun::star::lang::Locale > SAL_CALL
+    virtual css::uno::Sequence<
+            css::lang::Locale > SAL_CALL
         getLocales()
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL
-        hasLocale( const ::com::sun::star::lang::Locale& rLocale )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        hasLocale( const css::lang::Locale& rLocale )
+            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XHyphenator
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
+    virtual css::uno::Reference<
+            css::linguistic2::XHyphenatedWord > SAL_CALL
         hyphenate( const OUString& rWord,
-                const ::com::sun::star::lang::Locale& rLocale,
+                const css::lang::Locale& rLocale,
                 sal_Int16 nMaxLeading,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<
+            css::linguistic2::XHyphenatedWord > SAL_CALL
         queryAlternativeSpelling( const OUString& rWord,
-                const ::com::sun::star::lang::Locale& rLocale,
+                const css::lang::Locale& rLocale,
                 sal_Int16 nIndex,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<
+            css::linguistic2::XPossibleHyphens > SAL_CALL
         createPossibleHyphens(
                 const OUString& rWord,
-                const ::com::sun::star::lang::Locale& rLocale,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                const css::lang::Locale& rLocale,
+                const css::beans::PropertyValues& rProperties )
+            throw(css::lang::IllegalArgumentException,
+                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
@@ -695,7 +692,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
                         DictionaryType_POSITIVE,
                         linguistic::GetWritableDictionaryURL( aDicName ) );
         }
-        catch(const com::sun::star::uno::Exception &)
+        catch(const css::uno::Exception &)
         {
         }
 
@@ -765,8 +762,7 @@ uno::Reference< XDictionary >  SvxGetChangeAllList()
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
 SvxAlternativeSpelling SvxGetAltSpelling(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord )
+        const css::uno::Reference< css::linguistic2::XHyphenatedWord > & rHyphWord )
 {
     SvxAlternativeSpelling aRes;
     if (rHyphWord.is() && rHyphWord->isAlternativeSpelling())