mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
author: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 12:06:47 +0200
committer: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 14:23:11 +0200
commit: 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree: e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /package
parent: 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
35 files changed, 457 insertions, 465 deletions
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index 46361639a802..c6bfdd5f47f8 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -25,8 +25,8 @@
 
 struct eqFunc
 {
-    sal_Bool operator()( const rtl::OUString &r1,
-                         const rtl::OUString &r2) const
+    sal_Bool operator()( const OUString &r1,
+                         const OUString &r2) const
     {
         return r1 == r2;
     }
@@ -37,19 +37,19 @@ namespace com { namespace sun { namespace star { namespace packages {
 class ContentInfo;
 } } } }
 
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
                         ZipPackageFolder *,
-                        ::rtl::OUStringHash,
+                        OUStringHash,
                         eqFunc > FolderHash;
 
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
                         rtl::Reference < com::sun::star::packages::ContentInfo >,
-                        ::rtl::OUStringHash,
+                        OUStringHash,
                         eqFunc > ContentHash;
 
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
                         ZipEntry,
-                        rtl::OUStringHash,
+                        OUStringHash,
                         eqFunc > EntryHash;
 
 #endif
diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx
index 98de664cce17..31b8ba67cde1 100644
--- a/package/inc/ZipEntry.hxx
+++ b/package/inc/ZipEntry.hxx
@@ -33,7 +33,7 @@ struct ZipEntry
     sal_Int64 nOffset;
     sal_Int16 nPathLen;
     sal_Int16 nExtraLen;
-    ::rtl::OUString sPath;
+    OUString sPath;
 };
 #endif
 
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 59a0027ff028..e17a0cfae6a6 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -57,7 +57,7 @@ class ZipFile
 protected:
     ::osl::Mutex    m_aMutex;
 
-    ::rtl::OUString sComment;       /* zip file comment */
+    OUString sComment;       /* zip file comment */
     EntryHash       aEntries;
     ByteGrabber     aGrabber;
     ZipUtils::Inflater aInflater;
@@ -87,7 +87,7 @@ protected:
             const ::rtl::Reference < EncryptionData > &rData,
             sal_Int8 nStreamMode,
             sal_Bool bDecrypt,
-            ::rtl::OUString aMediaType = ::rtl::OUString() );
+            OUString aMediaType = OUString() );
 
     sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
 
@@ -137,7 +137,7 @@ public:
 
     static void StaticFillHeader ( const ::rtl::Reference < EncryptionData > & rData,
                                     sal_Int64 nSize,
-                                    const ::rtl::OUString& aMediaType,
+                                    const OUString& aMediaType,
                                     sal_Int8 * & pHeader );
 
     static sal_Bool StaticFillData ( ::rtl::Reference < BaseEncryptionData > & rData,
@@ -146,7 +146,7 @@ public:
                                      sal_Int32 &rDerivedKeySize,
                                      sal_Int32 &rStartKeyGenID,
                                      sal_Int32 &rSize,
-                                     ::rtl::OUString& aMediaType,
+                                     OUString& aMediaType,
                                      const ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StaticGetDataFromRawStream(
@@ -183,7 +183,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream(
             ZipEntry& rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
-            const ::rtl::OUString& aMediaType,
+            const OUString& aMediaType,
             SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::NoEncryptionException,
                 ::com::sun::star::io::IOException,
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 0f1970725632..d14d53eac6a4 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -48,7 +48,7 @@ protected:
 
     ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
 
-    ::rtl::OUString     sComment;
+    OUString     sComment;
     ZipUtils::Deflater  aDeflater;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 7aeb32f159cd..3631799c59e9 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -81,7 +81,7 @@ protected:
     ::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey;
 
     FolderHash        m_aRecent;
-    ::rtl::OUString   m_aURL;
+    OUString   m_aURL;
 
     sal_Int32         m_nStartKeyGenerationID;
     sal_Int32         m_nChecksumDigestID;
@@ -142,9 +142,9 @@ public:
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     // XHierarchicalNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName )
         throw(::com::sun::star::uno::RuntimeException);
     // XSingleServiceFactory
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(  )
@@ -166,32 +166,32 @@ public:
     // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 
     // Uno componentiseralation
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+    static OUString static_getImplementationName();
+    static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
-    sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+    sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
 };
 #endif
 
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 5afe30eae113..6d3bf070a48b 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -40,19 +40,19 @@ class ZipPackageEntry : public cppu::WeakImplHelper5
 >
 {
 protected:
-    ::rtl::OUString msName;
+    OUString msName;
     bool mbIsFolder:1;
     bool mbAllowRemoveOnInsert:1;
     // com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xParent;
-    ::rtl::OUString     sMediaType;
+    OUString     sMediaType;
     ZipPackageFolder * pParent;
 public:
     ZipEntry aEntry;
     ZipPackageEntry ( bool bNewFolder = sal_False );
     virtual ~ZipPackageEntry( void );
 
-    ::rtl::OUString & GetMediaType () { return sMediaType; }
-    void SetMediaType ( const ::rtl::OUString & sNewType) { sMediaType = sNewType; }
+    OUString & GetMediaType () { return sMediaType; }
+    void SetMediaType ( const OUString & sNewType) { sMediaType = sNewType; }
     void doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bInsert );
     bool IsFolder ( ) { return mbIsFolder; }
     ZipPackageFolder* GetParent ( ) { return pParent; }
@@ -64,9 +64,9 @@ public:
         pParent = NULL;
     }
     // XNamed
-    virtual ::rtl::OUString SAL_CALL getName(  )
+    virtual OUString SAL_CALL getName(  )
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName )
+    virtual void SAL_CALL setName( const OUString& aName )
         throw(::com::sun::star::uno::RuntimeException);
     // XChild
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  )
@@ -79,17 +79,17 @@ public:
     // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index a99813c15b58..2a41e94d9dfd 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -52,7 +52,7 @@ class ZipPackageFolder : public cppu::ImplInheritanceHelper2
 private:
     ContentHash maContents;
     sal_Int32 m_nFormat;
-    ::rtl::OUString m_sVersion;
+    OUString m_sVersion;
 
 public:
 
@@ -60,17 +60,17 @@ public:
                       sal_Bool bAllowRemoveOnInsert );
     virtual ~ZipPackageFolder();
 
-    ::rtl::OUString& GetVersion() { return m_sVersion; }
-    void SetVersion( const ::rtl::OUString& aVersion ) { m_sVersion = aVersion; }
+    OUString& GetVersion() { return m_sVersion; }
+    void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; }
 
-    sal_Bool LookForUnexpectedODF12Streams( const ::rtl::OUString& aPath );
+    sal_Bool LookForUnexpectedODF12Streams( const OUString& aPath );
 
     void setChildStreamsTypeByExtension( const ::com::sun::star::beans::StringPair& aPair );
 
     void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    com::sun::star::packages::ContentInfo & doGetByName( const ::rtl::OUString& aName )
+    com::sun::star::packages::ContentInfo & doGetByName( const OUString& aName )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
@@ -79,17 +79,17 @@ public:
     void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
     void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
 
-    bool saveChild(const rtl::OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool);
+    bool saveChild(const OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool);
 
     // Recursive functions
-    void  saveContents(rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool)
+    void  saveContents(OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool)
         throw(::com::sun::star::uno::RuntimeException);
     void  releaseUpwardRef();
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+    virtual void SAL_CALL removeByName( const OUString& Name )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XEnumerationAccess
@@ -103,21 +103,21 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  )
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
         throw(::com::sun::star::uno::RuntimeException);
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XUnoTunnel
@@ -125,11 +125,11 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 70e8e13c03f8..a127dd8fd555 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -191,17 +191,17 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 0d87fe6a6de0..8b1fc0d962f7 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -58,15 +58,15 @@ public:
 
     virtual ~OZipFileAccess();
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPatternsFromString_Impl( const ::rtl::OUString& aString );
+    ::com::sun::star::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString );
 
-    sal_Bool StringGoodForPattern_Impl( const ::rtl::OUString& aString,
-                                        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPattern );
+    sal_Bool StringGoodForPattern_Impl( const OUString& aString,
+                                        const ::com::sun::star::uno::Sequence< OUString >& aPattern );
 
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
 
