Namespace cleanup and disambiguation

Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739
Reviewed-on: https://gerrit.libreoffice.org/19900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

36 files changed, 236 insertions, 246 deletions

diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 76280017493f..bc83276a3a14 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -44,7 +44,6 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentconstants.hxx>
-
 #include <comphelper/storagehelper.hxx>
 
 #include <boost/current_function.hpp>
@@ -398,8 +397,8 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
         {
             uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
 
-            uno::Reference< xml::crypto::XNSSInitializer > xDigestContextSupplier = xml::crypto::NSSInitializer::create(xContext);
-            uno::Reference< xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW );
+            uno::Reference< css::xml::crypto::XNSSInitializer > xDigestContextSupplier = css::xml::crypto::NSSInitializer::create(xContext);
+            uno::Reference< css::xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( css::xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW );
 
             OString aUTF8Password( OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) );
             xDigestContext->updateDigest( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aUTF8Password.getStr() ), aUTF8Password.getLength() ) );
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 161481229914..550103e963de 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -41,7 +41,7 @@ namespace comphelper {
 
 // this helper class is designed to allow to parse ContentType- and Relationship-related information from OfficeOpenXML format
 class OFOPXMLHelper_Impl
-    : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler >
+    : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
     sal_uInt16 m_nFormat; // which format to parse
 
@@ -61,25 +61,25 @@ class OFOPXMLHelper_Impl
     OUString m_aPartNameAttr;
     OUString m_aContentTypeAttr;
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aResultSeq;
-    ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed
+    css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > m_aResultSeq;
+    css::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed
 
 
 public:
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetParsingResult();
+    css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > GetParsingResult();
 
     explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly
     virtual ~OFOPXMLHelper_Impl();
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 };
 
 
@@ -122,7 +122,7 @@ void WriteRelationsInfoSequence(
     if ( !xOutStream.is() )
         throw uno::RuntimeException();
 
-    uno::Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(rContext);
+    uno::Reference< css::xml::sax::XWriter > xWriter = css::xml::sax::Writer::create(rContext);
 
     xWriter->setOutputStream( xOutStream );
 
@@ -133,7 +133,7 @@ void WriteRelationsInfoSequence(
 
     // write the namespace
     AttributeList* pRootAttrList = new AttributeList;
-    uno::Reference< xml::sax::XAttributeList > xRootAttrList( pRootAttrList );
+    uno::Reference< css::xml::sax::XAttributeList > xRootAttrList( pRootAttrList );
     pRootAttrList->AddAttribute(
         "xmlns",
         aCDATAString,
@@ -145,7 +145,7 @@ void WriteRelationsInfoSequence(
     for ( sal_Int32 nInd = 0; nInd < aSequence.getLength(); nInd++ )
     {
         AttributeList *pAttrList = new AttributeList;
-        uno::Reference< xml::sax::XAttributeList > xAttrList( pAttrList );
+        uno::Reference< css::xml::sax::XAttributeList > xAttrList( pAttrList );
         for( sal_Int32 nSecInd = 0; nSecInd < aSequence[nInd].getLength(); nSecInd++ )
         {
             if ( aSequence[nInd][nSecInd].First == "Id"
@@ -183,7 +183,7 @@ void WriteContentSequence(
     if ( !xOutStream.is() )
         throw uno::RuntimeException();
 
-    uno::Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(rContext);
+    uno::Reference< css::xml::sax::XWriter > xWriter = css::xml::sax::Writer::create(rContext);
 
     xWriter->setOutputStream( xOutStream );
 
@@ -196,7 +196,7 @@ void WriteContentSequence(
 
     // write the namespace
     AttributeList* pRootAttrList = new AttributeList;
-    uno::Reference< xml::sax::XAttributeList > xRootAttrList( pRootAttrList );
+    uno::Reference< css::xml::sax::XAttributeList > xRootAttrList( pRootAttrList );
     pRootAttrList->AddAttribute(
         "xmlns",
         aCDATAString,
@@ -208,7 +208,7 @@ void WriteContentSequence(
     for ( sal_Int32 nInd = 0; nInd < aDefaultsSequence.getLength(); nInd++ )
     {
         AttributeList *pAttrList = new AttributeList;
-        uno::Reference< xml::sax::XAttributeList > xAttrList( pAttrList );
+        uno::Reference< css::xml::sax::XAttributeList > xAttrList( pAttrList );
         pAttrList->AddAttribute( "Extension", aCDATAString, aDefaultsSequence[nInd].First );
         pAttrList->AddAttribute( aContentTypeAttr, aCDATAString, aDefaultsSequence[nInd].Second );
 
@@ -220,7 +220,7 @@ void WriteContentSequence(
     for ( sal_Int32 nInd = 0; nInd < aOverridesSequence.getLength(); nInd++ )
     {
         AttributeList *pAttrList = new AttributeList;
-        uno::Reference< xml::sax::XAttributeList > xAttrList( pAttrList );
+        uno::Reference< css::xml::sax::XAttributeList > xAttrList( pAttrList );
         pAttrList->AddAttribute( "PartName", aCDATAString, aOverridesSequence[nInd].First );
         pAttrList->AddAttribute( aContentTypeAttr, aCDATAString, aOverridesSequence[nInd].Second );
 
@@ -244,16 +244,16 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl(
     if ( !rContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID )
         throw uno::RuntimeException();
 
-    uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( rContext );
+    uno::Reference< css::xml::sax::XParser > xParser = css::xml::sax::Parser::create( rContext );
 
     OFOPXMLHelper_Impl *const pHelper = new OFOPXMLHelper_Impl( nFormat );
-    uno::Reference< xml::sax::XDocumentHandler > xHelper( static_cast< xml::sax::XDocumentHandler* >( pHelper ) );
-    xml::sax::InputSource aParserInput;
+    uno::Reference< css::xml::sax::XDocumentHandler > xHelper( static_cast< css::xml::sax::XDocumentHandler* >( pHelper ) );
+    css::xml::sax::InputSource aParserInput;
     aParserInput.aInputStream = xInStream;
     aParserInput.sSystemId = aStringID;
     xParser->setDocumentHandler( xHelper );
     xParser->parseStream( aParserInput );
-    xParser->setDocumentHandler( uno::Reference < xml::sax::XDocumentHandler > () );
+    xParser->setDocumentHandler( uno::Reference < css::xml::sax::XDocumentHandler > () );
 
     return pHelper->GetParsingResult();
 }
@@ -293,19 +293,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper_Impl::GetParsi
 
 
 void SAL_CALL OFOPXMLHelper_Impl::startDocument()
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::endDocument()
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
-void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
-        throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
+void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
+        throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT )
     {
@@ -314,7 +314,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
             sal_Int32 nNewLength = m_aElementsSeq.getLength() + 1;
 
             if ( nNewLength != 1 )
-                throw xml::sax::SAXException(); // TODO: this element must be the first level element
+                throw css::xml::sax::SAXException(); // TODO: this element must be the first level element
 
             m_aElementsSeq.realloc( nNewLength );
             m_aElementsSeq[nNewLength-1] = aName;
@@ -325,7 +325,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
         {
             sal_Int32 nNewLength = m_aElementsSeq.getLength() + 1;
             if ( nNewLength != 2 )
-                throw xml::sax::SAXException(); // TODO: this element must be the second level element
+                throw css::xml::sax::SAXException(); // TODO: this element must be the second level element
 
             m_aElementsSeq.realloc( nNewLength );
             m_aElementsSeq[nNewLength-1] = aName;
@@ -337,7 +337,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
 
             OUString aIDValue = xAttribs->getValueByName( m_aIDAttr );
             if ( aIDValue.isEmpty() )
-                throw xml::sax::SAXException(); // TODO: the ID value must present
+                throw css::xml::sax::SAXException(); // TODO: the ID value must present
 
             OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr );
             OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr );
@@ -367,7 +367,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
             m_aResultSeq[nNewEntryNum-1].realloc( nAttrNum );
         }
         else
-            throw xml::sax::SAXException(); // TODO: no other elements expected!
+            throw css::xml::sax::SAXException(); // TODO: no other elements expected!
     }
     else if ( m_nFormat == CONTENTTYPE_FORMAT )
     {
@@ -376,7 +376,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
             sal_Int32 nNewLength = m_aElementsSeq.getLength() + 1;
 
             if ( nNewLength != 1 )
-                throw xml::sax::SAXException(); // TODO: this element must be the first level element
+                throw css::xml::sax::SAXException(); // TODO: this element must be the first level element
 
             m_aElementsSeq.realloc( nNewLength );
             m_aElementsSeq[nNewLength-1] = aName;
@@ -390,7 +390,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
         {
             sal_Int32 nNewLength = m_aElementsSeq.getLength() + 1;
             if ( nNewLength != 2 )
-                throw xml::sax::SAXException(); // TODO: this element must be the second level element
+                throw css::xml::sax::SAXException(); // TODO: this element must be the second level element
 
             m_aElementsSeq.realloc( nNewLength );
             m_aElementsSeq[nNewLength-1] = aName;
@@ -403,11 +403,11 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
 
             OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr );
             if ( aExtensionValue.isEmpty() )
-                throw xml::sax::SAXException(); // TODO: the Extension value must present
+                throw css::xml::sax::SAXException(); // TODO: the Extension value must present
 
             OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
             if ( aContentTypeValue.isEmpty() )
-                throw xml::sax::SAXException(); // TODO: the ContentType value must present
+                throw css::xml::sax::SAXException(); // TODO: the ContentType value must present
 
             sal_Int32 nNewResultLen = m_aResultSeq[0].getLength() + 1;
             m_aResultSeq[0].realloc( nNewResultLen );
@@ -419,7 +419,7 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
         {
             sal_Int32 nNewLength = m_aElementsSeq.getLength() + 1;
             if ( nNewLength != 2 )
-                throw xml::sax::SAXException(); // TODO: this element must be the second level element
+                throw css::xml::sax::SAXException(); // TODO: this element must be the second level element
 
             m_aElementsSeq.realloc( nNewLength );
             m_aElementsSeq[nNewLength-1] = aName;
@@ -432,11 +432,11 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
 
             OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr );
             if ( aPartNameValue.isEmpty() )
-                throw xml::sax::SAXException(); // TODO: the PartName value must present
+                throw css::xml::sax::SAXException(); // TODO: the PartName value must present
 
             OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
             if ( aContentTypeValue.isEmpty() )
-                throw xml::sax::SAXException(); // TODO: the ContentType value must present
+                throw css::xml::sax::SAXException(); // TODO: the ContentType value must present
 
             sal_Int32 nNewResultLen = m_aResultSeq[1].getLength() + 1;
             m_aResultSeq[1].realloc( nNewResultLen );
@@ -445,24 +445,24 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
             m_aResultSeq[1][nNewResultLen-1].Second = aContentTypeValue;
         }
         else
-            throw xml::sax::SAXException(); // TODO: no other elements expected!
+            throw css::xml::sax::SAXException(); // TODO: no other elements expected!
     }
     else
-        throw xml::sax::SAXException(); // TODO: no other elements expected!
+        throw css::xml::sax::SAXException(); // TODO: no other elements expected!
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
+    throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT )
     {
         sal_Int32 nLength = m_aElementsSeq.getLength();
         if ( nLength <= 0 )
-            throw xml::sax::SAXException(); // TODO: no other end elements expected!
+            throw css::xml::sax::SAXException(); // TODO: no other end elements expected!
 
         if ( !m_aElementsSeq[nLength-1].equals( aName ) )
-            throw xml::sax::SAXException(); // TODO: unexpected element ended
+            throw css::xml::sax::SAXException(); // TODO: unexpected element ended
 
         m_aElementsSeq.realloc( nLength - 1 );
     }
@@ -470,25 +470,25 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
 
 
 void SAL_CALL OFOPXMLHelper_Impl::characters( const OUString& /*aChars*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
-void SAL_CALL OFOPXMLHelper_Impl::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OFOPXMLHelper_Impl::setDocumentLocator( const uno::Reference< css::xml::sax::XLocator >& /*xLocator*/ )
+        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index c9871bd9fba9..7fbabf6fe00f 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -2187,7 +2187,7 @@ namespace cppcanvas
 
                         // crop bitmap to given source rectangle (no
                         // need to copy and convert the whole bitmap)
-                        Bitmap aBmp( pAct->GetBitmap() );
+                        ::Bitmap aBmp( pAct->GetBitmap() );
                         const Rectangle aCropRect( pAct->GetSrcPoint(),
                                                     pAct->GetSrcSize() );
                         aBmp.Crop( aCropRect );
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 0f4545aba8f4..86591ac593c8 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -216,7 +216,7 @@ namespace
 
         @return converted tools PolyPolygon, w/o one-point fills
      */
-    tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
+    ::tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
     {
         // filter input rPoly
         basegfx::B2DPolyPolygon aPoly;
@@ -227,7 +227,7 @@ namespace
             if( !aCandidate.isClosed() || aCandidate.count() > 1 )
                 aPoly.append(aCandidate);
         }
-        return tools::PolyPolygon(aPoly);
+        return ::tools::PolyPolygon(aPoly);
     }
 
 } // end of anonymous namespace
@@ -519,9 +519,9 @@ namespace drawinglayer
                 aEndArrow.transform(maCurrentTransformation);
 
                 pRetval = new SvtGraphicStroke(
-                        tools::Polygon(aLocalPolygon),
-                        tools::PolyPolygon(aStartArrow),
-                        tools::PolyPolygon(aEndArrow),
+                        ::tools::Polygon(aLocalPolygon),
+                        ::tools::PolyPolygon(aStartArrow),
+                        ::tools::PolyPolygon(aEndArrow),
                         mfCurrentUnifiedTransparence,
                         fLineWidth,
                         eCap,
@@ -1266,7 +1266,7 @@ namespace drawinglayer
 
                                 if(aCandidate.count() > 1)
                                 {
-                                    const tools::Polygon aToolsPolygon(aCandidate);
+                                    const ::tools::Polygon aToolsPolygon(aCandidate);
 
                                     mpMetaFile->AddAction(new MetaPolyLineAction(aToolsPolygon, aLineInfo));
                                 }
@@ -1540,7 +1540,7 @@ namespace drawinglayer
 
                     // #i111954# do NOT use decomposition, but use direct VCL-command
                     // process(rCandidate.get2DDecomposition(getViewInformation2D()));
-                    const tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
+                    const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
                     const HatchStyle aHatchStyle(
                         attribute::HATCHSTYLE_SINGLE == rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
                         attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
@@ -1615,7 +1615,7 @@ namespace drawinglayer
                         // necessary to again remove this subdivision since it decreases possible
                         // printing quality (not even resolution-dependent for now). THB will tell
                         // me when that task is fixed in the master
-                        const tools::PolyPolygon aToolsPolyPolygon(
+                        const ::tools::PolyPolygon aToolsPolyPolygon(
                             getFillPolyPolygon(
                                 basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)));
 
@@ -1899,7 +1899,7 @@ namespace drawinglayer
                                 }
 
                                 mpOutputDevice->DrawTransparent(
-                                    tools::PolyPolygon(aLocalPolyPolygon),
+                                    ::tools::PolyPolygon(aLocalPolyPolygon),
                                     nTransPercentVcl);
 
                                 if(bSupportSvtGraphicFill)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 29056685f620..8dcd74e77ac5 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1146,7 +1146,7 @@ namespace drawinglayer
                         ::Hatch aVCLHatch(eHatchStyle, Color(rFillHatchAttributes.getColor()), nDistance, nAngle10);
 
                         // draw hatch using VCL
-                        mpOutputDevice->DrawHatch(tools::PolyPolygon(tools::Polygon(aHatchPolygon)), aVCLHatch);
+                        mpOutputDevice->DrawHatch(::tools::PolyPolygon(::tools::Polygon(aHatchPolygon)), aVCLHatch);
                     }
                     break;
                 }
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index dbf62d229c70..a20e4b7ee6de 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -36,21 +36,6 @@ namespace vcl { class Window; }
 namespace framework
 {
 
-struct ExecuteInfo
-{
-    css::uno::Reference< css::frame::XDispatch >     xDispatch;
-    css::util::URL                                   aTargetURL;
-    css::uno::Sequence< css::beans::PropertyValue >  aArgs;
-};
-
-struct NotifyInfo
-{
-    OUString                                                        aEventName;
-    css::uno::Reference< css::frame::XControlNotificationListener > xNotifyListener;
-    css::util::URL                                                  aSourceURL;
-    css::uno::Sequence< css::beans::NamedValue >                    aInfoSeq;
-};
-
 class ComplexToolbarController : public svt::ToolboxController
 
 {
@@ -74,6 +59,21 @@ class ComplexToolbarController : public svt::ToolboxController
         DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
         DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void);
 
+        struct ExecuteInfo
+        {
+            css::uno::Reference< css::frame::XDispatch >     xDispatch;
+            css::util::URL                                   aTargetURL;
+            css::uno::Sequence< css::beans::PropertyValue >  aArgs;
+        };
+
+        struct NotifyInfo
+        {
+            OUString                                                        aEventName;
+            css::uno::Reference< css::frame::XControlNotificationListener > xNotifyListener;
+            css::util::URL                                                  aSourceURL;
+            css::uno::Sequence< css::beans::NamedValue >                    aInfoSeq;
+        };
+
     protected:
         static sal_Int32 getFontSizePixel( const vcl::Window* pWindow );
         css::uno::Reference< css::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const;
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 016c5920d52f..805a232f0dca 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -31,7 +31,6 @@ class ToolBox;
 namespace framework
 {
 
-struct ExecuteInfo;
 class GenericToolbarController : public svt::ToolboxController
 {
     public:
@@ -53,6 +52,13 @@ class GenericToolbarController : public svt::ToolboxController
 
         DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void );
 
+        struct ExecuteInfo
+        {
+            css::uno::Reference< css::frame::XDispatch >     xDispatch;
+            css::util::URL                                   aTargetURL;
+            css::uno::Sequence< css::beans::PropertyValue >  aArgs;
+        };
+
     protected:
         VclPtr<ToolBox>     m_pToolbar;
         sal_uInt16          m_nID;
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 9df0745b9f7b..56ae8e47d55b 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -604,7 +604,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone
     // update window list
     ::std::vector< OUString > aNewWindowListVector;
 
-    Reference< XDesktop2 > xDesktop = Desktop::create( xContext );
+    Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( xContext );
 
     sal_uInt16  nActiveItemId = 0;
     sal_uInt16  nItemId = START_ITEMID_WINDOWLIST;
@@ -831,7 +831,7 @@ IMPL_LINK_TYPED( MenuManager, Select, Menu *, pMenu, bool )
             {
                 // window list menu item selected
 
-                Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext );
+                Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext );
 
                 sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                 Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index e5db95fd3611..c393dd433403 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -50,7 +50,7 @@
 #define ATTRIBUTE_ID                "http://openoffice.org/2001/menu^id"
 #define ATTRIBUTE_LABEL             "http://openoffice.org/2001/menu^label"
 #define ATTRIBUTE_HELPID            "http://openoffice.org/2001/menu^helpid"
-#define ATTRIBUTE_STYLE         "http://openoffice.org/2001/menu^style"
+#define ATTRIBUTE_STYLE             "http://openoffice.org/2001/menu^style"
 
 #define ATTRIBUTE_NS_ID             "menu:id"
 #define ATTRIBUTE_NS_LABEL          "menu:label"
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 0f93f62e5fa9..90f95ab91bdb 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -91,13 +91,6 @@ static OUString getMasterCommand( const OUString& rCommand )
     return aMasterCommand;
 }
 
-struct ExecuteInfo
-{
-    css::uno::Reference< css::frame::XDispatch >     xDispatch;
-    css::util::URL                                   aTargetURL;
-    css::uno::Sequence< css::beans::PropertyValue >  aArgs;
-};
-
 GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >&    rxContext,
                                                     const Reference< XFrame >&               rFrame,
                                                     ToolBox*                                 pToolbar,
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 399c667a3487..85fa140577a4 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -995,7 +995,7 @@ IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool )
             {
                 // window list menu item selected
 
-                Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext );
+                Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext );
 
                 sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                 Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index a8f5d77d36d3..1534f5b3984b 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -49,8 +49,10 @@ const double nPi180=0.000174532925199432957692222; // If we have too few digits,
 
 class XPolygon;
 class XPolyPolygon;
-
-inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); }
+namespace svx
+{
+    inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); }
+}
 
 inline void MoveRect(Rectangle& rRect, const Size& S)    { rRect.Move(S.Width(),S.Height()); }
 inline void MovePoint(Point& rPnt, const Size& S)        { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); }
