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

14 files changed, 112 insertions, 112 deletions

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 0cea04fe568e..da337cd84e33 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -72,9 +72,9 @@ public:
     CustomAnimationEffectPtr clone() const;
 
     // attributes
-    const rtl::OUString&    getPresetId() const { return maPresetId; }
-    const rtl::OUString&    getPresetSubType() const { return maPresetSubType; }
-    const rtl::OUString&    getProperty() const { return maProperty; }
+    const OUString&    getPresetId() const { return maPresetId; }
+    const OUString&    getPresetSubType() const { return maPresetSubType; }
+    const OUString&    getProperty() const { return maProperty; }
 
     sal_Int16               getPresetClass() const { return mnPresetClass; }
     void                    setPresetClass( sal_Int16 nPresetClass );
@@ -135,8 +135,8 @@ public:
     sal_Bool        getAutoReverse() const { return mbAutoReverse; }
     void            setAutoReverse( sal_Bool bAutoReverse );
 
-    ::com::sun::star::uno::Any  getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue );
-    bool                        setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+    ::com::sun::star::uno::Any  getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
+    bool                        setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
 
     ::com::sun::star::uno::Any  getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
     bool                        setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
@@ -153,8 +153,8 @@ public:
     sal_Int16       getTargetSubItem() const { return mnTargetSubItem; }
     SD_DLLPUBLIC void           setTargetSubItem( sal_Int16 nSubItem );
 
-    ::rtl::OUString getPath() const;
-    void setPath( const ::rtl::OUString& rPath );
+    OUString getPath() const;
+    void setPath( const OUString& rPath );
 
     bool checkForText();
     bool calculateIterateDuration();
@@ -185,9 +185,9 @@ protected:
 
 private:
     sal_Int16       mnNodeType;
-    rtl::OUString   maPresetId;
-    rtl::OUString   maPresetSubType;
-    rtl::OUString   maProperty;
+    OUString   maPresetId;
+    OUString   maPresetSubType;
+    OUString   maProperty;
     sal_Int16       mnPresetClass;
     double          mfBegin;
     double          mfDuration;                 // this is the maximum duration of the subeffects
@@ -291,7 +291,7 @@ public:
     SD_DLLPUBLIC void append( const CustomAnimationEffectPtr& pEffect );
     void insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect );
     void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 );
-    void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const rtl::OUString& rPresetSubType, double fDuration = -1.0 );
+    void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 );
     void remove( const CustomAnimationEffectPtr& pEffect );
 
     void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index dd1836304d3c..49092161322f 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -31,9 +31,9 @@
 
 namespace sd {
 
-typedef boost::unordered_map< rtl::OUString, CustomAnimationEffectPtr, rtl::OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
-typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap;
-typedef std::vector< rtl::OUString > UStringList;
+typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap;
+typedef std::vector< OUString > UStringList;
 
 class CustomAnimationPreset
 {
@@ -44,26 +44,26 @@ public:
 
     void add( CustomAnimationEffectPtr pEffect );
 
-    SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const rtl::OUString& rstrSubType );
+    SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const OUString& rstrSubType );
 
-    const rtl::OUString& getPresetId() const { return maPresetId; }
-    const rtl::OUString& getProperty() const { return maProperty; }
-    const rtl::OUString& getLabel() const { return maLabel; }
+    const OUString& getPresetId() const { return maPresetId; }
+    const OUString& getProperty() const { return maProperty; }
+    const OUString& getLabel() const { return maLabel; }
     sal_Int16 getPresetClass() const { return mnPresetClass; }
     double getDuration() const { return mfDuration; }
 
     UStringList getSubTypes();
     UStringList getProperties() const;
 
-    bool hasProperty( const rtl::OUString& rProperty ) const;
+    bool hasProperty( const OUString& rProperty ) const;
     bool isTextOnly() const { return mbIsTextOnly; }
 
 private:
-    rtl::OUString maPresetId;
-    rtl::OUString maProperty;
+    OUString maPresetId;
+    OUString maProperty;
     sal_Int16 mnPresetClass;
-    rtl::OUString maLabel;
-    rtl::OUString maDefaultSubTyp;
+    OUString maLabel;
+    OUString maDefaultSubTyp;
     double mfDuration;
     bool mbIsTextOnly;
 
@@ -71,15 +71,15 @@ private:
 };
 
 typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<rtl::OUString, CustomAnimationPresetPtr, rtl::OUStringHash, comphelper::UStringEqual> EffectDescriptorMap;
+typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash, comphelper::UStringEqual> EffectDescriptorMap;
 typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
 
 struct PresetCategory
 {
-    rtl::OUString maLabel;
+    OUString maLabel;
     EffectDescriptorList maEffects;
 
-    PresetCategory( const rtl::OUString& rLabel, const EffectDescriptorList& rEffects )
+    PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects )
         : maLabel( rLabel ), maEffects( rEffects ) {}
 };
 typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr;
@@ -97,10 +97,10 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
 
-    SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const rtl::OUString& rPresetId ) const;
+    SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const;
 
-    const rtl::OUString& getUINameForPresetId( const rtl::OUString& rPresetId ) const;
-    const rtl::OUString& getUINameForProperty( const rtl::OUString& rProperty ) const;
+    const OUString& getUINameForPresetId( const OUString& rPresetId ) const;
+    const OUString& getUINameForProperty( const OUString& rProperty ) const;
 
     const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; }
     const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; }
@@ -108,15 +108,15 @@ public:
     const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; }
     const PresetCategoryList& getMiscPresets() const { return maMiscPresets; }
 
-    void changePresetSubType( CustomAnimationEffectPtr pEffect, const rtl::OUString& rPresetSubType ) const;
+    void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const;
 
 private:
     void importEffects();
     void importResources();
 
-    void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const rtl::OUString& rNodePath, PresetCategoryList& rPresetMap  );
+    void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap  );
 
-    const rtl::OUString& translateName( const rtl::OUString& rId, const UStringMap& rNameMap ) const;
+    const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const;
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode;
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 511cec499568..2387d4390491 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -41,8 +41,8 @@ public:
     static ::com::sun::star::presentation::AnimationSpeed ConvertDuration( double fDuration );
     static double ConvertAnimationSpeed( ::com::sun::star::presentation::AnimationSpeed eSpeed );
 
-    static bool ConvertPreset( const ::rtl::OUString& rPresetId, const ::rtl::OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect );
-    static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, ::rtl::OUString& rPresetId, ::rtl::OUString& rPresetSubType );
+    static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect );
+    static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType );
 
 public:
     void AddEffectFromAnimationInfo( SdrObject* pObject, SdAnimationInfo* pInfo );
@@ -67,7 +67,7 @@ public:
     static void SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos );
     static sal_Int32 GetPresentationOrder( SvxShape* pShape );
     static void UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo );
-    static ::rtl::OUString GetSoundFile( SvxShape* pShape );
+    static OUString GetSoundFile( SvxShape* pShape );
     static sal_Bool GetSoundOn( SvxShape* pShape );
 
     static void SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj );
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index ae5fe218e5ad..7010a3394647 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -41,7 +41,7 @@ namespace sd {
 class TransitionPreset;
 typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
 typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap;
 
 class TransitionPreset
 {
@@ -56,8 +56,8 @@ public:
     sal_Bool getDirection() const { return mbDirection; }
     sal_Int32 getFadeColor() const { return mnFadeColor; }
 
-    const rtl::OUString& getUIName() const { return maUIName; }
-    const rtl::OUString& getPresetId() const { return maPresetId; }
+    const OUString& getUIName() const { return maUIName; }
+    const OUString& getPresetId() const { return maPresetId; }
 
 private:
     TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
@@ -66,8 +66,8 @@ private:
     sal_Int16 mnSubtype;
     sal_Bool mbDirection;
     sal_Int32 mnFadeColor;
-    rtl::OUString maPresetId;
-    rtl::OUString maUIName;
+    OUString maPresetId;
+    OUString maUIName;
 
     static bool importTransitionsFile( TransitionPresetList& rList,
                                        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index d9b96793e28a..77ac6b676b2a 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -112,7 +112,7 @@ namespace sd
 {
     struct PresentationSettings
     {
-        rtl::OUString maPresPage;
+        OUString maPresPage;
         sal_Bool mbAll;
         sal_Bool mbEndless;
         sal_Bool mbCustomShow;
@@ -186,7 +186,7 @@ private:
                         DECL_LINK(OnlineSpellingHdl, void *);
                         DECL_LINK(OnlineSpellEventHdl, EditStatus*);
 
-    std::vector< rtl::OUString > maAnnotationAuthors;
+    std::vector< OUString > maAnnotationAuthors;
 
     bool                mbUseEmbedFonts;
 
@@ -249,8 +249,8 @@ public:
     SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile);
     SdDrawDocument*     OpenBookmarkDoc(SfxMedium& rMedium);
 
-    sal_Bool InsertBookmark(const std::vector<rtl::OUString> &rBookmarkList,
-                            std::vector<rtl::OUString> &rExchangeList, sal_Bool bLink,
+    sal_Bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
+                            std::vector<OUString> &rExchangeList, sal_Bool bLink,
                             sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs,
                             ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy,
                             Point* pObjPos);
@@ -304,15 +304,15 @@ public:
         page, or preserve the old name
      */
 
-    sal_Bool InsertBookmarkAsPage(const std::vector<rtl::OUString> &rBookmarkList,
-                                  std::vector<rtl::OUString> *pExchangeList,
+    sal_Bool InsertBookmarkAsPage(const std::vector<OUString> &rBookmarkList,
+                                  std::vector<OUString> *pExchangeList,
                               sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos,
                               sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
                               sal_Bool bCopy, sal_Bool bMergeMasterPages,
                               sal_Bool bPreservePageNames);
 
-    sal_Bool InsertBookmarkAsObject(const std::vector<rtl::OUString> &rBookmarkList,
-                                    const std::vector<rtl::OUString> &rExchangeList,
+    sal_Bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
+                                    const std::vector<OUString> &rExchangeList,
                                     sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
                                     Point* pObjPos, bool bCalcObjCount = false);
 
@@ -557,7 +557,7 @@ public:
 
     void SetCalcFieldValueHdl( ::Outliner* pOutliner);
 
-    sal_uInt16 GetAnnotationAuthorIndex( const rtl::OUString& rAuthor );
+    sal_uInt16 GetAnnotationAuthorIndex( const OUString& rAuthor );
 
     bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
     void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 4051149257d1..21c78b7aadba 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -110,7 +110,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog  //add for SdInsertLay
 public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) = 0;
     //from class ::Window
-    virtual void    SetHelpId( const rtl::OString& rHelpId ) = 0;
+    virtual void    SetHelpId( const OString& rHelpId ) = 0;
 };
 
 class AbstractSdInsertPasteDlg : public VclAbstractDialog  //add for SdInsertPasteDlg
@@ -123,7 +123,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog  //add for SdInser
 {
 public:
     virtual ::Window*   GetWindow() = 0;  //this method is added for return a ::Window type pointer
-    virtual std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ) = 0;
+    virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) = 0;
     virtual sal_Bool        IsLink() = 0;
     virtual sal_Bool        IsRemoveUnnessesaryMasterPages() const = 0;
 };
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 73886ba1fc4f..6bcbcf20e2b0 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -52,7 +52,7 @@ public:
 class SdAttrLayerTitle : public SfxStringItem
 {
 public:
-    SdAttrLayerTitle() : SfxStringItem( ATTR_LAYER_TITLE, rtl::OUString()) {}
+    SdAttrLayerTitle() : SfxStringItem( ATTR_LAYER_TITLE, OUString()) {}
     SdAttrLayerTitle( const String& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {}
 };
 
@@ -61,7 +61,7 @@ public:
 class SdAttrLayerDesc : public SfxStringItem
 {
 public:
-    SdAttrLayerDesc() : SfxStringItem( ATTR_LAYER_DESC, rtl::OUString()) {}
+    SdAttrLayerDesc() : SfxStringItem( ATTR_LAYER_DESC, OUString()) {}
     SdAttrLayerDesc( const String& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {}
 };
 
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index 5dc9502dfa8e..beca2badc741 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -58,13 +58,13 @@ protected:
     sal_Bool                    mbIsDraw : 1;
     sal_Bool                    mbShowProgress : 1;
 #ifndef DISABLE_DYNLOADING
-    ::osl::Module*              OpenLibrary( const ::rtl::OUString& rLibraryName ) const;
+    ::osl::Module*              OpenLibrary( const OUString& rLibraryName ) const;
 #endif
     void                        CreateStatusIndicator();
 
 private:
 
-    ::rtl::OUString             ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const;
+    OUString             ImplGetFullLibraryName( const OUString& rLibraryName ) const;
 
 };
 
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index bc8f1d71c292..2035fa6d934b 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -34,7 +34,7 @@ public:
     virtual                 ~SdUndoAction() {}
 
     void                    SetComment(String& rStr) { maComment = rStr; }
-    virtual rtl::OUString   GetComment() const { return maComment; }
+    virtual OUString   GetComment() const { return maComment; }
     virtual SdUndoAction*   Clone() const { return NULL; }
 
 protected:
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index 0adf85fc3182..24f27dfaa78a 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -55,18 +55,18 @@ public:
     virtual ~SdStyleFamily();
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException);
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException);
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException);
 
     // XNamed