-    static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+    static OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
@@ -76,14 +76,14 @@ public:
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XZipFileAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const ::rtl::OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     // XComponent
     virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -91,9 +91,9 @@ public:
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
 };
 
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 51afa9332d7b..1ecb093c3e2b 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -36,8 +36,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler,  const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList )
 {
@@ -94,13 +92,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
     const sal_uInt32 nManLength = rManList.getLength();
 
     // find the mediatype of the document if any
-    ::rtl::OUString aDocMediaType;
-    ::rtl::OUString aDocVersion;
+    OUString aDocMediaType;
+    OUString aDocVersion;
     for (sal_uInt32 nInd = 0; nInd < nManLength ; nInd++ )
     {
-        ::rtl::OUString aMediaType;
-        ::rtl::OUString aPath;
-        ::rtl::OUString aVersion;
+        OUString aMediaType;
+        OUString aPath;
+        OUString aVersion;
 
         const beans::PropertyValue *pValue = pSequence[nInd].getConstArray();
         for (sal_uInt32 j = 0, nNum = pSequence[nInd].getLength(); j < nNum; j++, pValue++)
@@ -192,7 +190,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
     {
         ::comphelper::AttributeList *pAttrList = new ::comphelper::AttributeList;
         const beans::PropertyValue *pValue = pSequence[i].getConstArray();
-        ::rtl::OUString aString;
+        OUString aString;
         const uno::Any *pVector = NULL, *pSalt = NULL, *pIterationCount = NULL, *pDigest = NULL, *pDigestAlg = NULL, *pEncryptAlg = NULL, *pStartKeyAlg = NULL, *pDerivedKeySize = NULL;
         for (sal_uInt32 j = 0, nNum = pSequence[i].getLength(); j < nNum; j++, pValue++)
         {
@@ -217,7 +215,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
             {
                 sal_Int64 nSize = 0;
                 pValue->Value >>= nSize;
-                ::rtl::OUStringBuffer aBuffer;
+                OUStringBuffer aBuffer;
                 aBuffer.append ( nSize );
                 pAttrList->AddAttribute ( sSizeAttribute, sCdataAttribute, aBuffer.makeStringAndClear() );
             }
@@ -247,13 +245,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
             // ==== Encryption Data
             ::comphelper::AttributeList * pNewAttrList = new ::comphelper::AttributeList;
             uno::Reference < xml::sax::XAttributeList > xNewAttrList (pNewAttrList);
-            ::rtl::OUStringBuffer aBuffer;
+            OUStringBuffer aBuffer;
             uno::Sequence < sal_Int8 > aSequence;
 
             xHandler->ignorableWhitespace ( sWhiteSpace );
 
             // ==== Digest
-            ::rtl::OUString sChecksumType;
+            OUString sChecksumType;
             sal_Int32 nDigestAlgID = 0;
             *pDigestAlg >>= nDigestAlgID;
             if ( nDigestAlgID == xml::crypto::DigestID::SHA256_1K )
@@ -279,7 +277,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
             *pEncryptAlg >>= nEncAlgID;
             *pDerivedKeySize >>= nDerivedKeySize;
 
-            ::rtl::OUString sEncAlgName;
+            OUString sEncAlgName;
             if ( nEncAlgID == xml::crypto::CipherID::AES_CBC_W3C_PADDING )
             {
                 OSL_ENSURE( nDerivedKeySize, "Unexpected key size is provided!" );
@@ -340,8 +338,8 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
                 pNewAttrList = new ::comphelper::AttributeList;
                 xNewAttrList = pNewAttrList;
 
-                ::rtl::OUString sStartKeyAlg;
-                ::rtl::OUString sStartKeySize;
+                OUString sStartKeyAlg;
+                OUString sStartKeySize;
                 sal_Int32 nStartKeyAlgID = 0;
                 *pStartKeyAlg >>= nStartKeyAlgID;
                 if ( nStartKeyAlgID == xml::crypto::DigestID::SHA256 )
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 0fe547569eed..970417a06476 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star;
 using namespace std;
 
-using ::rtl::OUString;
 
 // ---------------------------------------------------
 ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
@@ -279,7 +278,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
     StringHashMap aConvertedAttribs;
-    ::rtl::OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
+    OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
 
     size_t nLevel = aStack.size();
 
@@ -349,7 +348,7 @@ namespace
 void SAL_CALL ManifestImport::endElement( const OUString& aName )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
-    ::rtl::OUString aConvertedName = ConvertName( aName );
+    OUString aConvertedName = ConvertName( aName );
     if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) )
     {
         if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid )
@@ -393,10 +392,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 }
 
 // ---------------------------------------------------
-::rtl::OUString ManifestImport::PushNameAndNamespaces( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
+OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
 {
     StringHashMap aNamespaces;
-    ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > aAttribsStrs;
+    ::std::vector< ::std::pair< OUString, OUString > > aAttribsStrs;
 
     if ( xAttribs.is() )
     {
@@ -405,25 +404,25 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 
         for( sal_Int16 nInd = 0; nInd < nAttrCount; nInd++ )
         {
-            ::rtl::OUString aAttrName = xAttribs->getNameByIndex( nInd );
-            ::rtl::OUString aAttrValue = xAttribs->getValueByIndex( nInd );
+            OUString aAttrName = xAttribs->getNameByIndex( nInd );
+            OUString aAttrValue = xAttribs->getValueByIndex( nInd );
             if ( aAttrName.getLength() >= 5
               && aAttrName.startsWith("xmlns")
               && ( aAttrName.getLength() == 5 || aAttrName.getStr()[5] == ( sal_Unicode )':' ) )
             {
                 // this is a namespace declaration
-                ::rtl::OUString aNsName( ( aAttrName.getLength() == 5 ) ? ::rtl::OUString() : aAttrName.copy( 6 ) );
+                OUString aNsName( ( aAttrName.getLength() == 5 ) ? OUString() : aAttrName.copy( 6 ) );
                 aNamespaces[aNsName] = aAttrValue;
             }
             else
             {
                 // this is no namespace declaration
-                aAttribsStrs.push_back( pair< ::rtl::OUString, ::rtl::OUString >( aAttrName, aAttrValue ) );
+                aAttribsStrs.push_back( pair< OUString, OUString >( aAttrName, aAttrValue ) );
             }
         }
     }
 
-    ::rtl::OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces );
+    OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces );
     if ( !aConvertedName.getLength() )
         aConvertedName = ConvertName( aName );
 
@@ -439,10 +438,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 }
 
 // ---------------------------------------------------
-::rtl::OUString ManifestImport::ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces )
+OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces )
 {
-    ::rtl::OUString aNsAlias;
-    ::rtl::OUString aPureName = aName;
+    OUString aNsAlias;
+    OUString aPureName = aName;
 
     sal_Int32 nInd = aName.indexOf( ( sal_Unicode )':' );
     if ( nInd != -1 && nInd < aName.getLength() )
@@ -451,7 +450,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
         aPureName = aName.copy( nInd + 1 );
     }
 
-    ::rtl::OUString aResult;
+    OUString aResult;
 
     StringHashMap::const_iterator aIter = aNamespaces.find( aNsAlias );
     if ( aIter != aNamespaces.end()
@@ -466,9 +465,9 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 }
 
 // ---------------------------------------------------
-::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName )
+OUString ManifestImport::ConvertName( const OUString& aName )
 {
-    ::rtl::OUString aConvertedName;
+    OUString aConvertedName;
     for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter )
     {
         if ( !aIter->m_aNamespaces.empty() )
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 51c5244f0697..73a1b58d52cd 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -32,15 +32,15 @@ namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
 } } }
 
-typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap;
+typedef ::boost::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap;
 
 struct ManifestScopeEntry
 {
-    ::rtl::OUString m_aConvertedName;
+    OUString m_aConvertedName;
     StringHashMap   m_aNamespaces;
     bool            m_bValid;
 
-    ManifestScopeEntry( const ::rtl::OUString& aConvertedName, const StringHashMap& aNamespaces )
+    ManifestScopeEntry( const OUString& aConvertedName, const StringHashMap& aNamespaces )
     : m_aConvertedName( aConvertedName )
     , m_aNamespaces( aNamespaces )
     , m_bValid( true )
@@ -61,66 +61,66 @@ protected:
     sal_Int32 nDerivedKeySize;
     ::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector;
 
-    const ::rtl::OUString sFileEntryElement;
-    const ::rtl::OUString sManifestElement;
-    const ::rtl::OUString sEncryptionDataElement;
-    const ::rtl::OUString sAlgorithmElement;
-    const ::rtl::OUString sStartKeyAlgElement;
-    const ::rtl::OUString sKeyDerivationElement;
-
-    const ::rtl::OUString sCdataAttribute;
-    const ::rtl::OUString sMediaTypeAttribute;
-    const ::rtl::OUString sVersionAttribute;
-    const ::rtl::OUString sFullPathAttribute;
-    const ::rtl::OUString sSizeAttribute;
-    const ::rtl::OUString sSaltAttribute;
-    const ::rtl::OUString sInitialisationVectorAttribute;
-    const ::rtl::OUString sIterationCountAttribute;
-    const ::rtl::OUString sKeySizeAttribute;
-    const ::rtl::OUString sAlgorithmNameAttribute;
-    const ::rtl::OUString sStartKeyAlgNameAttribute;
-    const ::rtl::OUString sKeyDerivationNameAttribute;
-    const ::rtl::OUString sChecksumAttribute;
-    const ::rtl::OUString sChecksumTypeAttribute;
-
-    const ::rtl::OUString sFullPathProperty;
-    const ::rtl::OUString sMediaTypeProperty;
-    const ::rtl::OUString sVersionProperty;
-    const ::rtl::OUString sIterationCountProperty;
-    const ::rtl::OUString sDerivedKeySizeProperty;
-    const ::rtl::OUString sSaltProperty;
-    const ::rtl::OUString sInitialisationVectorProperty;
-    const ::rtl::OUString sSizeProperty;
-    const ::rtl::OUString sDigestProperty;
-    const ::rtl::OUString sEncryptionAlgProperty;
-    const ::rtl::OUString sStartKeyAlgProperty;
-    const ::rtl::OUString sDigestAlgProperty;
-
-    const ::rtl::OUString sWhiteSpace;
-
-    const ::rtl::OUString sSHA256_URL;
-    const ::rtl::OUString sSHA1_Name;
-    const ::rtl::OUString sSHA1_URL;
-
-    const ::rtl::OUString sSHA256_1k_URL;
-    const ::rtl::OUString sSHA1_1k_Name;
-    const ::rtl::OUString sSHA1_1k_URL;
-
-    const ::rtl::OUString sBlowfish_Name;
-    const ::rtl::OUString sBlowfish_URL;
-    const ::rtl::OUString sAES128_URL;
-    const ::rtl::OUString sAES192_URL;
-    const ::rtl::OUString sAES256_URL;
-
-    const ::rtl::OUString sPBKDF2_Name;
-    const ::rtl::OUString sPBKDF2_URL;
-
-
-    ::rtl::OUString PushNameAndNamespaces( const ::rtl::OUString& aName,
+    const OUString sFileEntryElement;
+    const OUString sManifestElement;
+    const OUString sEncryptionDataElement;
+    const OUString sAlgorithmElement;
+    const OUString sStartKeyAlgElement;
+    const OUString sKeyDerivationElement;
+
+    const OUString sCdataAttribute;
+    const OUString sMediaTypeAttribute;
+    const OUString sVersionAttribute;
+    const OUString sFullPathAttribute;
+    const OUString sSizeAttribute;
+    const OUString sSaltAttribute;
+    const OUString sInitialisationVectorAttribute;
+    const OUString sIterationCountAttribute;
+    const OUString sKeySizeAttribute;
+    const OUString sAlgorithmNameAttribute;
+    const OUString sStartKeyAlgNameAttribute;
+    const OUString sKeyDerivationNameAttribute;
+    const OUString sChecksumAttribute;
+    const OUString sChecksumTypeAttribute;
+
+    const OUString sFullPathProperty;
+    const OUString sMediaTypeProperty;
+    const OUString sVersionProperty;
+    const OUString sIterationCountProperty;
+    const OUString sDerivedKeySizeProperty;
+    const OUString sSaltProperty;
+    const OUString sInitialisationVectorProperty;
+    const OUString sSizeProperty;
+    const OUString sDigestProperty;
+    const OUString sEncryptionAlgProperty;
+    const OUString sStartKeyAlgProperty;
+    const OUString sDigestAlgProperty;
+
+    const OUString sWhiteSpace;
+
+    const OUString sSHA256_URL;
+    const OUString sSHA1_Name;
+    const OUString sSHA1_URL;
+
+    const OUString sSHA256_1k_URL;
+    const OUString sSHA1_1k_Name;
+    const OUString sSHA1_1k_URL;
+
+    const OUString sBlowfish_Name;
+    const OUString sBlowfish_URL;
+    const OUString sAES128_URL;
+    const OUString sAES192_URL;
+    const OUString sAES256_URL;
+
+    const OUString sPBKDF2_Name;
+    const OUString sPBKDF2_URL;
+
+
+    OUString PushNameAndNamespaces( const OUString& aName,
                                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs,
                                            StringHashMap& o_aConvertedAttribs );
-    ::rtl::OUString ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces );
-    ::rtl::OUString ConvertName( const ::rtl::OUString& aName );
+    OUString ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces );
+    OUString ConvertName( const OUString& aName );
 
 public:
     ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector );
@@ -129,15 +129,15 @@ public:
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL endDocument(  )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
+    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);
-    virtual void SAL_CALL endElement( const ::rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const OUString& aName )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const ::rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const OUString& aChars )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData )
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
     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);
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index feac40c72f8b..2e2b6a0922c0 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::packages;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::packages::manifest;
-using ::rtl::OUString;
 
 ManifestReader::ManifestReader( const Reference < XComponentContext > & xContext )
 : m_xContext ( xContext )
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index d422f9a7c29e..d050405ace15 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -46,17 +46,17 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 
     // Component constructor
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
-    sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+    static OUString static_getImplementationName();
+    static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
+    sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
 };
 #endif
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 8453d928cfc6..4b7e773c729b 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -46,18 +46,18 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 
     // Component constructor
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+    static OUString static_getImplementationName();
+    static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
-    sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+    sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
 };
 #endif
 
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 47f38270513d..e8078634b195 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::packages;
 using namespace ::com::sun::star::packages::manifest;
 
-using rtl::OUString;
 
 /**
  * This function is called to get service factories for an implementation.
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 97c3eca22c7f..55a731281a43 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -335,7 +335,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
 }
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OInputCompStream::hasByID(  const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OInputCompStream::hasByID(  const OUString& sID )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID(  const ::rtl::OUString& sID )
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OInputCompStream::getTargetByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OInputCompStream::getTargetByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -383,11 +383,11 @@ sal_Bool SAL_CALL OInputCompStream::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Target" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OInputCompStream::getTypeByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OInputCompStream::getTypeByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -408,11 +408,11 @@ sal_Bool SAL_CALL OInputCompStream::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Type" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID(  const ::rtl::OUString& sID  )
+uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -443,7 +443,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
 }
 
 //-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType(  const ::rtl::OUString& sType  )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType(  const OUString& sType  )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -508,7 +508,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
 }
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::insertRelationshipByID(  const ::rtl::OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, ::sal_Bool /*bReplace*/  )
+void SAL_CALL OInputCompStream::insertRelationshipByID(  const OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, ::sal_Bool /*bReplace*/  )
         throw ( container::ElementExistException,
                 io::IOException,
                 uno::RuntimeException )
@@ -528,7 +528,7 @@ void SAL_CALL OInputCompStream::insertRelationshipByID(  const ::rtl::OUString&
 }
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::removeRelationshipByID(  const ::rtl::OUString& /*sID*/  )
+void SAL_CALL OInputCompStream::removeRelationshipByID(  const OUString& /*sID*/  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -603,7 +603,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
 }
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& /*aValue*/ )
+void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ )
         throw ( beans::UnknownPropertyException,
                 beans::PropertyVetoException,
                 lang::IllegalArgumentException,
@@ -632,7 +632,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const ::rtl::OUString& aProper
 
 
 //-----------------------------------------------
-uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aProp )
+uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
                 uno::RuntimeException )
@@ -645,7 +645,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
         throw lang::DisposedException();
     }
 
-    ::rtl::OUString aPropertyName;
+    OUString aPropertyName;
     if ( aProp == "IsEncrypted" )
         aPropertyName = "Encrypted";
     else
