com::sun::star->css in starmath,stoc,svgio,svl

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

15 files changed, 223 insertions, 231 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index fb07b189a318..a76538efda06 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -125,12 +125,12 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
 
     virtual sal_uLong   GetMiscStatus() const override;
     virtual void        OnDocumentPrinterChanged( Printer * ) override;
-    virtual bool        InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+    virtual bool        InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
     virtual bool        Load( SfxMedium& rMedium ) override;
     virtual bool        Save() override;
     virtual bool        SaveAs( SfxMedium& rMedium ) override;
     virtual bool        ConvertTo( SfxMedium &rMedium ) override;
-    virtual bool        SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+    virtual bool        SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
 
     Printer             *GetPrt();
     OutputDevice*       GetRefDev();
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 0ae45d3f7e00..98733d243146 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -48,7 +48,7 @@ class SmParser
     std::set< OUString >   m_aUsedSymbols;
 
     //! locale where '.' is decimal separator!
-    ::com::sun::star::lang::Locale m_aDotLoc;
+    css::lang::Locale m_aDotLoc;
 
     SmParser(const SmParser&) = delete;
     SmParser& operator=(const SmParser&) = delete;
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index c897e26d14b6..2227e20639a8 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -50,45 +50,45 @@ public:
 
 class SmModel : public SfxBaseModel,
                 public comphelper::PropertySetHelper,
-                public com::sun::star::lang::XServiceInfo,
-                public com::sun::star::view::XRenderable,
+                public css::lang::XServiceInfo,
+                public css::view::XRenderable,
                 public oox::FormulaExportBase,
                 public oox::FormulaImportBase
 {
     std::unique_ptr<SmPrintUIOptions> m_pPrintUIOptions;
 protected:
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues )
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues )
         throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue )
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
         throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
 public:
     SmModel( SfxObjectShell *pObjSh = 0 );
     virtual ~SmModel() throw ();
 
     //XInterface
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) 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;
-    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;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
 
     // oox::FormulaExportBase
     virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) override;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index cd040781a2a4..034b67e2155e 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -675,7 +675,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     return aTxt.copy( nStart, nEnd - nStart );
 }
 
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -683,7 +683,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     if (!(nIndex <= aTxt.getLength()))
         throw IndexOutOfBoundsException();
 
-    ::com::sun::star::accessibility::TextSegment aResult;
+    css::accessibility::TextSegment aResult;
     aResult.SegmentStart = -1;
     aResult.SegmentEnd = -1;
     if ( (AccessibleTextType::CHARACTER == aTextType)  &&  (nIndex < aTxt.getLength()) )
@@ -695,7 +695,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     return aResult;
 }
 
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -703,7 +703,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     if (!(nIndex <= aTxt.getLength()))
         throw IndexOutOfBoundsException();
 
-    ::com::sun::star::accessibility::TextSegment aResult;
+    css::accessibility::TextSegment aResult;
     aResult.SegmentStart = -1;
     aResult.SegmentEnd = -1;
 
@@ -716,7 +716,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     return aResult;
 }
 
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -724,7 +724,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     if (!(nIndex <= aTxt.getLength()))
         throw IndexOutOfBoundsException();
 
-    ::com::sun::star::accessibility::TextSegment aResult;
+    css::accessibility::TextSegment aResult;
     aResult.SegmentStart = -1;
     aResult.SegmentEnd = -1;
 
@@ -787,10 +787,10 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
     throw (RuntimeException, std::exception)
 {
     return Sequence< OUString >{
-        "com::sun::star::accessibility::Accessible",
-        "com::sun::star::accessibility::AccessibleComponent",
-        "com::sun::star::accessibility::AccessibleContext",
-        "com::sun::star::accessibility::AccessibleText"
+        "css::accessibility::Accessible",
+        "css::accessibility::AccessibleComponent",
+        "css::accessibility::AccessibleContext",
+        "css::accessibility::AccessibleText"
     };
 }
 
@@ -1304,7 +1304,7 @@ bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
-        ESelection aRes = pEditEngine->GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
+        ESelection aRes = pEditEngine->GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD );
 
         if( aRes.nStartPara == nPara &&
             aRes.nStartPara == aRes.nEndPara )