-    virtual ::rtl::OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
+    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException);
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException);
 
     // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException);
@@ -77,11 +77,11 @@ public:
     virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     // XSingleServiceFactory
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) throw(css::uno::Exception, css::uno::RuntimeException);
@@ -94,17 +94,17 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName,const css::uno::Reference<css::beans::XVetoableChangeListener>&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference<css::beans::XVetoableChangeListener>&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
 private:
     void throwIfDisposed() const throw(css::uno::RuntimeException);
     SdStyleSheet* GetValidNewSheet( const css::uno::Any& rElement ) throw(css::lang::IllegalArgumentException);
-    SdStyleSheet* GetSheetByName( const ::rtl::OUString& rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException );
+    SdStyleSheet* GetSheetByName( const OUString& rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException );
 
     SfxStyleFamily mnFamily;
     rtl::Reference< SfxStyleSheetPool > mxPool;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 294dec2912e8..624d5da15a02 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -97,14 +97,14 @@ public:
     void throwIfDisposed() 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);
 
     // 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);
 
     // XElementAccess
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException);
@@ -141,7 +141,7 @@ private:
     SdStyleFamilyRef        mxCellFamily;
     SdStyleFamilyMap        maStyleFamilyMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily;
-    rtl::OUString           msTableFamilyName;
+    OUString           msTableFamilyName;
 };
 
 #endif     // _SD_STLPOOL_HXX
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 84762222a7b7..5a9662c28747 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -51,7 +51,7 @@ typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet,
 class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex
 {
 public:
-    SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask );
+    SdStyleSheet( const OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask );
     SdStyleSheet( const SdStyleSheet& );
 
     virtual bool        SetParent (const String& rParentName);
@@ -68,10 +68,10 @@ public:
     SdStyleSheet* GetRealStyleSheet() const;
     SdStyleSheet* GetPseudoStyleSheet() const;
 
-    void SetApiName( const ::rtl::OUString& rApiName );
-    rtl::OUString GetApiName() const;
+    void SetApiName( const OUString& rApiName );
+    OUString GetApiName() const;
 
-    static rtl::OUString GetFamilyString( SfxStyleFamily eFamily );
+    static OUString GetFamilyString( SfxStyleFamily eFamily );
 
     static SdStyleSheet* CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily );
 
@@ -79,34 +79,34 @@ public:
     virtual void SAL_CALL release(  ) throw ();
 
     // 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);
 
     // XNamed
-    virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
 
     // XStyle
     virtual sal_Bool SAL_CALL isUserDefined(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isInUse(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getParentStyle(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getParentStyle(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::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);
 
     // XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -120,7 +120,7 @@ public:
     void notifyModifyListener();
 
 protected:
-    const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw();
+    const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw();
 
     virtual void Load (SvStream& rIn, sal_uInt16 nVersion);
     virtual void Store(SvStream& rOut);
@@ -132,7 +132,7 @@ protected:
 
     virtual void disposing();
 
-    rtl::OUString   msApiName;
+    OUString   msApiName;
     rtl::Reference< SfxStyleSheetBasePool > mxPool;
 
     /** boradcast helper for events */
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 1122abe78f6e..6ae356a20135 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -21,13 +21,13 @@
 #define _SD_STRMNAME_H
 
 // PowerPoint-Filter
-static const rtl::OUString pFilterPowerPoint97( "MS PowerPoint 97" );
-static const rtl::OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
-static const rtl::OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
+static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
+static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
+static const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
 
 // XML content stream
-static const rtl::OUString pStarDrawXMLContent( "content.xml" );
-static const rtl::OUString pStarDrawOldXMLContent( "Content.xml" );
+static const OUString pStarDrawXMLContent( "content.xml" );
+static const OUString pStarDrawOldXMLContent( "Content.xml" );
 
 #endif  // _SD_STRMNAME_H
 
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 3fe7855b17e3..04322224a6be 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -43,7 +43,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 
 private:
     boost::scoped_ptr<UndoAnimationImpl>  mpImpl;
@@ -59,7 +59,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 
 private:
     boost::scoped_ptr<UndoAnimationPathImpl> mpImpl;
@@ -76,7 +76,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 
 private:
     boost::scoped_ptr<UndoTransitionImpl> mpImpl;