@@ -669,7 +669,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
 
 //-----------------------------------------------
 void SAL_CALL OInputCompStream::addPropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -689,7 +689,7 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OInputCompStream::removePropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -709,7 +709,7 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OInputCompStream::addVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -729,7 +729,7 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OInputCompStream::removeVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 50628f588819..ba71dd80e491 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -94,25 +94,25 @@ public:
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //XRelationshipAccess
-    virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL clearRelationships(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
 
 };
 
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index a5fa77653c73..ae4eecdc9037 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -56,13 +56,13 @@ void OHierarchyHolder_Impl::RemoveStreamHierarchically( OStringList_Impl& aListP
 
 //-----------------------------------------------
 // static
-OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const ::rtl::OUString& aPath )
+OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const OUString& aPath )
 {
     OStringList_Impl aResult;
     sal_Int32 nIndex = 0;
     do
     {
-        ::rtl::OUString aName = aPath.getToken( 0, '/', nIndex );
+        OUString aName = aPath.getToken( 0, '/', nIndex );
         if ( aName.isEmpty() )
             throw lang::IllegalArgumentException();
 
@@ -88,7 +88,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
     if ( !aListPath.size() )
         throw uno::RuntimeException();
 
-    ::rtl::OUString aNextName = *(aListPath.begin());
+    OUString aNextName = *(aListPath.begin());
     aListPath.erase( aListPath.begin() );
 
     uno::Reference< embed::XExtendedStorageStream > xResult;
@@ -172,7 +172,7 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList
     if ( !aListPath.size() )
         throw uno::RuntimeException();
 
-    ::rtl::OUString aNextName = *(aListPath.begin());
+    OUString aNextName = *(aListPath.begin());
     aListPath.erase( aListPath.begin() );
 
     uno::Reference< embed::XExtendedStorageStream > xResult;
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 501d305071b0..993a4d267738 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -37,18 +37,18 @@ struct OHierarchyElement_Impl;
 
 struct eqFunc
 {
-    sal_Bool operator()( const rtl::OUString &r1,
-                         const rtl::OUString &r2) const
+    sal_Bool operator()( const OUString &r1,
+                         const OUString &r2) const
     {
         return r1 == r2;
     }
 };
-typedef ::boost::unordered_map< ::rtl::OUString,
+typedef ::boost::unordered_map< OUString,
                          ::rtl::Reference< OHierarchyElement_Impl >,
-                         ::rtl::OUStringHash,
+                         OUStringHash,
                          eqFunc > OHierarchyElementList_Impl;
 
-typedef ::std::vector< ::rtl::OUString > OStringList_Impl;
+typedef ::std::vector< OUString > OStringList_Impl;
 typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XExtendedStorageStream > >
                         OWeakStorRefList_Impl;
 
@@ -118,7 +118,7 @@ public:
     , m_xChild( new OHierarchyElement_Impl( ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >( xOwnStorage ) ) )
     {}
 
-    static OStringList_Impl GetListPathFromString( const ::rtl::OUString& aPath );
+    static OStringList_Impl GetListPathFromString( const OUString& aPath );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream >
         GetStreamHierarchically( sal_Int32 nStorageMode,
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index fc9a5f306385..6b8d15fae768 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -82,7 +82,7 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
 }
 
 //-----------------------------------------------
-void StaticAddLog( const ::rtl::OUString& aMessage )
+void StaticAddLog( const OUString& aMessage )
 {
     try
     {
@@ -203,7 +203,7 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
 }
 
 //-----------------------------------------------
-sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
+sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
 {
     if ( !xContext.is() )
         return sal_False;
@@ -229,9 +229,9 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< uno::XComp
 const sal_Int32 n_ConstBufferSize = 32000;
 
 //-----------------------------------------------
-::rtl::OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext )
+OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext )
 {
-    ::rtl::OUString aTempURL;
+    OUString aTempURL;
 
     uno::Reference < beans::XPropertySet > xTempFile(
             io::TempFile::create(xContext),
@@ -307,7 +307,7 @@ OWriteStream_Impl::~OWriteStream_Impl()
     if ( !m_aTempURL.isEmpty() )
     {
         KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
-        m_aTempURL = ::rtl::OUString();
+        m_aTempURL = OUString();
     }
 
     CleanCacheStream();
@@ -342,7 +342,7 @@ void OWriteStream_Impl::CleanCacheStream()
 }
 
 //-----------------------------------------------
-void OWriteStream_Impl::AddLog( const ::rtl::OUString& aMessage )
+void OWriteStream_Impl::AddLog( const OUString& aMessage )
 {
     if ( !m_xLogRing.is() )
     {
@@ -363,7 +363,7 @@ void OWriteStream_Impl::AddLog( const ::rtl::OUString& aMessage )
 
 
 //-----------------------------------------------
-void OWriteStream_Impl::InsertIntoPackageFolder( const ::rtl::OUString& aName,
+void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
                                                   const uno::Reference< container::XNameContainer >& xParentPackageFolder )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -532,11 +532,11 @@ void OWriteStream_Impl::DisposeWrappers()
 }
 
 //-----------------------------------------------
-::rtl::OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream )
+OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream )
 {
     if ( !m_aTempURL.getLength() )
     {
-        ::rtl::OUString aTempURL = GetNewTempFileURL( m_xContext );
+        OUString aTempURL = GetNewTempFileURL( m_xContext );
 
         try {
             if ( !aTempURL.isEmpty() && xStream.is() )
@@ -582,7 +582,7 @@ void OWriteStream_Impl::DisposeWrappers()
 }
 
 //-----------------------------------------------
-::rtl::OUString OWriteStream_Impl::FillTempGetFileName()
+OUString OWriteStream_Impl::FillTempGetFileName()
 {
     // should try to create cache first, if the amount of contents is too big, the temp file should be taken
     if ( !m_xCacheStream.is() && m_aTempURL.isEmpty() )
@@ -645,14 +645,14 @@ void OWriteStream_Impl::DisposeWrappers()
                 catch( const packages::WrongPasswordException& )
                 {
                     KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
-                    m_aTempURL = ::rtl::OUString();
+                    m_aTempURL = OUString();
 
                     throw;
                 }
                 catch( const uno::Exception& )
                 {
                     KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
-                    m_aTempURL = ::rtl::OUString();
+                    m_aTempURL = OUString();
                 }
             }
         }
@@ -880,7 +880,7 @@ void OWriteStream_Impl::Commit()
 
         // TODO/NEW: Let the temporary file be removed after commit
         xNewPackageStream->setDataStream( xInStream );
-        m_aTempURL = ::rtl::OUString();
+        m_aTempURL = OUString();
     }
     else // if ( m_bHasInsertedStreamOptimization )
     {
@@ -955,7 +955,7 @@ void OWriteStream_Impl::Revert()
     if ( !m_aTempURL.isEmpty() )
     {
         KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
-        m_aTempURL = ::rtl::OUString();
+        m_aTempURL = OUString();
     }
 
     m_aProps.realloc( 0 );
@@ -1390,7 +1390,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
             if ( !m_aTempURL.isEmpty() )
             {
                 KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
-                m_aTempURL = ::rtl::OUString();
+                m_aTempURL = OUString();
             }
             if ( m_xCacheStream.is() )
                 CleanCacheStream();
@@ -1635,7 +1635,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
 }
 
 //-----------------------------------------------
-void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const ::rtl::OUString& aOrigStreamName, const ::rtl::OUString& aNewStreamName )
+void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const OUString& aOrigStreamName, const OUString& aNewStreamName )
 {
     // at this point of time the old stream must be already cleaned
     OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML, "The method should be used only with OFOPXML format!\n" );
@@ -1651,10 +1651,10 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
         if ( m_nRelInfoStatus == RELINFO_BROKEN || m_nRelInfoStatus == RELINFO_CHANGED_BROKEN )
             throw io::IOException(); // TODO:
 
-        ::rtl::OUString aOrigRelStreamName = aOrigStreamName;
+        OUString aOrigRelStreamName = aOrigStreamName;
         aOrigRelStreamName += ".rels";
 
-        ::rtl::OUString aNewRelStreamName = aNewStreamName;
+        OUString aNewRelStreamName = aNewStreamName;
         aNewRelStreamName += ".rels";
 
         sal_Bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
@@ -2623,7 +2623,7 @@ void SAL_CALL OWriteStream::removeEventListener(
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::setEncryptionPassword( const ::rtl::OUString& aPass )
+void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
     throw ( uno::RuntimeException,
             io::IOException )
 {
@@ -2705,7 +2705,7 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
 }
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OWriteStream::hasByID(  const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OWriteStream::hasByID(  const OUString& sID )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -2735,7 +2735,7 @@ sal_Bool SAL_CALL OWriteStream::hasByID(  const ::rtl::OUString& sID )
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OWriteStream::getTargetByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OWriteStream::getTargetByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2756,11 +2756,11 @@ sal_Bool SAL_CALL OWriteStream::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Target" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OWriteStream::getTypeByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OWriteStream::getTypeByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2781,11 +2781,11 @@ sal_Bool SAL_CALL OWriteStream::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Type" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(  const ::rtl::OUString& sID  )
+uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2816,7 +2816,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
 }
 
 //-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType(  const ::rtl::OUString& sType  )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType(  const OUString& sType  )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -2870,7 +2870,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::insertRelationshipByID(  const ::rtl::OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace  )
+void SAL_CALL OWriteStream::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace  )
         throw ( container::ElementExistException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2935,7 +2935,7 @@ void SAL_CALL OWriteStream::insertRelationshipByID(  const ::rtl::OUString& sID,
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::removeRelationshipByID(  const ::rtl::OUString& sID  )
+void SAL_CALL OWriteStream::removeRelationshipByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -3091,7 +3091,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetI
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
         throw ( beans::UnknownPropertyException,
                 beans::PropertyVetoException,
                 lang::IllegalArgumentException,
@@ -3113,7 +3113,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
     {
         // if the "Compressed" property is not set explicitly, the MediaType can change the default value
         sal_Bool bCompressedValueFromType = sal_True;
-        ::rtl::OUString aType;
+        OUString aType;
         aValue >>= aType;
 
         if ( !m_pImpl->m_bCompressedSetExplicit )
@@ -3216,7 +3216,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
 
 
 //-----------------------------------------------
-uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
+uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
                 uno::RuntimeException )
@@ -3234,7 +3234,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
         return uno::makeAny( m_pImpl->GetNewRelId() );
     }
 
-    ::rtl::OUString aPropertyName;
+    OUString aPropertyName;
     if ( aProp == "IsEncrypted" )
         aPropertyName = "Encrypted";
     else
@@ -3272,7 +3272,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
 
 //-----------------------------------------------
 void SAL_CALL OWriteStream::addPropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -3292,7 +3292,7 @@ void SAL_CALL OWriteStream::addPropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OWriteStream::removePropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -3312,7 +3312,7 @@ void SAL_CALL OWriteStream::removePropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OWriteStream::addVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -3332,7 +3332,7 @@ void SAL_CALL OWriteStream::addVetoableChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OWriteStream::removeVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 896739a8c45e..12d6f78d1585 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -68,7 +68,7 @@ namespace cppu {
 }
 
 namespace package {
-    void StaticAddLog( const ::rtl::OUString& aMessage );
+    void StaticAddLog( const OUString& aMessage );
     bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 );
 }
 
@@ -100,7 +100,7 @@ struct OWriteStream_Impl : public PreCreationStruct
     friend class OInputCompStream;
 
     OWriteStream*   m_pAntiImpl;
-    ::rtl::OUString m_aTempURL;
+    OUString m_aTempURL;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCacheStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xCacheSeek;
@@ -145,8 +145,8 @@ struct OWriteStream_Impl : public PreCreationStruct
 
 
 private:
-    ::rtl::OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
-    ::rtl::OUString FillTempGetFileName();
+    OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
+    OUString FillTempGetFileName();
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >       GetTempFileAsStream();
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  GetTempFileAsInputStream();
 
@@ -176,7 +176,7 @@ public:
 
     void CleanCacheStream();
 
-    void AddLog( const ::rtl::OUString& aMessage );
+    void AddLog( const OUString& aMessage );
 
     sal_Bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; }
     sal_Bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); }
