com::sun::star->css in include/sot to include/typelib

Change-Id: I9cd92b53370a6b6018d2f7c648890f9c014a27de

36 files changed, 195 insertions, 213 deletions

diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx
index 06cf311d6bd5..ca048ed85924 100644
--- a/include/svl/PasswordHelper.hxx
+++ b/include/svl/PasswordHelper.hxx
@@ -26,19 +26,19 @@
 
 class SvPasswordHelper
 {
-    static void     GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
-    static void     GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+    static void     GetHashPasswordLittleEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+    static void     GetHashPasswordBigEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
 
 public:
-    SVL_DLLPUBLIC static void     GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
+    SVL_DLLPUBLIC static void     GetHashPassword(css::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
 
-    SVL_DLLPUBLIC static void     GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+    SVL_DLLPUBLIC static void     GetHashPassword(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
     /**
     Use this method to compare a given string with another given Hash value.
     This is necessary, because in older versions exists different hashes of the same string. They were endian dependent.
     We need this to handle old files. This method will compare against big and little endian. See #101326#
     */
-    SVL_DLLPUBLIC static bool     CompareHashPassword(const com::sun::star::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass);
+    SVL_DLLPUBLIC static bool     CompareHashPassword(const css::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass);
 };
 
 #endif
diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 127eb009a973..738d127933e4 100644
--- a/include/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
@@ -48,15 +48,14 @@ public:
 
     void SetCharDistanceCompression(sal_Int16 value);
 
-    com::sun::star::uno::Sequence< com::sun::star::lang::Locale >
-    GetStartEndCharLocales() const;
+    css::uno::Sequence< css::lang::Locale > GetStartEndCharLocales() const;
 
     bool GetStartEndChars(
-        com::sun::star::lang::Locale const & locale, OUString & startChars,
+        css::lang::Locale const & locale, OUString & startChars,
         OUString & endChars) const;
 
     void SetStartEndChars(
-        com::sun::star::lang::Locale const & locale,
+        css::lang::Locale const & locale,
         OUString const * startChars, OUString const * endChars);
 
 private:
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 52360c7a6524..a14f0c77b9b3 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -42,9 +42,9 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const override;
+    virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 ) override;
+    virtual bool PutValue(const css::uno::Any & rVal, sal_uInt8 ) override;
 
     virtual sal_uInt16 GetValueCount() const = 0;
 
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index 788c609e77d7..1ea75ae8e07f 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -48,10 +48,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue(css::uno::Any& rVal,
                             sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue(const css::uno::Any& rVal,
                           sal_uInt8 nMemberId) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -98,10 +98,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue(css::uno::Any& rVal,
                             sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue(const css::uno::Any& rVal,
                           sal_uInt8 nMemberId) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -148,10 +148,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue(css::uno::Any& rVal,
                             sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue(const css::uno::Any& rVal,
                           sal_uInt8 nMemberId) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -198,10 +198,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue(css::uno::Any& rVal,
                             sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue(const css::uno::Any& rVal,
                           sal_uInt8 nMemberId) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index a7401fd84694..991a8036ec08 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -49,16 +49,16 @@ public:
     virtual SvStream&       Store( SvStream&, sal_uInt16 nItemVersion ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const override;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool            QueryValue( css::uno::Any& rVal,
                                          sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual bool            PutValue  ( const css::uno::Any& rVal,
                                          sal_uInt8 nMemberId ) override;
 
     void                    SetBitmapURL( const OUString& rURL ) { _aURL = rURL; }
     void                    SetColor( Color nColor ) { _nColor = nColor; }
     void                    SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; }
 
-    const OUString&    GetBitmapURL() const { return _aURL; }
+    const OUString&         GetBitmapURL() const { return _aURL; }
     Color                   GetColor() const { return _nColor; }
     sal_uInt16              GetStyle() const { return _nStyle; }
 };
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 37d8bdc0028d..bd72434ae87f 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -55,9 +55,9 @@ public:
                                                  OUString & rText,
                                                  const IntlWrapper* pIntlWrapper = 0 ) const override;
 
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue( css::uno::Any& rVal,
                              sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue  ( const css::uno::Any& rVal,
                              sal_uInt8 nMemberId ) override;
 
     INetContentType GetEnumValue() const;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index ee365efb3aa4..4c59264de5e1 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -52,10 +52,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue(css::uno::Any& rVal,
                             sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) override;
+    virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
 
     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 23403c85dbcd..b658dccf8c29 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -37,9 +37,9 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
     // the workaround for automated testing!
     static bool m_bAllowInteraction;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream();
+    css::uno::Reference< css::io::XInputStream > OpenStream();
 
-    void WriteEntryToStream( const LockFileEntry& aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream );
+    void WriteEntryToStream( const LockFileEntry& aEntry, css::uno::Reference< css::io::XOutputStream > xStream );
 
 public:
     DocumentLockFile( const OUString& aOrigURL );
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 7c0d8de411cb..46c8534327ea 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -94,11 +94,9 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0)
-        const override;
+    virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
-        override;
+    virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override;
 
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 4144e05bc1dc..3e552c2e40e6 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -38,9 +38,9 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
     SvGlobalName            GetValue() const { return m_aName; }
 
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual bool            PutValue  ( const css::uno::Any& rVal,
                                         sal_uInt8 nMemberId ) override;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool            QueryValue( css::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) const override;
 };
 
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 9b9e9375bd9f..64410a8e0196 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -27,28 +27,28 @@
 
 class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem
 {
-    ::com::sun::star::uno::Sequence < sal_Int32 > m_aList;
+    css::uno::Sequence < sal_Int32 > m_aList;
 
 public:
     TYPEINFO_OVERRIDE();
 
     SfxIntegerListItem();
     SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
-    SfxIntegerListItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Sequence < sal_Int32 >& rList );
+    SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList );
     SfxIntegerListItem( const SfxIntegerListItem& rItem );
     virtual ~SfxIntegerListItem();
 
-    ::com::sun::star::uno::Sequence < sal_Int32 > GetSequence()
+    css::uno::Sequence < sal_Int32 > GetSequence()
     { return m_aList; }
-    ::com::sun::star::uno::Sequence < sal_Int32 > GetConstSequence() const
+    css::uno::Sequence < sal_Int32 > GetConstSequence() const
     { return (const_cast< SfxIntegerListItem * >(this))->GetSequence(); }
 
     void                    GetList( ::std::vector < sal_Int32 >& rList ) const;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue  ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 };
 
 #endif // INCLUDED_SVL_ILSTITEM_HXX
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 0ec2b775a47e..a6bfd1d09176 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -35,8 +35,8 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     void                    SetRotation( long nValue );
     long                    GetRotation() const;
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index 07188cdf49b3..1e64eda2aecf 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -34,12 +34,10 @@ class SvDataPipe_Impl;
 
 class SVL_DLLPUBLIC SvInputStream: public SvStream
 {
-    com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
-        m_xStream;
-    com::sun::star::uno::Reference< com::sun::star::io::XSeekable >
-        m_xSeekable;
-    SvDataPipe_Impl * m_pPipe;
-    sal_uInt64 m_nSeekedFrom;
+    css::uno::Reference< css::io::XInputStream >   m_xStream;
+    css::uno::Reference< css::io::XSeekable >      m_xSeekable;
+    SvDataPipe_Impl *                              m_pPipe;
+    sal_uInt64                                     m_nSeekedFrom;
 
     SVL_DLLPRIVATE bool open();
 
@@ -54,10 +52,7 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream
     SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
 
 public:
-    SvInputStream(
-        com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
-                const &
-            rTheStream);
+    SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream );
 
     virtual ~SvInputStream();
 };
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index b5f36c0564e7..feb0734e77d9 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -31,10 +31,10 @@ public:
         OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const override;
 
     virtual bool QueryValue(
-        com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+        css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 
     virtual bool PutValue(
-        const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+        const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const override;
 
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 3b9d4bf37f80..9ecbfce68b2d 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -65,10 +65,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue( css::uno::Any& rVal,
                              sal_uInt8 nMemberId = 0 ) const override;
 
-    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue( const css::uno::Any& rVal,
                            sal_uInt8 nMemberId ) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 2c68dfa7718e..56a82d9af91e 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -32,8 +32,8 @@ struct SfxItemPropertyMapEntry
 {
     OUString                            aName; ///< name of property
     sal_uInt16                          nWID;  ///< WhichId of SfxPoolItem
-    com::sun::star::uno::Type           aType; ///< UNO type of property
-    /// flag bitmap, @see com::sun::star::beans::PropertyAttribute
+    css::uno::Type                      aType; ///< UNO type of property
+    /// flag bitmap, @see css::beans::PropertyAttribute
     long                                nFlags;
     /// "member ID" to tell QueryValue/PutValue which property it is
     /// (when multiple properties map to the same nWID)
@@ -44,7 +44,7 @@ struct SfxItemPropertyMapEntry
 struct SfxItemPropertySimpleEntry
 {
     sal_uInt16                          nWID;
-    com::sun::star::uno::Type           aType;
+    css::uno::Type                      aType;
     long                                nFlags;
     sal_uInt8                           nMemberId;
 
@@ -55,7 +55,7 @@ struct SfxItemPropertySimpleEntry
         {
         }
 
-    SfxItemPropertySimpleEntry(sal_uInt16 _nWID, com::sun::star::uno::Type const & _rType,
+    SfxItemPropertySimpleEntry(sal_uInt16 _nWID, css::uno::Type const & _rType,
                                long _nFlags, sal_uInt8 _nMemberId)
         : nWID(      _nWID )
         , aType(     _rType )
@@ -94,12 +94,12 @@ public:
     ~SfxItemPropertyMap();
 
     const SfxItemPropertySimpleEntry*  getByName( const OUString &rName ) const;
-    com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const;
-    com::sun::star::beans::Property getPropertyByName( const OUString & rName ) const
-        throw( ::com::sun::star::beans::UnknownPropertyException );
+    css::uno::Sequence< css::beans::Property > getProperties() const;
+    css::beans::Property getPropertyByName( const OUString & rName ) const
+        throw( css::beans::UnknownPropertyException );
     bool hasPropertyByName( const OUString& rName ) const;
 
-    void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq );
+    void mergeProperties( const css::uno::Sequence< css::beans::Property >& rPropSeq );
     PropertyEntryVector_t getPropertyEntries() const;
     sal_uInt32 getSize() const;
 
@@ -107,8 +107,8 @@ public:
 
 class SVL_DLLPUBLIC SfxItemPropertySet
 {
-    SfxItemPropertyMap                                                              m_aMap;
-    mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
+    SfxItemPropertyMap                                        m_aMap;
+    mutable css::uno::Reference<css::beans::XPropertySetInfo> m_xInfo;
 
 public:
                             SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
@@ -117,45 +117,44 @@ public:
 
     void getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
                                           const SfxItemSet& rSet,
-                                          com::sun::star::uno::Any& rAny) const
-                                          throw(::com::sun::star::uno::RuntimeException);
+                                          css::uno::Any& rAny) const
+                                          throw(css::uno::RuntimeException);
     void getPropertyValue( const OUString &rName,
                                             const SfxItemSet& rSet,
-                                            com::sun::star::uno::Any& rAny) const
-                                            throw(::com::sun::star::uno::RuntimeException,
-                                                    ::com::sun::star::beans::UnknownPropertyException);
-    com::sun::star::uno::Any
+                                            css::uno::Any& rAny) const
+                                            throw(css::uno::RuntimeException,
+                                                    css::beans::UnknownPropertyException);
+    css::uno::Any
         getPropertyValue( const OUString &rName,
                                             const SfxItemSet& rSet ) const
-                                            throw(::com::sun::star::uno::RuntimeException,
-                                                    ::com::sun::star::beans::UnknownPropertyException);
+                                            throw(css::uno::RuntimeException,
+                                                    css::beans::UnknownPropertyException);
     void                setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
-                                          const com::sun::star::uno::Any& aVal,
+                                          const css::uno::Any& aVal,
                                           SfxItemSet& rSet ) const
-                                          throw(::com::sun::star::uno::RuntimeException,
-                                                  com::sun::star::lang::IllegalArgumentException);
+                                          throw(css::uno::RuntimeException,
+                                                  css::lang::IllegalArgumentException);
     void                  setPropertyValue( const OUString& rPropertyName,
-                                            const com::sun::star::uno::Any& aVal,
+                                            const css::uno::Any& aVal,
                                             SfxItemSet& rSet ) const
-                                            throw(::com::sun::star::uno::RuntimeException,
-                                                    com::sun::star::lang::IllegalArgumentException,
-                                                    ::com::sun::star::beans::UnknownPropertyException);
+                                            throw(css::uno::RuntimeException,
+                                                    css::lang::IllegalArgumentException,
+                                                    css::beans::UnknownPropertyException);
 
-    com::sun::star::beans::PropertyState
+    css::beans::PropertyState
         getPropertyState(const OUString& rName, const SfxItemSet& rSet)const
-                                    throw(com::sun::star::beans::UnknownPropertyException);
-    com::sun::star::beans::PropertyState
+                                    throw(css::beans::UnknownPropertyException);
+    css::beans::PropertyState
         getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const
                                     throw();
 
-    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo>
+    css::uno::Reference<css::beans::XPropertySetInfo>
         getPropertySetInfo() const;
     const SfxItemPropertyMap& getPropertyMap() const {return m_aMap;}
 };
 
 struct SfxItemPropertySetInfo_Impl;