@@ -119,27 +121,27 @@ inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction
         SAL_WARN( "svx.svdraw", "invalid fraction yFact, using Fraction(1,1)" );
         yFact = Fraction(1,1);
     }
-    rPnt.X() = rRef.X() + Round( (rPnt.X() - rRef.X()) * double(xFact) );
-    rPnt.Y() = rRef.Y() + Round( (rPnt.Y() - rRef.Y()) * double(yFact) );
+    rPnt.X() = rRef.X() + svx::Round( (rPnt.X() - rRef.X()) * double(xFact) );
+    rPnt.Y() = rRef.Y() + svx::Round( (rPnt.Y() - rRef.Y()) * double(yFact) );
 }
 
 inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs)
 {
     long dx=rPnt.X()-rRef.X();
     long dy=rPnt.Y()-rRef.Y();
-    rPnt.X()=Round(rRef.X()+dx*cs+dy*sn);
-    rPnt.Y()=Round(rRef.Y()+dy*cs-dx*sn);
+    rPnt.X()=svx::Round(rRef.X()+dx*cs+dy*sn);
+    rPnt.Y()=svx::Round(rRef.Y()+dy*cs-dx*sn);
 }
 
 inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear)
 {
     if (!bVShear) { // Horizontal
         if (rPnt.Y()!=rRef.Y()) { // else not needed
-            rPnt.X()-=Round((rPnt.Y()-rRef.Y())*tn);
+            rPnt.X()-=svx::Round((rPnt.Y()-rRef.Y())*tn);
         }
     } else { // or else vertical
         if (rPnt.X()!=rRef.X()) { // else not needed
-            rPnt.Y()-=Round((rPnt.X()-rRef.X())*tn);
+            rPnt.Y()-=svx::Round((rPnt.X()-rRef.X())*tn);
         }
     }
 }
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index ea754a917281..ceb0efc14d02 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -130,7 +130,7 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
                         else
                         {
                             double fValue = rChars.toDouble();
-                            Color* pColor = nullptr;
+                            ::Color* pColor = nullptr;
                             OUString aFormattedValue;
                             pNumFrmt->GetOutputString( fValue, nKey, aFormattedValue, &pColor );
                             mrModel.maData[ mnPtIndex ] <<= aFormattedValue;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 103157efaaf0..7d247f16fb00 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -308,7 +308,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
 
             Reference< XEnumerationAccess > xEA( xShape, UNO_QUERY_THROW );
             Reference< XEnumeration > xEnumeration( xEA->createEnumeration(), UNO_QUERY_THROW );
-            Locale aLocale;
+            css::lang::Locale aLocale;
             const OUString aStrLocaleName( "CharLocale" );
             Reference< XTextRange > xParagraph;
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 55470bdb3711..20f6e169204b 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -82,7 +82,7 @@ class AnnotationWindow : public FloatingWindow
         SdDrawDocument*         mpDoc;
 
         OutlinerView*           mpOutlinerView;
-        Outliner*               mpOutliner;
+        ::Outliner*             mpOutliner;
         VclPtr<ScrollBar>       mpVScrollbar;
         css::uno::Reference< css::office::XAnnotation > mxAnnotation;
         bool                    mbReadonly;
@@ -113,7 +113,7 @@ class AnnotationWindow : public FloatingWindow
 
         DrawDocShell*           DocShell()      { return mpDocShell; }
         OutlinerView*           getView()       { return mpOutlinerView; }
-        Outliner*               Engine()        { return mpOutliner; }
+        ::Outliner*             Engine()        { return mpOutliner; }
         SdDrawDocument*         Doc()           { return mpDoc; }
 
         long            GetPostItTextHeight();
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 09be79df18da..450fb4de2760 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -57,7 +57,6 @@
 
 #define FONTNAMEBOXMRUENTRIESFILE "/user/config/fontnameboxmruentries"
 
-using namespace ::com::sun::star;
 
 class ImplColorListData
 {
@@ -495,7 +494,7 @@ Color ImpLineListData::GetColorDist( const Color& rMain, const Color& rDefault )
 
 sal_uInt16 LineListBox::GetSelectEntryStyle( sal_Int32 nSelIndex ) const
 {
-    sal_uInt16 nStyle = table::BorderLineStyle::SOLID;
+    sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID;
     sal_Int32 nPos = GetSelectEntryPos( nSelIndex );
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
@@ -554,25 +553,25 @@ std::vector<double> GetDashing( sal_uInt16 nDashing )
     std::vector<double> aPattern;
     switch (nDashing)
     {
-        case table::BorderLineStyle::DOTTED:
+        case css::table::BorderLineStyle::DOTTED:
             aPattern.push_back( 1.0 ); // line
             aPattern.push_back( 2.0 ); // blank
         break;
-        case table::BorderLineStyle::DASHED:
+        case css::table::BorderLineStyle::DASHED:
             aPattern.push_back( 16.0 ); // line
             aPattern.push_back( 5.0 );  // blank
         break;
-        case table::BorderLineStyle::FINE_DASHED:
+        case css::table::BorderLineStyle::FINE_DASHED:
             aPattern.push_back( 6.0 ); // line
             aPattern.push_back( 2.0 ); // blank
         break;
-        case table::BorderLineStyle::DASH_DOT:
+        case css::table::BorderLineStyle::DASH_DOT:
             aPattern.push_back( 16.0 ); // line
             aPattern.push_back( 5.0 );  // blank
             aPattern.push_back( 5.0 );  // line
             aPattern.push_back( 5.0 );  // blank
         break;
-        case table::BorderLineStyle::DASH_DOT_DOT:
+        case css::table::BorderLineStyle::DASH_DOT_DOT:
             aPattern.push_back( 16.0 ); // line
             aPattern.push_back( 5.0 );  // blank
             aPattern.push_back( 5.0 );  // line
@@ -702,7 +701,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
         {
             double y2 =  n1 + nDist + double( n2 ) / 2;
             aVirDev->SetFillColor( aColor2 );
-            svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, table::BorderLineStyle::SOLID );
+            svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, css::table::BorderLineStyle::SOLID );
         }
         rBmp = aVirDev->GetBitmap( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
     }
@@ -823,7 +822,7 @@ sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
 sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const
 {
     ImpLineListData* pData = (0 <= nPos && static_cast<size_t>(nPos) < pLineList->size()) ? (*pLineList)[ nPos ] : nullptr;
-    return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
+    return ( pData ) ? pData->GetStyle() : css::table::BorderLineStyle::NONE;
 }
 
 bool LineListBox::UpdatePaintLineColor()
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index 165db8854d36..18cb421e3caf 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -38,7 +38,7 @@ namespace svt
 
 using namespace ::com::sun::star;
 
-bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
+bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, css::table::CellRangeAddress& aAddress )
 {
     bool bRes = false;
     uno::Reference< sheet::XCellRangeReferrer > xReferrer;
@@ -81,7 +81,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference
          // pretend we converted the imported string address into the
          // appropriate address structure
          uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellAddressConversion"), uno::UNO_QUERY );
-         table::CellAddress aAddress;
+         css::table::CellAddress aAddress;
          if ( xConvertor.is() )
          {
              // we need this service to properly convert XL notation also
@@ -112,7 +112,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference
          // pretend we converted the imported string address into the
          // appropriate address structure
          uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellRangeAddressConversion"), uno::UNO_QUERY );
-         table::CellRangeAddress aAddress;
+         css::table::CellRangeAddress aAddress;
          if ( xConvertor.is() )
          {
              if ( !lcl_isNamedRange( rsRowSource, xModel, aAddress ) )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 0184419c8c38..c88f10a83a79 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -97,40 +97,40 @@ namespace {
                     , public Wizard_PBase
     {
     public:
-        explicit Wizard( const uno::Reference< uno::XComponentContext >& i_rContext );
+        explicit Wizard( const css::uno::Reference< css::uno::XComponentContext >& i_rContext );
 
         // lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override;
-        virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
         // beans::XPropertySet
-        virtual uno::Reference< beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // ui::dialogs::XWizard
-        virtual OUString SAL_CALL getHelpURL() throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (uno::RuntimeException, std::exception) override;
-        virtual uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() throw (uno::RuntimeException, std::exception) override;
-        virtual uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage(  ) throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) throw (uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL travelNext(  ) throw (uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL travelPrevious(  ) throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) throw (container::NoSuchElementException, util::InvalidStateException, uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTravelUI(  ) throw (uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) throw (uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) throw (container::NoSuchElementException, util::InvalidStateException, uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getHelpURL() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL travelNext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL travelPrevious(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateTravelUI(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
 
         // ui::dialogs::XExecutableDialog
-        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL execute(  ) throw (uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // lang::XInitialization
-        virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
    protected:
         virtual ~Wizard();
@@ -140,8 +140,8 @@ namespace {
         virtual void destroyDialog() override;
 
     private:
-        uno::Sequence< uno::Sequence< sal_Int16 > >         m_aWizardSteps;
-        uno::Reference< ui::dialogs::XWizardController >    m_xController;
+        css::uno::Sequence< css::uno::Sequence< sal_Int16 > >         m_aWizardSteps;
+        css::uno::Reference< ui::dialogs::XWizardController >    m_xController;
         OUString                                            m_sHelpURL;
     };
 
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index cb4ba74454a1..1d00f00b0229 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1142,9 +1142,9 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r
                 double fY =-dx * sin( a );
                 rReturnPosition =
                     Point(
-                        Round( fX + aReferencePoint.X() ),
+                        svx::Round( fX + aReferencePoint.X() ),
                         basegfx::fTools::equalZero(fXScale) ? aReferencePoint.Y() :
-                        Round( ( fY * fYScale ) / fXScale + aReferencePoint.Y() ) );
+                        svx::Round( ( fY * fYScale ) / fXScale + aReferencePoint.Y() ) );
             }
             else
             {
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index b1d59bf1ae1f..307454051047 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -265,7 +265,6 @@ using namespace ::com::sun::star::form::runtime;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::script;
 using namespace ::svxform;
 using namespace ::svx;
@@ -675,14 +674,14 @@ FmXFormShell::~FmXFormShell()
 }
 
 
-Reference< XModel > FmXFormShell::getContextDocument() const
+Reference< css::frame::XModel > FmXFormShell::getContextDocument() const
 {
-    Reference< XModel > xModel;
+    Reference< css::frame::XModel > xModel;
 
     // determine the type of document we live in
     try
     {
-        Reference< XController > xController;
+        Reference< css::frame::XController > xController;
         if ( m_xAttachedFrame.is() )
             xController = m_xAttachedFrame->getController();
         if ( xController.is() )
@@ -719,7 +718,7 @@ bool FmXFormShell::impl_checkDisposed() const
         return m_eDocumentType;
 
     // determine the type of document we live in
-    Reference< XModel > xModel = getContextDocument();
+    Reference< css::frame::XModel > xModel = getContextDocument();
     if ( xModel.is() )
         m_eDocumentType = DocumentClassification::classifyDocument( xModel );
     else
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 89a608b80a82..9b787da6af25 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -72,7 +72,6 @@ namespace svx
 
     using namespace ::com::sun::star;
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::form::runtime;
     using namespace ::com::sun::star::lang;
@@ -160,16 +159,16 @@ namespace svx
         0
     };
 
-    typedef ::cppu::WeakImplHelper <   XFocusListener
+    typedef ::cppu::WeakImplHelper <   css::awt::XFocusListener
                                     >   FmFocusListenerAdapter_Base;
     class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base
     {
     private:
         IFocusObserver*         m_pObserver;
-        Reference< XWindow >    m_xWindow;
+        Reference< css::awt::XWindow >    m_xWindow;
 
     public:
-        FmFocusListenerAdapter( const Reference< XControl >& _rxControl, IFocusObserver* _pObserver );
+        FmFocusListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IFocusObserver* _pObserver );
 
         // clean up the instance
         void    dispose();
@@ -178,14 +177,14 @@ namespace svx
         virtual ~FmFocusListenerAdapter();
 
     protected:
-        virtual void SAL_CALL focusGained( const FocusEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL focusLost( const FocusEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
         virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
     };
 
 
 
-    FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< XControl >& _rxControl, IFocusObserver* _pObserver )
+    FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IFocusObserver* _pObserver )
         :m_pObserver( _pObserver )
         ,m_xWindow( _rxControl, UNO_QUERY )
     {
@@ -225,14 +224,14 @@ namespace svx
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusGained( const FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
     {
         if ( m_pObserver )
             m_pObserver->focusGained( e );
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusLost( const FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
     {
         if ( m_pObserver )
             m_pObserver->focusLost( e );
@@ -246,16 +245,16 @@ namespace svx
         m_xWindow.clear();
     }
 
-    typedef ::cppu::WeakImplHelper <   XMouseListener
+    typedef ::cppu::WeakImplHelper <   css::awt::XMouseListener
                                     >   FmMouseListenerAdapter_Base;
     class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base
     {
     private:
         IContextRequestObserver*  m_pObserver;
-        Reference< XWindow >    m_xWindow;
+        Reference< css::awt::XWindow >    m_xWindow;
 
     public:
-        FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver );
+        FmMouseListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IContextRequestObserver* _pObserver );
 
         // clean up the instance
         void    dispose();
@@ -264,14 +263,14 @@ namespace svx
         virtual ~FmMouseListenerAdapter();
 
     protected:
-        virtual void SAL_CALL mousePressed( const awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseExited( const awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
         virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
     };
 
-    FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver )
+    FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IContextRequestObserver* _pObserver )
         :m_pObserver( _pObserver )
         ,m_xWindow( _rxControl, UNO_QUERY )
     {
@@ -311,7 +310,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
     {
         SolarMutexGuard aGuard;
         // is this a request for a context menu?
@@ -323,19 +322,19 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
     {
         // not interested in
     }
@@ -455,7 +454,7 @@ namespace svx
         }
 
 
-        bool lcl_determineReadOnly( const Reference< XControl >& _rxControl )
+        bool lcl_determineReadOnly( const Reference< css::awt::XControl >& _rxControl )
         {
             bool bIsReadOnlyModel = true;
             try
@@ -484,12 +483,12 @@ namespace svx
         }
 
 
-        static vcl::Window* lcl_getWindow( const Reference< XControl >& _rxControl )
+        static vcl::Window* lcl_getWindow( const Reference< css::awt::XControl >& _rxControl )
         {
             vcl::Window* pWindow = nullptr;
             try
             {
-                Reference< XWindowPeer > xControlPeer;
+                Reference< css::awt::XWindowPeer > xControlPeer;
                 if ( _rxControl.is() )
                     xControlPeer = _rxControl->getPeer();
                 if ( xControlPeer.is() )
@@ -504,7 +503,7 @@ namespace svx
         }
 
 
-        bool lcl_isRichText( const Reference< XControl >& _rxControl )
+        bool lcl_isRichText( const Reference< css::awt::XControl >& _rxControl )
         {
             if ( !_rxControl.is() )
                 return false;
@@ -758,7 +757,7 @@ namespace svx
             if ( m_xActiveTextComponent.is() )
             {
                 sal_Int32 nTextLen = m_xActiveTextComponent->getText().getLength();
-                m_xActiveTextComponent->setSelection( awt::Selection( 0, nTextLen ) );
+                m_xActiveTextComponent->setSelection( css::awt::Selection( 0, nTextLen ) );
                 return true;
             }
         }
@@ -785,7 +784,7 @@ namespace svx
                     ::svt::OStringTransfer::CopyString( sSelectedText, lcl_getWindow( m_xActiveControl ) );
                     if ( SID_CUT == _nSlot )
                     {
-                        awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
+                        css::awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
                         m_xActiveTextComponent->insertText( aSelection, OUString() );
                     }
                 }
@@ -794,7 +793,7 @@ namespace svx
                 {
                     OUString sClipboardContent;
                     OSL_VERIFY( ::svt::OStringTransfer::PasteString( sClipboardContent, lcl_getWindow( m_xActiveControl ) ) );
-                    awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
+                    css::awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
                     m_xActiveTextComponent->insertText( aSelection, sClipboardContent );
                 }
                 break;
@@ -1008,7 +1007,7 @@ namespace svx
 
                 if ( !bDisable && bNeedSelection )
                 {
-                    awt::Selection aSelection = m_xActiveTextComponent->getSelection();
+                    css::awt::Selection aSelection = m_xActiveTextComponent->getSelection();
                     bDisable |= aSelection.Min == aSelection.Max;
                 }
 
@@ -1102,12 +1101,12 @@ namespace svx
 
         try
         {
-            Sequence< Reference< XControl > > aControls( _rxController->getControls() );
+            Sequence< Reference< css::awt::XControl > > aControls( _rxController->getControls() );
             m_aControlObservers.resize( 0 );
             m_aControlObservers.reserve( aControls.getLength() );
 
-            const Reference< XControl >* pControls = aControls.getConstArray();
-            const Reference< XControl >* pControlsEnd = pControls + aControls.getLength();
+            const Reference< css::awt::XControl >* pControls = aControls.getConstArray();
+            const Reference< css::awt::XControl >* pControlsEnd = pControls + aControls.getLength();
             for ( ; pControls != pControlsEnd; ++pControls )
             {
                 m_aControlObservers.push_back( FocusListenerAdapter( new FmFocusListenerAdapter( *pControls, this ) ) );
@@ -1186,7 +1185,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::controlActivated( const Reference< XControl >& _rxControl )
+    void FmTextControlShell::controlActivated( const Reference< css::awt::XControl >& _rxControl )
     {
         // ensure that all knittings with the previously active control are lost
         if ( m_xActiveControl.is() )
@@ -1195,14 +1194,14 @@ namespace svx
 
 #if OSL_DEBUG_LEVEL > 0
         {
-            Sequence< Reference< XControl > > aActiveControls;
+            Sequence< Reference< css::awt::XControl > > aActiveControls;
             if ( m_xActiveController.is() )
                 aActiveControls = m_xActiveController->getControls();
 
             bool bFoundThisControl = false;
 
-            const Reference< XControl >* pControls = aActiveControls.getConstArray();
-            const Reference< XControl >* pControlsEnd = pControls + aActiveControls.getLength();
+            const Reference< css::awt::XControl >* pControls = aActiveControls.getConstArray();
+            const Reference< css::awt::XControl >* pControlsEnd = pControls + aActiveControls.getLength();
             for ( ; ( pControls != pControlsEnd ) && !bFoundThisControl; ++pControls )
             {
                 if ( *pControls == _rxControl )
@@ -1262,7 +1261,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::fillFeatureDispatchers(const Reference< XControl >& _rxControl, SfxSlotId* _pZeroTerminatedSlots,
+    void FmTextControlShell::fillFeatureDispatchers(const Reference< css::awt::XControl >& _rxControl, SfxSlotId* _pZeroTerminatedSlots,
             ControlFeatures& _rDispatchers)
     {
         Reference< XDispatchProvider > xProvider( _rxControl, UNO_QUERY );
@@ -1325,7 +1324,7 @@ namespace svx
 
     void FmTextControlShell::focusGained( const css::awt::FocusEvent& _rEvent )
     {
-        Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
+        Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY );
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusGained: 0x" );
@@ -1341,7 +1340,7 @@ namespace svx
 
     void FmTextControlShell::focusLost( const css::awt::FocusEvent& _rEvent )
     {
-        Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
+        Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY );
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusLost: 0x" );
@@ -1359,7 +1358,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::contextMenuRequested( const awt::MouseEvent& /*_rEvent*/ )
+    void FmTextControlShell::contextMenuRequested( const css::awt::MouseEvent& /*_rEvent*/ )
     {
         m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) );
     }
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index 0a4b5aafe2b4..2c852ac21001 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -34,7 +34,7 @@ namespace svx { namespace sidebar {
 
 SelectionChangeHandler::SelectionChangeHandler (
     const std::function<rtl::OUString()>& rSelectionChangeCallback,
-    const Reference<frame::XController>& rxController,
+    const Reference<css::frame::XController>& rxController,
     const EnumContext::Context eDefaultContext)
     : SelectionChangeHandlerInterfaceBase(m_aMutex),
       maSelectionChangeCallback(rSelectionChangeCallback),
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index c0e4649aa067..b27c520cf294 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -131,7 +131,7 @@ IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEven
             return;
     }
 
-    Reference<frame::XSubToolbarController> xController (pSidebarToolBox->GetControllerForItemId(nItemId), UNO_QUERY);
+    Reference<css::frame::XSubToolbarController> xController (pSidebarToolBox->GetControllerForItemId(nItemId), UNO_QUERY);
     if ( ! xController.is() )
         return;
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 77f67e9602d4..ebf7bf41fd1a 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -59,7 +59,7 @@ namespace svx { namespace sidebar {
 
 LinePropertyPanel::LinePropertyPanel(
     vcl::Window* pParent,
-    const uno::Reference<frame::XFrame>& rxFrame,
+    const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 :   LinePropertyPanelBase(pParent, rxFrame),
     maStyleControl(SID_ATTR_LINE_STYLE, *pBindings, *this),
@@ -105,7 +105,7 @@ void LinePropertyPanel::Initialize()
 
 VclPtr<vcl::Window> LinePropertyPanel::Create (
     vcl::Window* pParent,
-    const uno::Reference<frame::XFrame>& rxFrame,
+    const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 {
     if (pParent == nullptr)
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 2c6958e84aa2..9890d6211c2f 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -166,7 +166,7 @@ namespace svx { namespace sidebar {
 
 LinePropertyPanelBase::LinePropertyPanelBase(
     vcl::Window* pParent,
-    const uno::Reference<frame::XFrame>& rxFrame)
+    const uno::Reference<css::frame::XFrame>& rxFrame)
 :   PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame),
     mpStyleItem(),
     mpDashItem(),
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 812229bf2acf..abaac42e8878 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -70,7 +70,7 @@ namespace svx { namespace sidebar {
 
 ShadowPropertyPanel::ShadowPropertyPanel(
     vcl::Window* pParent,
-    const uno::Reference<frame::XFrame>& rxFrame,
+    const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 :   PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame),
     maShadowController(SID_ATTR_FILL_SHADOW, *pBindings, *this),
@@ -358,7 +358,7 @@ void ShadowPropertyPanel::NotifyItemUpdate(
 
 VclPtr<vcl::Window> ShadowPropertyPanel::Create (
     vcl::Window* pParent,
-    const uno::Reference<frame::XFrame>& rxFrame,
+    const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 {
     if(pParent == nullptr)
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 863f8d48fd60..961e084b125d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -578,7 +578,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
         aCtr1 -= aCtr0;
 
         if(bRotOk)
-            pO->Rotate(aCtr0, Round(nAngle/nPi180), nSin, nCos);
+            pO->Rotate(aCtr0, svx::Round(nAngle/nPi180), nSin, nCos);
 
         pO->Move(Size(aCtr1.X(),aCtr1.Y()));
     }
@@ -1572,7 +1572,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
                     double nNew=tan((double)nNewShearAngle*nPi180);
                     nNew-=nOld;
                     nNew=atan(nNew)/nPi180;
-                    nShearAngle=Round(nNew);
+                    nShearAngle=svx::Round(nNew);
                 } else {
                     nShearAngle=nNewShearAngle-nOldShearAngle;
                 }
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index b0a8c62341df..eee1101c59c6 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -60,7 +60,7 @@ Point GetAnglePnt(const Rectangle& rR, long nAngle)
     long nMaxRad=((nWdt>nHgt ? nWdt : nHgt)+1) /2;
     double a;
     a=nAngle*nPi180;
-    Point aRetval(Round(cos(a)*nMaxRad),-Round(sin(a)*nMaxRad));
+    Point aRetval(svx::Round(cos(a)*nMaxRad),-svx::Round(sin(a)*nMaxRad));
     if (nWdt==0) aRetval.X()=0;
     if (nHgt==0) aRetval.Y()=0;
     if (nWdt!=nHgt) {
@@ -883,13 +883,13 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
         double a;
         // starting point
         a=nStartAngle*nPi180;
-        aTmpPt1=Point(Round(cos(a)*nMaxRad),-Round(sin(a)*nMaxRad));
+        aTmpPt1=Point(svx::Round(cos(a)*nMaxRad),-svx::Round(sin(a)*nMaxRad));
         if (nWdt==0) aTmpPt1.X()=0;
         if (nHgt==0) aTmpPt1.Y()=0;
         aTmpPt1+=aCenter;
         // finishing point
         a=nEndAngle*nPi180;
-        aTmpPt2=Point(Round(cos(a)*nMaxRad),-Round(sin(a)*nMaxRad));
+        aTmpPt2=Point(svx::Round(cos(a)*nMaxRad),-svx::Round(sin(a)*nMaxRad));
         if (nWdt==0) aTmpPt2.X()=0;
         if (nHgt==0) aTmpPt2.Y()=0;
         aTmpPt2+=aCenter;
@@ -1001,7 +1001,7 @@ void SdrCircObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
         }
     }
     if (aGeo.nShearAngle!=0) {
-        long nDst=Round((rRect.Bottom()-rRect.Top())*aGeo.nTan);
+        long nDst=svx::Round((rRect.Bottom()-rRect.Top())*aGeo.nTan);
         if (aGeo.nShearAngle>0) {
             Point aRef(rRect.TopLeft());
             rRect.Left()-=nDst;
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5f65f17e8d33..3dc86c494113 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -486,14 +486,14 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
     long nOverhang=rRec.nHelplineOverhang;
     long nHelplineDist=rRec.nHelplineDist;
 
-    long dx= Round(nLineDist*nHlpCos);
-    long dy=-Round(nLineDist*nHlpSin);
-    long dxh1a= Round((nHelplineDist-rRec.nHelpline1Len)*nHlpCos);
-    long dyh1a=-Round((nHelplineDist-rRec.nHelpline1Len)*nHlpSin);
-    long dxh1b= Round((nHelplineDist-rRec.nHelpline2Len)*nHlpCos);
-    long dyh1b=-Round((nHelplineDist-rRec.nHelpline2Len)*nHlpSin);
-    long dxh2= Round((nLineDist+nOverhang)*nHlpCos);
-    long dyh2=-Round((nLineDist+nOverhang)*nHlpSin);
+    long dx= svx::Round(nLineDist*nHlpCos);
+    long dy=-svx::Round(nLineDist*nHlpSin);
+    long dxh1a= svx::Round((nHelplineDist-rRec.nHelpline1Len)*nHlpCos);
+    long dyh1a=-svx::Round((nHelplineDist-rRec.nHelpline1Len)*nHlpSin);
+    long dxh1b= svx::Round((nHelplineDist-rRec.nHelpline2Len)*nHlpCos);
+    long dyh1b=-svx::Round((nHelplineDist-rRec.nHelpline2Len)*nHlpSin);
+    long dxh2= svx::Round((nLineDist+nOverhang)*nHlpCos);
+    long dyh2=-svx::Round((nLineDist+nOverhang)*nHlpSin);
 
     // extension line 1
     rPol.aHelpline1.aP1=Point(aP1.X()+dxh1a,aP1.Y()+dyh1a);
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 73a57eee16c2..42a0edba9ca1 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -330,18 +330,18 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi
     if (bRet) {
         double cs=cos(nTmpAngle*nPi180);
         double nR=(double)GetLen(Point(dx,dy))/cs/2;
-        nRad=std::abs(Round(nR));
+        nRad=std::abs(svx::Round(nR));
     }
     if (dAngle<18000) {
         nCircStAngle=NormAngle360(nTangAngle-9000);
         nCircRelAngle=NormAngle360(2*dAngle);
-        aCircCenter.X()+=Round(nRad*cos((nTangAngle+9000)*nPi180));
-        aCircCenter.Y()-=Round(nRad*sin((nTangAngle+9000)*nPi180));
+        aCircCenter.X()+=svx::Round(nRad*cos((nTangAngle+9000)*nPi180));
+        aCircCenter.Y()-=svx::Round(nRad*sin((nTangAngle+9000)*nPi180));
     } else {
         nCircStAngle=NormAngle360(nTangAngle+9000);
         nCircRelAngle=-NormAngle360(36000-2*dAngle);
-        aCircCenter.X()+=Round(nRad*cos((nTangAngle-9000)*nPi180));
-        aCircCenter.Y()-=Round(nRad*sin((nTangAngle-9000)*nPi180));
+        aCircCenter.X()+=svx::Round(nRad*cos((nTangAngle-9000)*nPi180));
+        aCircCenter.Y()-=svx::Round(nRad*sin((nTangAngle-9000)*nPi180));
     }
     bAngleSnap=pView!=nullptr && pView->IsAngleSnapEnabled();
     if (bAngleSnap) {
@@ -465,8 +465,8 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
         double sn=sin(a);
         double cs=cos(a);
         double nGKathLen=nHypLen*sn;
-        y+=Round(nGKathLen*sn);
-        x+=Round(nGKathLen*cs);
+        y+=svx::Round(nGKathLen*sn);
+        x+=svx::Round(nGKathLen*cs);
     }
     aRectP2.X()+=x;
     aRectP2.Y()+=y;
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 009164499f4e..56a491229705 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -206,7 +206,7 @@ void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
     rRect = maRect;
     if (aGeo.nShearAngle!=0)
     {
-        long nDst=Round((maRect.Bottom()-maRect.Top())*aGeo.nTan);
+        long nDst=svx::Round((maRect.Bottom()-maRect.Top())*aGeo.nTan);
         if (aGeo.nShearAngle>0)
         {
             Point aRef(rRect.TopLeft());
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index a942fda7b82a..c25d34ceed05 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -43,8 +43,8 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
         long nWdt = rRect.Right() - rRect.Left();
         if (nWdt == 0) rRect.Right()++;
     }
-    rRect.Left()  = rRef.X() + Round( (rRect.Left()  - rRef.X()) * double(xFact) );
-    rRect.Right() = rRef.X() + Round( (rRect.Right() - rRef.X()) * double(xFact) );
+    rRect.Left()  = rRef.X() + svx::Round( (rRect.Left()  - rRef.X()) * double(xFact) );
+    rRect.Right() = rRef.X() + svx::Round( (rRect.Right() - rRef.X()) * double(xFact) );
 
     if (!yFact.IsValid()) {
         SAL_WARN( "svx.svdraw", "invalid fraction yFract, using Fraction(1,1)" );
@@ -52,8 +52,8 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
         long nHgt = rRect.Bottom() - rRect.Top();
         if (nHgt == 0) rRect.Bottom()++;
     }
-    rRect.Top()    = rRef.Y() + Round( (rRect.Top()    - rRef.Y()) * double(yFact) );
-    rRect.Bottom() = rRef.Y() + Round( (rRect.Bottom() - rRef.Y()) * double(yFact) );
+    rRect.Top()    = rRef.Y() + svx::Round( (rRect.Top()    - rRef.Y()) * double(yFact) );
+    rRect.Bottom() = rRef.Y() + svx::Round( (rRect.Bottom() - rRef.Y()) * double(yFact) );
 
     if (!bNoJustify) rRect.Justify();
 }
@@ -175,7 +175,7 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
             // move into the direction of the center, as a basic position for the rotation
             pC1->Y()-=y0;
             // resize, account for the distance from the center
-            pC1->Y()=Round(((double)pC1->Y()) /rRad.X()*(cx-pC1->X()));
+            pC1->Y()=svx::Round(((double)pC1->Y()) /rRad.X()*(cx-pC1->X()));
             pC1->Y()+=cy;
         } else {
             // move into the direction of the center, as a basic position for the rotation
@@ -183,7 +183,7 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
             // resize, account for the distance from the center
             long nPntRad=cy-pC1->Y();
             double nFact=(double)nPntRad/(double)rRad.Y();
-            pC1->X()=Round((double)pC1->X()*nFact);
+            pC1->X()=svx::Round((double)pC1->X()*nFact);
             pC1->X()+=cx;
         }
         RotatePoint(*pC1,rCenter,sn,cs);
@@ -193,7 +193,7 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
             // move into the direction of the center, as a basic position for the rotation
             pC2->Y()-=y0;
             // resize, account for the distance from the center
-            pC2->Y()=Round(((double)pC2->Y()) /rRad.X()*(rCenter.X()-pC2->X()));
+            pC2->Y()=svx::Round(((double)pC2->Y()) /rRad.X()*(rCenter.X()-pC2->X()));
             pC2->Y()+=cy;
         } else {
             // move into the direction of the center, as a basic position for the rotation
@@ -201,7 +201,7 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
             // resize, account for the distance from the center
             long nPntRad=rCenter.Y()-pC2->Y();
             double nFact=(double)nPntRad/(double)rRad.Y();
-            pC2->X()=Round((double)pC2->X()*nFact);
+            pC2->X()=svx::Round((double)pC2->X()*nFact);
             pC2->X()+=cx;
         }
         RotatePoint(*pC2,rCenter,sn,cs);
@@ -280,7 +280,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
         long dy=rPnt.Y()-y0;
         double a=((double)(y0-nTop))/nHgt;
         a*=dy;
-        rPnt.Y()=y0+Round(a);
+        rPnt.Y()=y0+svx::Round(a);
     } return 0.0;
 }
 
@@ -392,7 +392,7 @@ long GetAngle(const Point& rPnt)
         if (rPnt.Y()>0) a=-9000;
         else a=9000;
     } else {
-        a=Round((atan2((double)-rPnt.Y(),(double)rPnt.X())/nPi180));
+        a=svx::Round((atan2((double)-rPnt.Y(),(double)rPnt.X())/nPi180));
     }
     return a;
 }
@@ -429,7 +429,7 @@ long GetLen(const Point& rPnt)
         x*=x;
         y*=y;
         x+=y;
-        x=Round(sqrt((double)x));
+        x=svx::Round(sqrt((double)x));
         return x;
     } else {
         double nx=x;
@@ -441,7 +441,7 @@ long GetLen(const Point& rPnt)
         if (nx>0x7FFFFFFF) {
             return 0x7FFFFFFF; // we can't go any further, for fear of an overrun!
         } else {
-            return Round(nx);
+            return svx::Round(nx);
         }
     }
 }
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index cdfb086f0de0..0d68e606dba5 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -44,11 +44,6 @@
 #include "colorwindow.hxx"
 #include "extrusiondepthdialog.hxx"
 
-
-
-//using ::svtools::ToolbarMenu;
-
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
@@ -242,7 +237,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
     const Reference< XComponentContext >& rxContext
 )   : svt::PopupWindowController(
         rxContext,
-        Reference< frame::XFrame >(),
+        Reference< css::frame::XFrame >(),
         OUString( ".uno:ExtrusionDirectionFloater" )
     )
 {
@@ -486,7 +481,7 @@ ExtrusionDepthController::ExtrusionDepthController(
     const Reference< XComponentContext >& rxContext
 )   : svt::PopupWindowController(
         rxContext,
-        Reference< frame::XFrame >(),
+        Reference< css::frame::XFrame >(),
         OUString( ".uno:ExtrusionDepthFloater" )
     )
 {
@@ -759,7 +754,7 @@ void ExtrusionLightingWindow::SelectHdl(void* pControl)
 ExtrusionLightingControl::ExtrusionLightingControl(
     const Reference< XComponentContext >& rxContext
 )   : svt::PopupWindowController( rxContext,
-                Reference< frame::XFrame >(),
+                Reference< css::frame::XFrame >(),
                 OUString( ".uno:ExtrusionDirectionFloater" )
     )
 {
@@ -903,7 +898,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
 )
 :   svt::PopupWindowController(
         rxContext,
-        Reference< frame::XFrame >(),
+        Reference< css::frame::XFrame >(),
         OUString( ".uno:ExtrusionSurfaceFloater" )
     )
 {
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c0d7cb18205f..23ebb5aee81f 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -57,11 +57,9 @@
 
 using ::svtools::ToolbarMenu;
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
 
 namespace svx
 {
@@ -251,9 +249,9 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*,
 class FontworkAlignmentWindow : public ToolbarMenu
 {
 public:
-    FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
+    FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow );
 
-    virtual void statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException ) override;
 
 private:
     svt::ToolboxController& mrController;
@@ -272,7 +270,7 @@ private:
 };
 
 FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController,
-    const Reference< XFrame >& rFrame, vcl::Window* pParentWindow)
+    const Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow)
     : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK)
     , mrController(rController)
     , maImgAlgin1(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_LEFT))
@@ -305,7 +303,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
     }
 }
 
-void FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException )
+void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException )
 {
     if( Event.FeatureURL.Main.equals( msFontworkAlignment ) )
     {
@@ -362,7 +360,7 @@ public:
 
 
 FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext )
-: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
+: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
 {
 }
 
@@ -426,7 +424,7 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames
 class FontworkCharacterSpacingWindow : public ToolbarMenu
 {
 public:
-    FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
+    FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow );
 
     virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override;
 private:
@@ -443,7 +441,7 @@ private:
 };
 
 FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxController& rController,
-    const Reference< XFrame >& rFrame, vcl::Window* pParentWindow)
+    const Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow)
     : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK)
     , mrController(rController)
     , msFontworkCharacterSpacing(".uno:FontworkCharacterSpacing")
@@ -598,7 +596,7 @@ public:
 
 
 FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Reference< XComponentContext >& rxContext )
-: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) )
+: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) )
 {
 }
 
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index c37f49086953..6c825bd1f86c 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -500,8 +500,8 @@ Moderator::Moderator(
     const Command& rArg
 )
     throw(
-        ::com::sun::star::ucb::ContentCreationException,
-        ::com::sun::star::uno::RuntimeException
+        css::ucb::ContentCreationException,
+        css::uno::RuntimeException
     )
     : m_aMutex(),
 
@@ -1131,7 +1131,7 @@ bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInputSt
             if( !m_xSeekable.is() && rxInputStream.is() )
             {
                 Reference < XComponentContext > xContext = ::comphelper::getProcessComponentContext();
-                Reference< XOutputStream > rxTempOut( TempFile::create(xContext), UNO_QUERY_THROW );
+                Reference< XOutputStream > rxTempOut( css::io::TempFile::create(xContext), UNO_QUERY_THROW );
 
                 ::comphelper::OStorageHelper::CopyInputToOutput( rxInputStream, rxTempOut );
                 m_xInputStream.set( rxTempOut, UNO_QUERY );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 11098986f9dc..4025b7738f16 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
                 ::ucbhelper::Content aCnt(
                     rFileName, Reference < XCommandEnvironment >(),
                     comphelper::getProcessComponentContext() );
-                aCnt.executeCommand( "delete", makeAny( true ) );
+                aCnt.executeCommand( "delete", css::uno::makeAny( true ) );
             }
 
             catch ( const CommandAbortedException& )