@@ -185,7 +185,7 @@ public:
     sal_Bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); }
 
     void InsertIntoPackageFolder(
-            const ::rtl::OUString& aName,
+            const OUString& aName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
 
     void SetToBeCommited() { m_bFlushed = sal_True; }
@@ -251,8 +251,8 @@ public:
 
     void CommitStreamRelInfo(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xRelStorage,
-                    const ::rtl::OUString& aOrigStreamName,
-                    const ::rtl::OUString& aNewStreamName );
+                    const OUString& aOrigStreamName,
+                    const OUString& aNewStreamName );
 
     void ReadRelInfoIfNecessary();
 
@@ -352,7 +352,7 @@ public:
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //XEncryptionProtectedSource
-    virtual void SAL_CALL setEncryptionPassword( const ::rtl::OUString& aPass )
+    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
         throw ( ::com::sun::star::uno::RuntimeException,
                 ::com::sun::star::io::IOException );
     virtual void SAL_CALL removeEncryption()
@@ -364,25 +364,25 @@ public:
     virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException);
 
     //XRelationshipAccess
-    virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL clearRelationships(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
 
     // XTransactedObject
     virtual void SAL_CALL commit()
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index 9b0052dae03f..e542b3eaad36 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -32,7 +32,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_component_getFactory( const sal_Char
 {
     void * pRet = 0;
 
-    ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
+    OUString aImplName( OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
     if ( pServiceManager && aImplName.equals( OStorageFactory::impl_staticGetImplementationName() ) )
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index 7f3cb233bec1..1617a9b9ed65 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -26,7 +26,7 @@
 using namespace ::com::sun::star;
 
 //-----------------------------------------------
-OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::XComponentContext > xContext, const ::rtl::OUString& aURL )
+OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::XComponentContext > xContext, const OUString& aURL )
 : m_aURL( aURL )
 {
     uno::Reference< uno::XComponentContext > xOwnContext = xContext;
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index ab4248bccff0..12e5f2ef0df7 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -33,13 +33,13 @@ class OSelfTerminateFileStream : public cppu::WeakImplHelper2< ::com::sun::star:
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xFileAccess;
 
-    ::rtl::OUString m_aURL;
+    OUString m_aURL;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
 
 public:
-    OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const ::rtl::OUString& aURL );
+    OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const OUString& aURL );
 
     virtual ~OSelfTerminateFileStream();
 
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index cd88abd2d44f..8cf91ede9e21 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -56,9 +56,9 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
 }
 
 //-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
 {
-    uno::Sequence< ::rtl::OUString > aRet(2);
+    uno::Sequence< OUString > aRet(2);
     aRet[0] = "com.sun.star.embed.StorageFactory";
     aRet[1] = "com.sun.star.comp.embed.StorageFactory";
     return aRet;
@@ -134,7 +134,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
         throw lang::IllegalArgumentException(); // TODO:
 
     // retrieve storage source stream
-    ::rtl::OUString aURL;
+    OUString aURL;
     uno::Reference< io::XStream > xStream;
     uno::Reference< io::XInputStream > xInputStream;
 
@@ -198,7 +198,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
                 }
                 else if ( aDescr[nInd].Name == "StorageFormat" )
                 {
-                    ::rtl::OUString aFormatName;
+                    OUString aFormatName;
                     sal_Int32 nFormatID = 0;
                     if ( aDescr[nInd].Value >>= aFormatName )
                     {
@@ -281,17 +281,17 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OStorageFactory::getImplementationName()
+OUString SAL_CALL OStorageFactory::getImplementationName()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
 //-------------------------------------------------------------------------
-sal_Bool SAL_CALL OStorageFactory::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName )
     throw ( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
+    uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
 
     for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
         if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL OStorageFactory::supportsService( const ::rtl::OUString& Servi
 }
 
 //-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetSupportedServiceNames();
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 457c37bffa32..1d3b1993e3e5 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -39,10 +39,10 @@ public:
         OSL_ENSURE( xContext.is(), "No service manager is provided!\n" );
     }
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
             impl_staticGetSupportedServiceNames();
 
-    static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+    static OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         impl_staticCreateSelfInstance(
@@ -54,9 +54,9 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
 
 };
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index dc1c51fef1c2..a0958e5ba3bf 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -92,7 +92,7 @@ struct StorInternalData_Impl
 };
 
 //=========================================================
-::rtl::OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext );
+OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext );
 
 // static
 void OStorage_Impl::completeStorageStreamCopy_Impl(
@@ -117,7 +117,7 @@ void OStorage_Impl::completeStorageStreamCopy_Impl(
         // TODO: headers of encripted streams should be copied also
         ::comphelper::OStorageHelper::CopyInputToOutput( xSourceInStream, xDestOutStream );
 
-        uno::Sequence< ::rtl::OUString > aPropNames( 1 );
+        uno::Sequence< OUString > aPropNames( 1 );
         aPropNames[0] = "Compressed";
 
         if ( nStorageType == embed::StorageFormats::PACKAGE )
@@ -164,7 +164,7 @@ StorInternalData_Impl::~StorInternalData_Impl()
 }
 
 
-SotElement_Impl::SotElement_Impl( const ::rtl::OUString& rName, sal_Bool bStor, sal_Bool bNew )
+SotElement_Impl::SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew )
 : m_aName( rName )
 , m_aOriginalName( rName )
 , m_bIsRemoved( sal_False )
@@ -360,7 +360,7 @@ OStorage_Impl::~OStorage_Impl()
     m_xPackageFolder = uno::Reference< container::XNameContainer >();
     m_xPackage = uno::Reference< lang::XSingleServiceFactory >();
 
-    ::rtl::OUString aPropertyName = "URL";
+    OUString aPropertyName = "URL";
     for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); ++aInd )
     {
         if ( m_xProperties[aInd].Name.equals( aPropertyName ) )
@@ -397,7 +397,7 @@ OStorage_Impl::~OStorage_Impl()
 }
 
 //-----------------------------------------------