@@ -1918,9 +1918,9 @@ Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
     throw (RuntimeException, std::exception)
 {
     return Sequence< OUString >{
-        "com::sun::star::accessibility::Accessible",
-        "com::sun::star::accessibility::AccessibleComponent",
-        "com::sun::star::accessibility::AccessibleContext"
+        "css::accessibility::Accessible",
+        "css::accessibility::AccessibleComponent",
+        "css::accessibility::AccessibleContext"
     };
 }
 
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index b671b23656df..103989cbfadd 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -54,12 +54,12 @@ struct AccessibleEventObject;
 typedef
 cppu::WeakImplHelper
     <
-        com::sun::star::lang::XServiceInfo,
-        com::sun::star::accessibility::XAccessible,
-        com::sun::star::accessibility::XAccessibleComponent,
-        com::sun::star::accessibility::XAccessibleContext,
-        com::sun::star::accessibility::XAccessibleText,
-        com::sun::star::accessibility::XAccessibleEventBroadcaster
+        css::lang::XServiceInfo,
+        css::accessibility::XAccessible,
+        css::accessibility::XAccessibleComponent,
+        css::accessibility::XAccessibleContext,
+        css::accessibility::XAccessibleText,
+        css::accessibility::XAccessibleEventBroadcaster
     >
 SmGraphicAccessibleBaseClass;
 
@@ -86,62 +86,62 @@ public:
     void                ClearWin();     // to be called when view is destroyed
     void                LaunchEvent(
                             const sal_Int16 nAccesibleEventId,
-                            const ::com::sun::star::uno::Any &rOldVal,
-                            const ::com::sun::star::uno::Any &rNewVal);
+                            const css::uno::Any &rOldVal,
+                            const css::uno::Any &rNewVal);
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSelectedText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::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;
+    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
 
@@ -302,11 +302,11 @@ public:
 typedef
 cppu::WeakImplHelper
     <
-        com::sun::star::lang::XServiceInfo,
-        com::sun::star::accessibility::XAccessible,
-        com::sun::star::accessibility::XAccessibleComponent,
-        com::sun::star::accessibility::XAccessibleContext,
-        com::sun::star::accessibility::XAccessibleEventBroadcaster
+        css::lang::XServiceInfo,
+        css::accessibility::XAccessible,
+        css::accessibility::XAccessibleComponent,
+        css::accessibility::XAccessibleContext,
+        css::accessibility::XAccessibleEventBroadcaster
     >
 SmEditAccessibleBaseClass;
 
@@ -335,39 +335,39 @@ public:
     EditView   * GetEditView()      { return pWin ? pWin->GetEditView() : 0; }
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::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;
+    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 14029a7c62e8..2272437cd698 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -1138,7 +1138,7 @@ void SmMathConfig::SetShowFormulaCursor( bool bVal )
     SetOtherIfNotEqual( pOther->bFormulaCursor, bVal );
 }
 
-void SmMathConfig::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SmMathConfig::Notify( const css::uno::Sequence< OUString >& )
 {}
 
 
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 16b1f84ee8c9..c6c00de898c8 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -146,7 +146,7 @@ public:
     virtual ~SmMathConfig();
 
     // utl::ConfigItem
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
 
     SmSymbolManager &   GetSymbolManager();
     void                GetSymbols( std::vector< SmSym > &rSymbols ) const;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index a5c8ad1c0446..bd5f1351062d 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -701,7 +701,7 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
             pTree = 0;
             InvalidateCursor();
         }
-        Reference<com::sun::star::frame::XModel> xModel(GetModel());
+        Reference<css::frame::XModel> xModel(GetModel());
         SmXMLImportWrapper aEquation(xModel);
         bSuccess = 0 == aEquation.Import(rMedium);
     }