-class SVL_DLLPUBLIC SfxItemPropertySetInfo : public
-    cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo>
+class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<css::beans::XPropertySetInfo>
 {
     SfxItemPropertySetInfo_Impl* m_pImpl;
 
@@ -164,41 +163,41 @@ public:
     SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries );
     virtual ~SfxItemPropertySetInfo();
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL
         getProperties(  )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::beans::Property SAL_CALL
+    virtual css::beans::Property SAL_CALL
         getPropertyByName( const OUString& aName )
-            throw(::com::sun::star::beans::UnknownPropertyException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::beans::UnknownPropertyException,
+                    css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
         hasPropertyByName( const OUString& Name )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
 };
 
-class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo >
+class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<css::beans::XPropertySetInfo >
 {
     SfxItemPropertyMap aExtMap;
 public:
                             SfxExtItemPropertySetInfo(
                                 const SfxItemPropertyMapEntry *pMap,
-                                const com::sun::star::uno::Sequence<com::sun::star::beans::Property>& rPropSeq );
+                                const css::uno::Sequence<css::beans::Property>& rPropSeq );
                             virtual ~SfxExtItemPropertySetInfo();
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL
         getProperties(  )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::beans::Property SAL_CALL
+    virtual css::beans::Property SAL_CALL
         getPropertyByName( const OUString& aName )