-void OStorage_Impl::AddLog( const ::rtl::OUString& aMessage )
+void OStorage_Impl::AddLog( const OUString& aMessage )
 {
     if ( !m_xLogRing.is() )
     {
@@ -587,7 +587,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
     if ( m_nRelInfoStatus == RELINFO_NO_INIT )
     {
         // Init from original stream
-        uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( ::rtl::OUString() );
+        uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( OUString() );
         if ( xRelInfoStream.is() )
             m_aRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(
                                     xRelInfoStream,
@@ -649,7 +649,7 @@ void OStorage_Impl::ReadContents()
                 throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
             }
 
-            ::rtl::OUString aName = xNamed->getName();
+            OUString aName = xNamed->getName();
             OSL_ENSURE( !aName.isEmpty(), "Empty name!\n" );
 
             uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY );
@@ -725,8 +725,8 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
     // move storage properties to the destination one ( means changeable properties )
     if ( m_nStorageType == embed::StorageFormats::PACKAGE )
     {
-        ::rtl::OUString aMediaTypeString = "MediaType";
-        ::rtl::OUString aVersionString = "Version";
+        OUString aMediaTypeString = "MediaType";
+        OUString aVersionString = "Version";
         xPropSet->setPropertyValue( aMediaTypeString, uno::makeAny( m_aMediaType ) );
         xPropSet->setPropertyValue( aVersionString, uno::makeAny( m_aVersion ) );
     }
@@ -735,7 +735,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
     {
         // if this is a root storage, the common key from current one should be moved there
         sal_Bool bIsRoot = sal_False;
-        ::rtl::OUString aRootString = "IsRoot";
+        OUString aRootString = "IsRoot";
         if ( ( xPropSet->getPropertyValue( aRootString ) >>= bIsRoot ) && bIsRoot )
         {
             try
@@ -763,13 +763,13 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
     {
 
         // TODO/LATER: currently the optimization is not active
-        // uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own stream
+        // uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( OUString() ); // own stream
         // if ( xRelInfoStream.is() )
         // {
         //  // Relations info stream is a writeonly property, introduced only to optimyze copying
         //  // Should be used carefuly since no check for stream consistency is done, and the stream must not stay locked
         //
-        //  ::rtl::OUString aRelInfoString = "RelationsInfoStream";
+        //  OUString aRelInfoString = "RelationsInfoStream";
         //  xPropSet->setPropertyValue( aRelInfoString, uno::makeAny( GetSeekableTempCopy( xRelInfoStream, m_xFactory ) ) );
         // }
 
@@ -789,7 +789,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
 //-----------------------------------------------
 void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                                         uno::Reference< embed::XStorage > xDest,
-                                        ::rtl::OUString aName,
+                                        OUString aName,
                                         sal_Bool bDirect )
 {
     OSL_ENSURE( xDest.is(), "No destination storage!\n" );
@@ -858,7 +858,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                 else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
                     // TODO/LATER: currently the optimization is not active
-                    // uno::Reference< io::XInputStream > xInStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own rels stream
+                    // uno::Reference< io::XInputStream > xInStream = GetRelInfoStreamForName( OUString() ); // own rels stream
                     // if ( xInStream.is() )
                     // {
                     //  aStrProps.realloc( ++nNum );
@@ -1030,7 +1030,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
 }
 
 //-----------------------------------------------
-void OStorage_Impl::InsertIntoPackageFolder( const ::rtl::OUString& aName,
+void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
                                              const uno::Reference< container::XNameContainer >& xParentPackageFolder )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1386,7 +1386,7 @@ void OStorage_Impl::Revert()
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
+SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
 {
     OSL_ENSURE( !rName.isEmpty(), "Name is empty!" );
 
@@ -1405,7 +1405,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertStream( ::rtl::OUString aName, sal_Bool bEncr )
+SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr )
 {
     OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
     if ( !m_xPackage.is() )
@@ -1440,7 +1440,7 @@ SotElement_Impl* OStorage_Impl::InsertStream( ::rtl::OUString aName, sal_Bool bE
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertRawStream( ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInStream )
+SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Reference< io::XInputStream >& xInStream )
 {
     // insert of raw stream means insert and commit
     OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
@@ -1510,7 +1510,7 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertStorage( ::rtl::OUString aName, sal_Int32 nStorageMode )
+SotElement_Impl* OStorage_Impl::InsertStorage( OUString aName, sal_Int32 nStorageMode )
 {
     SotElement_Impl* pNewElement = InsertElement( aName, sal_True );
 
@@ -1522,7 +1522,7 @@ SotElement_Impl* OStorage_Impl::InsertStorage( ::rtl::OUString aName, sal_Int32
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertElement( ::rtl::OUString aName, sal_Bool bIsStorage )
+SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStorage )
 {
     OSL_ENSURE( FindElement( aName ) == NULL, "Should not try to insert existing element" );
 
@@ -1615,14 +1615,14 @@ void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
 }
 
 //-----------------------------------------------
-uno::Sequence< ::rtl::OUString > OStorage_Impl::GetElementNames()
+uno::Sequence< OUString > OStorage_Impl::GetElementNames()
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
     ReadContents();
 
     sal_uInt32 nSize = m_aChildrenList.size();
-    uno::Sequence< ::rtl::OUString > aElementNames( nSize );
+    uno::Sequence< OUString > aElementNames( nSize );
 
     sal_uInt32 nInd = 0;
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
@@ -1679,7 +1679,7 @@ void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
 }
 
 //-----------------------------------------------
-void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
+void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
                                         sal_Bool bEncryptionDataProvided,
                                         const ::comphelper::SequenceAsHashMap& aEncryptionData,
                                         uno::Reference< io::XStream >& xTargetStream )
@@ -1723,14 +1723,14 @@ void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
 }
 
 //-----------------------------------------------
-void OStorage_Impl::RemoveStreamRelInfo( const ::rtl::OUString& aOriginalName )
+void OStorage_Impl::RemoveStreamRelInfo( const OUString& aOriginalName )
 {
     // this method should be used only in OStorage_Impl::Commit() method
     // the aOriginalName can be empty, in this case the storage relation info should be removed
 
     if ( m_nStorageType == embed::StorageFormats::OFOPXML && m_xRelStorage.is() )
     {
-        ::rtl::OUString aRelStreamName = aOriginalName;
+        OUString aRelStreamName = aOriginalName;
         aRelStreamName += ".rels";
 
         if ( m_xRelStorage->hasByName( aRelStreamName ) )
@@ -1789,14 +1789,14 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
 }
 
 //-----------------------------------------------
-uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const ::rtl::OUString& aName )
+uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const OUString& aName )
 {
     if ( m_nStorageType == embed::StorageFormats::OFOPXML )
     {
         ReadContents();
         if ( m_xRelStorage.is() )
         {
-            ::rtl::OUString aRelStreamName = aName;
+            OUString aRelStreamName = aName;
             aRelStreamName += ".rels";
             if ( m_xRelStorage->hasByName( aRelStreamName ) )
             {
@@ -1814,7 +1814,7 @@ uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const
 void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContainer >& xNewPackageFolder )
 {
     // this method should be used only in OStorage_Impl::Commit() method
-    ::rtl::OUString aRelsStorName("_rels");
+    OUString aRelsStorName("_rels");
 
     if ( !xNewPackageFolder.is() )
         throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
@@ -1853,7 +1853,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
                     m_nRelInfoStatus = RELINFO_READ;
                 }
                 else if ( m_xRelStorage.is() )
-                    RemoveStreamRelInfo( ::rtl::OUString() ); // remove own rel info
+                    RemoveStreamRelInfo( OUString() ); // remove own rel info
             }
             else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
                       || m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -2178,7 +2178,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
 }
 
 //-----------------------------------------------
-SotElement_Impl* OStorage::OpenStreamElement_Impl( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
+SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2464,7 +2464,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
 
 //-----------------------------------------------
 uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
-    const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode )
+    const OUString& aStreamName, sal_Int32 nOpenMode )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::WrongPasswordException,
@@ -2566,7 +2566,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
 
 //-----------------------------------------------
 uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
-    const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
+    const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -2582,7 +2582,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
 
 //-----------------------------------------------
 uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
-            const ::rtl::OUString& aStorName, sal_Int32 nStorageMode )
+            const OUString& aStorName, sal_Int32 nStorageMode )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 io::IOException,
@@ -2735,7 +2735,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
 }
 
 //-----------------------------------------------
-uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl::OUString& aStreamName )
+uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUString& aStreamName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::WrongPasswordException,
@@ -2817,8 +2817,8 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl
 
 //-----------------------------------------------
 uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement(
-    const ::rtl::OUString& aStreamName,
-    const ::rtl::OUString& aPass )
+    const OUString& aStreamName,
+    const OUString& aPass )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -2900,7 +2900,7 @@ void SAL_CALL OStorage::copyLastCommitTo(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::copyStorageElementLastCommitTo(
-            const ::rtl::OUString& aStorName,
+            const OUString& aStorName,
             const uno::Reference< embed::XStorage >& xTargetStorage )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -2997,7 +2997,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
 }
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName )
+sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3065,7 +3065,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName
 }
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementName )
+sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3133,7 +3133,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementNam
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName )
+void SAL_CALL OStorage::removeElement( const OUString& aElementName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3225,7 +3225,7 @@ void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName )
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, const ::rtl::OUString& aNewName )
+void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUString& aNewName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3328,9 +3328,9 @@ void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, cons
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::copyElementTo(  const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::copyElementTo(  const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
-                                        const ::rtl::OUString& aNewName )
+                                        const OUString& aNewName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3431,9 +3431,9 @@ void SAL_CALL OStorage::copyElementTo(  const ::rtl::OUString& aElementName,
 
 
 //-----------------------------------------------
-void SAL_CALL OStorage::moveElementTo(  const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::moveElementTo(  const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
-                                        const ::rtl::OUString& aNewName )
+                                        const OUString& aNewName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3549,7 +3549,7 @@ void SAL_CALL OStorage::moveElementTo(  const ::rtl::OUString& aElementName,
 
 //-----------------------------------------------
 uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
-    const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
+    const OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -3658,7 +3658,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
 
 //-----------------------------------------------
 uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
-    const ::rtl::OUString& aStreamName,
+    const OUString& aStreamName,
     const uno::Sequence< beans::NamedValue >& aEncryptionData )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -3753,7 +3753,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
 
 //-----------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
-            const ::rtl::OUString& sStreamName )
+            const OUString& sStreamName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -3860,7 +3860,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
 
 //-----------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
-            const ::rtl::OUString& sStreamName )
+            const OUString& sStreamName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -3977,7 +3977,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::insertRawEncrStreamElement( const ::rtl::OUString& aStreamName,
+void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
                                 const uno::Reference< io::XInputStream >& xInStream )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -4340,7 +4340,7 @@ void SAL_CALL OStorage::removeModifyListener(
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
-uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName )
+uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
         throw ( container::NoSuchElementException,
                 lang::WrappedTargetException,
                 uno::RuntimeException )
@@ -4408,7 +4408,7 @@ uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName )
 
 
 //-----------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorage::getElementNames()
+uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
         throw ( uno::RuntimeException )
 {
     RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementNames" );
@@ -4446,7 +4446,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStorage::getElementNames()
 
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
         throw ( uno::RuntimeException )
 {
     RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasByName" );
@@ -4624,7 +4624,7 @@ void SAL_CALL OStorage::removeEventListener(
 //  XEncryptionProtectedSource
 //____________________________________________________________________________________________________
 
-void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
+void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass )
     throw ( uno::RuntimeException,
             io::IOException )
 {
@@ -4939,7 +4939,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo(
 
 
 //-----------------------------------------------
-void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
         throw ( beans::UnknownPropertyException,
                 beans::PropertyVetoException,
                 lang::IllegalArgumentException,
@@ -5050,7 +5050,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
 
 
 //-----------------------------------------------
-uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyName )
+uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
                 uno::RuntimeException )
@@ -5117,7 +5117,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
             }
 
             if ( aPropertyName == "URL" )
-                return uno::makeAny( ::rtl::OUString() );
+                return uno::makeAny( OUString() );
 
             return uno::makeAny( sal_False ); // RepairPackage
         }
@@ -5160,7 +5160,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
 
 //-----------------------------------------------
 void SAL_CALL OStorage::addPropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -5180,7 +5180,7 @@ void SAL_CALL OStorage::addPropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::removePropertyChangeListener(
-    const ::rtl::OUString& /*aPropertyName*/,
+    const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -5200,7 +5200,7 @@ void SAL_CALL OStorage::removePropertyChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::addVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -5220,7 +5220,7 @@ void SAL_CALL OStorage::addVetoableChangeListener(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::removeVetoableChangeListener(
-    const ::rtl::OUString& /*PropertyName*/,
+    const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
@@ -5244,7 +5244,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener(
 // TODO/LATER: the storage and stream implementations of this interface are very similar, they could use a helper class
 
 //-----------------------------------------------
-sal_Bool SAL_CALL OStorage::hasByID(  const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OStorage::hasByID(  const OUString& sID )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -5274,7 +5274,7 @@ sal_Bool SAL_CALL OStorage::hasByID(  const ::rtl::OUString& sID )
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OStorage::getTargetByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OStorage::getTargetByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -5295,11 +5295,11 @@ sal_Bool SAL_CALL OStorage::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Target" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL OStorage::getTypeByID(  const ::rtl::OUString& sID  )
+OUString SAL_CALL OStorage::getTypeByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -5320,11 +5320,11 @@ sal_Bool SAL_CALL OStorage::hasByID(  const ::rtl::OUString& sID )
         if ( aSeq[nInd].First == "Type" )
             return aSeq[nInd].Second;
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  const ::rtl::OUString& sID  )
+uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -5355,7 +5355,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  cons
 }
 
 //-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType(  const ::rtl::OUString& sType  )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType(  const OUString& sType  )
         throw ( io::IOException,
                 uno::RuntimeException )
 {
@@ -5410,7 +5410,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::insertRelationshipByID(  const ::rtl::OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace  )
+void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace  )
         throw ( container::ElementExistException,
                 io::IOException,
                 uno::RuntimeException )
@@ -5475,7 +5475,7 @@ void SAL_CALL OStorage::insertRelationshipByID(  const ::rtl::OUString& sID, con
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::removeRelationshipByID(  const ::rtl::OUString& sID  )
+void SAL_CALL OStorage::removeRelationshipByID(  const OUString& sID  )
         throw ( container::NoSuchElementException,
                 io::IOException,
                 uno::RuntimeException )
@@ -5625,7 +5625,7 @@ void SAL_CALL OStorage::clearRelationships()
 //____________________________________________________________________________________________________
 //-----------------------------------------------
 void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
-            const ::rtl::OUString& /*sStreamName*/,
+            const OUString& /*sStreamName*/,
             const uno::Reference< io::XInputStream >& /*xInStream*/ )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -5642,7 +5642,7 @@ void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::insertStreamElementDirect(
-            const ::rtl::OUString& aStreamName,
+            const OUString& aStreamName,
             const uno::Reference< io::XInputStream >& xInStream,
             const uno::Sequence< beans::PropertyValue >& aProps )
         throw ( embed::InvalidStorageException,
@@ -5733,9 +5733,9 @@ void SAL_CALL OStorage::insertStreamElementDirect(
 
 //-----------------------------------------------
 void SAL_CALL OStorage::copyElementDirectlyTo(
-            const ::rtl::OUString& aElementName,
+            const OUString& aElementName,
             const uno::Reference< embed::XOptimizedStorage >& xDest,
-            const ::rtl::OUString& aNewName )
+            const OUString& aNewName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -5907,7 +5907,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL,
+void SAL_CALL OStorage::attachToURL( const OUString& sURL,
                                     sal_Bool bReadOnly )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -5990,7 +5990,7 @@ void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL,
 }
 
 //-----------------------------------------------
-uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aElementName, const ::rtl::OUString& aPropertyName )
+uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementName, const OUString& aPropertyName )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -6096,7 +6096,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream )
+void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::WrongPasswordException,
@@ -6185,7 +6185,7 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::WrongPasswordException,
@@ -6244,7 +6244,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
 }
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const OUString& sPassword )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -6257,7 +6257,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath )
+void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& aStreamPath )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -6293,7 +6293,7 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUSt
 // XHierarchicalStorageAccess2
 //____________________________________________________________________________________________________
 
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 83c997ca3544..b8d5e15ba517 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -72,8 +72,8 @@ struct OWriteStream_Impl;
 
 struct SotElement_Impl
 {
-    ::rtl::OUString             m_aName;
-    ::rtl::OUString             m_aOriginalName;
+    OUString             m_aName;
+    OUString             m_aOriginalName;
     sal_Bool                    m_bIsRemoved;
     sal_Bool                    m_bIsInserted;
     sal_Bool                    m_bIsStorage;
@@ -82,7 +82,7 @@ struct SotElement_Impl
     OWriteStream_Impl*          m_pStream;
 
 public:
-                                SotElement_Impl( const ::rtl::OUString& rName, sal_Bool bStor, sal_Bool bNew );
+                                SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew );
                                 ~SotElement_Impl();
 };
 
@@ -152,11 +152,11 @@ struct OStorage_Impl
     OStorage_Impl* m_pParent;
 
     sal_Bool        m_bControlMediaType;
-    ::rtl::OUString m_aMediaType;
+    OUString m_aMediaType;
     sal_Bool        m_bMTFallbackUsed;
 
     sal_Bool        m_bControlVersion;
-    ::rtl::OUString m_aVersion;
+    OUString m_aVersion;
 
     SwitchablePersistenceStream* m_pSwitchStream;
 
@@ -194,7 +194,7 @@ struct OStorage_Impl
 
     ~OStorage_Impl();
 
-    void AddLog( const ::rtl::OUString& aMessage );
+    void AddLog( const OUString& aMessage );
 
     void SetReadOnlyWrap( OStorage& aStorage );
     void RemoveReadOnlyWrap( OStorage& aStorage );
@@ -210,10 +210,10 @@ struct OStorage_Impl
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetAllRelationshipsIfAny();
     void CopyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStor );
     void CopyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStor,
-                            const ::rtl::OUString& aPass );
+                            const OUString& aPass );
 
     void InsertIntoPackageFolder(
-            const ::rtl::OUString& aName,
+            const OUString& aName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
 
     void Commit();
@@ -225,32 +225,32 @@ struct OStorage_Impl
                         sal_Bool bDirect );
     void CopyStorageElement( SotElement_Impl* pElement,
                             ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xDest,
-                            ::rtl::OUString aName,
+                            OUString aName,
                             sal_Bool bDirect );
 
     void SetModified( sal_Bool bModified );
 