@@ -766,7 +766,7 @@ bool SmDocShell::Load( SfxMedium& rMedium )
            )
         {
             // is this a fabulous math package ?
-            Reference<com::sun::star::frame::XModel> xModel(GetModel());
+            Reference<css::frame::XModel> xModel(GetModel());
             SmXMLImportWrapper aEquation(xModel);
             sal_uLong nError = aEquation.Import(rMedium);
             bRet = 0 == nError;
@@ -798,7 +798,7 @@ bool SmDocShell::Save()
         if( pTree && !IsFormulaArranged() )
             ArrangeFormula();
 
-        Reference<com::sun::star::frame::XModel> xModel(GetModel());
+        Reference<css::frame::XModel> xModel(GetModel());
         SmXMLExportWrapper aEquation(xModel);
         aEquation.SetFlat(false);
         return aEquation.Export(*GetMedium());
@@ -860,7 +860,7 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
         if( pTree && !IsFormulaArranged() )
             ArrangeFormula();
 
-        Reference<com::sun::star::frame::XModel> xModel(GetModel());
+        Reference<css::frame::XModel> xModel(GetModel());
         SmXMLExportWrapper aEquation(xModel);
         aEquation.SetFlat(false);
         bRet = aEquation.Export(rMedium);
@@ -882,14 +882,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
         const OUString& rFltName = pFlt->GetFilterName();
         if(rFltName == STAROFFICE_XML)
         {
-            Reference<com::sun::star::frame::XModel> xModel(GetModel());
+            Reference<css::frame::XModel> xModel(GetModel());
             SmXMLExportWrapper aEquation(xModel);
             aEquation.SetFlat(false);
             bRet = aEquation.Export(rMedium);
         }
         else if(rFltName == MATHML_XML)
         {
-            Reference<com::sun::star::frame::XModel> xModel(GetModel());
+            Reference<css::frame::XModel> xModel(GetModel());
             SmXMLExportWrapper aEquation(xModel);
             aEquation.SetFlat(true);
             bRet = aEquation.Export(rMedium);
@@ -926,7 +926,7 @@ void SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream& stream )
     SetText( aEquation.ConvertToStarMath());
 }
 
-bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
+bool SmDocShell::SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage )
 {
     if( SfxObjectShell::SaveCompleted( xStorage ))
         return true;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 788708a688e6..f5bf1046531c 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -348,7 +348,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 
         // added for replaceability of context menus
         Menu* pMenu = NULL;
-        ::com::sun::star::ui::ContextMenuExecuteEvent aEvent;
+        css::ui::ContextMenuExecuteEvent aEvent;
         aEvent.SourceWindow = VCLUnoHelper::GetInterface( this );
         aEvent.ExecutePosition.X = aPoint.X();
         aEvent.ExecutePosition.Y = aPoint.Y();
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 471e0e3b3bb2..2e557a7d87c9 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -360,7 +360,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
 }
 
 SmXMLExport::SmXMLExport(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+    const css::uno::Reference< css::uno::XComponentContext >& rContext,
     OUString const & implementationName, SvXMLExportFlags nExportFlags)
     : SvXMLExport(util::MeasureUnit::INCH, rContext, implementationName, XML_MATH,
                   nExportFlags)
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index f04f416dc83f..44e9c5782568 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -40,35 +40,29 @@ namespace com { namespace sun { namespace star {
 
 class SmXMLExportWrapper
 {
-    com::sun::star::uno::Reference<com::sun::star::frame::XModel> xModel;
+    css::uno::Reference<css::frame::XModel> xModel;
     bool bFlat;     //set true for export to flat .mml, set false for
                         //export to a .sxm (or whatever) package
 public:
-    explicit SmXMLExportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
+    explicit SmXMLExportWrapper(css::uno::Reference<css::frame::XModel> &rRef)
         : xModel(rRef), bFlat(true) {}
 
     bool Export(SfxMedium &rMedium);
     void SetFlat(bool bIn) {bFlat = bIn;}
 
     static bool WriteThroughComponent(
-        ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
-            xOutputStream,
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
-            xComponent,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & rxContext,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        css::uno::Reference< css::io::XOutputStream >   xOutputStream,
+        css::uno::Reference< css::lang::XComponent >    xComponent,
+        css::uno::Reference< css::uno::XComponentContext > & rxContext,
+        css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const sal_Char* pComponentName );
 
     static bool WriteThroughComponent(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
+        const css::uno::Reference< css::embed::XStorage >& xStor,
+        css::uno::Reference< css::lang::XComponent > xComponent,
         const sal_Char* pStreamName,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & rxContext,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        css::uno::Reference< css::uno::XComponentContext > & rxContext,
+        css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const sal_Char* pComponentName );
 };
 
@@ -104,21 +98,21 @@ protected:
 
 public:
     SmXMLExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+        const css::uno::Reference< css::uno::XComponentContext >& rContext,
         OUString const & implementationName, SvXMLExportFlags nExportFlags);
     virtual ~SmXMLExport() {};
 
     // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
     void _ExportAutoStyles() override {}
     void _ExportMasterStyles() override {}
     void _ExportContent() override;
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
 
-    virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
-    virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+    virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
+    virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
 
     bool GetSuccess() {return bSuccess;}
 };
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 8e4f65749ea4..d8c635624c11 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -396,7 +396,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
 
 
 SmXMLImport::SmXMLImport(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+    const css::uno::Reference< css::uno::XComponentContext >& rContext,
     OUString const & implementationName, SvXMLImportFlags nImportFlags)
 :   SvXMLImport(rContext, implementationName, nImportFlags),
     bSuccess(false)
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index b5ddc07de5ed..961efadd8530 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -40,31 +40,29 @@ namespace com { namespace sun { namespace star {
 
 class SmXMLImportWrapper
 {
-    com::sun::star::uno::Reference<com::sun::star::frame::XModel> xModel;
+    css::uno::Reference<css::frame::XModel> xModel;
 
 public:
-    explicit SmXMLImportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
+    explicit SmXMLImportWrapper(css::uno::Reference<css::frame::XModel> &rRef)
         : xModel(rRef) {}
 
     sal_uLong Import(SfxMedium &rMedium);
 
     static sal_uLong ReadThroughComponent(
-        ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        css::uno::Reference< css::io::XInputStream > xInputStream,
+        css::uno::Reference< css::lang::XComponent > xModelComponent,
+        css::uno::Reference< css::uno::XComponentContext > & rxContext,
+        css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const sal_Char* pFilterName,
         bool bEncrypted );
 
     static sal_uLong ReadThroughComponent(
-         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
+        const css::uno::Reference< css::embed::XStorage >& xStorage,
+        css::uno::Reference< css::lang::XComponent > xModelComponent,
         const sal_Char* pStreamName,
         const sal_Char* pCompatibilityStreamName,
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        css::uno::Reference< css::uno::XComponentContext > & rxContext,
+        css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const sal_Char* pFilterName );
 };
 
@@ -89,146 +87,146 @@ class SmXMLImport : public SvXMLImport
 
 public:
     SmXMLImport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+        const css::uno::Reference< css::uno::XComponentContext >& rContext,
         OUString const & implementationName, SvXMLImportFlags nImportFlags);
     virtual ~SmXMLImport() throw ();
 
     // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
     void SAL_CALL endDocument()
-        throw( ::com::sun::star::xml::sax::SAXException,
-        ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::xml::sax::SAXException,
+        css::uno::RuntimeException, std::exception ) override;
 
     SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList) override;
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList) override;
     SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateEncloseContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
     SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
-        const com::sun::star::uno::Reference <
-        com::sun::star::xml::sax::XAttributeList> &xAttrList);
+        const css::uno::Reference <
+        css::xml::sax::XAttributeList> &xAttrList);
 
     const SvXMLTokenMap &GetPresLayoutElemTokenMap();
     const SvXMLTokenMap &GetPresLayoutAttrTokenMap();