-            throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
         hasPropertyByName( const OUString& Name )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index 0064395b9cac..92158684a461 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -29,7 +29,7 @@
 // class SvtLanguageOptions ----------------------------------------------------
 
 // these defines can be ORed
-// note these values DO NOT match the values in com::sun::star::i18n::ScriptType
+// note these values DO NOT match the values in css::i18n::ScriptType
 enum class SvtScriptType
 {
     NONE         = 0x00,
@@ -124,7 +124,7 @@ public:
     SvtSystemLanguageOptions();
     virtual ~SvtSystemLanguageOptions();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override;
 
     LanguageType    GetWin16SystemLanguage() const;
 
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index f60d359e9d25..716e8fce8ea9 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -42,9 +42,9 @@ public:
 
     SvLockBytes*            GetValue() const { return _xVal; }
 
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual bool            PutValue  ( const css::uno::Any& rVal,
                                         sal_uInt8 nMemberId ) override;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool            QueryValue( css::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) const override;
 };
 
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index 767df068180b..ce6c435ceef2 100644
--- a/include/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
@@ -55,9 +55,9 @@ public:
     LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix );
     ~LockFileCommon();
 
-    static void ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput );
-    static LockFileEntry ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
-    static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+    static void ParseList( const css::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput );
+    static LockFileEntry ParseEntry( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+    static OUString ParseName( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
     static OUString EscapeCharacters( const OUString& aSource );
     static OUString GetOOOUserName();
     static OUString GetCurrentLocalTime();
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 059ead4f6ec7..4dab2ef8e908 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -37,10 +37,9 @@ namespace comphelper
 
 //  SvNumberFormatterServiceObj must be registered as service somewhere
 
-com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface> SAL_CALL
     SvNumberFormatterServiceObj_NewInstance(
-        const com::sun::star::uno::Reference<
-            com::sun::star::lang::XMultiServiceFactory>& rSMgr );
+        const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr );
 
 
 
@@ -48,8 +47,8 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
 //  construct with SvNumberFormatter
 
 class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
-                                    com::sun::star::util::XNumberFormatsSupplier,
-                                    com::sun::star::lang::XUnoTunnel>
+                                    css::util::XNumberFormatsSupplier,
+                                    css::lang::XUnoTunnel>
 {
 private:
     SvNumFmtSuppl_Impl* pImpl;
@@ -63,21 +62,20 @@ public:
     SvNumberFormatter*          GetNumberFormatter() const;
 
                                 // XNumberFormatsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
                                 getNumberFormatSettings()
-                                    throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL
+                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL
                                 getNumberFormats()
-                                    throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
                                 // 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;
 
-    static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
-    static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference<
-                                    com::sun::star::util::XNumberFormatsSupplier>& rObj );
+    static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
+    static SvNumberFormatsSupplierObj* getImplementation( const css::uno::Reference<
+                                    css::util::XNumberFormatsSupplier>& rObj );
 
     ::comphelper::SharedMutex&  getSharedMutex() const;
 };
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index 9e9ddbb83b7f..8b9f3672da01 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -54,7 +54,7 @@
 
 class OnDemandLocaleDataWrapper
 {
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+            css::uno::Reference< css::uno::XComponentContext > m_xContext;
             SvtSysLocale        aSysLocale;
             LanguageType        eCurrentLanguage;
             LanguageType        eLastAnyLanguage;
@@ -75,7 +75,7 @@ public:
                                         eCurrentLanguage = LANGUAGE_SYSTEM;
                                     }
                                 OnDemandLocaleDataWrapper(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                     const LanguageTag& rLanguageTag
                                     )
                                     : pEnglish(0)