-    SotElement_Impl* FindElement( const ::rtl::OUString& rName );
+    SotElement_Impl* FindElement( const OUString& rName );
 
 
-    SotElement_Impl* InsertStream( ::rtl::OUString aName, sal_Bool bEncr );
-    SotElement_Impl* InsertRawStream( ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
+    SotElement_Impl* InsertStream( OUString aName, sal_Bool bEncr );
+    SotElement_Impl* InsertRawStream( OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
 
     OStorage_Impl* CreateNewStorageImpl( sal_Int32 nStorageMode );
-    SotElement_Impl* InsertStorage( ::rtl::OUString aName, sal_Int32 nStorageMode );
-    SotElement_Impl* InsertElement( ::rtl::OUString aName, sal_Bool bIsStorage );
+    SotElement_Impl* InsertStorage( OUString aName, sal_Int32 nStorageMode );
+    SotElement_Impl* InsertElement( OUString aName, sal_Bool bIsStorage );
 
     void OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode );
     void OpenSubStream( SotElement_Impl* pElement );
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > GetElementNames();
+    ::com::sun::star::uno::Sequence< OUString > GetElementNames();
 
     void RemoveElement( SotElement_Impl* pElement );
     void ClearElement( SotElement_Impl* pElement );
     void DisposeChildren();
 
     void CloneStreamElement(
-                    const ::rtl::OUString& aStreamName,
+                    const OUString& aStreamName,
                     sal_Bool bPassProvided,
                     const ::comphelper::SequenceAsHashMap& aEncryptionData,
                     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
@@ -261,10 +261,10 @@ struct OStorage_Impl
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    void RemoveStreamRelInfo( const ::rtl::OUString& aOriginalName );
+    void RemoveStreamRelInfo( const OUString& aOriginalName );
     void CreateRelStorage();
     void CommitStreamRelInfo( SotElement_Impl* pStreamElement );
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRelInfoStreamForName( const ::rtl::OUString& aName );
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRelInfoStreamForName( const OUString& aName );
     void CommitRelInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xNewPackageFolder );
 
     static void completeStorageStreamCopy_Impl(
@@ -296,7 +296,7 @@ protected:
 
     void Commit_Impl();
 
-    SotElement_Impl* OpenStreamElement_Impl( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr );
+    SotElement_Impl* OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr );
 
     void BroadcastModifiedIfNecessary();
 
@@ -362,7 +362,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement(
-            const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode )
+            const OUString& aStreamName, sal_Int32 nOpenMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::WrongPasswordException,
@@ -371,7 +371,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement(
-            const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
+            const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -381,7 +381,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement(
-            const ::rtl::OUString& aStorName, sal_Int32 nStorageMode )
+            const OUString& aStorName, sal_Int32 nStorageMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::io::IOException,
@@ -389,7 +389,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement(
-            const ::rtl::OUString& aStreamName )
+            const OUString& aStreamName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::WrongPasswordException,
@@ -398,7 +398,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement(
-            const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass )
+            const OUString& aStreamName, const OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -416,7 +416,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL copyStorageElementLastCommitTo(
-            const ::rtl::OUString& aStorName,
+            const OUString& aStorName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -424,19 +424,19 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Bool SAL_CALL isStreamElement( const ::rtl::OUString& aElementName )
+    virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Bool SAL_CALL isStorageElement( const ::rtl::OUString& aElementName )
+    virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL removeElement( const ::rtl::OUString& aElementName )
+    virtual void SAL_CALL removeElement( const OUString& aElementName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -444,7 +444,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL renameElement( const ::rtl::OUString& rEleName, const ::rtl::OUString& rNewName )
+    virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -453,9 +453,9 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL copyElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL copyElementTo(    const OUString& aElementName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
-                                        const ::rtl::OUString& aNewName )
+                                        const OUString& aNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -464,9 +464,9 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL moveElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL moveElementTo(    const OUString& aElementName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
-                                        const ::rtl::OUString& rNewName )
+                                        const OUString& rNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -479,7 +479,7 @@ public:
     //  XStorage2
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -488,7 +488,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -502,7 +502,7 @@ public:
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getPlainRawStreamElement(
-            const ::rtl::OUString& sStreamName )
+            const OUString& sStreamName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -511,7 +511,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawEncrStreamElement(
-            const ::rtl::OUString& sStreamName )
+            const OUString& sStreamName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -520,7 +520,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL insertRawEncrStreamElement( const ::rtl::OUString& aStreamName,
+    virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -579,15 +579,15 @@ public:
     //  XNameAccess
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
         throw ( ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
@@ -615,7 +615,7 @@ public:
     //  XEncryptionProtectedSource
     //____________________________________________________________________________________________________
 
-    virtual void SAL_CALL setEncryptionPassword( const ::rtl::OUString& aPass )
+    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
         throw ( ::com::sun::star::uno::RuntimeException,
                 ::com::sun::star::io::IOException );
 
@@ -650,40 +650,40 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::beans::PropertyVetoException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL addPropertyChangeListener(
-            const ::rtl::OUString& aPropertyName,
+            const OUString& aPropertyName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL removePropertyChangeListener(
-            const ::rtl::OUString& aPropertyName,
+            const OUString& aPropertyName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL addVetoableChangeListener(
-            const ::rtl::OUString& PropertyName,
+            const OUString& PropertyName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
@@ -691,7 +691,7 @@ public:
     //____________________________________________________________________________________________________
     //  XOptimizedStorage
     //____________________________________________________________________________________________________
-    virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
+    virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoRawFormatException,
@@ -700,7 +700,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL insertStreamElementDirect( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps )
+    virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::ElementExistException,
@@ -708,7 +708,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL copyElementDirectlyTo( const ::rtl::OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const ::rtl::OUString& sTargetName )
+    virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -724,14 +724,14 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL attachToURL( const ::rtl::OUString& sURL, sal_Bool bReadOnly )
+    virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const ::rtl::OUString& sElementName, const ::rtl::OUString& sPropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -741,7 +741,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL copyStreamElementData( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
+    virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::WrongPasswordException,
@@ -753,26 +753,26 @@ public:
     // XRelationshipAccess
     //____________________________________________________________________________________________________
 
-    virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID )
+    virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID )
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID )
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID )
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType )
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
@@ -780,12 +780,12 @@ public:
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace )
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace )
         throw ( ::com::sun::star::container::ElementExistException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID )
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException);
@@ -803,7 +803,7 @@ public:
     // XHierarchicalStorageAccess
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::WrongPasswordException,
@@ -811,7 +811,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -820,7 +820,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removeStreamElementByHierarchicalName( const ::rtl::OUString& sElementPath )
+    virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
@@ -832,7 +832,7 @@ public:
     // XHierarchicalStorageAccess2
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index cb4b8123a71c..cd2e2f988ef2 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::uno;
 using com::sun::star::lang::IllegalArgumentException;
 using com::sun::star::packages::zip::ZipIOException;
-using ::rtl::OUString;
 
 XUnbufferedStream::XUnbufferedStream(
                       const uno::Reference< uno::XComponentContext >& xContext,
@@ -48,7 +47,7 @@ XUnbufferedStream::XUnbufferedStream(
                       const ::rtl::Reference< EncryptionData >& rData,
                       sal_Int8 nStreamMode,
                       sal_Bool bIsEncrypted,
-                      const ::rtl::OUString& aMediaType,
+                      const OUString& aMediaType,
                       sal_Bool bRecoveryMode )
 : maMutexHolder( aMutexHolder.Is() ? aMutexHolder : SotMutexHolderRef( new SotMutexHolder ) )
 , mxZipStream ( xNewZipStream )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 4bfa35c49a05..9840ff0b471a 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -68,7 +68,7 @@ public:
                  const ::rtl::Reference< EncryptionData >& rData,
                  sal_Int8 nStreamMode,
                  sal_Bool bIsEncrypted,
-                 const ::rtl::OUString& aMediaType,
+                 const OUString& aMediaType,
                  sal_Bool bRecoveryMode );
 
     // allows to read package raw stream
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 1237b26f17a8..9a894f496e77 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -56,7 +56,6 @@ using namespace com::sun::star::packages;
 using namespace com::sun::star::packages::zip;
 using namespace com::sun::star::packages::zip::ZipConstants;
 
-using rtl::OUString;
 using ZipUtils::Inflater;
 
 /** This class is used to read entries from a zip file
@@ -194,7 +193,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un
 
 void ZipFile::StaticFillHeader( const ::rtl::Reference< EncryptionData >& rData,
                                 sal_Int64 nSize,
-                                const ::rtl::OUString& aMediaType,
+                                const OUString& aMediaType,
                                 sal_Int8 * & pHeader )
 {
     // I think it's safe to restrict vector and salt length to 2 bytes !
@@ -294,7 +293,7 @@ sal_Bool ZipFile::StaticFillData (  ::rtl::Reference< BaseEncryptionData > & rDa
                                     sal_Int32 &rDerivedKeySize,
                                     sal_Int32 &rStartKeyGenID,
                                     sal_Int32 &rSize,
-                                    ::rtl::OUString& aMediaType,
+                                    OUString& aMediaType,
                                     const uno::Reference< XInputStream >& rStream )
 {
     sal_Bool bOk = sal_False;
@@ -364,7 +363,7 @@ sal_Bool ZipFile::StaticFillData (  ::rtl::Reference< BaseEncryptionData > & rDa
 
                         if ( nMediaTypeLength == rStream->readBytes ( aBuffer, nMediaTypeLength ) )
                         {
-                            aMediaType = ::rtl::OUString( (sal_Unicode*)aBuffer.getConstArray(),
+                            aMediaType = OUString( (sal_Unicode*)aBuffer.getConstArray(),
                                                             nMediaTypeLength / sizeof( sal_Unicode ) );
                             bOk = sal_True;
                         }
@@ -517,7 +516,7 @@ uno::Reference< XInputStream > ZipFile::createUnbufferedStream(
             const ::rtl::Reference< EncryptionData > &rData,
             sal_Int8 nStreamMode,
             sal_Bool bIsEncrypted,
-            ::rtl::OUString aMediaType )
+            OUString aMediaType )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -616,7 +615,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
 uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
         ZipEntry& rEntry,
         const ::rtl::Reference< EncryptionData >& rData,
-        const ::rtl::OUString& aMediaType,
+        const OUString& aMediaType,
         SotMutexHolderRef aMutexHolder )
     throw ( packages::NoEncryptionException,
             IOException,
@@ -671,7 +670,7 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
         if ( nRead < aNameBuffer.getLength() )
                 aNameBuffer.realloc( nRead );
 
-        ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(),
+        OUString sLOCPath = OUString::intern( (sal_Char *) aNameBuffer.getArray(),
                                                           aNameBuffer.getLength(),
                                                           RTL_TEXTENCODING_UTF8 );
 
@@ -849,7 +848,7 @@ sal_Int32 ZipFile::readCEN()
                 throw ZipException("unexpected extra header info length", uno::Reference < XInterface > () );
 
             // read always in UTF8, some tools seem not to set UTF8 bit
-            aEntry.sPath = rtl::OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(),
+            aEntry.sPath = OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(),
                                                    aEntry.nPathLen,
                                                    RTL_TEXTENCODING_UTF8 );
 
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index f24881dfbb7a..7b2ae4ffe543 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -320,7 +320,7 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
     if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, sal_True ) )
         throw IOException("Unexpected character is used in file name.", uno::Reference< XInterface >() );
 
-    ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
+    OString sUTF8Name = OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
     sal_Int16 nNameLength       = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
 
     aChucker << CENSIG;
@@ -391,7 +391,7 @@ sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry )
     if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, sal_True ) )
         throw IOException("Unexpected character is used in file name.", uno::Reference< XInterface >() );
 
-    ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
+    OString sUTF8Name = OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
     sal_Int16 nNameLength       = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
 
     aChucker << LOCSIG;
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index 627ccdaf4408..e3b1676cd83a 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -21,7 +21,6 @@
 #include <ContentInfo.hxx>
 
 using namespace com::sun::star;
-using rtl::OUString;
 
 ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput)
 : rContents (rInput)
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index 4879616c4945..b9894a2feefe 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -34,7 +34,7 @@ protected:
     ContentHash& rContents;
     ContentHash::const_iterator aIterator;
 public:
-    //ZipPackageFolderEnumeration (boost::unordered_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput);
+    //ZipPackageFolderEnumeration (boost::unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput);
     ZipPackageFolderEnumeration (ContentHash &rInput);
     virtual ~ZipPackageFolderEnumeration( void );
 
@@ -45,11 +45,11 @@ public:
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
         throw (::com::sun::star::uno::RuntimeException);
 
 };
author	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 12:06:47 +0200
committer	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 14:23:11 +0200
commit	1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree	e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /package
parent	5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)