@@ -251,8 +249,8 @@ public:
     SAL_WARN_UNUSED_RESULT OUString GetText() { return aText; }
     void SetText(const OUString &rStr) { aText = rStr; }
 
-    virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
-    virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
+    virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
+    virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
 };
 
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 02b123656fbd..e2ae2e27cbf3 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -344,8 +344,8 @@ bool SmParser::IsDelimiter( const OUString &rTxt, sal_Int32 nPos )
 
     sal_Int16 nTypJp = SM_MOD()->GetSysLocale().GetCharClass().getType( rTxt, nPos );
     bool bIsDelim = (*pDelim != 0 ||
-            nTypJp == com::sun::star::i18n::UnicodeType::SPACE_SEPARATOR ||
-            nTypJp == com::sun::star::i18n::UnicodeType::CONTROL);
+            nTypJp == css::i18n::UnicodeType::SPACE_SEPARATOR ||
+            nTypJp == css::i18n::UnicodeType::CONTROL);
 
     return bIsDelim;
 }
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c8f03b56aaae..103ca38038aa 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1387,7 +1387,7 @@ void SmViewShell::Insert( SfxMedium& rMedium )
         if (xNameAccess->hasByName(OUString("content.xml")) || xNameAccess->hasByName(OUString("Content.xml")))
         {
             // is this a fabulous math package ?
-            Reference<com::sun::star::frame::XModel> xModel(pDoc->GetModel());
+            Reference<css::frame::XModel> xModel(pDoc->GetModel());
             SmXMLImportWrapper aEquation(xModel);    //!! modifies the result of pDoc->GetText() !!
             bRet = 0 == aEquation.Import(rMedium);
         }