@@ -95,7 +95,7 @@ public:
             bool                isInitialized() const   { return bInitialized; }
 
             void                init(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                     const LanguageTag& rLanguageTag
                                     )
                                     {
@@ -148,8 +148,8 @@ public:
  */
 class OnDemandCalendarWrapper
 {
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-            ::com::sun::star::lang::Locale  aLocale;
+            css::uno::Reference< css::uno::XComponentContext > m_xContext;
+            css::lang::Locale  aLocale;
     mutable CalendarWrapper*    pPtr;
     mutable bool                bValid;
             bool                bInitialized;
@@ -161,8 +161,8 @@ public:
                                     , bInitialized(false)
                                     {}
                                 OnDemandCalendarWrapper(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                                    ::com::sun::star::lang::Locale& rLocale
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                                    css::lang::Locale& rLocale
                                     )
                                     : bValid(false)
                                     , bInitialized(false)
@@ -175,8 +175,8 @@ public:
                                     }
 
             void                init(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                                    const ::com::sun::star::lang::Locale& rLocale
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                                    const css::lang::Locale& rLocale
                                     )
                                     {
                                         m_xContext = rxContext;
@@ -189,7 +189,7 @@ public:
                                         bInitialized = true;
                                     }
 
-            void                changeLocale( const ::com::sun::star::lang::Locale& rLocale )
+            void                changeLocale( const css::lang::Locale& rLocale )
                                     {
                                         bValid = false;
                                         aLocale = rLocale;
@@ -218,9 +218,9 @@ public:
  */
 class OnDemandTransliterationWrapper
 {
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+            css::uno::Reference< css::uno::XComponentContext > m_xContext;
             LanguageType        eLanguage;
-            ::com::sun::star::i18n::TransliterationModules  nType;
+            css::i18n::TransliterationModules  nType;
     mutable ::utl::TransliterationWrapper*  pPtr;
     mutable bool                bValid;
             bool                bInitialized;
@@ -228,15 +228,15 @@ class OnDemandTransliterationWrapper
 public:
                                 OnDemandTransliterationWrapper()
                                     : eLanguage( LANGUAGE_SYSTEM )
-                                    , nType(::com::sun::star::i18n::TransliterationModules_END_OF_MODULE)
+                                    , nType(css::i18n::TransliterationModules_END_OF_MODULE)
                                     , pPtr(0)
                                     , bValid(false)
                                     , bInitialized(false)
                                     {}
                                 OnDemandTransliterationWrapper(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                     LanguageType eLang,
-                                    ::com::sun::star::i18n::TransliterationModules nTypeP
+                                    css::i18n::TransliterationModules nTypeP
                                     )
                                     : bValid(false)
                                     , bInitialized(false)
@@ -251,9 +251,9 @@ public:
             bool                isInitialized() const   { return bInitialized; }
 
             void                init(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                     LanguageType eLang,
-                                    ::com::sun::star::i18n::TransliterationModules nTypeP
+                                    css::i18n::TransliterationModules nTypeP
                                     )
                                     {
                                         m_xContext = rxContext;
@@ -298,9 +298,9 @@ public:
  */
 class OnDemandNativeNumberWrapper
 {
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+            css::uno::Reference< css::uno::XComponentContext > m_xContext;
     mutable NativeNumberWrapper*    pPtr;
-            bool                bInitialized;
+            bool                    bInitialized;
 
 public:
                                 OnDemandNativeNumberWrapper()
@@ -308,7 +308,7 @@ public:
                                     , bInitialized(false)
                                     {}
                                 OnDemandNativeNumberWrapper(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext
                                     )
                                     : pPtr(0)
                                     , bInitialized(false)
@@ -321,7 +321,7 @@ public:
                                     }
 
             void                init(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
+                                    const css::uno::Reference< css::uno::XComponentContext >& rxContext
                                     )
                                     {
                                         m_xContext = rxContext;
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 0239a2f19428..487d133da738 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -31,8 +31,7 @@ namespace com { namespace sun { namespace star { namespace io {
 
 class SVL_DLLPUBLIC SvOutputStream: public SvStream
 {
-    com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >
-        m_xStream;
+    css::uno::Reference< css::io::XOutputStream > m_xStream;
 
     SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override;
 
@@ -45,9 +44,7 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream
     SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
 
 public:
-    SvOutputStream(com::sun::star::uno::Reference<
-                           com::sun::star::io::XOutputStream > const &
-                       rTheStream);
+    SvOutputStream(css::uno::Reference< css::io::XOutputStream > const & rTheStream);
 
     virtual ~SvOutputStream();
 };
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index eb0298c72c0e..78d5c676fca3 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -65,8 +65,8 @@ public:
     SvCommand&      Append( const OUString & rCommand, const OUString & rArg );
     bool        AppendCommands( const OUString & rCmd, sal_Int32 * pEaten );
 
-    bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
-    void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
+    bool FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& );
+    void FillSequence( css::uno::Sequence < css::beans::PropertyValue >& );
 
     size_t          size() const { return aCommandList.size(); }
 
diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx
index 4b848c879118..4291dd04c1bf 100644
--- a/include/svl/pickerhistoryaccess.hxx
+++ b/include/svl/pickerhistoryaccess.hxx
@@ -31,10 +31,10 @@ namespace svt
 
 
     SVL_DLLPUBLIC void addFolderPicker(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker );
+        const css::uno::Reference< css::uno::XInterface >& _rxPicker );
 
     SVL_DLLPUBLIC void addFilePicker(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker );
+        const css::uno::Reference< css::uno::XInterface >& _rxPicker );
 
 
 }   // namespace svt
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 1ea63b91e8b3..f6a7df9b98bf 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -47,7 +47,7 @@ enum SfxItemKind {
 #define CONVERT_TWIPS                       0x80    // Uno conversion for measurement (for MemberId)
 
 // warning, if there is no boolean inside the any this will always return the value false
-inline bool Any2Bool( const ::com::sun::star::uno::Any&rValue )
+inline bool Any2Bool( const css::uno::Any&rValue )
 {
     bool bValue = false;
     if( rValue.hasValue() )
@@ -99,7 +99,7 @@ enum SfxItemPresentation
 
 /**
  * These values have to match the values in the
- * com::sun::star::frame::status::ItemState IDL
+ * css::frame::status::ItemState IDL
  * to be found at offapi/com/sun/star/frame/status/ItemState.idl
 */
 enum class SfxItemState {
@@ -181,8 +181,8 @@ public:
     virtual bool             ScaleMetrics( long lMult, long lDiv );
     virtual bool             HasMetrics() const;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
+    virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId );
 
     virtual SfxPoolItem*     Create( SvStream &, sal_uInt16 nItemVersion ) const;
     virtual SvStream&        Store( SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 27375140415f..92dd2abaa2b1 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -54,9 +54,9 @@ public:
                                  aVal = rNewVal;
                              }
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool             QueryValue( css::uno::Any& rVal,
                                           sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual bool             PutValue( const css::uno::Any& rVal,
                                           sal_uInt8 nMemberId ) override;
 };
 
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index f94215b94d8e..5031f0732f53 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -49,9 +49,9 @@ public:
     virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const override;
 
     const Rectangle&         GetValue() const { return aVal; }
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool             QueryValue( css::uno::Any& rVal,
                                           sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual bool             PutValue( const css::uno::Any& rVal,
                                           sal_uInt8 nMemberId ) override;
 };
 
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index 26ec50702e2a..d622d0e74f3c 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -36,13 +36,13 @@ namespace svt {
 
 class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate;
+    css::uno::Reference< css::io::XStream >       m_xStream;
+    css::uno::Reference< css::io::XInputStream >  m_xInputStream;
+    css::uno::Reference< css::io::XOutputStream > m_xOutputStream;
+    css::uno::Reference< css::io::XSeekable >     m_xSeekable;
+    css::uno::Reference< css::io::XTruncate >     m_xTruncate;
 
-    std::vector< LockFileEntry > m_aUsersData;
+    std::vector< LockFileEntry >                  m_aUsersData;
 
     void OpenStream();
     void Close();
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 1e7e4a5891cf..9f1fac772b1c 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -50,8 +50,8 @@ public:
     void                    SetString( const OUString& );
     OUString                GetString();
 
-    void                    SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
-    void                    GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
+    void                    SetStringList( const css::uno::Sequence< OUString >& rList );
+    void                    GetStringList( css::uno::Sequence< OUString >& rList ) const;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual bool            GetPresentation( SfxItemPresentation ePres,
@@ -63,9 +63,9 @@ public:
     virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const override;
     virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const override;
 
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual bool            PutValue  ( const css::uno::Any& rVal,
                                          sal_uInt8 nMemberId ) override;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool            QueryValue( css::uno::Any& rVal,
                                          sal_uInt8 nMemberId = 0 ) const override;
 };
 #endif
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 4813458afb9a..7a48eebf492c 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -63,7 +63,7 @@ class SVL_DLLPUBLIC SvxSearchItem :
         public SfxPoolItem,
         public utl::ConfigItem
 {
-    com::sun::star::util::SearchOptions m_aSearchOpt;
+    css::util::SearchOptions m_aSearchOpt;
 
     SfxStyleFamily  m_eFamily;            // style family
 
@@ -98,8 +98,8 @@ public:
     SvxSearchItem( const SvxSearchItem& rItem );
     virtual ~SvxSearchItem();
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual bool             operator == ( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -108,7 +108,7 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const override;
 
     // ConfigItem
-    virtual void            Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+    virtual void            Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
 
             SvxSearchCmd    GetCommand() const { return m_nCommand; }
             void            SetCommand(SvxSearchCmd nNewCommand) { m_nCommand = nNewCommand; }
@@ -177,9 +177,9 @@ public:
     inline  sal_uInt16      GetLEVLonger() const;
     inline  void            SetLEVLonger(sal_uInt16 nSet);
 
-    inline const com::sun::star::util::SearchOptions &
-                GetSearchOptions() const;
-    inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
+    inline const css::util::SearchOptions &
+                            GetSearchOptions() const;
+    inline void             SetSearchOptions( const css::util::SearchOptions &rOpt );
 
     inline  sal_Int32       GetTransliterationFlags() const;
             void            SetTransliterationFlags( sal_Int32 nFlags );
@@ -219,30 +219,27 @@ void SvxSearchItem::SetReplaceString(const OUString& rNewString)
 bool SvxSearchItem::GetWordOnly() const
 {
     return 0 != (m_aSearchOpt.searchFlag &
-                        com::sun::star::util::SearchFlags::NORM_WORD_ONLY);
+                        css::util::SearchFlags::NORM_WORD_ONLY);
 }
 
 bool SvxSearchItem::GetExact() const
 {
-    return 0 == (m_aSearchOpt.transliterateFlags &
-                        com::sun::star::i18n::TransliterationModules_IGNORE_CASE);
+    return 0 == (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_CASE);
 }
 
 bool SvxSearchItem::GetSelection() const
 {
-    return 0 != (m_aSearchOpt.searchFlag &
-                        com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE);
+    return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::REG_NOT_BEGINOFLINE);
 }
 
 bool SvxSearchItem::GetRegExp() const
 {
-    return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
+    return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_REGEXP ;
 }
 
 bool SvxSearchItem::IsLEVRelaxed() const
 {
-    return 0 != (m_aSearchOpt.searchFlag &
-                        com::sun::star::util::SearchFlags::LEV_RELAXED);
+    return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::LEV_RELAXED);
 }
 
 sal_uInt16 SvxSearchItem::GetLEVOther() const
@@ -277,15 +274,15 @@ void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
 
 bool SvxSearchItem::IsLevenshtein() const
 {
-    return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
+    return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_APPROXIMATE;
 }
 
-const com::sun::star::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
+const css::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
 {
     return m_aSearchOpt;
 }
 
-void SvxSearchItem::SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt )
+void SvxSearchItem::SetSearchOptions( const css::util::SearchOptions &rOpt )
 {
     m_aSearchOpt = rOpt;
 }
@@ -297,8 +294,7 @@ sal_Int32 SvxSearchItem::GetTransliterationFlags() const
 
 bool SvxSearchItem::IsMatchFullHalfWidthForms() const
 {
-    return 0 != (m_aSearchOpt.transliterateFlags &
-                        com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH);
+    return 0 != (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_WIDTH);
 }
 
 #endif
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index da82d7ba6cf1..cff7f49dfcee 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -340,20 +340,20 @@ public:
     const OUString&     GetOldName() const { return aName; }
 };
 
-class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
+class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel >
 {
 public:
     SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske );
 
-    static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle );
+    static SfxUnoStyleSheet* getUnoStyleSheet( const css::uno::Reference< css::style::XStyle >& xStyle );
 
     // 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;
 
 private:
     SfxUnoStyleSheet(); // not implemented
 
-    static const ::com::sun::star::uno::Sequence< ::sal_Int8 >& getIdentifier();
+    static const css::uno::Sequence< ::sal_Int8 >& getIdentifier();
 };
 
 #endif
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index ef2e1bc436b4..3d9894ba4f42 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -44,9 +44,9 @@ public:
                                     const IntlWrapper * = 0 ) const override;
 
     virtual bool             operator==( const SfxPoolItem& ) const override;
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool             QueryValue( css::uno::Any& rVal,
                                           sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual bool             PutValue( const css::uno::Any& rVal,
                                           sal_uInt8 nMemberId ) override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 6007b672a333..b784188461f8 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -82,13 +82,13 @@ SVL_DLLPUBLIC Link<OUString *, bool> GetMaybeFileHdl();
 
    @exception std::bad_alloc if an out-of-memory condition occurs
 
-   @exception com::sun::star::uno::RuntimeException if any error occurs
+   @exception css::uno::RuntimeException if any error occurs
  */
-SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
+SVL_DLLPUBLIC css::uno::Reference< css::uri::XUriReference >
 normalizedMakeRelative(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-    const & context,
-    OUString const & baseUriReference, OUString const & uriReference);
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    OUString const & baseUriReference,
+    OUString const & uriReference);
 
 /**
    A variant of normalizedMakeRelative with a simplified interface.
@@ -107,7 +107,7 @@ normalizedMakeRelative(
 
    @exception std::bad_alloc if an out-of-memory condition occurs
 
-   @exception com::sun::star::uno::RuntimeException if any error occurs
+   @exception css::uno::RuntimeException if any error occurs
 
    @deprecated
    No code should rely on the default component context.
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 3ef6b0002af1..107c8087b3d4 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -26,7 +26,7 @@
 
 class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem
 {
-    ::com::sun::star::frame::status::Visibility m_nValue;
+    css::frame::status::Visibility m_nValue;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -53,10 +53,10 @@ public:
                                                 const IntlWrapper * = 0)
         const override;
 
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+    virtual bool QueryValue( css::uno::Any& rVal,
                              sal_uInt8 nMemberId = 0 ) const override;
 
-    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+    virtual bool PutValue( const css::uno::Any& rVal,
                            sal_uInt8 nMemberId ) override;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 8703a031a05f..216d354d3db1 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -228,7 +228,7 @@ public:
 
     NfCurrencyEntry( const LocaleDataWrapper& rLocaleData,
                      LanguageType eLang );
-    NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr,
+    NfCurrencyEntry( const css::i18n::Currency & rCurr,
                      const LocaleDataWrapper& rLocaleData,
                      LanguageType eLang );
     inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol,
@@ -317,7 +317,7 @@ public:
 
     /// Preferred ctor with service manager and language/country enum
     SvNumberFormatter(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         LanguageType eLang
         );
 
@@ -770,7 +770,7 @@ public:
     static bool IsLocaleInstalled( LanguageType eLang );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
     LanguageTag maLanguageTag;
     SvNumberFormatTable aFTable;            // Table of format keys to format entries
     typedef std::map<sal_uInt32, sal_uInt32> DefaultFormatKeysMap;
@@ -816,7 +816,7 @@ private:
                                                       NumberFormatCodeWrapper& rNumberFormatCode,
                                                       bool bAfterChangingSystemCL );
 
-    SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode,
+    SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const css::i18n::NumberFormatCode& rCode,
                                                     sal_uInt32 nPos,
                                                     bool bAfterChangingSystemCL = false,
                                                     sal_Int16 nOrgIndex = 0 );
@@ -856,7 +856,7 @@ private:
     // Return the index in a sequence of format codes matching an enum of
     // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
     // contain any format code elements a default element is created and inserted.
-    SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq,
+    SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( css::uno::Sequence< css::i18n::NumberFormatCode >& rSeq,
                                                     const NfIndexTableOffset nTabOff );
 
     // Adjust a sequence of format codes to contain only one (THE) default
@@ -865,7 +865,7 @@ private:
     // Return the default index in the sequence.
     // Non-PRODUCT version may check locale data for matching defaults in one
     // FormatElement group.
-    SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( ::com::sun::star::i18n::NumberFormatCode * pFormatArr,
+    SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( css::i18n::NumberFormatCode * pFormatArr,
                                                          sal_Int32 nCount, bool bCheckCorrectness = true );
 
     // Obtain the format entry for a given key index.
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 2858563ee4ef..c204702d168c 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -395,7 +395,7 @@ public:
 
     // rAttr.Number not empty if NatNum attributes are to be stored
     void GetNatNumXml(
-            ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr,
+            css::i18n::NativeNumberXmlAttributes& rAttr,
             sal_uInt16 nNumFor ) const;
 
     /** Switches to the first non-"gregorian" calendar, but only if the current
@@ -477,7 +477,7 @@ private:
         @param eCodeType
             a NfKeywordIndex, must designate a month type code
 
-        @returns one of com::sun::star::i18n::CalendarDisplayCode values
+        @returns one of css::i18n::CalendarDisplayCode values
             according to eCodeType and the check executed (or passed).
      */
     SVL_DLLPRIVATE sal_Int32 ImpUseMonthCase( int & io_nState, const ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType ) const;