diff options
| 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 /sd | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
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
Diffstat (limited to 'sd')
339 files changed, 1731 insertions, 1856 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; diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index a834686b48e7..bcec85035f95 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -61,9 +61,9 @@ class SdFiltersTest public: SdFiltersTest(); - ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, - const rtl::OUString &rURL, const rtl::OUString &rUserData, + ::sd::DrawDocShellRef loadURL( const OUString &rURL ); + virtual bool load( const OUString &rFilter, + const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); @@ -98,7 +98,7 @@ FileFormat aFileFormats[] = { { 0, 0, 0, 0 } }; -::sd::DrawDocShellRef SdFiltersTest::loadURL( const rtl::OUString &rURL ) +::sd::DrawDocShellRef SdFiltersTest::loadURL( const OUString &rURL ) { FileFormat *pFmt = NULL; @@ -114,11 +114,11 @@ FileFormat aFileFormats[] = { if (pFmt->nFormatType) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; SfxFilter* aFilter = new SfxFilter( - rtl::OUString::createFromAscii( pFmt->pFilterName ), - rtl::OUString(), pFmt->nFormatType, nFormat, - rtl::OUString::createFromAscii( pFmt->pTypeName ), - 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString("private:factory/sdraw*") ); + OUString::createFromAscii( pFmt->pFilterName ), + OUString(), pFmt->nFormatType, nFormat, + OUString::createFromAscii( pFmt->pTypeName ), + 0, OUString(), OUString(), /* userdata */ + OUString("private:factory/sdraw*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -181,14 +181,14 @@ void SdFiltersTest::testN778859() } } -bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, +bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString() ); + OUString(), nFilterFlags, nClipboardID, OUString(), 0, OUString(), + rUserData, OUString() ); aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -202,13 +202,13 @@ bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL void SdFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(rtl::OUString("MS PowerPoint 97"), + testDir(OUString("MS PowerPoint 97"), getURLFromSrc("/sd/qa/unit/data/ppt/"), - rtl::OUString("sdfilt")); + OUString("sdfilt")); - testDir(rtl::OUString("draw8"), + testDir(OUString("draw8"), getURLFromSrc("/sd/qa/unit/data/odg/"), - rtl::OUString("sdfilt")); + OUString("sdfilt")); #endif } diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index a19a0566a008..2bda506d717e 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -75,9 +75,9 @@ class SdFiltersTest public: SdFiltersTest(); - ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, - const rtl::OUString &rURL, const rtl::OUString &rUserData, + ::sd::DrawDocShellRef loadURL( const OUString &rURL ); + virtual bool load( const OUString &rFilter, + const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); @@ -97,7 +97,7 @@ public: private: uno::Reference<document::XFilter> m_xFilter; uno::Reference<uno::XInterface> m_xDrawComponent; - void testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OString& fileNameBase); + void testStuff(::sd::DrawDocShellRef xDocShRef, const OString& fileNameBase); }; #define PPTX_FORMAT_TYPE 268959811 @@ -114,7 +114,7 @@ FileFormat aFileFormats[] = { { 0, 0, 0, 0 } }; -::sd::DrawDocShellRef SdFiltersTest::loadURL( const rtl::OUString &rURL ) +::sd::DrawDocShellRef SdFiltersTest::loadURL( const OUString &rURL ) { FileFormat *pFmt(0); @@ -130,11 +130,11 @@ FileFormat aFileFormats[] = { if (pFmt->nFormatType) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; SfxFilter* aFilter = new SfxFilter( - rtl::OUString::createFromAscii( pFmt->pFilterName ), - rtl::OUString(), pFmt->nFormatType, nFormat, - rtl::OUString::createFromAscii( pFmt->pTypeName ), - 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString("private:factory/simpress*") ); + OUString::createFromAscii( pFmt->pFilterName ), + OUString(), pFmt->nFormatType, nFormat, + OUString::createFromAscii( pFmt->pTypeName ), + 0, OUString(), OUString(), /* userdata */ + OUString("private:factory/simpress*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -154,7 +154,7 @@ void SdFiltersTest::test() { { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/odp/shapes-test.odp")); - testStuff(xDocShRef, rtl::OUStringToOString(getPathFromSrc("/sd/qa/unit/data/xml/shapes-test_page"), RTL_TEXTENCODING_UTF8)); + testStuff(xDocShRef, OUStringToOString(getPathFromSrc("/sd/qa/unit/data/xml/shapes-test_page"), RTL_TEXTENCODING_UTF8)); } /* { @@ -206,10 +206,10 @@ void SdFiltersTest::testFdo47434() // The problem was the arrow that has cy < 180 and flipH = 0 is rendered incorrectly. // Its height should be 1, not negative. ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/fdo47434-all.pptx")); - testStuff(xDocShRef, rtl::OUStringToOString(getPathFromSrc("/sd/qa/unit/data/pptx/xml/fdo47434_page"), RTL_TEXTENCODING_UTF8)); + testStuff(xDocShRef, OUStringToOString(getPathFromSrc("/sd/qa/unit/data/pptx/xml/fdo47434_page"), RTL_TEXTENCODING_UTF8)); } -void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OString& fileNameBase) +void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const OString& fileNameBase) { CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); @@ -223,39 +223,39 @@ void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OStrin XShapeDumper xShapeDumper; sal_Int32 nLength = xDrawPages->getCount(); - rtl::OString aFileNameExt(".xml"); + OString aFileNameExt(".xml"); for (sal_Int32 i = 0; i < nLength; ++i) { uno::Reference<drawing::XDrawPage> xDrawPage; uno::Any aAny = xDrawPages->getByIndex(i); aAny >>= xDrawPage; uno::Reference< drawing::XShapes > xShapes(xDrawPage, uno::UNO_QUERY_THROW); - rtl::OUString aString = xShapeDumper.dump(xShapes); - rtl::OStringBuffer aFileNameBuf(fileNameBase); + OUString aString = xShapeDumper.dump(xShapes); + OStringBuffer aFileNameBuf(fileNameBase); aFileNameBuf.append(i); aFileNameBuf.append(aFileNameExt); - rtl::OString aFileName = aFileNameBuf.makeStringAndClear(); + OString aFileName = aFileNameBuf.makeStringAndClear(); std::cout << aString << std::endl; doXMLDiff(aFileName.getStr(), - rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), static_cast<int>(aString.getLength()), - rtl::OUStringToOString( + OUStringToOString( getPathFromSrc("/sd/qa/unit/data/tolerance.xml"), RTL_TEXTENCODING_UTF8).getStr()); } xDocShRef->DoClose(); } -bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, +bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString() ); + OUString(), nFilterFlags, nClipboardID, OUString(), 0, OUString(), + rUserData, OUString() ); aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -277,7 +277,7 @@ void SdFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xDrawComponent = - getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Draw.PresentationDocument")); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Draw.PresentationDocument")); CPPUNIT_ASSERT_MESSAGE("no impress component!", m_xDrawComponent.is()); } diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 3ea6f70ecc65..60e06570070a 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -52,8 +52,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OString; using ::com::sun::star::drawing::XShape; using ::com::sun::star::beans::NamedValue; @@ -131,7 +129,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::Clone(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -215,7 +213,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::transformNode(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -289,7 +287,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::transformValue(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 94a50020ff67..c24b3c9dbf90 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -74,7 +74,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::animations; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; @@ -1137,9 +1136,9 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -::rtl::OUString CustomAnimationEffect::getPath() const +OUString CustomAnimationEffect::getPath() const { - ::rtl::OUString aPath; + OUString aPath; if( mxNode.is() ) try { @@ -1165,7 +1164,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -void CustomAnimationEffect::setPath( const ::rtl::OUString& rPath ) +void CustomAnimationEffect::setPath( const OUString& rPath ) { if( mxNode.is() ) try { diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 9ac81d682214..91b0836a9aaf 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::io::XInputStream; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XNameAccess; @@ -171,7 +170,7 @@ UStringList CustomAnimationPreset::getSubTypes() return aSubTypes; } -Reference< XAnimationNode > CustomAnimationPreset::create( const rtl::OUString& rstrSubType ) +Reference< XAnimationNode > CustomAnimationPreset::create( const OUString& rstrSubType ) { try { @@ -320,16 +319,16 @@ void CustomAnimationPresets::importEffects() xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aFiles; + uno::Sequence< OUString > aFiles; xNameAccess->getByName( "EffectFiles" ) >>= aFiles; for( sal_Int32 i=0; i<aFiles.getLength(); ++i ) { - rtl::OUString aURL = aFiles[i]; + OUString aURL = aFiles[i]; if( aURL.startsWith( EXPAND_PROTOCOL ) ) { // cut protocol - rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); + OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); // decode uric class chars aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand macro string @@ -492,15 +491,15 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor #ifdef DEBUG if( aMissedPresetIds.Len() ) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("sd::CustomAnimationPresets::importPresets(), invalid preset id!\n")); - aTmp.append(rtl::OUStringToOString(aMissedPresetIds, + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("sd::CustomAnimationPresets::importPresets(), invalid preset id!\n")); + aTmp.append(OUStringToOString(aMissedPresetIds, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aTmp.getStr()); } #endif } -CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const rtl::OUString& rPresetId ) const +CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const OUString& rPresetId ) const { EffectDescriptorMap::const_iterator aIter( maEffectDiscriptorMap.find( rPresetId ) ); @@ -514,17 +513,17 @@ CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const rtl: } } -const rtl::OUString& CustomAnimationPresets::getUINameForPresetId( const rtl::OUString& rPresetId ) const +const OUString& CustomAnimationPresets::getUINameForPresetId( const OUString& rPresetId ) const { return translateName( rPresetId, maEffectNameMap ); } -const rtl::OUString& CustomAnimationPresets::getUINameForProperty( const rtl::OUString& rPresetId ) const +const OUString& CustomAnimationPresets::getUINameForProperty( const OUString& rPresetId ) const { return translateName( rPresetId, maPropertyNameMap ); } -const rtl::OUString& CustomAnimationPresets::translateName( const rtl::OUString& rId, const UStringMap& rNameMap ) const +const OUString& CustomAnimationPresets::translateName( const OUString& rId, const UStringMap& rNameMap ) const { UStringMap::const_iterator aIter( rNameMap.find( rId ) ); @@ -537,7 +536,7 @@ const rtl::OUString& CustomAnimationPresets::translateName( const rtl::OUString& return rId; } } -void CustomAnimationPresets::changePresetSubType( CustomAnimationEffectPtr pEffect, const rtl::OUString& rPresetSubType ) const +void CustomAnimationPresets::changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const { if( pEffect.get() && pEffect->getPresetSubType() != rPresetSubType ) { diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 41d4eba0befd..0a496a3444cd 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using ::com::sun::star::drawing::XShape; -using ::rtl::OUString; struct deprecated_FadeEffect_conversion_table_entry { diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 127b3027bdb4..de67f40c0667 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -170,16 +169,16 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) "com.sun.star.configuration.ConfigurationAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aFiles; + uno::Sequence< OUString > aFiles; xNameAccess->getByName("TransitionFiles") >>= aFiles; for( sal_Int32 i=0; i<aFiles.getLength(); ++i ) { - rtl::OUString aURL = aFiles[i]; + OUString aURL = aFiles[i]; if( aURL.startsWith( EXPAND_PROTOCOL ) ) { // cut protocol - rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); + OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); // decode uric class chars aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand macro string diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 2cd0719ca6e3..114c191d06b9 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -108,7 +108,7 @@ void SdAnimationInfo::SetBookmark( const String& rBookmark ) { if( meClickAction == ::com::sun::star::presentation::ClickAction_BOOKMARK ) { - String sURL = rtl::OUString('#'); + String sURL = OUString('#'); sURL += rBookmark; SvxFieldItem aURLItem( SvxURLField( sURL, sURL ), EE_FEATURE_FIELD ); mrObject.SetMergedItem( aURLItem ); diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index 372194b35281..3904447fa0b5 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -34,7 +34,6 @@ #include "sdpage.hxx" #include "textapi.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -45,7 +44,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::util; using namespace ::com::sun::star; -extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName, const Reference< XInterface >& xSource ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource ); namespace sd { @@ -170,7 +169,7 @@ void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage ) Annotation::Annotation( const Reference< XComponentContext >& context, SdPage* pPage ) : ::cppu::WeakComponentImplHelper1< XAnnotation >(m_aMutex) -, ::cppu::PropertySetMixin< XAnnotation >(context, static_cast< Implements >(IMPLEMENTS_PROPERTY_SET), Sequence< ::rtl::OUString >()) +, ::cppu::PropertySetMixin< XAnnotation >(context, static_cast< Implements >(IMPLEMENTS_PROPERTY_SET), Sequence< OUString >()) , mpPage( pPage ) { } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 3fa27ff94efa..844b93053e95 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -84,7 +84,6 @@ #include <tools/tenccvt.hxx> -using ::rtl::OUString; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -949,7 +948,7 @@ void SdDrawDocument::SetCalcFieldValueHdl(::Outliner* pOutliner) pOutliner->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); } -sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAuthor ) +sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const OUString& rAuthor ) { // force current user to have first color if( maAnnotationAuthors.empty() ) diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 0e8f5d67e229..9e4adb22aa48 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -311,7 +311,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ if (aURL.Len() && (aURL.GetChar(0) == 35)) { - XubString aHashSlide = rtl::OUString('#'); + XubString aHashSlide = OUString('#'); aHashSlide += SD_RESSTR(STR_PAGE); if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL) diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 2389beb6a7ab..903998c692f5 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -70,11 +70,11 @@ using namespace ::com::sun::star; class InsertBookmarkAsPage_FindDuplicateLayouts { public: - InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<rtl::OUString> &rLayoutsToTransfer ) + InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<OUString> &rLayoutsToTransfer ) : mrLayoutsToTransfer(rLayoutsToTransfer) {} void operator()( SdDrawDocument&, SdPage* ); private: - std::vector<rtl::OUString> &mrLayoutsToTransfer; + std::vector<OUString> &mrLayoutsToTransfer; }; void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) @@ -85,9 +85,9 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String aFullNameLayout( pBMMPage->GetLayoutName() ); aFullNameLayout.Erase( aFullNameLayout.SearchAscii( SD_LT_SEPARATOR )); - rtl::OUString aLayout(aFullNameLayout); + OUString aLayout(aFullNameLayout); - std::vector<rtl::OUString>::const_iterator pIter = + std::vector<OUString>::const_iterator pIter = find(mrLayoutsToTransfer.begin(),mrLayoutsToTransfer.end(),aLayout); bool bFound = pIter != mrLayoutsToTransfer.end(); @@ -100,7 +100,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String aFullTest(pTestPage->GetLayoutName()); aFullTest.Erase( aFullTest.SearchAscii( SD_LT_SEPARATOR )); - rtl::OUString aTest(aFullTest); + OUString aTest(aFullTest); if (aTest == aLayout) bFound = true; @@ -112,7 +112,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc // Inserts a bookmark as a page static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBookmarkDoc, - const std::vector<rtl::OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount, + const std::vector<OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount, InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator ) { // @@ -260,8 +260,8 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) // Inserts a bookmark (page or object) sal_Bool SdDrawDocument::InsertBookmark( - const std::vector<rtl::OUString> &rBookmarkList, // List of names of the bookmarks to be inserted - std::vector<rtl::OUString> &rExchangeList, // List of the names to be used + const std::vector<OUString> &rBookmarkList, // List of names of the bookmarks to be inserted + std::vector<OUString> &rExchangeList, // List of the names to be used sal_Bool bLink, // Insert bookmarks as links? sal_Bool bReplace, // Replace current default and notes pages? sal_uInt16 nInsertPos, // Insertion position of pages @@ -296,7 +296,7 @@ sal_Bool SdDrawDocument::InsertBookmark( else bOK = sal_False; - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = rBookmarkList.begin(); bOK && pIter != rBookmarkList.end() && !bInsertPages; ++pIter ) { // Is there a page name in the bookmark list? @@ -351,8 +351,8 @@ lcl_removeUnusedStyles(SfxStyleSheetBasePool* const pStyleSheetPool, SdStyleShee } sal_Bool SdDrawDocument::InsertBookmarkAsPage( - const std::vector<rtl::OUString> &rBookmarkList, - std::vector<rtl::OUString> *pExchangeList, // List of names to be used + const std::vector<OUString> &rBookmarkList, + std::vector<OUString> *pExchangeList, // List of names to be used sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nInsertPos, @@ -465,7 +465,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( // // Refactored copy'n'pasted layout name collection into IterateBookmarkPages // - std::vector<rtl::OUString> aLayoutsToTransfer; + std::vector<OUString> aLayoutsToTransfer; InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( aLayoutsToTransfer ); lcl_IterateBookmarkPages( *this, pBookmarkDoc, rBookmarkList, nBMSdPageCount, aSearchFunctor ); @@ -478,7 +478,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( if( !aLayoutsToTransfer.empty() ) bMergeMasterPages = sal_True; - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = aLayoutsToTransfer.begin(); pIter != aLayoutsToTransfer.end(); ++pIter ) { SdStyleSheetVector aCreatedStyles; @@ -527,7 +527,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( sal_uInt16 nBMSdPage; std::set<sal_uInt16> aRenameSet; - std::map<sal_uInt16,rtl::OUString> aNameMap; + std::map<sal_uInt16,OUString> aNameMap; for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) { @@ -795,7 +795,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1; } - std::vector<rtl::OUString>::iterator pExchangeIter; + std::vector<OUString>::iterator pExchangeIter; if (pExchangeList) pExchangeIter = pExchangeList->begin(); @@ -919,8 +919,8 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( // Inserts a bookmark as an object sal_Bool SdDrawDocument::InsertBookmarkAsObject( - const std::vector<rtl::OUString> &rBookmarkList, - const std::vector<rtl::OUString> &rExchangeList, // List of names to use + const std::vector<OUString> &rBookmarkList, + const std::vector<OUString> &rExchangeList, // List of names to use sal_Bool /* bLink */, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos, bool bCalcObjCount) @@ -962,7 +962,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( SdrPage* pPage; SdrPageView* pPV; - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = rBookmarkList.begin(); pIter != rBookmarkList.end(); ++pIter ) { // Get names of bookmarks from the list @@ -1072,7 +1072,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( // Get number of objects after inserting. sal_uLong nCount = pPage->GetObjCount(); - std::vector<rtl::OUString>::const_iterator pIter = rExchangeList.begin(); + std::vector<OUString>::const_iterator pIter = rExchangeList.begin(); for (sal_uLong nObj = nCountBefore; nObj < nCount; nObj++) { // Get the name to use from the Exchange list diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 0c850dbf7cd4..3f24709bb5c9 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -106,7 +106,6 @@ #include <svl/itemset.hxx> #include "app.hrc" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 6c4287242d29..af17feb0e099 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -92,7 +92,7 @@ SdPageLink::~SdPageLink() pPage->SetBookmarkName(aBookmarkName); } - std::vector<rtl::OUString> aBookmarkList; + std::vector<OUString> aBookmarkList; aBookmarkList.push_back(aBookmarkName); sal_uInt16 nInsertPos = pPage->GetPageNum(); sal_Bool bLink = sal_True; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 9057a4f68c73..0411ef93cac8 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -314,7 +314,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_CHART: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarChart" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarChart" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_CHART ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -324,7 +324,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_ORGCHART: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarOrg" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarOrg" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_ORGCHART ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -335,7 +335,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_CALC: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarCalc" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarCalc" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_TABLE ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -2365,7 +2365,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO // to inside this method to work even when outliner is fetched here. pOutl->SetStyleSheet(0, pObj->GetStyleSheet()); - rtl::OUString aString; + OUString aString; switch( eObjKind ) { @@ -2537,7 +2537,7 @@ const String& SdPage::GetName() const } else if (mePageKind == PK_HANDOUT && mbMaster) { - aCreatedPageName += rtl::OUString(" ("); + aCreatedPageName += OUString(" ("); aCreatedPageName += SdResId(STR_HANDOUT).toString(); aCreatedPageName += sal_Unicode( ')' ); } diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 7007bf5fae69..cb4259d0cf49 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::office; -extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName, const Reference< XInterface >& xSource ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource ); /************************************************************************* |* @@ -633,7 +633,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) { pModel->SetChanged(); Reference< XInterface > xSource( xAnnotation, UNO_QUERY ); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( "OnAnnotationRemoved" ), xSource ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), OUString( "OnAnnotationRemoved" ), xSource ); } } diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index b895906189bf..e14bba4eafab 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -31,7 +31,6 @@ #include "undoanim.hxx" #include "EffectMigration.hxx" -using ::rtl::OUString; using namespace ::sd; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 9aa2178f20c1..2f140a2d438f 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -39,7 +39,6 @@ #include <map> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -48,7 +47,7 @@ using namespace ::com::sun::star::beans; // ---------------------------------------------------------- -typedef std::map< rtl::OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; +typedef std::map< OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; struct SdStyleFamilyImpl { @@ -223,7 +222,7 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException) // ---------------------------------------------------------- -void SAL_CALL SdStyleFamily::setName( const ::rtl::OUString& ) throw (RuntimeException) +void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException) { } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 14d29774db35..67db6eaeeb09 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -63,7 +63,6 @@ #include <svl/itemset.hxx> #include "app.hrc" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::style; @@ -1021,8 +1020,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFrmt.SetPrefix(::rtl::OUString()); - aFrmt.SetSuffix(::rtl::OUString()); + aFrmt.SetPrefix(OUString()); + aFrmt.SetSuffix(OUString()); aFrmt.SetStart(1); aFrmt.SetBulletRelSize(45); aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index ccd29d87f277..da5a606f6946 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -152,7 +152,7 @@ void SdStyleSheet::SetApiName( const OUString& rApiName ) msApiName = rApiName; } -rtl::OUString SdStyleSheet::GetApiName() const +OUString SdStyleSheet::GetApiName() const { if( !msApiName.isEmpty() ) return msApiName; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 82aa311f2c63..8e76f7e6a5f2 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -30,7 +30,6 @@ #include "Outliner.hxx" #include <svx/svdpool.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 27ca99fca39e..ac0af9a84e68 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -105,7 +105,7 @@ void UndoAnimation::Redo() } } -rtl::OUString UndoAnimation::GetComment() const +OUString UndoAnimation::GetComment() const { return SdResId(STR_UNDO_ANIMATION).toString(); } @@ -114,8 +114,8 @@ struct UndoAnimationPathImpl { SdPage* mpPage; sal_Int32 mnEffectOffset; - ::rtl::OUString msUndoPath; - ::rtl::OUString msRedoPath; + OUString msUndoPath; + OUString msRedoPath; UndoAnimationPathImpl( SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) : mpPage( pThePage ) @@ -183,7 +183,7 @@ void UndoAnimationPath::Redo() } } -rtl::OUString UndoAnimationPath::GetComment() const +OUString UndoAnimationPath::GetComment() const { return SdResId(STR_UNDO_ANIMATION).toString(); } @@ -273,7 +273,7 @@ void UndoTransition::Redo() mpImpl->mpPage->mbStopSound = mpImpl->mbNewStopSound; } -rtl::OUString UndoTransition::GetComment() const +OUString UndoTransition::GetComment() const { return SdResId(STR_UNDO_SLIDE_PARAMS).toString(); } diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 6ebd25fe4b54..7bf3d0a43536 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -40,12 +40,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); +typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #ifdef DISABLE_DYNLOADING -extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); #endif @@ -76,7 +76,7 @@ sal_Bool SdCGMFilter::Import() #else ImportCGMPointer FncImportCGM = ImportCGM; #endif - ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); sal_uInt32 nRetValue; if( mrDocument.GetPageCount() == 0L ) @@ -125,7 +125,7 @@ sal_Bool SdCGMFilter::Export() if( FncCGMExport ) { - ::rtl::OUString aPhysicalName( mrMedium.GetPhysicalName() ); + OUString aPhysicalName( mrMedium.GetPhysicalName() ); CreateStatusIndicator(); bRet = FncCGMExport( aPhysicalName, mxModel, mxStatusIndicator, NULL ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 8068caf4480d..7bd42c74802c 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -97,21 +97,21 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property { mbStatusIndicator = sal_True; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; - mXStatusIndicator->start( rtl::OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); + mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 ); - mrStg->SetClass( aGName, 0, rtl::OUString("MS PowerPoint 97") ); + mrStg->SetClass( aGName, 0, OUString("MS PowerPoint 97") ); if ( !ImplCreateCurrentUserStream() ) return; - mpStrm = mrStg->OpenSotStream( rtl::OUString( "PowerPoint Document" ) ); + mpStrm = mrStg->OpenSotStream( OUString( "PowerPoint Document" ) ); if ( !mpStrm ) return; if ( !mpPicStrm ) - mpPicStrm = mrStg->OpenSotStream( rtl::OUString( "Pictures" ) ); + mpPicStrm = mrStg->OpenSotStream( OUString( "Pictures" ) ); for (std::vector< com::sun::star::beans::PropertyValue >::const_iterator aIter( rMediaData.begin() ), aEnd( rMediaData.end() ); aIter != aEnd ; ++aIter) @@ -132,7 +132,7 @@ void PPTWriter::exportPPTPost( ) if ( mbStatusIndicator ) { - mXStatusIndicator->setText( rtl::OUString( "PowerPoint Export" ) ); + mXStatusIndicator->setText( OUString( "PowerPoint Export" ) ); sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 ); if ( nValue > mnLatestStatValue ) { @@ -178,9 +178,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Bool bVisible = sal_True; ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Visible" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Visible" ) ) ) aAny >>= bVisible; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Change" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Change" ) ) ) { switch ( *(sal_Int32*)aAny.getValue() ) { @@ -193,7 +193,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ break; } } - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Effect" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Effect" ) ) ) aAny >>= eFe; sal_uInt32 nSoundRef = 0; @@ -201,9 +201,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Bool bStopSound = sal_False; sal_Bool bLoopSound = sal_False; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Sound" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Sound" ) ) ) { - rtl::OUString aSoundURL; + OUString aSoundURL; if ( aAny >>= aSoundURL ) { nSoundRef = maSoundCollection.GetId( aSoundURL ); @@ -212,7 +212,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ else aAny >>= bStopSound; } - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "LoopSound" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) ) aAny >>= bLoopSound; sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False ) @@ -228,18 +228,18 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Int32 nSlideTime = 0; // still has to !!! sal_uInt8 nSpeed = 1; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Speed" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Speed" ) ) ) { ::com::sun::star::presentation::AnimationSpeed aAs; aAny >>= aAs; nSpeed = (sal_uInt8)aAs; } sal_Int16 nTT = 0; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionType" ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "TransitionType" ) ) && ( aAny >>= nTT ) ) { sal_Int16 nTST = 0; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionSubtype" ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "TransitionSubtype" ) ) && ( aAny >>= nTST ) ) nTransitionType = GetTransition( nTT, nTST, eFe, nDirection ); @@ -257,7 +257,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( bStopSound ) nBuildFlags |= 256; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Duration" ) ) )// duration of this slide + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Duration" ) ) )// duration of this slide nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom ); @@ -461,7 +461,7 @@ PPTWriter::~PPTWriter() sal_Bool PPTWriter::ImplCreateCurrentUserStream() { - mpCurUserStrm = mrStg->OpenSotStream( rtl::OUString( "Current User" ) ); + mpCurUserStrm = mrStg->OpenSotStream( OUString( "Current User" ) ); if ( !mpCurUserStrm ) return sal_False; char pUserName[] = "Current User"; @@ -524,7 +524,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() if ( mnCnvrtFlags & 0x8000 ) { uno::Sequence<sal_uInt8> aThumbSeq; - if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "PreviewBitmap" ) ) ) + if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, OUString( "PreviewBitmap" ) ) ) { aThumbSeq = *static_cast<const uno::Sequence<sal_uInt8>*>(mAny.getValue()); @@ -563,19 +563,19 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star { if ( rXPagePropSet.is() ) { - rtl::OUString aString; + OUString aString; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "HeaderText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 1 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "FooterText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 2 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 0 ); @@ -592,34 +592,34 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com sal_Bool bVal = sal_False; sal_uInt32 nVal = 0; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsHeaderVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x100000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsFooterVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x200000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x010000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsPageNumberVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x080000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeFixed" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), sal_True ) ) { if ( ( aAny >>= bVal ) && !bVal ) nVal |= 0x20000; else nVal |= 0x40000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeFormat" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), sal_True ) ) { sal_Int32 nFormat = *(sal_Int32*)aAny.getValue(); SvxDateFormat eDateFormat = (SvxDateFormat)( nFormat & 0xf ); @@ -741,7 +741,7 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( aXName.is() ) maSlideNameList.push_back( aXName->getName() ); else - maSlideNameList.push_back( ::rtl::OUString() ); + maSlideNameList.push_back( OUString() ); } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText @@ -771,7 +771,7 @@ sal_Bool PPTWriter::ImplCreateDocument() ( aXPresentation, ::com::sun::star::uno::UNO_QUERY ); if ( mXPropSet.is() ) { - ::rtl::OUString aCustomShow; + OUString aCustomShow; sal_uInt32 nPenColor = 0x1000000; sal_Int32 nRestartTime = 0x7fffffff; sal_Int16 nStartSlide = 0; @@ -785,9 +785,9 @@ sal_Bool PPTWriter::ImplCreateDocument() // Bit 7 loop continously // Bit ? show scrollbar - if ( ImplGetPropertyValue( rtl::OUString( "CustomShow" ) ) ) + if ( ImplGetPropertyValue( OUString( "CustomShow" ) ) ) { - aCustomShow = ( *(::rtl::OUString*)mAny.getValue() ); + aCustomShow = ( *(OUString*)mAny.getValue() ); if ( !aCustomShow.isEmpty() ) { nFlags |= 8; @@ -795,11 +795,11 @@ sal_Bool PPTWriter::ImplCreateDocument() } if ( ( nFlags & 8 ) == 0 ) { - if ( ImplGetPropertyValue( rtl::OUString( "FirstPage" ) ) ) + if ( ImplGetPropertyValue( OUString( "FirstPage" ) ) ) { - ::rtl::OUString aSlideName( *(::rtl::OUString*)mAny.getValue() ); + OUString aSlideName( *(OUString*)mAny.getValue() ); - std::vector<rtl::OUString>::const_iterator pIter = std::find( + std::vector<OUString>::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aSlideName); if (pIter != maSlideNameList.end()) @@ -811,7 +811,7 @@ sal_Bool PPTWriter::ImplCreateDocument() } } - if ( ImplGetPropertyValue( rtl::OUString("IsAutomatic" ) ) ) + if ( ImplGetPropertyValue( OUString("IsAutomatic" ) ) ) { sal_Bool bBool = sal_False; mAny >>= bBool; @@ -819,14 +819,14 @@ sal_Bool PPTWriter::ImplCreateDocument() nFlags |= 1; } - if ( ImplGetPropertyValue( rtl::OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? + if ( ImplGetPropertyValue( OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? { sal_Bool bBool = sal_False; mAny >>= bBool; if ( bBool ) nFlags |= 0x80; } - if ( ImplGetPropertyValue( rtl::OUString( "IsFullScreen" ) ) ) + if ( ImplGetPropertyValue( OUString( "IsFullScreen" ) ) ) { sal_Bool bBool = sal_False; mAny >>= bBool; @@ -859,8 +859,8 @@ sal_Bool PPTWriter::ImplCreateDocument() aXCont( aXCPSup->getCustomPresentations() ); if ( aXCont.is() ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameSeq( aXCont->getElementNames() ); - const ::rtl::OUString* pUString = aNameSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString> aNameSeq( aXCont->getElementNames() ); + const OUString* pUString = aNameSeq.getArray(); sal_uInt32 nCount = aNameSeq.getLength(); if ( nCount ) { @@ -902,8 +902,8 @@ sal_Bool PPTWriter::ImplCreateDocument() aXName( aXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( aXName.is() ) { - ::rtl::OUString aSlideName( aXName->getName() ); - std::vector<rtl::OUString>::const_iterator pIter = std::find( + OUString aSlideName( aXName->getName() ); + std::vector<OUString>::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aSlideName); if (pIter != maSlideNameList.end()) @@ -1060,9 +1060,9 @@ sal_Bool PPTWriter::ImplCreateMainNotes() // --------------------------------------------------------------------------------------------- -static rtl::OUString getInitials( const rtl::OUString& rName ) +static OUString getInitials( const OUString& rName ) { - rtl::OUString sInitials; + OUString sInitials; const sal_Unicode * pStr = rName.getStr(); sal_Int32 nLength = rName.getLength(); @@ -1078,7 +1078,7 @@ static rtl::OUString getInitials( const rtl::OUString& rName ) // take letter if( nLength ) { - sInitials += rtl::OUString( *pStr ); + sInitials += OUString( *pStr ); nLength--; pStr++; } @@ -1112,10 +1112,10 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr Point aPoint( OutputDevice::LogicToLogic( Point( static_cast< sal_Int32 >( aRealPoint2D.X * 100.0 ), static_cast< sal_Int32 >( aRealPoint2D.Y * 100.0 ) ), MAP_100TH_MM, aMapDest ) ); - rtl::OUString sAuthor( xAnnotation->getAuthor() ); + OUString sAuthor( xAnnotation->getAuthor() ); uno::Reference< text::XText > xText( xAnnotation->getTextRange() ); - rtl::OUString sText( xText->getString() ); - rtl::OUString sInitials( getInitials( sAuthor ) ); + OUString sText( xText->getString() ); + OUString sInitials( getInitials( sAuthor ) ); util::DateTime aDateTime( xAnnotation->getDateTime() ); if ( !sAuthor.isEmpty() ) PPTWriter::WriteCString( rBinaryTagData10Atom, sAuthor, 0 ); @@ -1206,7 +1206,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid ); ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( ImplGetPropertyValue( rXPropSet, OUString( "FillStyle" ) ) ) mAny >>= aFS; switch( aFS ) @@ -1221,16 +1221,16 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su break; case ::com::sun::star::drawing::FillStyle_BITMAP : - aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillBitmapURL" ), sal_True ); + aPropOpt.CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), sal_True ); break; case ::com::sun::star::drawing::FillStyle_HATCH : - aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillHatch" ), sal_True ); + aPropOpt.CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), sal_True ); break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillColor" ) ) ) + if ( ImplGetPropertyValue( rXPropSet, OUString( "FillColor" ) ) ) { nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ); nFillBackColor = nFillColor ^ 0xffffff; @@ -1295,7 +1295,7 @@ void PPTWriter::ImplWriteOLE( ) aOleExport.ExportOLEObject( xObj, *xTempStorage ); //TODO/MBA: testing - rtl::OUString aPersistStream( SVEXT_PERSIST_STREAM ); + OUString aPersistStream( SVEXT_PERSIST_STREAM ); SvMemoryStream aStream; SvStorageRef xCleanStorage( new SvStorage( sal_False, aStream ) ); xTempStorage->CopyTo( xCleanStorage ); @@ -1321,7 +1321,7 @@ void PPTWriter::ImplWriteOLE( ) { if ( pPtr->xControlModel.is() ) { - rtl::OUString aName; + OUString aName; ::com::sun::star::awt::Size aSize; SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); sal_Bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); @@ -1486,15 +1486,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); - aMSVBas.SaveOrDelMSVBAStorage( sal_True, rtl::OUString( "_MS_VBA_Overhead" ) ); + aMSVBas.SaveOrDelMSVBAStorage( sal_True, OUString( "_MS_VBA_Overhead" ) ); - SvStorageRef xOverhead = xDest->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") ); + SvStorageRef xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") ); + SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( rtl::OUString( "_MS_VBA_Overhead2") ); + SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") ); if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) { sal_uInt32 nLen = xTemp->GetSize(); diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 2765660a8684..982ddeee5752 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -168,8 +168,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; - std::vector<rtl::OUString> maSlideNameList; - rtl::OUString maBaseURI; + std::vector<OUString> maSlideNameList; + OUString maBaseURI; ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef of the global text ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 20670b7bc683..f84360db01d6 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -128,7 +128,7 @@ class PPTExBulletProvider public : - sal_uInt16 GetId( const rtl::OString& rUniqueId, Size& rGraphicSize ); + sal_uInt16 GetId( const OString& rUniqueId, Size& rGraphicSize ); PPTExBulletProvider(); ~PPTExBulletProvider(); @@ -179,7 +179,7 @@ public : ~FontCollection(); - short GetScriptDirection( const rtl::OUString& rText ) const; + short GetScriptDirection( const OUString& rText ) const; sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); @@ -341,7 +341,7 @@ protected: ::com::sun::star::awt::Size maSize; ::com::sun::star::awt::Point maPosition; Rectangle maRect; - rtl::OString mType; + OString mType; sal_Bool mbPresObj; sal_Bool mbEmptyPresObj; sal_Int32 mnAngle; diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 7135b3f693db..66d4711956b5 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -101,12 +101,12 @@ protected: virtual ::oox::ole::VbaProject* implCreateVbaProject() const; sal_Bool WriteNotesMaster(); - void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const ::rtl::OUString& rAttributeName ); + void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName ); void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ); void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ); void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS ); - void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const ::rtl::OUString& rAttributeName ); + void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild ); void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ); @@ -126,12 +126,12 @@ protected: sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; } sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; } - sal_Int32 GetAuthorIdAndLastIndex( ::rtl::OUString sAuthor, sal_Int32& nLastIndex ); + sal_Int32 GetAuthorIdAndLastIndex( OUString sAuthor, sal_Int32& nLastIndex ); private: void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId ); - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; @@ -156,7 +156,7 @@ private: sal_Int32 nId; sal_Int32 nLastIndex; }; - typedef ::boost::unordered_map< ::rtl::OUString, struct AuthorComments, rtl::OUStringHash, comphelper::UStringEqual > AuthorsMap; + typedef ::boost::unordered_map< OUString, struct AuthorComments, OUStringHash, comphelper::UStringEqual > AuthorsMap; AuthorsMap maAuthors; void WriteAuthors(); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 37a687772149..a67fbdf186f9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -111,7 +111,7 @@ PPTExBulletProvider::~PPTExBulletProvider() delete pGraphicProv; } -sal_uInt16 PPTExBulletProvider::GetId( const rtl::OString& rUniqueId, Size& rGraphicSize ) +sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicSize ) { sal_uInt16 nRetValue = 0xffff; @@ -385,12 +385,12 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const String& rBookmarkURL, const s { sal_uInt32 nHyperId = ++mnExEmbed; - rtl::OUString sBookmarkURL( rBookmarkURL ); + OUString sBookmarkURL( rBookmarkURL ); INetURLObject aBaseURI( maBaseURI ); INetURLObject aBookmarkURI( rBookmarkURL ); if( aBaseURI.GetProtocol() == aBookmarkURI.GetProtocol() ) { - rtl::OUString aRelUrl( INetURLObject::GetRelURL( maBaseURI, rBookmarkURL, + OUString aRelUrl( INetURLObject::GetRelURL( maBaseURI, rBookmarkURL, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DETECT ) ); if ( !aRelUrl.isEmpty() ) sBookmarkURL = aRelUrl; @@ -820,7 +820,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -871,7 +871,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nCharColor = bIsDark ? 0xffffff : 0x000000; } @@ -889,7 +889,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ) ) ) aAny >>= aFS; switch( aFS ) { @@ -904,7 +904,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillColor" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillColor" ) ) ) nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ); } break; @@ -912,7 +912,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { ::com::sun::star::uno::Any aBackAny; ::com::sun::star::drawing::FillStyle aBackFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, OUString( "FillStyle" ) ) ) aBackAny >>= aBackFS; switch( aBackFS ) { @@ -927,7 +927,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, rtl::OUString( "FillColor" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, OUString( "FillColor" ) ) ) nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ); } break; @@ -961,7 +961,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( aPropSetOfNextShape.is() ) { if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape, - rtl::OUString( "FillColor" ), sal_True ) ) + OUString( "FillColor" ), sal_True ) ) { if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) ) { @@ -1051,7 +1051,7 @@ sal_Bool PPTWriter::ImplGetText() { mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) aAny >>= mbFontIndependentLineSpacing; } return ( mnTextSize != 0 ); @@ -1211,17 +1211,17 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u String aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) ); aPage.Erase( 0, 1 ); - rtl::OUString aUPage(aPage); - std::vector<rtl::OUString>::const_iterator pIter = std::find( + OUString aUPage(aPage); + std::vector<OUString>::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aUPage); if ( pIter != maSlideNameList.end() ) { nPageIndex = pIter - maSlideNameList.begin(); - aPageUrl = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex)); - aPageUrl.Append( rtl::OUString( "," ) ); + aPageUrl = OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex)); + aPageUrl.Append( OUString( "," ) ); aPageUrl.Append( OUString::number( nPageIndex + 1 ) ); - aPageUrl.Append( rtl::OUString( ",Slide " ) ); + aPageUrl.Append( OUString( ",Slide " ) ); aPageUrl.Append( OUString::number( nPageIndex + 1 ) ); } } @@ -1312,7 +1312,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u const uno::Reference< beans::XPropertySet > xPropSet( mXModel, uno::UNO_QUERY ); if ( xPropSet.is() ) { - ImplGetPropertyValue( xPropSet, rtl::OUString( "TabStop" ) ); + ImplGetPropertyValue( xPropSet, OUString( "TabStop" ) ); sal_Int32 nTabStop( 0 ); if ( mAny >>= nTabStop ) nDefaultTabSizeSrc = nTabStop; @@ -1934,15 +1934,15 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, nFlags |= 4; if ( eTe != ::com::sun::star::presentation::AnimationEffect_NONE ) nBuildType = 2; - if ( ImplGetPropertyValue( rtl::OUString( "SoundOn" ) ) ) + if ( ImplGetPropertyValue( OUString( "SoundOn" ) ) ) { sal_Bool bBool(sal_False); mAny >>= bBool; if ( bBool ) { - if ( ImplGetPropertyValue( rtl::OUString( "Sound" ) ) ) + if ( ImplGetPropertyValue( OUString( "Sound" ) ) ) { - nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() ); + nSoundRef = maSoundCollection.GetId( *(OUString*)mAny.getValue() ); if ( nSoundRef ) nFlags |= 0x10; } @@ -1950,15 +1950,15 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, } sal_Bool bDimHide = sal_False; sal_Bool bDimPrevious = sal_False; - if ( ImplGetPropertyValue( rtl::OUString( "DimHide" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimHide" ) ) ) mAny >>= bDimHide; - if ( ImplGetPropertyValue( rtl::OUString( "DimPrevious" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimPrevious" ) ) ) mAny >>= bDimPrevious; if ( bDimPrevious ) nAfterEffect |= 1; if ( bDimHide ) nAfterEffect |= 2; - if ( ImplGetPropertyValue( rtl::OUString( "DimColor" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimColor" ) ) ) nDimColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ) | 0xfe000000; rSt << nDimColor << nFlags << nSoundRef << nDelayTime @@ -2025,15 +2025,15 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat break; case ::com::sun::star::presentation::ClickAction_SOUND : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) - nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() ); + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) + nSoundRef = maSoundCollection.GetId( *(OUString*)mAny.getValue() ); } break; case ::com::sun::star::presentation::ClickAction_PROGRAM : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - INetURLObject aUrl( *(::rtl::OUString*)mAny.getValue() ); + INetURLObject aUrl( *(OUString*)mAny.getValue() ); if ( INET_PROT_FILE == aUrl.GetProtocol() ) { aFile = aUrl.PathToFileName(); @@ -2045,11 +2045,11 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat case ::com::sun::star::presentation::ClickAction_BOOKMARK : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - rtl::OUString aBookmark( *(::rtl::OUString*)mAny.getValue() ); + OUString aBookmark( *(OUString*)mAny.getValue() ); sal_uInt32 nIndex = 0; - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = maSlideNameList.begin(); pIter != maSlideNameList.end(); ++pIter, nIndex++ ) { if ( *pIter == aBookmark ) @@ -2059,10 +2059,10 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat nHyperLinkType = 7; String aEmpty; - String aHyperString = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nIndex)); - aHyperString.Append( rtl::OUString( "," ) ); + String aHyperString = OUString::valueOf(static_cast<sal_Int32>(256 + nIndex)); + aHyperString.Append( OUString( "," ) ); aHyperString.Append( OUString::number( nIndex + 1 ) ); - aHyperString.Append( rtl::OUString( ",Slide " ) ); + aHyperString.Append( OUString( ",Slide " ) ); aHyperString.Append( OUString::number( nIndex + 1 ) ); nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1 << 31 ), aBookmark, aEmpty, aEmpty, aHyperString ); } @@ -2073,9 +2073,9 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat case ::com::sun::star::presentation::ClickAction_DOCUMENT : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - String aBookmark( *(::rtl::OUString*)mAny.getValue() ); + String aBookmark( *(OUString*)mAny.getValue() ); if ( aBookmark.Len() ) { nAction = 4; @@ -2134,16 +2134,16 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com sal_Bool& bIsSound ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "Effect" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "Effect" ) ) ) aAny >>= eEffect; else eEffect = ::com::sun::star::presentation::AnimationEffect_NONE; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "TextEffect" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "TextEffect" ) ) ) aAny >>= eTextEffect; else eTextEffect = ::com::sun::star::presentation::AnimationEffect_NONE; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "SoundOn" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "SoundOn" ) ) ) aAny >>= bIsSound; else bIsSound = sal_False; @@ -2281,12 +2281,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::presentation::AnimationEffect eAe; ::com::sun::star::presentation::AnimationEffect eTe; - if ( ImplGetPropertyValue( rtl::OUString( "PresentationOrder" ) ) ) + if ( ImplGetPropertyValue( OUString( "PresentationOrder" ) ) ) nEffectCount = *(sal_uInt16*)mAny.getValue(); sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); ::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE; - if ( ImplGetPropertyValue( rtl::OUString( "OnClick" ) ) ) + if ( ImplGetPropertyValue( OUString( "OnClick" ) ) ) mAny >>= eCa; sal_Bool bGroup = mType == "drawing.Group"; @@ -2329,16 +2329,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a sal_Bool bIsHatching = sal_False; ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle eFS; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "IsFontwork" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), sal_True ) ) aAny >>= bIsFontwork; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), sal_True ) ) { aAny >>= eFS; bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH; } if ( bIsHatching || bIsFontwork || ( mType == "drawing.Measure" ) || ( mType == "drawing.Caption" ) ) { - if ( ImplGetPropertyValue( rtl::OUString( "BoundRect" ) ) ) + if ( ImplGetPropertyValue( OUString( "BoundRect" ) ) ) { ::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)mAny.getValue() ); maPosition = MapPoint( ::com::sun::star::awt::Point( aRect.X, aRect.Y ) ); @@ -2357,12 +2357,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nMirrorFlags; - rtl::OUString sCustomShapeType; + OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType ); if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { // sj: creating metafile for customshapes that can't be saved to ms format properly ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) { aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); SdrObject* pObj = GetSdrObjectFromXShape( mXShape ); @@ -2392,7 +2392,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { sal_Int32 nRadius = 0; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); - if ( ImplGetPropertyValue( rtl::OUString( "CornerRadius" ) ) ) + if ( ImplGetPropertyValue( OUString( "CornerRadius" ) ) ) { mAny >>= nRadius; nRadius = MapSize( ::com::sun::star::awt::Size( nRadius, 0 ) ).Width; @@ -2422,7 +2422,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { ::com::sun::star::drawing::CircleKind eCircleKind( ::com::sun::star::drawing::CircleKind_FULL ); PolyStyle ePolyKind = POLY_CHORD; - if ( ImplGetPropertyValue( rtl::OUString( "CircleKind" ) ) ) + if ( ImplGetPropertyValue( OUString( "CircleKind" ) ) ) { mAny >>= eCircleKind; switch ( eCircleKind ) @@ -2459,10 +2459,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else { sal_Int32 nStartAngle, nEndAngle; - if ( !ImplGetPropertyValue( rtl::OUString( "CircleStartAngle" ) ) ) + if ( !ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) ) continue; nStartAngle = *( (sal_Int32*)mAny.getValue() ); - if( !ImplGetPropertyValue( rtl::OUString( "CircleEndAngle" ) ) ) + if( !ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) ) continue; nEndAngle = *( (sal_Int32*)mAny.getValue() ); ::com::sun::star::awt::Point aPoint( mXShape->getPosition() ); @@ -2538,7 +2538,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} @@ -2572,7 +2572,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a << (sal_uInt32)0x0012de00; ::com::sun::star::awt::Size aSize; - rtl::OUString aControlName; + OUString aControlName; SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), sal_True ) ); if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) ) { @@ -2581,7 +2581,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( aUserName.Len() ) { SvStorageStreamRef xCompObj = xTemp->OpenSotStream( - rtl::OUString( "\1CompObj" ), + OUString( "\1CompObj" ), STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL ); xCompObj->Seek( STREAM_SEEK_TO_END ); sal_uInt32 nStreamLen = xCompObj->Tell(); @@ -2604,8 +2604,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *xCompObj >> nStringLen; if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow - rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); - aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); + OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); + aOleIdentifier = OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); } } } @@ -2627,7 +2627,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nSpFlags = SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE; ImplCreateShape( ESCHER_ShpInst_HostControl, nSpFlags, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); aPropOpt.AddOpt( ESCHER_Prop_pictureId, mnExEmbed ); aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); @@ -2801,7 +2801,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat). */ ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa00, aSolverContainer ); // Flags: Connector | HasSpt - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_True, sal_True, sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "GraphicURL" ), sal_True, sal_True, sal_False ) ) { aPropOpt.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone ); aPropOpt.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle ); @@ -2815,7 +2815,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else { ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_False, sal_True ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "GraphicURL" ), sal_False, sal_True ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } } @@ -2853,7 +2853,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( mnTextSize ) { - ::rtl::OUString aUString( mXText->getString() ); + OUString aUString( mXText->getString() ); sal_uInt16 nChar; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -3087,7 +3087,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} @@ -3164,13 +3164,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D { // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject - if ( !ImplGetPropertyValue( rtl::OUString( "Bitmap" ) ) ) + if ( !ImplGetPropertyValue( OUString( "Bitmap" ) ) ) continue; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "Bitmap" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "Bitmap" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } else if ( mType == "drawing.Media" ) @@ -3180,9 +3180,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "MediaURL" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "MediaURL" ), sal_True ) ) { - rtl::OUString aMediaURL; + OUString aMediaURL; if ( (aAny >>= aMediaURL ) && !aMediaURL.isEmpty() ) { // SJ: creating the Media RefObj @@ -3253,7 +3253,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnAngle = 0; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } else @@ -3452,7 +3452,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::uno::Any aAny; EscherPropertyContainer aPropOpt; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), sal_True ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; @@ -3586,9 +3586,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc EscherPropertyContainer aPropOpt2; try { - static const rtl::OUString sModel( "Model" ); - static const rtl::OUString sWidth( "Width" ); - static const rtl::OUString sHeight( "Height" ); + static const OUString sModel( "Model" ); + static const OUString sWidth( "Width" ); + static const OUString sHeight( "Height" ); uno::Reference< table::XTable > xTable; if ( mXPropSet->getPropertyValue( sModel ) >>= xTable ) @@ -3685,7 +3685,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) aAny >>= mbFontIndependentLineSpacing; EscherPropertyContainer aPropOptSp; @@ -3717,10 +3717,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc } } - static const rtl::OUString sTopBorder( "TopBorder" ); - static const rtl::OUString sBottomBorder( "BottomBorder" ); - static const rtl::OUString sLeftBorder( "LeftBorder" ); - static const rtl::OUString sRightBorder( "RightBorder" ); + static const OUString sTopBorder( "TopBorder" ); + static const OUString sBottomBorder( "BottomBorder" ); + static const OUString sLeftBorder( "LeftBorder" ); + static const OUString sRightBorder( "RightBorder" ); // creating horz lines sal_Int32 nYPos = MapPoint( rXShape->getPosition() ).Y; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index fa1347bed5b5..e8df344b228e 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -23,7 +23,7 @@ // --------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------- -PptEscherEx::PptEscherEx( SvStream& rOutStrm, const rtl::OUString& rBaseURI ) : +PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm ) { mxGlobal->SetBaseURI( rBaseURI ); diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 334b0ba107f3..eecd15c4e9b2 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -48,7 +48,7 @@ class PptEscherEx : public EscherEx public: - PptEscherEx( SvStream& rOut, const rtl::OUString& ); + PptEscherEx( SvStream& rOut, const OUString& ); ~PptEscherEx(); void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ); diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 663bd98a19a6..6dbaeecddbea 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -66,8 +66,6 @@ #include <algorithm> using ::std::map; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::container::XChild; using ::com::sun::star::util::XCloneable; @@ -91,7 +89,7 @@ using namespace ::com::sun::star::presentation; namespace ppt { -void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTranslateMode ) +void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMode ) { if ( eTranslateMode != TRANSLATE_NONE ) { @@ -108,7 +106,7 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl { if ( eTranslateMode & TRANSLATE_VALUE ) { - rString = rtl::OUString( (sal_Unicode)'#' ); + rString = OUString( (sal_Unicode)'#' ); rString += OUString::createFromAscii( p->mpMSName ); } else @@ -147,7 +145,7 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl } } -sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType ) +sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ) { sal_uInt32 nPresetSubType = 0; sal_Bool bTranslated = sal_False; @@ -659,7 +657,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if( xAudio.is() ) { Any aAny( xAudio->getSource() ); - rtl::OUString aURL; + OUString aURL; if ( ( aAny >>= aURL) && !aURL.isEmpty() ) { @@ -908,17 +906,17 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co } } -sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) +sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) { sal_uInt32 nPresetId = 0; bPresetId = sal_False; - if ( rPreset.match( rtl::OUString( "ppt_" ), 0 ) ) + if ( rPreset.match( OUString( "ppt_" ), 0 ) ) { sal_Int32 nLast = rPreset.lastIndexOf( '_' ); if ( ( nLast != -1 ) && ( ( nLast + 1 ) < rPreset.getLength() ) ) { - rtl::OUString aNumber( rPreset.copy( nLast + 1 ) ); + OUString aNumber( rPreset.copy( nLast + 1 ) ); nPresetId = aNumber.toInt32(); bPresetId = sal_True; } @@ -1024,14 +1022,14 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer } if ( pAny[ DFF_ANIM_PRESET_ID ] ) { - rtl::OUString sPreset; + OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) nPresetId = GetPresetID( sPreset, nAPIPresetClass, bPresetId ); } if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { - rtl::OUString sPresetSubType; + OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); @@ -1157,7 +1155,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( eTranslateMode & TRANSLATE_NUMBER_TO_STRING ) { Any aAny; - rtl::OUString aNumber( rtl::OUString::valueOf( fVal ) ); + OUString aNumber( OUString::valueOf( fVal ) ); aAny <<= aNumber; exportAnimPropertyString( rStrm, nPropertyId, aNumber, eTranslateMode ); } @@ -1171,7 +1169,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 break; case ::com::sun::star::uno::TypeClass_STRING : { - rtl::OUString aStr; + OUString aStr; if ( rAny >>= aStr ) { exportAnimPropertyString( rStrm, nPropertyId, aStr, eTranslateMode ); @@ -1185,12 +1183,12 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 } return bRet; } -void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const rtl::OUString& rVal, const TranslateMode eTranslateMode ) +void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_UNISTRING; rStrm << nType; - rtl::OUString aStr( rVal ); + OUString aStr( rVal ); if ( eTranslateMode != TRANSLATE_NONE ) ImplTranslateAttribute( aStr, eTranslateMode ); writeZString( rStrm, aStr ); @@ -1221,7 +1219,7 @@ void AnimationExporter::exportAnimPropertyByte( SvStream& rStrm, const sal_uInt1 << nVal; } -void AnimationExporter::writeZString( SvStream& rStrm, const rtl::OUString& rVal ) +void AnimationExporter::writeZString( SvStream& rStrm, const OUString& rVal ) { sal_Int32 i; for ( i = 0; i < rVal.getLength(); i++ ) @@ -1393,16 +1391,16 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim } } -Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::OUString& rAttributeName ) +Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUString& rAttributeName ) { - rtl::OUString aDest; + OUString aDest; if ( rAttributeName == "X" || rAttributeName == "Y" || rAttributeName == "Width" || rAttributeName == "Height" ) { - rtl::OUString aStr; + OUString aStr; if ( rSourceValue >>= aStr ) { ImplTranslateAttribute( aStr, TRANSLATE_MEASURE ); @@ -1417,7 +1415,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: { double fNumber = 0.0; if ( rSourceValue >>= fNumber ) - aDest += rtl::OUString::valueOf( fNumber ); + aDest += OUString::valueOf( fNumber ); } else if ( rAttributeName == "Color" || rAttributeName == "FillColor" // "Fillcolor" or "FillColor" ? @@ -1427,25 +1425,25 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: { sal_Int32 nColor = 0; Sequence< double > aHSL( 3 ); - rtl::OUString aP( "," ); + OUString aP( "," ); if ( rSourceValue >>= aHSL ) { aDest += "hsl("; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) ); aDest += ")"; } else if ( rSourceValue >>= nColor ) { aDest += "rgb("; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) ); aDest += ")"; } } @@ -1542,7 +1540,7 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni } } -sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const rtl::OUString& rAttributeName ) +sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const OUString& rAttributeName ) { sal_uInt32 nValueType = 0; @@ -1680,7 +1678,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X if ( !xAnimate->getAttributeName().isEmpty() || nForceAttributeNames ) { EscherExContainer aAnimateAttributeNames( rStrm, DFF_msofbtAnimateAttributeNames, 1 ); - rtl::OUString aAttributeName( xAnimate->getAttributeName() ); + OUString aAttributeName( xAnimate->getAttributeName() ); if ( nForceAttributeNames ) { if( nForceAttributeNames == 1 ) @@ -1744,7 +1742,7 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s Reference< XTextRange > xTextRange( xTextParagraphEnumeration->nextElement(), UNO_QUERY ); if ( xTextRange.is() ) { - rtl::OUString aParaText( xTextRange->getString() ); + OUString aParaText( xTextRange->getString() ); sal_Int32 nLength = aParaText.getLength() + 1; rEnd += nLength; if ( nCurrentParagraph == nParagraph ) diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index b40742a14b3a..570b5222740f 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -68,10 +68,10 @@ class AnimationExporter { ::com::sun::star::uno::Any aTarget; - void writeZString( SvStream& rStrm, const rtl::OUString& rVal ); + void writeZString( SvStream& rStrm, const OUString& rVal ); sal_Bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; sal_Bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); - void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const rtl::OUString& rVal, const TranslateMode eTranslateMode ); + void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); @@ -119,13 +119,13 @@ public: sal_Int32 mnCurrentGroup; // helper methods also used in ooxml export - static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const rtl::OUString& rAttributeName ); + static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const OUString& rAttributeName ); static sal_Bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); static sal_Int16 GetFillMode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault ); static void GetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rUserData, const ::com::sun::star::uno::Any ** pAny, sal_Size nLen ); - static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType ); - static sal_uInt32 GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); - static sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName ); + static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ); + static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); + static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName ); static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ); static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ); diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 3519ed516d1d..efa58fdbc02b 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -28,7 +28,7 @@ namespace ppt { -ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) +ExSoundEntry::ExSoundEntry(const OUString& rString) : nFileSize(0) , aSoundURL(rString) { @@ -38,7 +38,7 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); sal_Int64 nVal = 0; - ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( ::rtl::OUString( "Size" ) ) ); + ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( OUString( "Size" ) ) ); nFileSize = (sal_uInt32)nVal; } catch( ::com::sun::star::uno::Exception& ) @@ -47,13 +47,13 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) } }; -rtl::OUString ExSoundEntry::ImplGetName() const +OUString ExSoundEntry::ImplGetName() const { INetURLObject aTmp( aSoundURL ); return aTmp.GetName(); } -rtl::OUString ExSoundEntry::ImplGetExtension() const +OUString ExSoundEntry::ImplGetExtension() const { INetURLObject aTmp( aSoundURL ); String aExtension( aTmp.GetExtension() ); @@ -62,15 +62,15 @@ rtl::OUString ExSoundEntry::ImplGetExtension() const return aExtension; } -sal_Bool ExSoundEntry::IsSameURL(const rtl::OUString& rURL) const +sal_Bool ExSoundEntry::IsSameURL(const OUString& rURL) const { return ( rURL == aSoundURL ); } sal_uInt32 ExSoundEntry::GetSize( sal_uInt32 nId ) const { - rtl::OUString aName( ImplGetName() ); - rtl::OUString aExtension( ImplGetExtension() ); + OUString aName( ImplGetName() ); + OUString aExtension( ImplGetExtension() ); sal_uInt32 nSize = 8; // SoundContainer Header if ( !aName.isEmpty() ) // String Atom ( instance 0 - name of sound ) @@ -78,7 +78,7 @@ sal_uInt32 ExSoundEntry::GetSize( sal_uInt32 nId ) const if ( !aExtension.isEmpty() ) // String Atom ( instance 1 - extension of sound ) nSize += aExtension.getLength() * 2 + 8; - rtl::OUString aId( OUString::number(nId) ); // String Atom ( instance 2 - reference id ) + OUString aId( OUString::number(nId) ); // String Atom ( instance 2 - reference id ) nSize += 2 * aId.getLength() + 8; nSize += nFileSize + 8; // SoundData Atom @@ -97,7 +97,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const // create SoundContainer rSt << (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) << (sal_uInt32)( GetSize( nId ) - 8 ); - rtl::OUString aSoundName( ImplGetName() ); + OUString aSoundName( ImplGetName() ); sal_Int32 i, nSoundNameLen = aSoundName.getLength(); if ( nSoundNameLen ) { @@ -106,7 +106,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const for ( i = 0; i < nSoundNameLen; ++i ) rSt << aSoundName[i]; } - rtl::OUString aExtension( ImplGetExtension() ); + OUString aExtension( ImplGetExtension() ); sal_Int32 nExtensionLen = aExtension.getLength(); if ( nExtensionLen ) { @@ -116,7 +116,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const rSt << aExtension[i]; } // id of sound ( instance 2 ) - rtl::OUString aId( OUString::number(nId ) ); + OUString aId( OUString::number(nId ) ); sal_Int32 nIdLen = aId.getLength(); rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) << (sal_uInt32)( nIdLen * 2 ); for ( i = 0; i < nIdLen; ++i ) @@ -145,7 +145,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const } } -sal_uInt32 ExSoundCollection::GetId(const rtl::OUString& rString) +sal_uInt32 ExSoundCollection::GetId(const OUString& rString) { sal_uInt32 nSoundId = 0; if (!rString.isEmpty()) diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index efbf9cccc87c..a83bf5ba9238 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -34,17 +34,17 @@ namespace ppt class ExSoundEntry { sal_uInt32 nFileSize; - rtl::OUString aSoundURL; + OUString aSoundURL; - rtl::OUString ImplGetName() const; - rtl::OUString ImplGetExtension() const; + OUString ImplGetName() const; + OUString ImplGetExtension() const; public : - sal_Bool IsSameURL(const rtl::OUString& rURL) const; + sal_Bool IsSameURL(const OUString& rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; - ExSoundEntry(const rtl::OUString& rSoundURL); + ExSoundEntry(const OUString& rSoundURL); /// @return size of a complete SoundContainer. sal_uInt32 GetSize( sal_uInt32 nId ) const; @@ -55,7 +55,7 @@ class ExSoundCollection { public: - sal_uInt32 GetId(const rtl::OUString&); + sal_uInt32 GetId(const OUString&); /// @return size of a complete SoundCollectionContainer. sal_uInt32 GetSize() const; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index f9c15f7b9753..8e9ff5c4fbc7 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -169,7 +169,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert if ( !InitSOIface() ) return; - FontCollectionEntry aDefaultFontDesc( rtl::OUString( "Times New Roman" ), + FontCollectionEntry aDefaultFontDesc( OUString( "Times New Roman" ), ROMAN, awt::FontPitch::VARIABLE, RTL_TEXTENCODING_MS_1252 ); @@ -179,10 +179,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert return; sal_Int32 nWidth = 21000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Width" ) ) ) mAny >>= nWidth; sal_Int32 nHeight = 29700; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Height" ) ) ) mAny >>= nHeight; maNotesPageSize = MapSize( awt::Size( nWidth, nHeight ) ); @@ -191,10 +191,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert return; nWidth = 28000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Width" ) ) ) mAny >>= nWidth; nHeight = 21000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Height" ) ) ) mAny >>= nHeight; maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) ); @@ -325,7 +325,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is taken the property from the master */ - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ), sal_True ); + sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), sal_True ); if ( bHasBackground ) bHasBackground = ( aAny >>= mXBackgroundPropSet ); if ( !bHasBackground ) @@ -342,7 +342,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) ( aXMasterDrawPage, UNO_QUERY ); if ( aXMasterPagePropSet.is() ) { - sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, rtl::OUString( "Background" ) ); + sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); if ( bBackground ) { aAny >>= mXBackgroundPropSet; @@ -369,7 +369,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) SetCurrentStyleSheet( nMasterNum ); Reference< XPropertySet > aXBackgroundPropSet; - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ) ); + sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); if ( bHasBackground ) bHasBackground = ( aAny >>= aXBackgroundPropSet ); @@ -388,7 +388,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) } } */ - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundObjectsVisible" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundObjectsVisible" ) ) ) { sal_Bool bBackgroundObjectsVisible = sal_False; if ( aAny >>= bBackgroundObjectsVisible ) @@ -424,7 +424,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) return sal_False; SetCurrentStyleSheet( nPageNum ); - if ( !ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) ) // load background shape + if ( !ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) ) // load background shape return sal_False; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet; if ( !( mAny >>= aXBackgroundPropSet ) ) @@ -441,7 +441,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference { ::com::sun::star::uno::Any aAny; sal_Int32 nLayout = 20; - if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "Layout" ) ), sal_True ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ) ), sal_True ) aAny >>= nLayout; DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout)); @@ -499,7 +499,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) if ( aXPropertySet.is() ) { - if ( ImplGetPropertyValue( aXPropertySet, rtl::OUString( "Number" ) ) ) + if ( ImplGetPropertyValue( aXPropertySet, OUString( "Number" ) ) ) nRetValue |= *(sal_Int16*)mAny.getValue(); if ( nRetValue & 0xffff ) // avoid overflow nRetValue--; @@ -546,7 +546,7 @@ sal_Bool PPTWriterBase::GetStyleSheets() Reference< XPropertySet > aXPropSet( mXModel, UNO_QUERY ); - sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, rtl::OUString( "TabStop" ) ) ) + sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, OUString( "TabStop" ) ) ) ? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 ) : 1250; @@ -571,25 +571,25 @@ sal_Bool PPTWriterBase::GetStyleSheets() case EPP_TEXTTYPE_CenterTitle : case EPP_TEXTTYPE_Title : { - aStyle = rtl::OUString( "title" ); + aStyle = OUString( "title" ); aFamily = aXNamed->getName(); } break; case EPP_TEXTTYPE_Body : { - aStyle = rtl::OUString( "outline1" ); // SD_LT_SEPARATOR + aStyle = OUString( "outline1" ); // SD_LT_SEPARATOR aFamily = aXNamed->getName(); } break; case EPP_TEXTTYPE_Other : { - aStyle = rtl::OUString( "standard" ); - aFamily = rtl::OUString( "graphics" ); + aStyle = OUString( "standard" ); + aFamily = OUString( "graphics" ); } break; case EPP_TEXTTYPE_CenterBody : { - aStyle = rtl::OUString( "subtitle" ); + aStyle = OUString( "subtitle" ); aFamily = aXNamed->getName(); } break; @@ -754,7 +754,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) maSize = MapSize( mXShape->getSize() ); maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) ); - rtl::OStringBuffer aTypeBuffer(rtl::OUStringToOString( + OStringBuffer aTypeBuffer(OUStringToOString( mXShape->getShapeType(), RTL_TEXTENCODING_UTF8)); // remove "com.sun.star." aTypeBuffer.remove(0, RTL_CONSTASCII_LENGTH("com.sun.star.")); @@ -764,14 +764,14 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) mType = aTypeBuffer.makeStringAndClear(); mbPresObj = mbEmptyPresObj = sal_False; - if ( ImplGetPropertyValue( rtl::OUString( "IsPresentationObject" ) ) ) + if ( ImplGetPropertyValue( OUString( "IsPresentationObject" ) ) ) mAny >>= mbPresObj; - if ( mbPresObj && ImplGetPropertyValue( rtl::OUString( "IsEmptyPresentationObject" ) ) ) + if ( mbPresObj && ImplGetPropertyValue( OUString( "IsEmptyPresentationObject" ) ) ) mAny >>= mbEmptyPresObj; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), sal_True ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 7260f27467db..724acfe6edfa 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -70,9 +70,6 @@ FSNS( XML_xmlns, XML_p ), "http://schemas.openxmlformats.org/presentationml/2006/main", \ FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships" -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::beans; @@ -348,7 +345,7 @@ bool PowerPointExport::exportDocument() throw() mXModel.set( getModel(), UNO_QUERY ); mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY ); - rtl::OUString sBaseURI( "BaseURI"); + OUString sBaseURI( "BaseURI"); std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = sBaseURI; @@ -421,7 +418,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert </p:grpSpPr>" #define GETA(propName) \ - ImplGetPropertyValue( mXPagePropSet, rtl::OUString( #propName ) ) + ImplGetPropertyValue( mXPagePropSet, OUString( #propName ) ) #define GET(variable, propName) \ if ( GETA(propName) ) \ @@ -1024,7 +1021,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons sal_uInt32 nPresetId = 0; sal_Bool bPresetId = sal_False; if ( pAny[ DFF_ANIM_PRESET_ID ] ) { - rtl::OUString sPreset; + OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) nPresetId = AnimationExporter::GetPresetID( sPreset, nPresetClass, bPresetId ); } @@ -1032,7 +1029,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons sal_uInt32 nPresetSubType = 0; sal_Bool bPresetSubType = sal_False; if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { - rtl::OUString sPresetSubType; + OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = AnimationExporter::TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); bPresetSubType = sal_True; @@ -2098,7 +2095,7 @@ sal_Bool PowerPointExport::WriteNotesMaster() pFS->startElementNS( XML_p, XML_cSld, FSEND ); Reference< XPropertySet > aXBackgroundPropSet; - if( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) && + if( ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) && ( mAny >>= aXBackgroundPropSet ) ) ImplWriteBackground( pFS, aXBackgroundPropSet ); diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index a4697fb4fbbc..d9fd8fd8f4c4 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -108,7 +108,7 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nFontColor = bIsDark ? 0xffffff : 0x000000; } @@ -239,7 +239,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing { sal_Bool bFixedLineSpacing = sal_False; - uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString( "FontIndependentLineSpacing" ) ); + uno::Any aAny = rXPropSet->getPropertyValue( OUString( "FontIndependentLineSpacing" ) ); if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing ) { const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont ); @@ -351,7 +351,7 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 534a31b71c91..adadc4459aab 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -110,7 +110,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text } sal_Bool bSymbol = sal_False; - if ( bPropSetsValid && ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) ) + if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) { sal_Int16 nCharset = 0; mAny >>= nCharset; @@ -219,21 +219,21 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue ) { - sal_Bool bOk = ImplGetPropertyValue( rtl::OUString( "CharFontName" ), bGetPropStateValue ); + sal_Bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); meFontName = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamily" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitch" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } @@ -241,53 +241,53 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); if ( mpText && mnTextSize && xPPTBreakIter.is() ) { - rtl::OUString sT( mpText, mnTextSize ); + OUString sT( mpText, mnTextSize ); nScriptType = xPPTBreakIter->getScriptType( sT, 0 ); } if ( nScriptType != com::sun::star::i18n::ScriptType::COMPLEX ) { - bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameAsian" ), bGetPropStateValue ); + bOk = ImplGetPropertyValue( OUString( "CharFontNameAsian" ), bGetPropStateValue ); meAsianOrComplexFont = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } } else { - bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameComplex" ), bGetPropStateValue ); + bOk = ImplGetPropertyValue( OUString( "CharFontNameComplex" ), bGetPropStateValue ); meAsianOrComplexFont = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } } - rtl::OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName; + OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName; switch( nScriptType ) { case com::sun::star::i18n::ScriptType::ASIAN : @@ -362,7 +362,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } } - if ( ImplGetPropertyValue( rtl::OUString( "CharUnderline" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharUnderline" ), bGetPropStateValue ) ) { sal_Int16 nVal(0); mAny >>= nVal; @@ -377,7 +377,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 4; - if ( ImplGetPropertyValue( rtl::OUString( "CharShadowed" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharShadowed" ), bGetPropStateValue ) ) { sal_Bool bBool(sal_False); mAny >>= bBool; @@ -387,7 +387,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 16; - if ( ImplGetPropertyValue( rtl::OUString( "CharRelief" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharRelief" ), bGetPropStateValue ) ) { sal_Int16 nVal(0); mAny >>= nVal; @@ -397,7 +397,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 512; - if ( ImplGetPropertyValue( rtl::OUString( "CharColor" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharColor" ), bGetPropStateValue ) ) { sal_uInt32 nSOColor = *( (sal_uInt32*)mAny.getValue() ); mnCharColor = nSOColor & 0xff00ff00; // green and hibyte @@ -407,7 +407,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool meCharColor = ePropState; mnCharEscapement = 0; - if ( ImplGetPropertyValue( rtl::OUString( "CharEscapement" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharEscapement" ), bGetPropStateValue ) ) { mAny >>= mnCharEscapement; if ( mnCharEscapement > 100 ) @@ -478,9 +478,9 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com sal_uInt32 nRetValue = 0; sal_Int32 nFormat; ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "TextPortionType" ), sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), sal_True ) ) { - rtl::OUString aTextFieldType( *(::rtl::OUString*)aAny.getValue() ); + OUString aTextFieldType( *(OUString*)aAny.getValue() ); if ( aTextFieldType == "TextField" ) { if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) ) @@ -494,16 +494,16 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY ); if ( xFieldPropSet.is() ) { - rtl::OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); + OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); if ( aFieldKind == "Date" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) // Fixed DateFields does not exist in PPT { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) @@ -525,8 +525,8 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "URL" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "URL" ) ), sal_True ) - rURL = String( *(::rtl::OUString*)aAny.getValue() ); + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ) ), sal_True ) + rURL = String( *(OUString*)aAny.getValue() ); nRetValue = 4 << 28; } else if ( aFieldKind == "Page" ) @@ -539,13 +539,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "Time" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000; @@ -563,13 +563,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "ExtTime" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) @@ -740,23 +740,23 @@ void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaLeftMargin" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaLeftMargin" ) ) ) { sal_Int32 nVal(0); if ( aAny >>= nVal ) nTextOfs = static_cast< sal_Int16 >( nVal / ( 2540.0 / 576 ) + 0.5 ) ; } - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaFirstLineIndent" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaFirstLineIndent" ) ) ) { if ( aAny >>= nBulletOfs ) nBulletOfs = static_cast< sal_Int32 >( nBulletOfs / ( 2540.0 / 576 ) + 0.5 ); } - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "NumberingIsNumber" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "NumberingIsNumber" ) ) ) aAny >>= bNumberingIsNumber; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace; - if ( bIsBullet && ImplGetPropertyValue( rtl::OUString( "NumberingRules" ), bGetPropStateValue ) ) + if ( bIsBullet && ImplGetPropertyValue( OUString( "NumberingRules" ), bGetPropStateValue ) ) { if ( ( mAny >>= aXIndexReplace ) && nNumberingDepth < aXIndexReplace->getCount() ) { @@ -779,14 +779,14 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 const void* pValue = pPropValue[ i ].Value.getValue(); if ( pValue ) { - ::rtl::OUString aPropName( pPropValue[ i ].Name ); + OUString aPropName( pPropValue[ i ].Name ); if ( aPropName == "NumberingType" ) nNumberingType = *( (sal_Int16*)pValue ); else if ( aPropName == "Adjust" ) nHorzAdjust = *( (sal_Int16*)pValue ); else if ( aPropName == "BulletChar" ) { - rtl::OUString aString( *( (::rtl::OUString*)pValue ) ); + OUString aString( *( (OUString*)pValue ) ); if ( !aString.isEmpty() ) cBulletId = aString[ 0 ]; } @@ -803,7 +803,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 } else if ( aPropName == "GraphicURL" ) - aGraphicURL = ( *(::rtl::OUString*)pValue ); + aGraphicURL = ( *(OUString*)pValue ); else if ( aPropName == "GraphicSize" ) { if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) ) @@ -835,9 +835,9 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nBulletFlags |= 8; } else if ( aPropName == "Prefix" ) - sPrefix = ( *(::rtl::OUString*)pValue ); + sPrefix = ( *(OUString*)pValue ); else if ( aPropName == "Suffix" ) - sSuffix = ( *(::rtl::OUString*)pValue ); + sSuffix = ( *(OUString*)pValue ); #ifdef DBG_UTIL else if ( ! ( ( aPropName == "SymbolTextDistance" ) @@ -859,7 +859,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nIndex++; if ( aGraphicURL.Len() > nIndex ) { - rtl::OString aUniqueId(rtl::OUStringToOString(aGraphicURL.Copy(nIndex, aGraphicURL.Len() - nIndex), RTL_TEXTENCODING_UTF8)); + OString aUniqueId(OUStringToOString(aGraphicURL.Copy(nIndex, aGraphicURL.Len() - nIndex), RTL_TEXTENCODING_UTF8)); if ( !aUniqueId.isEmpty() ) { nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize ); @@ -1082,10 +1082,10 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue ); - if ( ImplGetPropertyValue( rtl::OUString( "ParaTabStops" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaTabStops" ), bGetPropStateValue ) ) maTabStop = *( ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop>*)mAny.getValue(); sal_Int16 eTextAdjust( ::com::sun::star::style::ParagraphAdjust_LEFT ); - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaAdjust" ), bGetPropStateValue ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaAdjust" ), bGetPropStateValue ) ) aAny >>= eTextAdjust; switch ( (::com::sun::star::style::ParagraphAdjust)eTextAdjust ) { @@ -1105,7 +1105,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } meTextAdjust = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaLineSpacing" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaLineSpacing" ), bGetPropStateValue ) ) { ::com::sun::star::style::LineSpacing aLineSpacing = *( (::com::sun::star::style::LineSpacing*)mAny.getValue() ); @@ -1129,30 +1129,30 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } meLineSpacing = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaBottomMargin" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaBottomMargin" ), bGetPropStateValue ) ) { double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1; mnLineSpacingBottom = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) ); } meLineSpacingBottom = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaTopMargin" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaTopMargin" ), bGetPropStateValue ) ) { double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1; mnLineSpacingTop = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) ); } meLineSpacingTop = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaIsForbiddenRules" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaIsForbiddenRules" ), bGetPropStateValue ) ) mAny >>= mbForbiddenRules; meForbiddenRules = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaIsHangingPunctuation" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaIsHangingPunctuation" ), bGetPropStateValue ) ) mAny >>= mbParagraphPunctation; meParagraphPunctation = ePropState; mnBiDi = 0; - if ( ImplGetPropertyValue( rtl::OUString( "WritingMode" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "WritingMode" ), bGetPropStateValue ) ) { sal_Int16 nWritingMode = 0; mAny >>= nWritingMode; @@ -1349,7 +1349,7 @@ FontCollection::FontCollection() : xPPTBreakIter = com::sun::star::i18n::BreakIterator::create( xContext ); } -short FontCollection::GetScriptDirection( const rtl::OUString& rString ) const +short FontCollection::GetScriptDirection( const OUString& rString ) const { short nRet = ScriptTypeDetector::getScriptDirection( rString, 0, com::sun::star::i18n::ScriptDirection::NEUTRAL ); return nRet; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e8df14893f61..8c9af66a08c4 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -86,7 +86,6 @@ using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::io; using namespace ::com::sun::star::ucb; using namespace com::sun::star::ui::dialogs; -using rtl::OUString; using namespace ::sfx2; @@ -295,15 +294,15 @@ sal_Bool SdGRFFilter::Export() beans::PropertyValues aArgs; TransformItems( SID_SAVEASDOC, *pSet, aArgs ); - rtl::OUString sInteractionHandler( "InteractionHandler" ); - rtl::OUString sFilterName( "FilterName" ); - rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); + OUString sInteractionHandler( "InteractionHandler" ); + OUString sFilterName( "FilterName" ); + OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); sal_Bool bFilterNameFound = sal_False; sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { - rtl::OUString& rStr = aArgs[ i ].Name; + OUString& rStr = aArgs[ i ].Name; if ( rStr == sFilterName ) { bFilterNameFound = sal_True; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 3a2aa5ff7956..75c7e74df591 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -55,7 +55,7 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5 { Sequence< PropertyValue > maMediaDescriptor; Sequence< PropertyValue > maFilterDataSequence; - ::rtl::OUString aDialogTitle; + OUString aDialogTitle; DocumentType meDocType; public: @@ -71,9 +71,9 @@ public: virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw ( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); // XPropertyAccess virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException ); @@ -85,7 +85,7 @@ public: // XExecuteDialog virtual sal_Int16 SAL_CALL execute() throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( ::com::sun::star::uno::RuntimeException ); // XExporter @@ -105,24 +105,24 @@ Reference< XInterface > return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog ); } -::rtl::OUString SdHtmlOptionsDialog_getImplementationName() +OUString SdHtmlOptionsDialog_getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" ); + return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" ); } -sal_Bool SAL_CALL SdHtmlOptionsDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SdHtmlOptionsDialog_supportsService( const OUString& ServiceName ) throw( RuntimeException ) { return ServiceName.equals("com.sun.star.ui.dialog.FilterOptionsDialog"); } -Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString("com.sun.star.ui.dialog.FilterOptionsDialog"); + Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.ui.dialog.FilterOptionsDialog"); return aRet; } @@ -160,17 +160,17 @@ void SAL_CALL SdHtmlOptionsDialog::initialize( const Sequence< Any > & ) } // XServiceInfo -::rtl::OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName() +OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName() throw( RuntimeException ) { return SdHtmlOptionsDialog_getImplementationName(); } -sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString& rServiceName ) throw( RuntimeException ) { return SdHtmlOptionsDialog_supportsService( rServiceName ); } -Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames() throw ( RuntimeException ) { return SdHtmlOptionsDialog_getSupportedServiceNames(); @@ -215,7 +215,7 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a } // XExecutableDialog -void SdHtmlOptionsDialog::setTitle( const ::rtl::OUString& aTitle ) +void SdHtmlOptionsDialog::setTitle( const OUString& aTitle ) throw ( RuntimeException ) { aDialogTitle = aTitle; diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 64603ca0879e..3f7daf14f5af 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -38,7 +38,6 @@ #include "buttonset.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::embed; @@ -89,13 +88,13 @@ Reference< XInputStream > ButtonsImpl::getInputStream( const OUString& rName ) return xInputStream; } -bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvider, const rtl::OUString& rName, Graphic& rGraphic ) +bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvider, const OUString& rName, Graphic& rGraphic ) { Reference< XInputStream > xInputStream( getInputStream( rName ) ); if( xInputStream.is() && xGraphicProvider.is() ) try { Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString("InputStream" ); + aMediaProperties[0].Name = OUString("InputStream" ); aMediaProperties[0].Value <<= xInputStream; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); @@ -142,8 +141,8 @@ public: int getCount() const; - bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); - bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); + bool getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ); + bool exportButton( int nSet, const OUString& rPath, const OUString& rName ); void scanForButtonSets( const OUString& rPath ); @@ -190,7 +189,7 @@ int ButtonSetImpl::getCount() const return maButtons.size(); } -bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) +bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ) { if( (nSet >= 0) && (nSet < static_cast<int>(maButtons.size()))) { @@ -202,7 +201,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rB aDev.SetMapMode(MapMode(MAP_PIXEL)); Size aSize; - std::vector< rtl::OUString >::const_iterator aIter( rButtons.begin() ); + std::vector< OUString >::const_iterator aIter( rButtons.begin() ); while( aIter != rButtons.end() ) { Graphic aGraphic; @@ -241,7 +240,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rB return false; } -bool ButtonSetImpl::exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ) +bool ButtonSetImpl::exportButton( int nSet, const OUString& rPath, const OUString& rName ) { if( (nSet >= 0) && (nSet < static_cast<int>(maButtons.size()))) { @@ -278,12 +277,12 @@ int ButtonSet::getCount() const return mpImpl->getCount(); } -bool ButtonSet::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) +bool ButtonSet::getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ) { return mpImpl->getPreview( nSet, rButtons, rImage ); } -bool ButtonSet::exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ) +bool ButtonSet::exportButton( int nSet, const OUString& rPath, const OUString& rName ) { return mpImpl->exportButton( nSet, rPath, rName ); } diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx index 666778e792f7..537f3280b6fe 100644 --- a/sd/source/filter/html/buttonset.hxx +++ b/sd/source/filter/html/buttonset.hxx @@ -37,8 +37,8 @@ public: int getCount() const; - bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); - bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); + bool getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ); + bool exportButton( int nSet, const OUString& rPath, const OUString& rName ); private: ButtonSetImpl* mpImpl; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 5cc1a4f1baf3..a792e20b8041 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -82,8 +82,6 @@ #include "buttonset.hxx" #include <basegfx/polygon/b2dpolygon.hxx> -using ::rtl::OUString; -using ::rtl::OString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -939,7 +937,7 @@ bool HtmlExport::SavePresentation() aProperties[ 0 ].Name = "Overwrite"; aProperties[ 0 ].Value <<= (sal_Bool)sal_True; aProperties[ 1 ].Name = "FilterName"; - aProperties[ 1 ].Value <<= rtl::OUString("impress8"); + aProperties[ 1 ].Value <<= OUString("impress8"); xStorable->storeToURL( aURL, aProperties ); mpDocSh->EnableSetModified( false ); @@ -1148,7 +1146,7 @@ bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const S nErr = aFile.createStream(aFull , pStr); if(nErr == 0) { - rtl::OString aStr(rtl::OUStringToOString(rHtmlData, + OString aStr(OUStringToOString(rHtmlData, RTL_TEXTENCODING_UTF8)); *pStr << aStr.getStr(); nErr = aFile.close(); @@ -2868,7 +2866,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S INetURLObject aURL( SvtPathOptions().GetConfigPath() ); String aScript; - aURL.Append( rtl::OUString("webcast") ); + aURL.Append( OUString("webcast") ); aURL.Append( rSource ); meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); @@ -2878,7 +2876,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S if( pIStm ) { - rtl::OString aLine; + OString aLine; while( pIStm->ReadLine( aLine ) ) { @@ -2926,7 +2924,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S nErr = aFile.createStream(aDest, pStr); if(nErr == 0) { - rtl::OString aStr(rtl::OUStringToOString(aScript, + OString aStr(OUStringToOString(aScript, RTL_TEXTENCODING_UTF8)); *pStr << aStr.getStr(); @@ -2977,10 +2975,10 @@ bool HtmlExport::CreatePERLScripts() return false; } - if(!CopyScript(maExportPath, rtl::OUString("edit.pl"), maIndex, true )) + if(!CopyScript(maExportPath, OUString("edit.pl"), maIndex, true )) return false; - if(!CopyScript(maExportPath, rtl::OUString("index.pl"), maIndexUrl, true )) + if(!CopyScript(maExportPath, OUString("index.pl"), maIndexUrl, true )) return false; return true; @@ -3086,7 +3084,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA catch( com::sun::star::uno::Exception& ) { OSL_FAIL(OString(OString("sd::HtmlExport::checkFileExists(), exception caught: ") + - rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } return false; @@ -3148,7 +3146,7 @@ bool HtmlExport::checkForExistingFiles() catch( Exception& ) { OSL_FAIL(OString(OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") + - rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bFound = false; } @@ -3238,7 +3236,7 @@ sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName ) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rURL, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -3294,8 +3292,8 @@ sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) rCtxStr = SdResId( mnResId ); - rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL1)"), maURL1 ); - rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL2)"), maURL2 ); + rCtxStr = rCtxStr.replaceAll( OUString("$(URL1)"), maURL1 ); + rCtxStr = rCtxStr.replaceAll( OUString("$(URL2)"), maURL2 ); return true; } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 3a8f586d8818..e9b35a9d6dda 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -210,7 +210,7 @@ class HtmlExport String GetButtonName( int nButton ) const; public: - HtmlExport( rtl::OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); + HtmlExport( OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); virtual ~HtmlExport(); static String ColorToHTMLString( Color aColor ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 092cd990fcaa..2a3975815e9e 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -57,7 +57,6 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; #define NOOFPAGES 6 @@ -1319,9 +1318,9 @@ void SdPublishingDlg::LoadPreviewButtons() "collapse.png", }; - std::vector< rtl::OUString > aButtonNames; + std::vector< OUString > aButtonNames; for( int i = 0; i < nButtonCount; ++i ) - aButtonNames.push_back( rtl::OUString::createFromAscii( pButtonNames[i] ) ); + aButtonNames.push_back( OUString::createFromAscii( pButtonNames[i] ) ); int nSetCount = mpButtonSet->getCount(); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 87e7e98787db..d5124155c8a2 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -158,7 +158,7 @@ sal_uInt32 Ppt97Animation::GetSoundRef() const { return m_aAtom.nSoundRef; } -void Ppt97Animation::SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl ) +void Ppt97Animation::SetSoundFileUrl( const OUString& rSoundFileUrl ) { m_aSoundFileUrl = rSoundFileUrl; } @@ -256,12 +256,12 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const } return nRet; } -::rtl::OUString Ppt97Animation::GetPresetId() const +OUString Ppt97Animation::GetPresetId() const { UpdateCacheData(); return m_aPresetId; } -::rtl::OUString Ppt97Animation::GetPresetSubType() const +OUString Ppt97Animation::GetPresetSubType() const { UpdateCacheData(); return m_aSubType; @@ -269,7 +269,7 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const void Ppt97Animation::ClearCacheData() const { - m_aPresetId = m_aSubType = rtl::OUString(); + m_aPresetId = m_aSubType = OUString(); m_bHasSpecialDuration = false; m_fDurationInSeconds = 0.001; } diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 8a876f1f0227..dc653895c97b 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -104,7 +104,7 @@ public: //public methods //set methods void SetDimColor( sal_Int32 nDimColor ); - void SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl ); + void SetSoundFileUrl( const OUString& rSoundFileUrl ); void SetAnimateAssociatedShape( bool bAnimate ); //true if the shape should be animated in addition to the text //action methods @@ -116,8 +116,8 @@ public: //public methods private: //private methods //read methods - ::rtl::OUString GetPresetId() const; - ::rtl::OUString GetPresetSubType() const; + OUString GetPresetId() const; + OUString GetPresetSubType() const; bool HasAfterEffect() const; bool HasAfterEffect_ChangeColor() const; bool HasAfterEffect_DimAtNextEffect() const; @@ -146,12 +146,12 @@ private: //private methods private: //private member //input information: Ppt97AnimationInfoAtom m_aAtom; ///< pure input from stream - ::rtl::OUString m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url + OUString m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url //cached generated output information: mutable bool m_bDirtyCache; - mutable ::rtl::OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml - mutable ::rtl::OUString m_aSubType; + mutable OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml + mutable OUString m_aSubType; mutable bool m_bHasSpecialDuration; mutable double m_fDurationInSeconds; }; diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 92054bd6ddb5..04abeeecd920 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -242,7 +242,7 @@ struct transition sal_Int16 mnSubType; sal_Bool mbDirection; // true: default geometric direction - static const transition* find( const rtl::OUString& rName ); + static const transition* find( const OUString& rName ); static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection ); }; static const transition gTransitions[] = diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 9dc25d8af73b..1bbb9155c80f 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -126,7 +126,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto #endif PowerPointImportParam aParam( rDocStream, nImportFlags ); - SvStream* pCurrentUserStream = rStorage.OpenSotStream( rtl::OUString( "Current User" ), STREAM_STD_READ ); + SvStream* pCurrentUserStream = rStorage.OpenSotStream( OUString( "Current User" ), STREAM_STD_READ ); if( pCurrentUserStream ) { *pCurrentUserStream >> aParam.aCurrentUserAtom; @@ -183,7 +183,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage { sal_uLong nPosMerk = rStCtrl.Tell(); - pStData = rStorage_.OpenSotStream( rtl::OUString( "Pictures" ), STREAM_STD_READ ); + pStData = rStorage_.OpenSotStream( OUString( "Pictures" ), STREAM_STD_READ ); rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); sal_uLong nDocLen = maDocHd.GetRecEndFilePos(); @@ -257,7 +257,7 @@ sal_Bool ImplSdPPTImport::Import() SeekOle( pDocShell, mnFilterOptions ); // hyperlinks - PropRead* pDInfoSec2 = new PropRead( mrStorage, rtl::OUString( "\005DocumentSummaryInformation" ) ); + PropRead* pDInfoSec2 = new PropRead( mrStorage, OUString( "\005DocumentSummaryInformation" ) ); if ( pDInfoSec2->IsValid() ) { PropItem aPropItem; @@ -358,7 +358,7 @@ sal_Bool ImplSdPPTImport::Import() Dictionary aDict; if ( pSection->GetDictionary( aDict ) ) { - Dictionary::const_iterator iter = aDict.find( rtl::OUString("_PID_HLINKS") ); + Dictionary::const_iterator iter = aDict.find( OUString("_PID_HLINKS") ); if ( iter != aDict.end() ) { @@ -413,13 +413,13 @@ sal_Bool ImplSdPPTImport::Import() { sal_uInt32 nPageNumber = 0; OUString aString( pHyperlink->aSubAdress ); - rtl::OString aStringAry[ 3 ]; + OString aStringAry[ 3 ]; sal_uInt16 nTokenCount = comphelper::string::getTokenCount(aString, ','); if ( nTokenCount > 3 ) nTokenCount = 3; sal_uInt16 nToken; for( nToken = 0; nToken < nTokenCount; nToken++ ) - aStringAry[nToken] = rtl::OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); + aStringAry[nToken] = OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); sal_Bool bSucceeded = sal_False; @@ -1251,7 +1251,7 @@ sal_Bool ImplSdPPTImport::Import() DffRecordHeader aContent; if ( SeekToRec( rStCtrl, PPT_PST_CString, aCuHeader.GetRecEndFilePos(), &aContent ) ) { - rtl::OUString aCuShow; + OUString aCuShow; aContent.SeekToBegOfRecord( rStCtrl ); if ( ReadString( aCuShow ) ) { @@ -1368,7 +1368,7 @@ sal_Bool ImplSdPPTImport::Import() uno::Reference<document::XDocumentProperties> xDocProps = xDPS->getDocumentProperties(); sfx2::LoadOlePropertySet(xDocProps, &mrStorage); - xDocProps->setTemplateName(::rtl::OUString()); + xDocProps->setTemplateName(OUString()); pSdrModel->setLock(false); pSdrModel->EnableUndo(true); @@ -1853,7 +1853,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { - rtl::OUString aRetval; + OUString aRetval; sal_uInt32 nPosMerk = rStCtrl.Tell(); DffRecordHeader aDocHd; if ( SeekToDocument( &aDocHd ) ) @@ -1870,7 +1870,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos(); - rtl::OUString aRefStr; + OUString aRefStr; sal_uInt32 nPosMerk2 = rStCtrl.Tell(); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { @@ -1962,7 +1962,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const { - rtl::OUString aRetVal; + OUString aRetVal; DffRecordHeader* pHd( const_cast<ImplSdPPTImport*>(this)->aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ) ); if ( pHd ) { @@ -1996,7 +1996,7 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const case PPT_PST_CString : { aHd.SeekToBegOfRecord( rStCtrl ); - rtl::OUString aStr; + OUString aStr; if ( ReadString( aStr ) ) { if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) ) @@ -2605,7 +2605,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi case PPT_PST_InteractiveInfo: { sal_uInt32 nFilePosMerk2 = rSt.Tell(); - rtl::OUString aMacroName; + OUString aMacroName; if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) ) ReadString(aMacroName); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 192169da1fd5..8b5a2f251856 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -66,8 +66,6 @@ #include <algorithm> using ::std::map; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -236,10 +234,10 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec #ifdef DBG_ANIM_LOG static int ppt_anim_debug_stream_number = 1; - rtl::OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-"); - ppt_anim_debug_filename += rtl::OUString::valueOf(ppt_anim_debug_stream_number++); - ppt_anim_debug_filename += rtl::OUString(".xml"); - mpFile = fopen( rtl::OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" ); + OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-"); + ppt_anim_debug_filename += OUString::valueOf(ppt_anim_debug_stream_number++); + ppt_anim_debug_filename += OUString(".xml"); + mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" ); #endif dump("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); @@ -1310,7 +1308,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim // TODO: DFF_ANIM_ID if( rSet.hasProperty( DFF_ANIM_ID ) ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_ID ) >>= aString; //if( !aString.isEmpty() ) //{ @@ -1320,7 +1318,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim // TODO: DFF_ANIM_EVENT_FILTER if( rSet.hasProperty( DFF_ANIM_EVENT_FILTER ) ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_EVENT_FILTER ) >>= aString; //if( !aString.isEmpty() ) //{ @@ -1333,7 +1331,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim Reference< XAnimate > xAnim( xNode, UNO_QUERY ); if( xAnim.is() ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_TIMEFILTER ) >>= aString; if( !aString.isEmpty() ) { @@ -1624,7 +1622,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R Any aAny; if ( importAttributeValue( pChildAtom, aAny ) ) { - rtl::OUString filter; + OUString filter; aAny >>= filter; dump( " filter=\"%s\"", filter ); @@ -2132,7 +2130,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R Any aPath; if ( importAttributeValue( pChildAtom, aPath ) ) { - rtl::OUString aStr; + OUString aStr; if ( aPath >>= aStr ) { aStr = aStr.replace( 'E', ' ' ); @@ -2754,7 +2752,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValues[i] >>= aStr ) dump( "%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValues[i] >>= nVal ) dump( "%f", nVal ); @@ -2766,7 +2764,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen { if( aValuePair.First >>= aStr ) dump( "%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.First >>= nVal ) dump( "%f", nVal ); @@ -2775,7 +2773,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValuePair.Second >>= aStr ) dump( ",%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.Second >>= nVal ) dump( ",%f", nVal ); @@ -2853,7 +2851,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) { if ( ( nRecLen & 1 ) && ( nRecLen > 1 ) ) { - rtl::OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True ); + OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True ); rAny <<= aOUString; bOk = true; @@ -3282,7 +3280,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) if( importAttributeValue( pChildAtom, aValue ) ) { sal_Int32 nInt; - rtl::OUString aString; + OUString aString; double fDouble; if( aValue >>= nInt ) @@ -3292,7 +3290,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) else if( aValue >>= aString ) { fprintf(mpFile, " value=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr()); } else if( aValue >>= fDouble ) @@ -3443,7 +3441,7 @@ void AnimationImporter::dump( Any& rAny ) } else if( rAny >>= aString ) { - fprintf( mpFile, "%s", rtl::OUStringToOString(aString, + fprintf( mpFile, "%s", OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); } else if( rAny >>= nInt ) @@ -3655,11 +3653,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_ID: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " id=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3668,11 +3666,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_EVENT_FILTER: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " eventFilter=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3691,11 +3689,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_TIMEFILTER: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " timeFilter=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3704,11 +3702,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_RUNTIMECONTEXT: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " runtimeContext=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3786,9 +3784,9 @@ void AnimationImporter::dump( const char * pText ) fprintf( mpFile, "%s", pText ); } -void AnimationImporter::dump( const rtl::OUString& rString ) +void AnimationImporter::dump( const OUString& rString ) { - fprintf( mpFile, rtl::OUStringToOString(rString, + fprintf( mpFile, OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr() ); } @@ -3814,7 +3812,7 @@ void AnimationImporter::dump( const char * pText, const char * pText2 ) void AnimationImporter::dump( const char * pText, const OUString& rString ) { - fprintf( mpFile, pText, rtl::OUStringToOString(rString, + fprintf( mpFile, pText, OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr() ); } @@ -3860,7 +3858,7 @@ void AnimationImporter::dump( const char * , const char * ) { } -void AnimationImporter::dump( const char * , const rtl::OUString& ) +void AnimationImporter::dump( const char * , const OUString& ) { } diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 6f39990ed935..691e41872cdf 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -72,7 +72,7 @@ private: void importAnimateKeyPoints( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importPropertySetContainer( const Atom* pAtom,PropertySet& rSet ); bool importAttributeValue( const Atom* pAtom, com::sun::star::uno::Any& rAny ); - bool importAttributeNamesContainer( const Atom* pAtom, rtl::OUString& rAttributeNames ); + bool importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ); sal_Int32 importTargetElementContainer( const Atom* pAtom, ::com::sun::star::uno::Any& rTarget, sal_Int16& nSubType ); void fillNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet ); @@ -100,7 +100,7 @@ private: #ifdef DBG_ANIM_LOG FILE * mpFile; void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); - void dump( const rtl::OUString& rString ); + void dump( const OUString& rString ); void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif @@ -115,7 +115,7 @@ private: void dump( const char * pText, sal_Int64 nInt ); void dump( const char * pText, double fDouble ); void dump( const char * pText, const char * pText2 ); - void dump( const char * pText, const rtl::OUString& rString ); + void dump( const char * pText, const OUString& rString ); }; } // namespace ppt diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index e835e25d1815..f8809fb1b528 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -65,12 +65,12 @@ SdFilter::~SdFilter() // ----------------------------------------------------------------------------- -::rtl::OUString SdFilter::ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const +OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const { - String aTemp(::rtl::OUString(SVLIBRARY("?"))); + String aTemp(OUString(SVLIBRARY("?"))); xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' ); aTemp.Replace( nIndex, 1, rLibraryName ); - ::rtl::OUString aLibraryName( aTemp ); + OUString aLibraryName( aTemp ); return aLibraryName; } @@ -79,7 +79,7 @@ SdFilter::~SdFilter() #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } -::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const +::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName ) const { std::auto_ptr< osl::Module > mod(new osl::Module); return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName), diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index bbb383937f9f..f70b12a31764 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -96,13 +96,13 @@ sal_Bool SdPPTFilter::Import() xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ ); pStorage = xDualStorage; } - SvStream* pDocStream = pStorage->OpenSotStream( rtl::OUString("PowerPoint Document") , STREAM_STD_READ ); + SvStream* pDocStream = pStorage->OpenSotStream( OUString("PowerPoint Document") , STREAM_STD_READ ); if( pDocStream ) { pDocStream->SetVersion( pStorage->GetVersion() ); pDocStream->SetCryptMaskKey(pStorage->GetKey()); - if ( pStorage->IsStream( rtl::OUString("EncryptedSummary" ) ) ) + if ( pStorage->IsStream( OUString("EncryptedSummary" ) ) ) mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT, OSL_LOG_PREFIX ); else { @@ -173,7 +173,7 @@ sal_Bool SdPPTFilter::Export() if( mbShowProgress ) CreateStatusIndicator(); - //rtl::OUString sBaseURI( "BaseURI"); + //OUString sBaseURI( "BaseURI"); std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = "BaseURI"; diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 42e70de3158d..e8c622f53720 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -34,7 +34,6 @@ #include "drawdoc.hxx" #include "glob.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::style; class SdTransformOOo2xDocument diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 5cf4f2c708a6..e82ae25753b5 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -69,7 +69,6 @@ #include <sfx2/frame.hxx> -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -269,9 +268,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -305,9 +304,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -316,9 +315,9 @@ sal_Int32 ReadThroughComponent( catch (const packages::zip::ZipIOException& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -329,9 +328,9 @@ sal_Int32 ReadThroughComponent( catch (const io::IOException& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -342,9 +341,9 @@ sal_Int32 ReadThroughComponent( catch (const uno::Exception& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -458,7 +457,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Import" ); #ifdef TIMELOG - rtl::OString aFile(rtl::OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "importing %s", aFile.getStr() ); #endif @@ -840,7 +839,7 @@ sal_Bool SdXMLFilter::Export() { #ifdef TIMELOG RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Export" ); - rtl::OString aFile(rtl::OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting %s", aFile.getStr() ); #endif @@ -1083,9 +1082,9 @@ sal_Bool SdXMLFilter::Export() catch (const uno::Exception &e) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno Exception caught while exporting:\n")); - aError.append(rtl::OUStringToOString(e.Message, + aError.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index bd3cf7d43864..e4d0281a3069 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -60,7 +60,7 @@ void SimpleReferenceComponent::release() ) // don't break throw () { #if OSL_DEBUG_LEVEL > 0 - rtl::OString msg( rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); + OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( msg.getStr() ); #endif } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 00e1ac2b2d0f..d07489869b6a 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -46,7 +46,6 @@ #include "View.hxx" #include <memory> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; @@ -267,7 +266,7 @@ Reference<XAccessible> SAL_CALL if (nIndex == 0) return mxAccessibleOLEObject; - throw lang::IndexOutOfBoundsException ( "no child with index " + rtl::OUString::valueOf(nIndex), NULL); + throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::valueOf(nIndex), NULL); } @@ -452,17 +451,17 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleDocumentViewBase"); + return OUString("AccessibleDocumentViewBase"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -704,11 +703,11 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /// Create a name for this view. -::rtl::OUString +OUString AccessibleDocumentViewBase::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("AccessibleDocumentViewBase"); + return OUString ("AccessibleDocumentViewBase"); } @@ -717,11 +716,11 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleDocumentViewBase::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sDescription; + OUString sDescription; uno::Reference<lang::XServiceInfo> xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 047421716a5f..7d0f2f6a46b5 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -52,7 +52,6 @@ #include "sdresid.hxx" #include <osl/mutex.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -240,7 +239,7 @@ uno::Reference<XAccessible> SAL_CALL } else throw lang::IndexOutOfBoundsException ( - "no accessible child with index " + rtl::OUString::valueOf(nIndex), + "no accessible child with index " + OUString::valueOf(nIndex), static_cast<uno::XWeak*>(this)); } @@ -333,17 +332,17 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleDrawDocumentView"); + return OUString("AccessibleDrawDocumentView"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -365,16 +364,16 @@ void SAL_CALL /// Create a name for this view. -::rtl::OUString +OUString AccessibleDrawDocumentView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sName; + OUString sName; uno::Reference<lang::XServiceInfo> xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) { - uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( xInfo->getSupportedServiceNames() ); OUString sFirstService = aServices[0]; if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" ) { @@ -421,16 +420,16 @@ void SAL_CALL /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleDrawDocumentView::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sDescription; + OUString sDescription; uno::Reference<lang::XServiceInfo> xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) { - uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( xInfo->getSupportedServiceNames() ); OUString sFirstService = aServices[0]; if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" ) { diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 9c066d3ddbbc..5074eaff09ae 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -156,11 +156,11 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleOutlineView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleOutlineView"); + return OUString("AccessibleOutlineView"); } @@ -239,7 +239,7 @@ void SAL_CALL /// Create a name for this view. -::rtl::OUString +OUString AccessibleOutlineView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -252,7 +252,7 @@ void SAL_CALL /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleOutlineView::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 1cd092af0367..84b3695401a1 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace accessibility { @@ -248,18 +247,18 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePageShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - return ::rtl::OUString("AccessiblePageShape"); + return OUString("AccessiblePageShape"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -307,17 +306,17 @@ void AccessiblePageShape::dispose (void) //===== protected internal ================================================== -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("PageShape"); + return OUString ("PageShape"); } -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -342,11 +341,11 @@ void AccessiblePageShape::dispose (void) -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("Page Shape"); + return OUString ("Page Shape"); } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 4d2461c739a5..220792dc0c2e 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -51,22 +51,22 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationGraphicShape"); + return OUString("AccessiblePresentationGraphicShape"); } /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -87,7 +87,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) -::rtl::OUString +OUString AccessiblePresentationGraphicShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 9423b89490d3..64e14d9e8ce4 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -45,19 +45,19 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationOLEShape"); + return OUString("AccessiblePresentationOLEShape"); } /// Set this object's name if it is different to the current name. -::rtl::OUString +OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -81,7 +81,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) return sName; } -::rtl::OUString +OUString AccessiblePresentationOLEShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index e3f58046a07d..2b48c2b436cf 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -51,22 +51,22 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationShape"); + return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -114,7 +114,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) -::rtl::OUString +OUString AccessiblePresentationShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx index 01ca61973424..09bcaa0796ca 100644 --- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx +++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx @@ -29,7 +29,6 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; @@ -39,8 +38,8 @@ namespace accessibility { AccessibleScrollPanel::AccessibleScrollPanel ( ::sd::toolpanel::ScrollPanel& rScrollPanel, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription) + const OUString& rsName, + const OUString& rsDescription) : AccessibleTreeNode( rScrollPanel, rsName, diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 1fc462615207..9366bd16af40 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -40,7 +40,6 @@ #include "glob.hrc" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -200,7 +199,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -210,7 +209,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -490,7 +489,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -508,7 +507,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i<aSupportedServices.getLength(); i++) if (sServiceName == aSupportedServices[i]) @@ -519,7 +518,7 @@ sal_Bool SAL_CALL -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterObject::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 14ac486a9e07..ba31c04cb623 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -45,7 +45,6 @@ #include <rtl/ref.hxx> #include <vcl/svapp.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -289,7 +288,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -301,7 +300,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -716,7 +715,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleSlideSorterView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -734,7 +733,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i<aSupportedServices.getLength(); i++) if (sServiceName == aSupportedServices[i]) @@ -745,7 +744,7 @@ sal_Bool SAL_CALL -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterView::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 393e2816dd49..282208555d92 100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -33,7 +33,6 @@ #include <vcl/window.hxx> #include <svtools/colorcfg.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -231,7 +230,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) +OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -241,7 +240,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) +OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -565,7 +564,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleTreeNode::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -583,7 +582,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i<aSupportedServices.getLength(); i++) if (sServiceName == aSupportedServices[i]) @@ -594,7 +593,7 @@ sal_Bool SAL_CALL -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleTreeNode::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 08bc6eae3122..b24b8ef056a4 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -490,7 +489,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) // -------------------------------------------------------------------- -CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const ::rtl::OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION_CREATE ) ) , mpPane( pPane ) , mrTargets( rTargets ) @@ -651,7 +650,7 @@ void CustomAnimationCreateDialog::setPosition() E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE)); if ( aDlgOpt.Exists() ) { - SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(), + SetWindowState( OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US) ); } else diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 2f5fb2b3ab2b..4a0af710b320 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -41,7 +41,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const ::rtl::OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); ~CustomAnimationCreateDialog(); PathKind getCreatePathKind() const; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index e6c03d6eb88c..797cd6809ee2 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -110,7 +109,7 @@ public: virtual Control* getControl(); private: - std::map< sal_uInt16, rtl::OUString > maPropertyValues; + std::map< sal_uInt16, OUString > maPropertyValues; ListBox* mpControl; }; @@ -567,7 +566,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpMenu = new PopupMenu(); for( sal_Int32 i = 25; i < 101; i += 25 ) { - String aStr(rtl::OUString::valueOf(i)); + String aStr(OUString::valueOf(i)); aStr += sal_Unicode('%'); mpMenu->InsertItem( i, aStr ); } @@ -1908,7 +1907,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( nPos != LISTBOX_ENTRY_NOTFOUND ) mpCBDuration->SelectEntryPos( nPos ); else - mpCBDuration->SetText(rtl::OUString::valueOf(fDuration)); + mpCBDuration->SetText(OUString::valueOf(fDuration)); } } @@ -1939,7 +1938,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( nPos != LISTBOX_ENTRY_NOTFOUND ) mpCBRepeat->SelectEntryPos( nPos ); else - mpCBRepeat->SetText(rtl::OUString::valueOf(fRepeat)); + mpCBRepeat->SetText(OUString::valueOf(fRepeat)); } else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) ) { @@ -2083,7 +2082,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) break; default: { - rtl::OUString aText( mpCBRepeat->GetText() ); + OUString aText( mpCBRepeat->GetText() ); if( !aText.isEmpty() ) aRepeatCount <<= aText.toDouble(); } @@ -2114,7 +2113,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) } else { - rtl::OUString aText( mpCBDuration->GetText() ); + OUString aText( mpCBDuration->GetText() ); if( !aText.isEmpty() ) { fDuration = aText.toDouble(); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index a951fc01651b..38fd8df408b4 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -106,7 +106,7 @@ public: virtual ~PropertySubControl(); virtual ::com::sun::star::uno::Any getValue() = 0; - virtual void setValue( const ::com::sun::star::uno::Any& rValue, const rtl::OUString& rPresetId ) = 0; + virtual void setValue( const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId ) = 0; virtual Control* getControl() = 0; @@ -114,7 +114,7 @@ public: create( sal_Int32 nType, ::Window* pParent, const ::com::sun::star::uno::Any& rValue, - const rtl::OUString& rPresetId, + const OUString& rPresetId, const Link& rModifyHdl ); sal_Int32 getControlType() const { return mnType; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 1fde2cf6b6b2..d0e6d76fd1ad 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index d1e29d0545c1..4dc8ef9b2fcf 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -88,7 +88,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::text; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using ::com::sun::star::view::XSelectionSupplier; diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx index c1f734610302..07330828526f 100644 --- a/sd/source/ui/animations/STLPropertySet.cxx +++ b/sd/source/ui/animations/STLPropertySet.cxx @@ -21,7 +21,6 @@ using namespace com::sun::star::beans; -using rtl::OUString; using com::sun::star::uno::Any; namespace sd diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 8c3913e73575..05ac403eaa07 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::RuntimeException; using ::sd::framework::FrameworkHelper; @@ -946,7 +945,7 @@ void SlideTransitionPane::openSoundFileDialog() else { String aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE)); - rtl::OUString aStr('%'); + OUString aStr('%'); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); aWarningBox.SetModalInputMode (sal_True); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 8f2e1a992458..f5f7ac22e6af 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -56,7 +56,6 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> -using ::rtl::OUString; using ::sdr::PolyPolygonEditor; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -377,7 +376,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con } XDash aDash( XDASH_RECT, 1, 80, 1, 80, 80); - rtl::OUString aEmpty( "?" ); + OUString aEmpty( "?" ); mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) ); mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) ); mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) ); @@ -420,7 +419,7 @@ MotionPathTag::~MotionPathTag() void MotionPathTag::updatePathAttributes() { - rtl::OUString aEmpty( "?" ); + OUString aEmpty( "?" ); ::basegfx::B2DPolygon aCandidate; if( mxPolyPoly.count() ) diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 867a81fab099..05afa8dbb3da 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -109,7 +109,7 @@ private: SdrPathObj* mpPathObj; ::com::sun::star::awt::Point maOriginPos; SdrMark* mpMark; - rtl::OUString msLastPath; + OUString msLastPath; bool mbInUpdatePath; }; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index c4c6897ce8a6..e3fe236b591d 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -80,7 +80,6 @@ #include "textapi.hxx" #include "optsitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; @@ -463,16 +462,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aStr.SearchAndReplaceAscii("%1", sAuthor); - aStr.Append( rtl::OUString(" (") ); - aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) ); - aStr.Append( rtl::OUString("): \"") ); + aStr.Append( OUString(" (") ); + aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) ); + aStr.Append( OUString("): \"") ); String sQuote( pTextApi->GetText() ); if( sQuote.Len() == 0 ) - sQuote = rtl::OUString( "..." ); + sQuote = OUString( "..." ); aStr.Append( sQuote ); - aStr.Append( rtl::OUString("\"\n") ); + aStr.Append( OUString("\"\n") ); sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n'); for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ ) @@ -524,7 +523,7 @@ void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotati } } -void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor ) +void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor ) { if( mpDoc->IsUndoEnabled() ) mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_DELETE ) ) ); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index c0d83fdafe1f..9e7a3e5e202c 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -75,7 +75,7 @@ public: void InsertAnnotation(); void DeleteAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation ); - void DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor ); + void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index a10b5ba00960..53b6f7de2d53 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -46,7 +46,6 @@ #include "Window.hxx" #include "drawdoc.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d03548ad85fa..f539d1f4800a 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -84,7 +84,6 @@ #include "textapi.hxx" #include "sdresid.hxx" -using rtl::OUString; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -233,7 +232,7 @@ void AnnotationTextWindow::LoseFocus() Window::LoseFocus(); } -rtl::OUString AnnotationTextWindow::GetSurroundingText() const +OUString AnnotationTextWindow::GetSurroundingText() const { if( mpOutlinerView ) { @@ -246,7 +245,7 @@ rtl::OUString AnnotationTextWindow::GetSurroundingText() const return aEditEngine->GetText(aSelection.nStartPara); } } - return rtl::OUString(); + return OUString(); } Selection AnnotationTextWindow::GetSurroundingTextSelection() const diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 116a9cd15f6e..ef4d3763f6a2 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -66,7 +66,7 @@ public: void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; virtual void GetFocus(); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index ce978d37e231..c97b6577c1ea 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -69,7 +69,7 @@ void SdOptionsItem::Commit() mrParent.Commit( *this ); }; -void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {} diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index da7583992243..8b8f78a0b08e 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -79,7 +79,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) bWaterCan(sal_False), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { - SetName( rtl::OUString( "StarDraw" ) ); // Do not translate! + SetName( OUString( "StarDraw" ) ); // Do not translate! pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW); StartListening( *SFX_APP() ); @@ -194,7 +194,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( rtl::OUString( "drawing.cfg" ) ); + aURL.Append( OUString( "drawing.cfg" ) ); SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 0a2905e489b4..ec2c033c5911 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -550,7 +550,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) //we start without wizard //check whether we should load a template document - const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); + const OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) ); if( aStandardTemplate.Len() > 0 ) @@ -591,7 +591,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); SfxStringItem aFile( SID_FILE_NAME, aFileToOpen ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString()); + SfxStringItem aReferer( SID_REFERER, OUString()); SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, com::sun::star::uno::makeAny(aPasswrd) ); if ( xTargetFrame.is() ) @@ -620,7 +620,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) aRequest.AppendItem (aPassword); aRequest.AppendItem (SfxStringItem ( SID_TARGETNAME, - rtl::OUString("_default"))); + OUString("_default"))); try { const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a46761342b21..16397d398f35 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -200,7 +200,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) if( aTmp >>= eButtonType ) { - ::rtl::OUString aLabel, aURL; + OUString aLabel, aURL; xPropSet->getPropertyValue( "Label" ) >>= aLabel; xPropSet->getPropertyValue( "TargetURL" ) >>= aURL; @@ -665,7 +665,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO PrepareOLE( rObjDesc ); } -void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBookmarks, sal_Bool bPersistent ) +void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmarks, sal_Bool bPersistent ) { if( mpSourceDoc ) { diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index c668976d7ceb..99ba867f57e2 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -65,8 +65,8 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const SfxPopupWindow* SdTbxControl::CreatePopupWindow() { SfxPopupWindow *pWin = NULL; - rtl::OUString aToolBarResStr; - rtl::OUStringBuffer aTbxResName( "private:resource/toolbar/" ); + OUString aToolBarResStr; + OUStringBuffer aTbxResName( "private:resource/toolbar/" ); switch( GetSlotId() ) { case SID_OBJECT_ALIGN: @@ -148,8 +148,8 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nImage )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index ddd61701c279..115f7eb581ef 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -53,7 +53,6 @@ #include "pres.hxx" #include "slidelayoutcontroller.hxx" -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,7 +65,7 @@ using namespace ::com::sun::star::beans; namespace sd { -extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); +extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); // ----------------------------------------------------------------------- @@ -363,7 +362,7 @@ Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Ref // class SlideLayoutController //======================================================================== -SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ) +SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), sCommandURL ) , mbInsertPage( bInsertPage ) { diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 139aa56be00e..785cba0fb9ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -28,13 +28,13 @@ namespace sd class SlideLayoutController : public svt::PopupWindowController { public: - SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ); + SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ); virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 8f0c9809477b..67edc11a9f7b 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -172,7 +172,7 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt1 //---------------------------------------------------------------------------------------------------------------------- struct DelayedToolPanelActivation { - DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const ::rtl::OUString& i_rPanelURL ) + DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const OUString& i_rPanelURL ) :m_rToolPanelWindow( i_rToolPanelWindow ) ,m_sPanelURL( i_rPanelURL ) { @@ -185,11 +185,11 @@ struct DelayedToolPanelActivation private: ToolPanelChildWindow& m_rToolPanelWindow; - const ::rtl::OUString m_sPanelURL; + const OUString m_sPanelURL; }; //---------------------------------------------------------------------------------------------------------------------- -void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) +void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL ) { SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() ); ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() ); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 74330206c7ed..fb8169102d32 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -40,7 +40,7 @@ namespace sd { PaneDockingWindow::PaneDockingWindow( SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, - const ResId& rResId, const ::rtl::OUString& rsTitle ) + const ResId& rResId, const OUString& rsTitle ) :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { SetTitle( rsTitle ); diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 5040a9614d41..668d7abd9b09 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -49,7 +49,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell); LeftImpressPaneShell::LeftImpressPaneShell (void) : SfxShell() { - SetName(rtl::OUString("LeftImpressPane")); + SetName(OUString("LeftImpressPane")); } @@ -82,7 +82,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell); LeftDrawPaneShell::LeftDrawPaneShell (void) : SfxShell() { - SetName(rtl::OUString("LeftDrawPane")); + SetName(OUString("LeftDrawPane")); } @@ -112,7 +112,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell ); ToolPanelPaneShell::ToolPanelPaneShell() :SfxShell() { - SetName(rtl::OUString("ToolPanel")); + SetName(OUString("ToolPanel")); } ToolPanelPaneShell::~ToolPanelPaneShell(void) diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 0e57cf36ac5e..5b18349a0f1e 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -66,9 +66,9 @@ class FolderDescriptor public: FolderDescriptor ( int nPriority, - const ::rtl::OUString& rsTitle, - const ::rtl::OUString& rsTargetDir, - const ::rtl::OUString& rsContentIdentifier, + const OUString& rsTitle, + const OUString& rsTargetDir, + const OUString& rsContentIdentifier, const Reference<com::sun::star::ucb::XCommandEnvironment>& rxFolderEnvironment) : mnPriority(nPriority), msTitle(rsTitle), @@ -77,9 +77,9 @@ public: mxFolderEnvironment(rxFolderEnvironment) { } int mnPriority; - ::rtl::OUString msTitle; - ::rtl::OUString msTargetDir; - ::rtl::OUString msContentIdentifier; + OUString msTitle; + OUString msTargetDir; + OUString msContentIdentifier; // Reference<sdbc::XResultSet> mxFolderResultSet; Reference<com::sun::star::ucb::XCommandEnvironment> mxFolderEnvironment; @@ -94,7 +94,7 @@ public: /** Use a heuristic based on the URL of a top-level template folder to assign a priority that is used to sort the folders. */ -int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) +int Classify (const OUString&, const OUString& rsURL) { int nPriority (0); @@ -232,10 +232,10 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) // We are interested only in three properties: the entry's name, // its URL, and its content type. - Sequence<rtl::OUString> aProps (3); - aProps[0] = rtl::OUString(TITLE); - aProps[1] = rtl::OUString(TARGET_URL); - aProps[2] = rtl::OUString(DESCRIPTION); + Sequence<OUString> aProps (3); + aProps[0] = OUString(TITLE); + aProps[1] = OUString(TARGET_URL); + aProps[2] = OUString(DESCRIPTION); // Create a cursor to iterate over the templates in this folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_DOCUMENTS_ONLY; @@ -262,11 +262,11 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) { if (mxEntryResultSet->next()) { - ::rtl::OUString sTitle (xRow->getString (1)); - ::rtl::OUString sTargetURL (xRow->getString (2)); - ::rtl::OUString sContentType (xRow->getString (3)); + OUString sTitle (xRow->getString (1)); + OUString sTargetURL (xRow->getString (2)); + OUString sContentType (xRow->getString (3)); - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); ::ucbhelper::Content aContent = ::ucbhelper::Content (aId, mxEntryEnvironment, comphelper::getProcessComponentContext()); if (aContent.isDocument ()) { @@ -279,7 +279,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) || (sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE))) || (sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE_B)))) { - ::rtl::OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( + OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle ); mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL); mpTemplateDirectory->InsertEntry(mpLastAddedEntry); @@ -326,9 +326,9 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) ::ucbhelper::Content aTemplateDir (mxTemplateRoot, mxFolderEnvironment, comphelper::getProcessComponentContext()); // Define the list of properties we are interested in. - Sequence<rtl::OUString> aProps (2); - aProps[0] = rtl::OUString(TITLE); - aProps[1] = rtl::OUString(TARGET_DIR_URL); + Sequence<OUString> aProps (2); + aProps[0] = OUString(TITLE); + aProps[1] = OUString(TARGET_DIR_URL); // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; @@ -360,9 +360,9 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) Reference<sdbc::XRow> xRow (mxFolderResultSet, UNO_QUERY); if (xRow.is()) { - ::rtl::OUString sTitle (xRow->getString (1)); - ::rtl::OUString sTargetDir (xRow->getString (2)); - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString sTitle (xRow->getString (1)); + OUString sTargetDir (xRow->getString (2)); + OUString aId = xContentAccess->queryContentIdentifierString(); mpFolderDescriptors->insert( FolderDescriptor( @@ -392,9 +392,9 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) FolderDescriptor aDescriptor (*mpFolderDescriptors->begin()); mpFolderDescriptors->erase(mpFolderDescriptors->begin()); - ::rtl::OUString sTitle (aDescriptor.msTitle); - ::rtl::OUString sTargetDir (aDescriptor.msTargetDir); - ::rtl::OUString aId (aDescriptor.msContentIdentifier); + OUString sTitle (aDescriptor.msTitle); + OUString sTargetDir (aDescriptor.msTargetDir); + OUString aId (aDescriptor.msContentIdentifier); maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext()); if (maFolderContent.isFolder()) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 85c14e850d18..8735f44edc4b 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -287,7 +287,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) bDisableCtrls = sal_True; aBtnStop.Enable(); aBtnStop.Update(); - rtl::OUString aStr("Animator:"); // here we should think about something smart + OUString aStr("Animator:"); // here we should think about something smart pProgress = new SfxProgress( NULL, aStr, nFullTime ); } @@ -581,7 +581,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) aCtlDisplay.Invalidate(); aCtlDisplay.Update(); - aFiCount.SetText(rtl::OUString::valueOf( + aFiCount.SetText(OUString::valueOf( static_cast<sal_Int64>(m_FrameList.size()))); if (!m_FrameList.empty() && !bMovie) @@ -887,7 +887,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) if( !nLoopCount ) // endless aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1); else - aLbLoopCount.SelectEntry(rtl::OUString::valueOf( nLoopCount ) ); + aLbLoopCount.SelectEntry(OUString::valueOf( nLoopCount ) ); } long nTime = rAnimBmp.nWait; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index b1ae03f5a5da..1676e051f4a9 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -253,8 +253,8 @@ public: void ChangePage(); void LeavePage(); - String GetUiTextForCommand (const ::rtl::OUString& aCommandURL); - Image GetUiIconForCommand (const ::rtl::OUString& aCommandURL); + String GetUiTextForCommand (const OUString& aCommandURL); + Image GetUiIconForCommand (const OUString& aCommandURL); DECL_LINK( StartScanHdl, void * ); DECL_LINK( SelectFileHdl, void * ); @@ -425,8 +425,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, String sText (GetUiTextForCommand(".uno:Open")); // Remove the mnemonic and add a leading space so that icon and text // are not too close together. - sText.SearchAndReplaceAll(rtl::OUString("~"),String()); - sText.Insert(rtl::OUString(" "),0); + sText.SearchAndReplaceAll(OUString("~"),String()); + sText.Insert(OUString(" "),0); mpPage1OpenPB->SetText(sText); // Place icon left of text and both centered in the button. mpPage1OpenPB->SetModeImage( @@ -619,7 +619,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, UpdatePreview( sal_True ); //check whether we should start with a template document initialy and preselect it - const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); + const OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) ); if( aStandardTemplate.Len() ) { @@ -784,10 +784,10 @@ void AssistentDlgImpl::ScanDocmenu (void) { // Get the current history item's properties. uno::Sequence<beans::PropertyValue> aPropertySet = aHistory[nItem]; - rtl::OUString sURL; - rtl::OUString sFilter; - rtl::OUString sTitle; - rtl::OUString sPassword; + OUString sURL; + OUString sFilter; + OUString sTitle; + OUString sPassword; sal_uInt32 nPropertyCount = aPropertySet.getLength(); for (sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty) if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_URL) @@ -809,7 +809,7 @@ void AssistentDlgImpl::ScanDocmenu (void) } sal_Int32 nPropCount = lProps.getLength(); - rtl::OUString sFactoryName; + OUString sFactoryName; for( sal_Int32 i=0; i<nPropCount; ++i ) { if( lProps[i].Name.compareToAscii( "DocumentService" ) == 0 && @@ -1569,7 +1569,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() ); aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) ); @@ -1724,7 +1724,7 @@ sal_Bool AssistentDlgImpl::IsOwnFormat( const String& rPath ) -String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL) +String AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) { String sLabel; Reference<container::XNameAccess> xUICommandLabels; @@ -1749,7 +1749,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL if ( ! xUICommandLabels.is()) break; - ::rtl::OUString sString; + OUString sString; Sequence<beans::PropertyValue> aProperties; Any aAny (xUICommandLabels->getByName(sCommandURL)); if (aAny >>= aProperties) @@ -1757,7 +1757,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL sal_Int32 nCount (aProperties.getLength()); for (sal_Int32 i=0; i<nCount; i++) { - ::rtl::OUString sPropertyName (aProperties[i].Name); + OUString sPropertyName (aProperties[i].Name); if ( sPropertyName == "Label" ) { aProperties[i].Value >>= sString; @@ -1779,7 +1779,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL -Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL) +Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) { Image aIcon; Reference<container::XNameAccess> xUICommandLabels; @@ -1809,7 +1809,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL) xManager->getImageManager(), UNO_QUERY_THROW); - Sequence<rtl::OUString> aCommandList(1); + Sequence<OUString> aCommandList(1); aCommandList[0] = sCommandURL; Sequence<Reference<graphic::XGraphic> > xIconList ( xImageManager->getImages(0,aCommandList)); @@ -1852,7 +1852,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl) { sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - rtl::OUString("simpress") ); + OUString("simpress") ); if ( aFileDlg.Execute() == ERRCODE_NONE ) aFileToOpen = aFileDlg.GetPath(); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 86610c9ecb83..2c16005c715e 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -134,7 +134,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) } else { - rtl::OUString aUrl( GetPath() ); + OUString aUrl( GetPath() ); if ( !aUrl.isEmpty() ) { try @@ -305,25 +305,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() : { String aDescr; aDescr = String(SdResId(STR_ALL_FILES)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.*")); + mpImpl->AddFilter( aDescr, OUString("*.*")); // setup filter #if defined UNX aDescr = String(SdResId(STR_AU_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.au;*.snd" )); + mpImpl->AddFilter( aDescr, OUString("*.au;*.snd" )); aDescr = String(SdResId(STR_VOC_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.voc" )); + mpImpl->AddFilter( aDescr, OUString("*.voc" )); aDescr = String(SdResId(STR_WAV_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.wav" )); + mpImpl->AddFilter( aDescr, OUString("*.wav" )); aDescr = String(SdResId(STR_AIFF_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.aiff" )); + mpImpl->AddFilter( aDescr, OUString("*.aiff" )); aDescr = String(SdResId(STR_SVX_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.svx" )); + mpImpl->AddFilter( aDescr, OUString("*.svx" )); #else aDescr = String(SdResId(STR_WAV_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.wav;*.mp3;*.ogg" )); + mpImpl->AddFilter( aDescr, OUString("*.wav;*.mp3;*.ogg" )); aDescr = String(SdResId(STR_MIDI_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.mid" )); + mpImpl->AddFilter( aDescr, OUString("*.mid" )); #endif } diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5e81d819775d..9ffe406f5293 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -86,7 +86,7 @@ void SdInsertPagesObjsDlg::Reset() aCbxMasters.Check( sal_True ); } -std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) +std::vector<OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) { // With Draw documents, we have to return NULL on selection of the document if( pMedium ) @@ -99,7 +99,7 @@ std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType // the whole document is inserted (but not more!) if( aLbTree.GetSelectionCount() == 0 || ( aLbTree.IsSelected( aLbTree.First() ) ) ) - return std::vector<rtl::OUString>(); + return std::vector<OUString>(); } return aLbTree.GetSelectEntryList( nType ); diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 114ad8322c15..2b682bddb8d7 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -72,7 +72,7 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) , + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_LOAD ) ); sal_uInt16 nSteps; sal_Bool bOrient, bAttrib; @@ -98,7 +98,7 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) , + SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 235dfb4b4114..b80f7e385ddf 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -564,7 +564,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -586,7 +586,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE)); - SfxFilterMatcher aMatch( rtl::OUString("simpress") ); + SfxFilterMatcher aMatch( OUString("simpress") ); aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); } diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index f2a6d9a0be0b..9fce09b1e878 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -30,7 +30,6 @@ #include "cusshow.hxx" #include "customshowlist.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index aa8fcfc48e4d..b62eea74fda9 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -41,7 +41,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING SdFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); + static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 53cd8975e353..0103a32b7ac2 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -269,7 +269,7 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) { pDlg->SetHelpId( rHelpId ); } @@ -288,7 +288,7 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const return (::Window*)pDlg; } -std::vector<rtl::OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) +std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) { return pDlg->GetList(nType); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 21a0f2c1dcc7..bd44d54e5022 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -163,7 +163,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( const rtl::OString& rHelpId ) ; + virtual void SetHelpId( const OString& rHelpId ) ; }; // add for SdInsertPasteDlg @@ -180,7 +180,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ); + virtual std::vector<OUString> GetList ( const sal_uInt16 nType ); virtual sal_Bool IsLink(); virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 42e883e47968..f769db33e8f8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -208,7 +208,7 @@ SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::ge sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) { if (mnListBoxDropFormatId == SAL_MAX_UINT32) - mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(rtl::OUString( + mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(OUString( "application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")); return mnListBoxDropFormatId; } @@ -420,7 +420,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, void SdPageObjsTLB::AddShapeList ( const SdrObjList& rList, SdrObject* pShape, - const ::rtl::OUString& rsName, + const OUString& rsName, const bool bIsExcluded, SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider) @@ -626,9 +626,9 @@ String SdPageObjsTLB::GetSelectEntry() return( GetEntryText( GetCurEntry() ) ); } -std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const +std::vector<OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const { - std::vector<rtl::OUString> aEntries; + std::vector<OUString> aEntries; SvTreeListEntry* pEntry = FirstSelected(); while( pEntry ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2e5b27e792b0..30a540df7855 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -441,7 +441,7 @@ void SdTPAction::OpenFileDialog() Application::SetDefDialogParent( this ); // choose macro dialog - ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); + OUString aScriptURL = SfxApplication::ChooseScript(); if ( !aScriptURL.isEmpty() ) { @@ -466,7 +466,7 @@ void SdTPAction::OpenFileDialog() // links on the desktop to directories. aFileDialog.AddFilter ( String (SfxResId (STR_SFX_FILTERNAME_ALL)), - rtl::OUString("*.*")); + OUString("*.*")); if( aFileDialog.Execute() == ERRCODE_NONE ) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index aee8b264737c..e87baa8d654c 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -686,7 +686,7 @@ sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int if( comphelper::string::getTokenCount(aScale, TOKEN) != 2 ) return( sal_False ); - rtl::OUString aTmp(aScale.GetToken( 0, TOKEN )); + OUString aTmp(aScale.GetToken( 0, TOKEN )); if (!comphelper::string::isdigitAsciiString(aTmp)) return sal_False; diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 35e70621a068..68315604a326 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -132,7 +132,7 @@ StyleSheetUndoAction::~StyleSheetUndoAction() } -rtl::OUString StyleSheetUndoAction::GetComment() const +OUString StyleSheetUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index bfdd5e01249e..de8ce7c2a0b0 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl) void SdVectorizeDlg::LoadSettings() { SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( - rtl::OUString( SD_OPTION_VECTORIZE ) , + OUString( SD_OPTION_VECTORIZE ) , SD_OPTION_LOAD ) ); sal_uInt16 nLayers; sal_uInt16 nReduce; @@ -333,7 +333,7 @@ void SdVectorizeDlg::LoadSettings() void SdVectorizeDlg::SaveSettings() const { SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( - rtl::OUString(SD_OPTION_VECTORIZE) , + OUString(SD_OPTION_VECTORIZE) , SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index f611e84b7a97..85c87d593fcb 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -367,7 +367,7 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin else { // check for upper/lower case roman numbering - String sReserved( rtl::OUString("cdilmvx") ); + String sReserved( OUString("cdilmvx") ); // gobble up all following characters contained in one reserved class String sRemainder = rInOutPageName.GetToken( 1, sal_Unicode(' ') ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index c5154fa1b7c4..64f24c6a9cdd 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -324,7 +324,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium ) SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX ); // TODO/LATER: correct error handling?! - //pStore->SetError( SVSTREAM_WRONGVERSION, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + //pStore->SetError( SVSTREAM_WRONGVERSION, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); else SetError( ERRCODE_ABORT, OSL_LOG_PREFIX ); } @@ -411,7 +411,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) { mbNewDocument = sal_False; - const rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); + const OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); sal_Bool bRet = sal_False; bool bStartPresentation = false; @@ -556,7 +556,7 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( mpDoc->GetPageCount() ) { const SfxFilter* pMediumFilter = rMedium.GetFilter(); - const rtl::OUString aTypeName( pMediumFilter->GetTypeName() ); + const OUString aTypeName( pMediumFilter->GetTypeName() ); SdFilter* pFilter = NULL; if( aTypeName.indexOf( "graphic_HTML" ) >= 0 ) @@ -670,14 +670,14 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark) sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND; SdrObject* pObj = NULL; - rtl::OUString sBookmark( rBookmark ); - const rtl::OUString sInteraction( "action?" ); + OUString sBookmark( rBookmark ); + const OUString sInteraction( "action?" ); if ( sBookmark.match( sInteraction ) ) { - const rtl::OUString sJump( "jump=" ); + const OUString sJump( "jump=" ); if ( sBookmark.match( sJump, sInteraction.getLength() ) ) { - rtl::OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) ); + OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) ); if ( aDestination.match( "firstslide" ) ) { nPageNumber = 1; @@ -741,7 +741,7 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark) { // change work area GetFrameView()->SetPageKind(eNewPageKind); - ::rtl::OUString sViewURL; + OUString sViewURL; switch (eNewPageKind) { case PK_STANDARD: diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 2ddb21823636..3b0182e4b947 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -42,7 +42,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest) Reference<container::XNamed> xNamed (rxRequest, UNO_QUERY); if (xNamed.is()) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << - ::rtl::OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); } #endif diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 864766ea062f..9ad7bf4a1bff 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; namespace { /** Use the XResourceId::compareTo() method to implement a compare operator @@ -83,11 +82,11 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException) -Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.Configuration"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -185,7 +184,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, - const ::rtl::OUString& rsResourceURLPrefix, + const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 212a235ea8bd..b8c0d757ee6c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index efdbde6460fc..275f1ab04553 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -63,11 +62,11 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep -Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -219,7 +218,7 @@ void ConfigurationController::RequestSynchronousUpdate (void) void SAL_CALL ConfigurationController::addConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index a612fe63612f..a5640f85fbb0 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; namespace sd { namespace framework { @@ -43,7 +42,7 @@ ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster ( void ConfigurationControllerBroadcaster::AddListener( const Reference<XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) { if ( ! rxListener.is()) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 1858b69f860c..fd1ceddb3bfa 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -68,7 +68,7 @@ public: void AddListener( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Any& rUserData); /** Remove all references to the given listener. When one listener has @@ -96,7 +96,7 @@ public: the given arguments. */ void NotifyListeners ( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject); @@ -117,9 +117,9 @@ private: }; typedef ::std::vector<ListenerDescriptor> ListenerList; typedef ::boost::unordered_map - <rtl::OUString, + <OUString, ListenerList, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> ListenerMap; ListenerMap maListenerMap; diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index b974b3b4e92c..4b9f3e8b7adb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 74839b903aee..24d0f1f1dd99 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -59,11 +59,11 @@ void ConfigurationTracer::TraceBoundResources ( const int nIndentation) { Sequence<Reference<XResourceId> > aResourceList ( - rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT)); - const ::rtl::OUString sIndentation (" "); + rxConfiguration->getResources(rxResourceId, OUString(), AnchorBindingMode_DIRECT)); + const OUString sIndentation (" "); for (sal_Int32 nIndex=0; nIndex<aResourceList.getLength(); ++nIndex) { - ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL()); + OUString sLine (aResourceList[nIndex]->getResourceURL()); for (int i=0; i<nIndentation; ++i) sLine = sIndentation + sLine; SAL_INFO("sd.ui","" << OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr()); diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 8b2171cdeb88..14cd1ad29e8c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using ::std::vector; namespace { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index d2d54bb67cef..cde24baacd29 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 28b56736bfd0..4fa341a239c1 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -94,13 +94,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 7a13659d156b..f059efdb8c81 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 81b1efd01d22..fd83529202e6 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -47,7 +47,7 @@ public: The factory that will create resource objects of the specfied type. */ void AddFactory ( - const ::rtl::OUString& rsURL, + const OUString& rsURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory) throw (css::uno::RuntimeException); @@ -57,7 +57,7 @@ public: is registered for other URLs then these remain registered. */ void RemoveFactoryForURL( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); /** Unregister the specified factory. @@ -78,21 +78,21 @@ public: is returned. Otherwise an empty reference is returned. */ css::uno::Reference<css::drawing::framework::XResourceFactory> GetFactory ( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); private: ::osl::Mutex maMutex; typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, css::uno::Reference<css::drawing::framework::XResourceFactory>, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> FactoryMap; FactoryMap maFactoryMap; typedef ::std::vector< ::std::pair< - rtl::OUString, + OUString, css::uno::Reference<css::drawing::framework::XResourceFactory> > > FactoryPatternList; FactoryPatternList maFactoryPatternList; @@ -108,7 +108,7 @@ private: When the factory has not yet been added then return NULL. */ css::uno::Reference<css::drawing::framework::XResourceFactory> FindFactory ( - const ::rtl::OUString& rsURLBase) + const OUString& rsURLBase) throw (css::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 2c8a1362d243..fb1c771dc687 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; /** When the USE_OPTIMIZATIONS symbol is defined then at some optimizations are activated that work only together with XResourceId objects that are @@ -53,19 +52,19 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance ( -::rtl::OUString ResourceId_getImplementationName (void) throw(RuntimeException) +OUString ResourceId_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.ResourceId"); + return OUString("com.sun.star.comp.Draw.framework.ResourceId"); } -Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index aa781777c2d3..621a2f41b98a 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 0ce2797ef046..e1f72d03d1d9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -70,13 +70,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 042bfdf28a9c..4d2651dff923 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { @@ -96,19 +95,19 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance ( -::rtl::OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 66e060290f01..5a2c061087c7 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -44,19 +44,19 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance ( -::rtl::OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + const OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 6cac67a66f00..927a26159cd4 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -65,19 +64,19 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance ( -::rtl::OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4cb0bc8727fc..c4d5dd11bf72 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index b80fcce5c399..4eeb5c5f3e0c 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7bca561c972e..ce7b026ff834 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -107,19 +106,19 @@ Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance ( -::rtl::OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) +OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); + return OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); } -Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); + return Sequence<OUString>(&sServiceName, 1); } @@ -127,7 +126,7 @@ Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedService //===== PresentationFactory =================================================== -const ::rtl::OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); +const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); PresentationFactory::PresentationFactory ( diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 2269463471bc..b8e7e79cfb7e 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -43,19 +42,19 @@ Reference<XInterface> SAL_CALL TaskPanelFactory_createInstance ( -::rtl::OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) +OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); + return OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); } -Sequence<rtl::OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { const OUString sServiceName("com.sun.star.drawing.framework.TaskPanelFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -173,13 +172,13 @@ void SAL_CALL TaskPanelFactory::initialize( namespace { - void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< ::rtl::OUString >& o_rResourceURLs ) + void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< OUString >& o_rResourceURLs ) { ENSURE_OR_RETURN_VOID( i_rResourceId.is(), "illegal resource ID" ); o_rResourceURLs.resize(0); Reference< XResourceId > xResourceId( i_rResourceId ); - ::rtl::OUString sResourceURL = xResourceId->getResourceURL(); + OUString sResourceURL = xResourceId->getResourceURL(); while ( !sResourceURL.isEmpty() ) { o_rResourceURLs.push_back( sResourceURL ); @@ -209,10 +208,10 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( rxResourceId, aResourceURLs ); - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); @@ -237,18 +236,18 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const Reference< XResourceId > xResourceId( rxResource->getResourceId(), UNO_SET_THROW ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( xResourceId, aResourceURLs ); OSL_ENSURE( !aResourceURLs.empty(), "TaskPanelFactory::releaseResource: illegal resource/URL!" ); if ( !aResourceURLs.empty() ) { - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); if ( pPaneViewShell != NULL ) { - const ::rtl::OUString sPanelResourceURL( xResourceId->getResourceURL() ); + const OUString sPanelResourceURL( xResourceId->getResourceURL() ); const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index bc50d9b8dc46..e017cbf21566 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::rendering::XCanvas; using ::com::sun::star::lang::DisposedException; -using ::rtl::OUString; using ::sd::toolpanel::ToolPanelViewShell; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 5be26e1b5c0a..067f46c86a19 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4e5080fbaaa7..a1825f28bd86 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::tools::ConfigurationAccess; namespace sd { namespace framework { @@ -44,9 +43,9 @@ static const sal_uInt32 snStartupPropertyCount (1); class ModuleController::ResourceToFactoryMap : public ::boost::unordered_map< - rtl::OUString, - rtl::OUString, - ::rtl::OUStringHash, + OUString, + OUString, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -56,9 +55,9 @@ public: class ModuleController::LoadedFactoryContainer : public ::boost::unordered_map< - rtl::OUString, + OUString, WeakReference<XInterface>, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -78,19 +77,19 @@ Reference<XInterface> SAL_CALL ModuleController_createInstance ( -::rtl::OUString ModuleController_getImplementationName (void) throw(RuntimeException) +OUString ModuleController_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); + return OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); } -Sequence<rtl::OUString> SAL_CALL ModuleController_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); + return Sequence<OUString>(&sServiceName, 1); } @@ -149,7 +148,7 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont Reference<container::XNameAccess> xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/ResourceFactories"), UNO_QUERY); - ::std::vector<rtl::OUString> aProperties (snFactoryPropertyCount); + ::std::vector<OUString> aProperties (snFactoryPropertyCount); aProperties[0] = "ServiceName"; aProperties[1] = "ResourceList"; ConfigurationAccess::ForAll( @@ -171,12 +170,12 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) OSL_ASSERT(rValues.size() == snFactoryPropertyCount); // Get the service name of the factory. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Get all resource URLs that are created by the factory. Reference<container::XNameAccess> xResources (rValues[1], UNO_QUERY); - ::std::vector<rtl::OUString> aURLs; + ::std::vector<OUString> aURLs; tools::ConfigurationAccess::FillList( xResources, "URL", @@ -186,7 +185,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr()); // Add the resource URLs to the map. - ::std::vector<rtl::OUString>::const_iterator iResource; + ::std::vector<OUString>::const_iterator iResource; for (iResource=aURLs.begin(); iResource!=aURLs.end(); ++iResource) { (*mpResourceToFactoryMap)[*iResource] = sServiceName; @@ -208,7 +207,7 @@ void ModuleController::InstantiateStartupServices (void) Reference<container::XNameAccess> xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/StartupServices"), UNO_QUERY); - ::std::vector<rtl::OUString> aProperties (snStartupPropertyCount); + ::std::vector<OUString> aProperties (snStartupPropertyCount); aProperties[0] = "ServiceName"; tools::ConfigurationAccess::ForAll( xFactories, @@ -231,7 +230,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) try { // Get the service name of the startup service. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Instantiate service. diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index c0b07c71bfeb..352ea00ff208 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 71e440840899..67979a8e1ab6 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -59,8 +59,8 @@ public: /** Remember the given URL as one of a center pane view for which to activate the resource managed by the called object. */ - void AddActiveMainView (const ::rtl::OUString& rsMainViewURL); - sal_Bool IsResourceActive (const ::rtl::OUString& rsMainViewURL); + void AddActiveMainView (const OUString& rsMainViewURL); + sal_Bool IsResourceActive (const OUString& rsMainViewURL); virtual void SaveResourceState (void); virtual void SAL_CALL disposing (void); @@ -91,10 +91,10 @@ private: /// The anchor of the main view. css::uno::Reference<css::drawing::framework::XResourceId> mxMainViewAnchorId; - ::rtl::OUString msCurrentMainViewURL; + OUString msCurrentMainViewURL; void HandleMainViewSwitch ( - const ::rtl::OUString& rsViewURL, + const OUString& rsViewURL, const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const bool bIsActivated); diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index f0a8ad973423..6d56720d39d0 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 7852136b537d..412a7c608e48 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 64897c09d5c9..ce4c41eb83bd 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -36,7 +36,7 @@ class SlideSorterModule public: SlideSorterModule ( const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::OUString& rsLeftPaneURL); + const OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 5d15204d5b50..c731435182cb 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 880a49d2ffe7..aa2c9e8a9e24 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index d02404fa9a14..ce28ef826330 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -35,7 +35,7 @@ class ToolPanelModule public: ToolPanelModule ( const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::OUString& rsRightPaneURL); + const OUString& rsRightPaneURL); virtual ~ToolPanelModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index cee1e8a1fe3a..e490cdbfcd44 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 97c0ba9440dd..fb7fa1a2a328 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -193,12 +192,12 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa // Task panel URLs. -const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); -const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); -const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); -const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); -const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); -const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); +const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); +const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); +const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); +const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); +const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); +const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); // Event URLs. @@ -262,9 +261,9 @@ namespace */ class FrameworkHelper::ViewURLMap : public ::boost::unordered_map< - rtl::OUString, + OUString, ViewShell::ShellType, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -571,7 +570,7 @@ void FrameworkHelper::RequestTaskPanel ( -ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) +ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) { @@ -594,7 +593,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) -::rtl::OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) +OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) { switch (eType) { @@ -656,7 +655,7 @@ void FrameworkHelper::HandleModeChangeSlot ( Reference<XView> xView (GetView(xPaneId)); ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView)); - ::rtl::OUString sRequestedView; + OUString sRequestedView; if (bIsActive) { switch (nSlotId) @@ -721,7 +720,7 @@ void FrameworkHelper::HandleModeChangeSlot ( void FrameworkHelper::RunOnConfigurationEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Callback& rCallback) { RunOnEvent( @@ -814,7 +813,7 @@ void FrameworkHelper::WaitForUpdate (void) const void FrameworkHelper::RunOnEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, const Callback& rCallback) const { @@ -878,7 +877,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe -Reference<XResourceId> FrameworkHelper::CreateResourceId (const ::rtl::OUString& rsResourceURL) +Reference<XResourceId> FrameworkHelper::CreateResourceId (const OUString& rsResourceURL) { return new ::sd::framework::ResourceId(rsResourceURL); } @@ -911,7 +910,7 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( Reference<XResourceId> FrameworkHelper::CreateResourceId ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const Reference<XResourceId>& rxAnchorId) { if (rxAnchorId.is()) diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 2a2321213076..7795cb8ac451 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -132,7 +132,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) aEmptyStr ); // insert given text - rtl::OUString aStr( cMark ); + OUString aStr( cMark ); pOV->InsertText( aStr, sal_True); ESelection aSel = pOV->GetSelection(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index ab7c3b369cdf..45586622e4d4 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -196,7 +196,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 2492a5335da3..f932e68e8e48 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -341,7 +341,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, * Objects was created on the slide master page ***********************************************/ String aName( pPage->GetLayoutName() ); - String aSep = rtl::OUString(SD_LT_SEPARATOR); + String aSep = OUString(SD_LT_SEPARATOR); sal_uInt16 n = aName.Search(aSep); n = n + aSep.Len(); aName.Erase(n); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 344515e9d355..87b0c571cf95 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -256,7 +256,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma // except in a few cases (?) if( pObj ) { - rtl::OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); + OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); mpDoc->BegUndo( sLabel ); mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) ); } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e9bb90c84319..f21dd7e0c689 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -256,7 +256,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdrObject* pPickObj = mpView->GetEmptyPresentationObject( ePresObjKind ); // insert diagram or Calc table - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aName; if (nSlotId == SID_INSERT_DIAGRAM) aName = SvGlobalName( SO3_SCH_CLASSID); @@ -345,15 +345,15 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { if (nSlotId == SID_INSERT_DIAGRAM) { - pOleObj->SetProgName( rtl::OUString( "StarChart" )); + pOleObj->SetProgName( OUString( "StarChart" )); } else if (nSlotId == SID_ATTR_TABLE) { - pOleObj->SetProgName( rtl::OUString( "StarCalc" ) ); + pOleObj->SetProgName( OUString( "StarCalc" ) ); } else if (nSlotId == SID_INSERT_MATH) { - pOleObj->SetProgName( rtl::OUString( "StarMath" ) ); + pOleObj->SetProgName( OUString( "StarMath" ) ); } pOleObj->SetLogicRect(aRect); @@ -387,9 +387,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; - ::rtl::OUString aName; + OUString aName; - ::rtl::OUString aIconMediaType; + OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); @@ -467,7 +467,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) if ( xSet.is() ) { xSet->setPropertyValue("PluginURL", - uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } } @@ -665,7 +665,7 @@ FunctionReference FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) { - ::rtl::OUString aURL; + OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bAPI = false; diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 40d4eede8c42..821b156116e9 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -64,7 +64,6 @@ #include "Outliner.hxx" #include "sdabstdlg.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ui::dialogs; @@ -107,8 +106,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) SFXWB_INSERT ); Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY ); Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY ); - rtl::OUString aOwnCont; - rtl::OUString aOtherCont; + OUString aOwnCont; + OUString aOtherCont; const SfxFilter* pFilter = NULL; aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) ); @@ -134,7 +133,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) String aExt; String aAllSpec( SdResId( STR_ALL_FILES ) ); - xFilterManager->appendFilter( aAllSpec, rtl::OUString("*.*") ); + xFilterManager->appendFilter( aAllSpec, OUString("*.*") ); xFilterManager->setCurrentFilter( aAllSpec ); // set default-filter (<All>) // Get main filter @@ -160,7 +159,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); // get Powerpoint filter - aExt = rtl::OUString(".ppt"); + aExt = OUString(".ppt"); pFilter = aMatch.GetFilter4Extension( aExt ); if( pFilter ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); @@ -343,7 +342,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { /* list with page names (if NULL, then all pages) First, insert pages */ - std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // pages + std::vector<OUString> aBookmarkList = pDlg->GetList( 1 ); // pages sal_Bool bLink = pDlg->IsLink(); sal_Bool bReplace = sal_False; SdPage* pPage = NULL; @@ -373,8 +372,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) } sal_Bool bNameOK; - std::vector<rtl::OUString> aExchangeList; - std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects + std::vector<OUString> aExchangeList; + std::vector<OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects /* if pBookmarkList is NULL, we insert selected pages, and/or selected objects or everything. */ diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 566d2dcbd71d..9bf40b570052 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -823,7 +823,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(bPrintable) { // try to activate textedit mode for the selected object - SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, @@ -874,7 +874,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { mpView->UnMarkAll(); mpView->MarkObj(pCandidate, mpView->GetSdrPageView()); - SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index fecabb9d3fa8..93db40368f92 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -116,7 +116,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) AbstractSdStartPresDlg* pDlg = pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { - rtl::OUString aPage; + OUString aPage; long nValue32; sal_Bool bValue; bool bValuesChanged = sal_False; diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index c59e3e59aebf..7ce9b1bfa0db 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -66,7 +66,6 @@ #include "helpids.h" #include "sdabstdlg.hxx" -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::container; using namespace com::sun::star::beans; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 17de3c9c5d04..5724d2e4a7d5 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -67,7 +67,6 @@ #include "pres.hxx" #include "optsitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index cdb8a9d861f7..9a4012c1f1d4 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -41,7 +41,6 @@ #include "Window.hxx" #include "sdresid.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 7553e4c9e34e..ff42ebef9cd4 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -84,9 +84,9 @@ SdMoveStyleSheetsUndoAction::~SdMoveStyleSheetsUndoAction() { } -rtl::OUString SdMoveStyleSheetsUndoAction::GetComment() const +OUString SdMoveStyleSheetsUndoAction::GetComment() const { - return rtl::OUString(); + return OUString(); } diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 96d7268280ad..35cb13bb3a27 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -67,7 +67,7 @@ SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction() { } -rtl::OUString SdPresentationLayoutUndoAction::GetComment() const +OUString SdPresentationLayoutUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 2d55c2898881..f117682ab938 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -192,11 +192,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -309,7 +309,7 @@ protected: @return A name string. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); @@ -320,7 +320,7 @@ protected: @return A description string. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 05790c4e2893..0ae803dd63d4 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -87,11 +87,11 @@ protected: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -133,14 +133,14 @@ protected: AccessiblePageShape* CreateDrawPageShape (void); /// Create an accessible name that contains the current view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); /** Create an accessible description that contains the current view mode. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 2b6c115c3290..dc77370de124 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -90,7 +90,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -126,13 +126,13 @@ protected: virtual void SAL_CALL disposing (void); /// Create an accessible name that contains the current view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); /// Create an accessible description that contains the current /// view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index b079b28ed3bf..4a06b0f8c00c 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -117,11 +117,11 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -138,16 +138,16 @@ public: protected: /** Create a base name string that contains the accessible name. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString + virtual OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index d5b4921481e3..deddc03958c2 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -41,19 +41,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 853218c3c67d..2648e06dbf7a 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -41,19 +41,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 194aa4e62cbd..bf43a73792b5 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -40,19 +40,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleScrollPanel.hxx b/sd/source/ui/inc/AccessibleScrollPanel.hxx index 8a2f71dbd6e3..47aa7a3734c2 100644 --- a/sd/source/ui/inc/AccessibleScrollPanel.hxx +++ b/sd/source/ui/inc/AccessibleScrollPanel.hxx @@ -38,8 +38,8 @@ class AccessibleScrollPanel public: AccessibleScrollPanel ( ::sd::toolpanel::ScrollPanel& rScrollPanel, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription); + const OUString& rsName, + const OUString& rsDescription); ~AccessibleScrollPanel (void); //===== XAccessibleContext ============================================== @@ -59,7 +59,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 22f516e3a6fe..2c51b2251cb9 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -137,11 +137,11 @@ public: getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -197,19 +197,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index aa38601a4944..feb117f78e1d 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -148,12 +148,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -274,19 +274,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx index 25925fb94bf5..f1a3a5094a57 100644 --- a/sd/source/ui/inc/AccessibleTreeNode.hxx +++ b/sd/source/ui/inc/AccessibleTreeNode.hxx @@ -82,8 +82,8 @@ public: */ AccessibleTreeNode( ::sd::toolpanel::TreeNode& rNode, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription, + const OUString& rsName, + const OUString& rsDescription, sal_Int16 eRole); void FireAccessibleEvent ( @@ -151,12 +151,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -218,19 +218,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ protected: ::sd::toolpanel::TreeNode& mrTreeNode; ::rtl::Reference< ::utl::AccessibleStateSetHelper> mrStateSet; - const ::rtl::OUString msName; - const ::rtl::OUString msDescription; + const OUString msName; + const OUString msDescription; const sal_Int16 meRole; virtual ~AccessibleTreeNode (void); diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 7cf975da08d5..a53f7b95685d 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -162,9 +162,9 @@ public: virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) 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); // XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 4d34d2209de6..8aa6b834136e 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { ::com::sun::star::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; }; } diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 28d3d2fdc010..9c1c04e63c7d 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -83,7 +83,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow ); // ::sfx2::ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 2d02a88186ca..7975225061de 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -52,7 +52,7 @@ public: SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, - const ::rtl::OUString& rsTitle); + const OUString& rsTitle); virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index f209561fcd49..bc1e7c556576 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -39,11 +39,11 @@ namespace sd struct ClientInfo { - rtl::OUString mName; - rtl::OUString mAddress; + OUString mName; + OUString mAddress; enum PROTOCOL { NETWORK = 1, BLUETOOTH }; - ClientInfo( const rtl::OUString rName, const rtl::OUString rAddress ) : + ClientInfo( const OUString rName, const OUString rAddress ) : mName( rName ), mAddress( rAddress ) {} }; @@ -64,7 +64,7 @@ namespace sd // For the control dialog SD_DLLPUBLIC static std::vector<ClientInfo*> getClients(); SD_DLLPUBLIC static sal_Bool connectClient( ClientInfo *pClient, - rtl::OUString aPin ); + OUString aPin ); /// ensure that discoverability (eg. for Bluetooth) is enabled SD_DLLPUBLIC static void ensureDiscoverable(); diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index d572ac7a8227..27935df07462 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -93,9 +93,9 @@ public: css::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); protected: sal_Bool getMasterPageMode(void) const throw(); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 21b3432b759a..652128ba3e39 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -95,9 +95,9 @@ public: 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); private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 392925fde054..b02d9bbaecd1 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -89,9 +89,9 @@ public: css::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); private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index ec44027b2ff3..0d60c74f54b0 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -104,25 +104,25 @@ public: /** The set of tool bars that are handled by this manager class. */ - const static ::rtl::OUString msToolBar; // RID_DRAW_TOOLBOX, 23011 + const static OUString msToolBar; // RID_DRAW_TOOLBOX, 23011 // RID_GRAPHIC_TOOLBOX, 23025 - const static ::rtl::OUString msOptionsToolBar; // RID_DRAW_OPTIONS_TOOLBOX, 23020 + const static OUString msOptionsToolBar; // RID_DRAW_OPTIONS_TOOLBOX, 23020 // RID_GRAPHIC_OPTIONS_TOOLBOX, 23026 - const static ::rtl::OUString msCommonTaskToolBar; // RID_DRAW_COMMONTASK_TOOLBOX, 23021 - const static ::rtl::OUString msViewerToolBar; // RID_DRAW_VIEWER_TOOLBOX, 23023 + const static OUString msCommonTaskToolBar; // RID_DRAW_COMMONTASK_TOOLBOX, 23021 + const static OUString msViewerToolBar; // RID_DRAW_VIEWER_TOOLBOX, 23023 // RID_GRAPHIC_VIEWER_TOOLBOX, 23024 - const static ::rtl::OUString msSlideSorterToolBar; // RID_SLIDE_TOOLBOX, 23012 - const static ::rtl::OUString msSlideSorterObjectBar; // RID_SLIDE_OBJ_TOOLBOX, 23014 - const static ::rtl::OUString msOutlineToolBar; // RID_OUTLINE_TOOLBOX, 23017 - const static ::rtl::OUString msMasterViewToolBar; // SID_MASTERPAGE, 27053 - const static ::rtl::OUString msDrawingObjectToolBar; // RID_DRAW_OBJ_TOOLBOX, 23013 - const static ::rtl::OUString msGluePointsToolBar; // RID_GLUEPOINTS_TOOLBOX, 23019 - const static ::rtl::OUString msTextObjectBar; // RID_DRAW_TEXT_TOOLBOX, 23016 + const static OUString msSlideSorterToolBar; // RID_SLIDE_TOOLBOX, 23012 + const static OUString msSlideSorterObjectBar; // RID_SLIDE_OBJ_TOOLBOX, 23014 + const static OUString msOutlineToolBar; // RID_OUTLINE_TOOLBOX, 23017 + const static OUString msMasterViewToolBar; // SID_MASTERPAGE, 27053 + const static OUString msDrawingObjectToolBar; // RID_DRAW_OBJ_TOOLBOX, 23013 + const static OUString msGluePointsToolBar; // RID_GLUEPOINTS_TOOLBOX, 23019 + const static OUString msTextObjectBar; // RID_DRAW_TEXT_TOOLBOX, 23016 // RID_GRAPHIC_TEXT_TOOLBOX, 23028 - const static ::rtl::OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 - const static ::rtl::OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 - const static ::rtl::OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 - const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX + const static OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 + const static OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 + const static OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 + const static OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX /** The set of tool bar groups. */ @@ -167,7 +167,7 @@ public: */ void AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** Add the tool bar shell to the shell stack. This method basically forwards the call to the ViewShellManager. @@ -191,7 +191,7 @@ public: */ void RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent @@ -208,7 +208,7 @@ public: */ void SetToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index ae0bb5166de8..3dee2a95a310 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -142,7 +142,7 @@ public: SdrGrafObj* InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const Point& rPos, SdrObject* pSelectedObj, ImageMap* pImageMap ); - SdrMediaObj* InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, + SdrMediaObj* InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ); @@ -164,8 +164,8 @@ public: nType == 1 -> objects nType == 2 -> pages and objects */ - bool GetExchangeList( std::vector<rtl::OUString> &rExchangeList, - std::vector<rtl::OUString> &rBookmarkList, + bool GetExchangeList( std::vector<OUString> &rExchangeList, + std::vector<OUString> &rBookmarkList, const sal_uInt16 nType ); virtual void onAccessibilityOptionsChanged(); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 458896a042f8..0de9a17007db 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -82,7 +82,7 @@ public: /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ - virtual void LateInit (const ::rtl::OUString& rsDefaultView); + virtual void LateInit (const OUString& rsDefaultView); ::boost::shared_ptr<ViewShellManager> GetViewShellManager (void) const; @@ -226,7 +226,7 @@ public: /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ - ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; + OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) const; protected: osl::Mutex maMutex; @@ -247,7 +247,7 @@ private: we check that the right type is active and change again if that is not the case because something went wrong. */ - ::rtl::OUString GetInitialViewShellType (void); + OUString GetInitialViewShellType (void); }; } // end of namespace sd diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 530e1bd7915f..995f71777b83 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -192,7 +192,7 @@ protected: ::com::sun::star::accessibility::XAccessible> CreateAccessible (void); - rtl::OUString GetSurroundingText() const; + OUString GetSurroundingText() const; Selection GetSurroundingTextSelection() const; }; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index e9474f4a618d..58f73f6a386d 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -103,7 +103,7 @@ public: com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, - const ::rtl::OUString& rsResourceURLPrefix, + const OUString& rsResourceURLPrefix, ::com::sun::star::drawing::framework::AnchorBindingMode eMode) throw (::com::sun::star::uno::RuntimeException); @@ -125,13 +125,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index ea40b2d20bfc..a47818ebbb0d 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -131,7 +131,7 @@ public: virtual void SAL_CALL addConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Any& rUserData) throw (css::uno::RuntimeException); @@ -159,12 +159,12 @@ public: // XResourceFactoryManager virtual void SAL_CALL addResourceFactory( - const ::rtl::OUString& sResourceURL, + const OUString& sResourceURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) throw (css::uno::RuntimeException); virtual void SAL_CALL removeResourceFactoryForURL( - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) throw (css::uno::RuntimeException); virtual void SAL_CALL removeResourceFactoryForReference( @@ -173,7 +173,7 @@ public: virtual css::uno::Reference<css::drawing::framework::XResourceFactory> SAL_CALL getResourceFactory ( - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 2024b3ba6ffb..ab6a57e5930c 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -61,47 +61,47 @@ class FrameworkHelper { public: // URLs of frequently used panes. - static const ::rtl::OUString msPaneURLPrefix; - static const ::rtl::OUString msCenterPaneURL; - static const ::rtl::OUString msFullScreenPaneURL; - static const ::rtl::OUString msLeftImpressPaneURL; - static const ::rtl::OUString msLeftDrawPaneURL; - static const ::rtl::OUString msRightPaneURL; + static const OUString msPaneURLPrefix; + static const OUString msCenterPaneURL; + static const OUString msFullScreenPaneURL; + static const OUString msLeftImpressPaneURL; + static const OUString msLeftDrawPaneURL; + static const OUString msRightPaneURL; // URLs of frequently used views. - static const ::rtl::OUString msViewURLPrefix; - static const ::rtl::OUString msImpressViewURL; - static const ::rtl::OUString msDrawViewURL; - static const ::rtl::OUString msOutlineViewURL; - static const ::rtl::OUString msNotesViewURL; - static const ::rtl::OUString msHandoutViewURL; - static const ::rtl::OUString msSlideSorterURL; - static const ::rtl::OUString msPresentationViewURL; - static const ::rtl::OUString msTaskPaneURL; + static const OUString msViewURLPrefix; + static const OUString msImpressViewURL; + static const OUString msDrawViewURL; + static const OUString msOutlineViewURL; + static const OUString msNotesViewURL; + static const OUString msHandoutViewURL; + static const OUString msSlideSorterURL; + static const OUString msPresentationViewURL; + static const OUString msTaskPaneURL; // URLs of frequently used tool bars. - static const ::rtl::OUString msToolBarURLPrefix; - static const ::rtl::OUString msViewTabBarURL; + static const OUString msToolBarURLPrefix; + static const OUString msViewTabBarURL; // URLs of task panels. - static const ::rtl::OUString msTaskPanelURLPrefix; - static const ::rtl::OUString msMasterPagesTaskPanelURL; - static const ::rtl::OUString msLayoutTaskPanelURL; - static const ::rtl::OUString msTableDesignPanelURL; - static const ::rtl::OUString msCustomAnimationTaskPanelURL; - static const ::rtl::OUString msSlideTransitionTaskPanelURL; + static const OUString msTaskPanelURLPrefix; + static const OUString msMasterPagesTaskPanelURL; + static const OUString msLayoutTaskPanelURL; + static const OUString msTableDesignPanelURL; + static const OUString msCustomAnimationTaskPanelURL; + static const OUString msSlideTransitionTaskPanelURL; // Names of frequently used events. - static const ::rtl::OUString msResourceActivationRequestEvent; - static const ::rtl::OUString msResourceDeactivationRequestEvent; - static const ::rtl::OUString msResourceActivationEvent; - static const ::rtl::OUString msResourceDeactivationEvent; - static const ::rtl::OUString msConfigurationUpdateStartEvent; - static const ::rtl::OUString msConfigurationUpdateEndEvent; + static const OUString msResourceActivationRequestEvent; + static const OUString msResourceDeactivationRequestEvent; + static const OUString msResourceActivationEvent; + static const OUString msResourceDeactivationEvent; + static const OUString msConfigurationUpdateStartEvent; + static const OUString msConfigurationUpdateEndEvent; // Service names of the common controllers. - static const ::rtl::OUString msModuleControllerService; - static const ::rtl::OUString msConfigurationControllerService; + static const OUString msModuleControllerService; + static const OUString msConfigurationControllerService; /** Return the FrameworkHelper object that is associated with the given ViewShellBase. If such an object does not yet exist, a new one is @@ -132,12 +132,12 @@ public: used in a switch statement. See GetViewURL() for a mapping in the opposite direction. */ - static ViewShell::ShellType GetViewId (const rtl::OUString& rsViewURL); + static ViewShell::ShellType GetViewId (const OUString& rsViewURL); /** Return a view URL for the given identifier. See GetViewId() for a mapping in the opposite direction. */ - static ::rtl::OUString GetViewURL (ViewShell::ShellType eType); + static OUString GetViewURL (ViewShell::ShellType eType); /** Return a ViewShell pointer for the given XView reference. This assumes that the given reference is implemented by the @@ -175,7 +175,7 @@ public: of the involved objects does not support XUnoTunnel (where necessary). */ - ::boost::shared_ptr<ViewShell> GetViewShell (const ::rtl::OUString& rsPaneURL); + ::boost::shared_ptr<ViewShell> GetViewShell (const OUString& rsPaneURL); /** Return a reference to the view that is displayed in the specified pane. See GetViewShell () for a variant that returns a ViewShell @@ -208,8 +208,8 @@ public: do some initialization after the requested view becomes active. */ css::uno::Reference<css::drawing::framework::XResourceId> RequestView ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Request the activation of the specified task panel in the standard task pane. @@ -223,7 +223,7 @@ public: is not active then this call is silently ignored. */ void RequestTaskPanel ( - const ::rtl::OUString& rsTaskPanelURL, + const OUString& rsTaskPanelURL, const bool bEnsureTaskPaneIsVisible = true); /** Process a slot call that requests a view shell change. @@ -240,7 +240,7 @@ public: the event it waits for has been sent. */ void RunOnConfigurationEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Callback& rCallback); /** Run the given callback when the specified resource has been @@ -272,7 +272,7 @@ public: controller. When the configuration controller is not processing any requests the method returns immediately. */ - void WaitForEvent (const ::rtl::OUString& rsEventName) const; + void WaitForEvent (const OUString& rsEventName) const; /** This is a short cut for WaitForEvent(msConfigurationUpdateEndEvent). Call this method to execute the pending requests. @@ -289,7 +289,7 @@ public: /** Return a string representation of the given XResourceId object. */ - static ::rtl::OUString ResourceIdToString ( + static OUString ResourceIdToString ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId); @@ -298,7 +298,7 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL); + const OUString& rsResourceURL); /** Create a new XResourceId object for the given resource URL and a single anchor URL. @@ -306,8 +306,8 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Create a new XResourceId object for the given resource URL and the two given anchor URLs. @@ -315,16 +315,16 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsFirstAnchorURL, - const ::rtl::OUString& rsSecondAnchorURL); + const OUString& rsResourceURL, + const OUString& rsFirstAnchorURL, + const OUString& rsSecondAnchorURL); /** Create a new XResourceId object for the given resource URL. */ static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const css::uno::Reference< css::drawing::framework::XResourceId>& rxAnchor); @@ -372,7 +372,7 @@ private: The callback functor to be called. */ void RunOnEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, const Callback& rCallback) const; diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index bf83930ba8ba..d986112be6aa 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -79,7 +79,7 @@ public: // XModuleController - virtual void SAL_CALL requestResource(const ::rtl::OUString& rsResourceURL) + virtual void SAL_CALL requestResource(const OUString& rsResourceURL) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 4634bed147af..8dc234b51180 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -57,7 +57,7 @@ class PresentationFactory public PresentationFactoryInterfaceBase { public: - static const ::rtl::OUString msPresentationViewURL; + static const OUString msPresentationViewURL; PresentationFactory ( const css::uno::Reference<css::frame::XController>& rxController); diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 460db6db2bd6..a0f763fbc8b2 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -59,7 +59,7 @@ public: The set of URLs may be empty. The result is then the same as returned by ResourceId() default constructor. */ - ResourceId (const ::std::vector<rtl::OUString>& rsResourceURLs); + ResourceId (const ::std::vector<OUString>& rsResourceURLs); /** Create a new resource id that has an empty anchor. @param rsResourceURL @@ -68,7 +68,7 @@ public: had been called. */ ResourceId ( - const ::rtl::OUString& rsResourceURL); + const OUString& rsResourceURL); /** Create a new resource id for the given resource type and an anchor that is specified by a single URL. This constructor can be used for @@ -79,8 +79,8 @@ public: The single URL of the anchor. */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Create a new resource id for the specified resource type and the given list of anchor URLs. @@ -90,8 +90,8 @@ public: The possibly empty list of anchor URLs. */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::std::vector<rtl::OUString>& rAnchorURLs); + const OUString& rsResourceURL, + const ::std::vector<OUString>& rAnchorURLs); /** Create a new resource id with an anchor that consists of a sequence of URLs that is extended by a further URL. @@ -103,20 +103,20 @@ public: An anchor as it is returned by XResourceId::getAnchorURLs(). */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsFirstAnchorURL, - const css::uno::Sequence<rtl::OUString>& rAnchorURLs); + const OUString& rsResourceURL, + const OUString& rsFirstAnchorURL, + const css::uno::Sequence<OUString>& rAnchorURLs); virtual ~ResourceId (void); /** Return the list of URLs of both the resource URL and the anchor URLs. */ - const ::std::vector<rtl::OUString>& GetResourceURLs (void) const; + const ::std::vector<OUString>& GetResourceURLs (void) const; //===== XResourceId ======================================================= - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getResourceURL (void) throw(css::uno::RuntimeException); @@ -133,11 +133,11 @@ public: getAnchor (void) throw (css::uno::RuntimeException); - virtual css::uno::Sequence<rtl::OUString> SAL_CALL + virtual css::uno::Sequence<OUString> SAL_CALL getAnchorURLs (void) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getResourceTypePrefix (void) throw (css::uno::RuntimeException); @@ -155,7 +155,7 @@ public: virtual sal_Bool SAL_CALL isBoundToURL ( - const ::rtl::OUString& rsAnchorURL, + const OUString& rsAnchorURL, css::drawing::framework::AnchorBindingMode eMode) throw (css::uno::RuntimeException); @@ -174,7 +174,7 @@ private: /** The set of URLs that consist of the resource URL at index 0 and the anchor URLs and indices 1 and above. */ - ::std::vector<rtl::OUString> maResourceURLs; + ::std::vector<OUString> maResourceURLs; ::boost::scoped_ptr<css::util::URL> mpURL; @@ -208,8 +208,8 @@ private: it can be bound indirectly, too. */ bool IsBoundToAnchor ( - const rtl::OUString* psFirstAnchorURL, - const css::uno::Sequence<rtl::OUString>* paAnchorURLs, + const OUString* psFirstAnchorURL, + const css::uno::Sequence<OUString>* paAnchorURLs, css::drawing::framework::AnchorBindingMode eMode) const; /** Return whether the called ResourceId object is bound to the anchor @@ -222,7 +222,7 @@ private: it can be bound indirectly, too. */ bool IsBoundToAnchor ( - const ::std::vector<rtl::OUString>& rResourceURLs, + const ::std::vector<OUString>& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; void ParseResourceURL (void); diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index 463704177cec..43eb7ba27eea 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -61,7 +61,7 @@ protected: SfxRequest& rReq); private: - rtl::OUString aCustomShape; + OUString aCustomShape; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 1dcec9fa7ba9..0fe091aab63c 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -37,7 +37,7 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - static void GetSupportedFilterVector( ::std::vector< ::rtl::OUString >& rFilterVector ); + static void GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ); private: FuInsertFile ( diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 4041108805d0..16bd9b88e123 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -56,7 +56,7 @@ public: nType == 0 -> pages nType == 1 -> objects */ - std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ) ; + std::vector<OUString> GetList ( const sal_uInt16 nType ) ; sal_Bool IsLink(); sal_Bool IsRemoveUnnessesaryMasterPages() const; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 84555318ebbb..99e6bf3ed5a1 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -59,15 +59,15 @@ private: public: - SdOptionsItem( const SdOptionsGeneric& rParent, const ::rtl::OUString rSubTree ); + SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ); virtual ~SdOptionsItem(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); - sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, + const ::com::sun::star::uno::Sequence< OUString >& rNames ); + sal_Bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); void SetModified(); }; @@ -78,14 +78,14 @@ friend class SdOptionsItem; private: - ::rtl::OUString maSubTree; + OUString maSubTree; SdOptionsItem* mpCfgItem; sal_uInt16 mnConfigId; sal_Bool mbInit : 1; sal_Bool mbEnableModify : 1; SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; + SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const; protected: @@ -100,10 +100,10 @@ protected: public: - SdOptionsGeneric( sal_uInt16 nConfigId, const ::rtl::OUString& rSubTree ); + SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ); virtual ~SdOptionsGeneric(); - const ::rtl::OUString& GetSubTree() const { return maSubTree; } + const OUString& GetSubTree() const { return maSubTree; } sal_uInt16 GetConfigId() const { return mnConfigId; } void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 5f8cdcf3f922..e863aff63441 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -202,7 +202,7 @@ public: nDepth == 0 -> pages nDepth == 1 -> objects */ - std::vector<rtl::OUString> GetSelectEntryList (const sal_uInt16 nDepth) const; + std::vector<OUString> GetSelectEntryList (const sal_uInt16 nDepth) const; SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } @@ -261,7 +261,7 @@ private: void AddShapeList ( const SdrObjList& rList, SdrObject* pShape, - const ::rtl::OUString& rsName, + const OUString& rsName, const bool bIsExcluded, SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 66e36345d069..b09056f2832e 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -67,10 +67,10 @@ public: sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const std::vector<rtl::OUString>& rPageBookmarks, sal_Bool bPersistent ); + void SetPageBookmarks( const std::vector<OUString>& rPageBookmarks, sal_Bool bPersistent ); sal_Bool IsPageTransferable() const { return mbPageTransferable; } sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( !maPageBookmarks.empty() ) ); } - const std::vector<rtl::OUString>& GetPageBookmarks() const { return maPageBookmarks; } + const std::vector<OUString>& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); @@ -119,7 +119,7 @@ private: SfxObjectShellRef maDocShellRef; ::sd::DrawDocShell* mpPageDocShell; - std::vector<rtl::OUString> maPageBookmarks; + std::vector<OUString> maPageBookmarks; TransferableDataHelper* mpOLEDataHelper; TransferableObjectDescriptor* mpObjDesc; const ::sd::View* mpSdView; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 31d43589896d..a309c82a8de2 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -118,18 +118,18 @@ public: virtual void SAL_CALL disposing (void); // 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); // 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); // XPresentation virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); @@ -146,7 +146,7 @@ public: // actions void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() void jumpToPageIndex( sal_Int32 nIndex ); - void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() + void jumpToBookmark( const OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 6c1f401770f2..f37dcfed7d02 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -46,7 +46,7 @@ namespace sd { namespace toolpanel PID_UNKNOWN = 5 }; - PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ); + PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); //...................................................................................................................... } } // namespace sd::toolpanel diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 3440ba58d3f4..f3cfd1d72eb4 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -68,7 +68,7 @@ public: TitledControl* AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - const rtl::OString& sHelpId); + const OString& sHelpId); /** Add a control to the sub panel without a title bar. */ diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 89a093169130..ccef40366b41 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -86,11 +86,11 @@ public: /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are not under the drawing framework's control. */ - void ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); + void ActivatePanel( const OUString& i_rPanelResourceURL ); /** deactivates the given panel, bypassing the configuration controller */ - void DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); + void DeactivatePanel( const OUString& i_rPanelResourceURL ); /** Return a pointer to the docking window that is the parent or a predecessor of the content window. @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > CreatePanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocFrame, - const ::rtl::OUString& i_rPanelResourceURL + const OUString& i_rPanelResourceURL ); private: diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index 6b4e49a727f8..16dbdea13b0c 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -49,12 +49,12 @@ public: access. */ ConfigurationAccess( - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); ConfigurationAccess( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); /** Return a configuration node below the root of the called object. @@ -66,7 +66,7 @@ public: It is empty when the node was not found. */ css::uno::Any GetConfigurationNode ( - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Return a configuration node below the given node. @param rxNode @@ -79,7 +79,7 @@ public: */ static css::uno::Any GetConfigurationNode ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Write any changes that have been made back to the configuration. This call is ignored when the called ConfigurationAccess object was @@ -92,7 +92,7 @@ public: and the value of the item. */ typedef ::boost::function<void( - const ::rtl::OUString&, + const OUString&, const std::vector<css::uno::Any>&) > Functor; /** Execute a functor for all elements of the given container. @@ -109,7 +109,7 @@ public: */ static void ForAll ( const css::uno::Reference<css::container::XNameAccess>& rxContainer, - const ::std::vector<rtl::OUString>& rArguments, + const ::std::vector<OUString>& rArguments, const Functor& rFunctor); /** Fill a list with the string contents of all sub-elements in the given container. @@ -125,15 +125,15 @@ public: */ static void FillList( const css::uno::Reference<css::container::XNameAccess>& rxContainer, - const ::rtl::OUString& rsArgument, - ::std::vector<rtl::OUString>& rList); + const OUString& rsArgument, + ::std::vector<OUString>& rList); private: css::uno::Reference<css::uno::XInterface> mxRoot; void Initialize ( const css::uno::Reference<css::lang::XMultiServiceFactory>& rxProvider, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); }; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 0dedecda0beb..7955a60c1627 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -59,7 +59,7 @@ public: throw(css::uno::RuntimeException); virtual void SAL_CALL setPropertyValue ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -67,34 +67,34 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue (const rtl::OUString& rsPropertyName) + virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -105,18 +105,18 @@ protected: @throw com::sun::star::beans::UnknownPropertyException when the property is not supported. */ - virtual css::uno::Any GetPropertyValue (const ::rtl::OUString& rsPropertyName) = 0; + virtual css::uno::Any GetPropertyValue (const OUString& rsPropertyName) = 0; /** Set the given property value. @return the old value. @throw com::sun::star::beans::UnknownPropertyException when the property is not supported. */ virtual css::uno::Any SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue) = 0; private: - typedef ::std::multimap<rtl::OUString, + typedef ::std::multimap<OUString, css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer; ::boost::scoped_ptr<ChangeListenerContainer> mpChangeListeners; @@ -125,7 +125,7 @@ private: are registered for all properties. */ void CallListeners ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::beans::PropertyChangeEvent& rEvent); /** This method throws a DisposedException when the object has already been diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index cd6b07409662..785fe0c31b91 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -56,7 +56,7 @@ public: Link& rCallback, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>& rxDispatchProvider, - const ::rtl::OUString& rSlotName); + const OUString& rSlotName); /** The constructor de-registers all remaining listeners. Usually a prior dispose() call should have done that already. @@ -86,7 +86,7 @@ public: ".uno:VerticalTextState". @throws DisposedException */ - void ObserveSlot (const ::rtl::OUString& rSlotName); + void ObserveSlot (const OUString& rSlotName); //===== frame::XStatusListener ========================================== @@ -136,7 +136,7 @@ private: /** Transform the given string into a URL object. */ - ::com::sun::star::util::URL MakeURL (const ::rtl::OUString& rSlotName) const; + ::com::sun::star::util::URL MakeURL (const OUString& rSlotName) const; /** Return an XDispatch object for the given URL. */ diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 1787c635501f..16927cf17b9e 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -44,7 +44,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNCHSS_HXX diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 0e9c219c9325..44b942e75037 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -54,7 +54,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; // -------------------------------------------------------------------- @@ -67,7 +67,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String maOldName; diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 92b68ced2e1a..34f12bb18663 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -39,7 +39,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNMOVSS_HXX diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 9827f06fbe51..5d476e82c9d5 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -56,8 +56,8 @@ namespace sd { class DrawDocShell; } -extern ::rtl::OUString getPageApiName( SdPage* pPage ); -extern ::rtl::OUString getPageApiNameFromUiName( const String& rUIName ); +extern OUString getPageApiName( SdPage* pPage ); +extern OUString getPageApiNameFromUiName( const String& rUIName ); /*********************************************************************** * * @@ -113,7 +113,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - rtl::OUString maBuildId; + OUString maBuildId; void initializeDocument(); public: @@ -178,22 +178,22 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException); // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) 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); // 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); // XLinkTargetSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); @@ -202,7 +202,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XRenderable virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -241,9 +241,9 @@ public: virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) 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); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -254,9 +254,9 @@ public: virtual sal_Bool SAL_CALL hasElements() 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); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -292,9 +292,9 @@ public: virtual sal_Bool SAL_CALL hasElements() 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); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -317,18 +317,18 @@ public: virtual ~SdDocLinkTargets() throw(); // 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); virtual sal_Bool SAL_CALL hasElements() 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); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -336,7 +336,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); // intern - SdPage* FindPage( const ::rtl::OUString& rName ) const throw(); + SdPage* FindPage( const OUString& rName ) const throw(); }; #endif diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index caf5006052b7..66bb2f912f36 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -42,7 +42,7 @@ protected: ::com::sun::star::drawing::XDrawPage* mpPage; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - sal_Bool Search( const ::rtl::OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); + sal_Bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw(); @@ -83,8 +83,8 @@ protected: sal_Bool mbReplace; - ::rtl::OUString maSearchStr; - ::rtl::OUString maReplaceStr; + OUString maSearchStr; + OUString maReplaceStr; public: SdUnoSearchReplaceDescriptor( sal_Bool bReplace ) throw(); @@ -97,21 +97,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual ::rtl::OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XReplaceDescriptor - virtual ::rtl::OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::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/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index dd02d7c4fa1e..28ff9c757882 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -50,7 +50,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNPRLOUT_HXX diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 9d5c625d8278..16e1fd488c37 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 086cb41857c4..f93cade9dec4 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -52,7 +51,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance ( -::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) +OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory"); } @@ -60,11 +59,11 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance ( -Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.rendering.Canvas"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.rendering.Canvas"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index dda4cef92956..97bc4f1c7abe 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -53,7 +52,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance ( -::rtl::OUString PresenterHelperService_getImplementationName (void) +OUString PresenterHelperService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterHelper"); @@ -62,11 +61,11 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance ( -Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterHelper"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterHelper"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 2bfe3ff1c890..053b1e69d136 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -75,7 +75,7 @@ public: virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createCanvas ( const css::uno::Reference<css::awt::XWindow>& rxWindow, sal_Int16 nRequestedCanvasFeatures, - const ::rtl::OUString& rsOptionalCanvasServiceName) + const OUString& rsOptionalCanvasServiceName) throw (css::uno::RuntimeException); virtual void SAL_CALL toTop ( @@ -83,7 +83,7 @@ public: throw (css::uno::RuntimeException); virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL loadBitmap ( - const ::rtl::OUString& rsURL, + const OUString& rsURL, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 757f8067a78e..48101513c30e 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::cache; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -87,7 +86,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance ( -::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) +OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterPreviewCache"); } @@ -95,11 +94,11 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance ( -Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 88829865027a..349eefef3b97 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -61,7 +60,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance ( -::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) +OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterTextView"); } @@ -69,11 +68,11 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance ( -Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterTextView"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterTextView"); + return Sequence<OUString>(&sServiceName, 1); } @@ -215,7 +214,7 @@ Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName) Any PresenterTextView::SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue) { ThrowIfDisposed(); @@ -392,7 +391,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) pEditEngine->EnableUndo (sal_True); pEditEngine->SetDefTab (sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX")))); + Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX")))); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() @@ -400,7 +399,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); - pEditEngine->SetWordDelimiters (rtl::OUString(" .=+-*/(){}[];\"")); + pEditEngine->SetWordDelimiters (OUString(" .=+-*/(){}[];\"")); pEditEngine->SetRefMapMode (MAP_PIXEL); pEditEngine->SetPaperSize (Size(800, 0)); pEditEngine->EraseVirtualDevice(); diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 19cfd9110d9c..1b4918f93dc6 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -59,9 +59,9 @@ protected: virtual void SAL_CALL disposing (void); virtual css::uno::Any GetPropertyValue ( - const ::rtl::OUString& rsPropertyName); + const OUString& rsPropertyName); virtual css::uno::Any SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue); private: diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index e653bda12241..ccd6e795e087 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -42,7 +41,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance ( -::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) +OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideRenderer"); } @@ -50,11 +49,11 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance ( -Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideRenderer"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.SlideRenderer"); + return Sequence<OUString>(&sServiceName, 1); } @@ -216,7 +215,7 @@ BitmapEx SlideRenderer::CreatePreview ( const Image aPreview = maPreviewRenderer.RenderPage ( pPage, Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor), - ::rtl::OUString()); + OUString()); if (nFactor == 1) return aPreview.GetBitmapEx(); else diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index a874a6ad819c..c87f1b82fb10 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -290,7 +290,7 @@ OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) : SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::OSXBluetoothWrapper(): mnMTU=" << mnMTU ); } -sal_Int32 OSXBluetoothWrapper::readLine( rtl::OString& aLine ) +sal_Int32 OSXBluetoothWrapper::readLine( OString& aLine ) { SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::readLine()" ); diff --git a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx index 0359807d549f..cef365ac7e4e 100644 --- a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx +++ b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx @@ -26,7 +26,7 @@ namespace sd @return whatever the last call of recv returned, i.e. 0 or less if there was a problem in communications. */ - virtual sal_Int32 readLine(rtl::OString& aLine) = 0; + virtual sal_Int32 readLine(OString& aLine) = 0; /** Write a number of bytes diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index e9f9c22d9099..14d62d78e976 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -221,9 +221,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) return ""; - static const ::rtl::OUString sNotesShapeName ( + static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape" ); - static const ::rtl::OUString sTextShapeName ( + static const OUString sTextShapeName ( "com.sun.star.drawing.TextShape" ); uno::Reference<container::XIndexAccess> xIndexAccess ( aNotesPage, UNO_QUERY); @@ -253,7 +253,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xShapeDescriptor.is()) { - ::rtl::OUString sType (xShapeDescriptor->getShapeType()); + OUString sType (xShapeDescriptor->getShapeType()); if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName)) { uno::Reference<text::XTextRange> xText ( @@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl ) { - ::rtl::OUString aFilterName( "XHTML Draw File" ); + OUString aFilterName( "XHTML Draw File" ); uno::Reference< document::XExporter > xExporter; { @@ -298,7 +298,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl else fprintf( stderr, "Couldn't find by name.\n" ); - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ ) { @@ -384,7 +384,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 66b30aeeee4c..750d2535e139 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -38,7 +38,7 @@ private: sal_uInt32 aWidth, sal_uInt32 aHeight, sal_uInt64 &rSize ); void sendNotes( sal_uInt32 aSlideNumber ); - rtl::OString prepareNotes( sal_uInt32 aSlideNumber ); + OString prepareNotes( sal_uInt32 aSlideNumber ); }; } diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 2052fbf4d065..67259d70a963 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -20,8 +20,6 @@ using namespace sd; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::frame; -using rtl::OString; -using rtl::OStringBuffer; Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator, @@ -105,7 +103,7 @@ void SAL_CALL Listener::slideEnded (sal_Bool bReverse) (void) bReverse; } -void SAL_CALL Listener::hyperLinkClicked (const rtl::OUString &) +void SAL_CALL Listener::hyperLinkClicked (const OUString &) throw (css::uno::RuntimeException) { } diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index e3385eb359fc..111076b47595 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -51,7 +51,7 @@ public: virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException); // XEventListener diff --git a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx index cecaa7a8b1e5..d744a60cff81 100644 --- a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx +++ b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx @@ -29,7 +29,7 @@ namespace sd public: OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ); - virtual sal_Int32 readLine( rtl::OString& aLine ); + virtual sal_Int32 readLine( OString& aLine ); virtual sal_Int32 write( const void* pBuffer, sal_uInt32 len ); void appendData(void* pBuffer, size_t len ); void channelClosed(); diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 3ec14de911a8..c3fe6fcb80dd 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -23,8 +23,6 @@ using namespace sd; using namespace ::com::sun::star; -using rtl::OUString; -using rtl::OString; using namespace ::osl; using namespace std; @@ -50,7 +48,7 @@ void Receiver::Timeout() { if( maExecQueue.size() ) { - std::vector< rtl::OString > aCommands( maExecQueue.front() ); + std::vector< OString > aCommands( maExecQueue.front() ); maExecQueue.pop_front(); if( !aCommands.empty() ) executeCommand( aCommands ); diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index a4a915c4b3a9..261a72cc06ce 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -29,13 +29,13 @@ namespace sd // Timer is protected by the solar mutex => so are we. class Receiver : Timer { - std::deque< std::vector< rtl::OString > > maExecQueue; + std::deque< std::vector< OString > > maExecQueue; public: Receiver( Transmitter *aTransmitter ); ~Receiver(); virtual void Timeout(); - void pushCommand( const std::vector<rtl::OString> &rCommand ); - void executeCommand( const std::vector<rtl::OString> &aCommand ); + void pushCommand( const std::vector<OString> &rCommand ); + void executeCommand( const std::vector<OString> &aCommand ); private: Transmitter *pTransmitter; diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 5b53b87d4494..846ea9eae3db 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using rtl::OString; using namespace ::osl; using namespace ::comphelper; @@ -51,11 +50,11 @@ namespace sd { ClientInfo { BufferedStreamSocket *mpStreamSocket; - rtl::OUString mPin; + OUString mPin; - ClientInfoInternal( const rtl::OUString rName, - const rtl::OUString rAddress, - BufferedStreamSocket *pSocket, rtl::OUString rPin ): + ClientInfoInternal( const OUString rName, + const OUString rAddress, + BufferedStreamSocket *pSocket, OUString rPin ): ClientInfo( rName, rAddress ), mpStreamSocket( pSocket ), mPin( rPin ) {} @@ -249,7 +248,7 @@ std::vector<ClientInfo*> RemoteServer::getClients() return aClients; } -sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin ) +sal_Bool RemoteServer::connectClient( ClientInfo* pClient, OUString aPin ) { SAL_INFO( "sdremote", "RemoteServer::connectClient called" ); if ( !spServer ) diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx index a7c211b20ad1..f5861e4286f2 100644 --- a/sd/source/ui/remotecontrol/Transmitter.cxx +++ b/sd/source/ui/remotecontrol/Transmitter.cxx @@ -8,7 +8,6 @@ */ #include "Transmitter.hxx" -using rtl::OString; using namespace std; using namespace osl; // Sockets etc. using namespace sd; diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx index 783e1d5dbc3c..9412ccc2faa4 100644 --- a/sd/source/ui/remotecontrol/Transmitter.hxx +++ b/sd/source/ui/remotecontrol/Transmitter.hxx @@ -28,7 +28,7 @@ public: enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH }; Transmitter( ::sd::IBluetoothSocket* aSocket ); ~Transmitter(); - void addMessage( const rtl::OString& aMessage, const Priority aPriority ); + void addMessage( const OString& aMessage, const Priority aPriority ); void notifyFinished(); private: @@ -41,8 +41,8 @@ private: ::osl::Mutex mQueueMutex; - std::queue<rtl::OString> mLowPriority; - std::queue<rtl::OString> mHighPriority; + std::queue<OString> mLowPriority; + std::queue<OString> mHighPriority; }; } diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 90ed5146ac6e..b4fb2b0d218c 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 99e7efc991f2..f9154e255431 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -57,7 +57,6 @@ using ::com::sun::star::presentation::XSlideShowController; using ::com::sun::star::container::XIndexAccess; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using ::com::sun::star::awt::XWindow; using namespace ::sd; using namespace ::cppu; @@ -69,7 +68,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::drawing::framework; -extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName ); +extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); namespace { @@ -831,7 +830,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) uno::Reference< frame::XDispatch > xDispatch( xProvider->queryDispatch( - aURL, ::rtl::OUString(), 0)); + aURL, OUString(), 0)); if( xDispatch.is() ) { xDispatch->dispatch(aURL, diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index fd29a7bd9996..7bb32b86995d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -78,8 +78,6 @@ #include <boost/bind.hpp> -using ::rtl::OUString; -using ::rtl::OString; using ::cppu::OInterfaceContainerHelper; using ::comphelper::ImplementationReference; using ::com::sun::star::animations::XAnimationNode; @@ -94,7 +92,7 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::beans; -extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName ); extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); namespace sd @@ -327,7 +325,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X OSL_FAIL( OString(OString("sd::AnimationSlideController::getSlideAPI(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -651,7 +649,7 @@ void SAL_CALL SlideshowImpl::disposing() OSL_FAIL( OString(OString("sd::SlideshowImpl::stop(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -879,7 +877,7 @@ bool SlideshowImpl::startPreview( OSL_FAIL( OString(OString("sd::SlideshowImpl::startPreview(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bRet = false; @@ -1106,7 +1104,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) OSL_FAIL( OString(OString("sd::SlideshowImpl::startShow(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bRet = false; @@ -1167,7 +1165,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp OSL_FAIL( OString(OString("sd::SlideshowImpl::startShowImpl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); return false; @@ -1205,7 +1203,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) OSL_FAIL( OString(OString("sd::SlideshowImpl::paint(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1259,7 +1257,7 @@ void SlideshowImpl::removeShapeEvents() OSL_FAIL( OString(OString("sd::SlideshowImpl::removeShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1294,7 +1292,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) OSL_FAIL( OString(OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1372,7 +1370,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( OSL_FAIL( OString(OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1443,7 +1441,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::pause(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1479,7 +1477,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::resume(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1663,7 +1661,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark // --------------------------------------------------------- -void SlideshowImpl::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException) +void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { OUString aBookmark( aHyperLink ); @@ -1901,7 +1899,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) { OSL_FAIL( OString(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ") - + rtl::OUStringToOString( + + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2033,7 +2031,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) OSL_FAIL( OString(OString("sd::SlideshowImpl::keyInput(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2422,7 +2420,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const OSL_FAIL( OString(OString("sd::SlideshowImpl::createSlideShow(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2631,7 +2629,7 @@ void SlideshowImpl::resize( const Size& rSize ) OSL_FAIL( OString(OString("sd::SlideshowImpl::resize(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2987,7 +2985,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc OSL_FAIL( OString(OString("sd::SlideshowImpl::setUsePen(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3280,7 +3278,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) OSL_FAIL( OString(OString("sd::SlideshowImpl::gotoPreviousSlide(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3380,7 +3378,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::stopSound(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3728,7 +3726,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti // --------------------------------------------------------- -void SlideShowListenerProxy::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException) +void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 7f87ea01ccd5..8be006b320da 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -102,7 +102,7 @@ struct PresentationSettingsEx : public PresentationSettings void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException); - void SetPropertyValue( const ::rtl::OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); + void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; // -------------------------------------------------------------------- @@ -111,7 +111,7 @@ struct WrappedShapeEventImpl { css::presentation::ClickAction meClickAction; sal_Int32 mnVerb; - ::rtl::OUString maStrBookmark; + OUString maStrBookmark; WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {}; }; @@ -148,7 +148,7 @@ public: virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); + virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException); // css::lang::XEventListener: virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException); @@ -201,7 +201,7 @@ public: virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoBookmark( const ::rtl::OUString& Bookmark ) throw (css::uno::RuntimeException); + virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException); virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException); @@ -227,7 +227,7 @@ public: // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); - void hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); + void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException); void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent); /// ends the presentation async @@ -311,7 +311,7 @@ private: SfxDispatcher* getDispatcher() const; SfxBindings* getBindings() const; - sal_Int32 getSlideNumberForBookmark( const rtl::OUString& rStrBookmark ); + sal_Int32 getSlideNumberForBookmark( const OUString& rStrBookmark ); void removeShapeEvents(); void registerShapeEvents( sal_Int32 nSlideNumber ); @@ -388,9 +388,9 @@ private: sal_Int32 mnLastSlideNumber; WrappedShapeEventImplMap maShapeEventMap; - ::rtl::OUString msOnClick; - ::rtl::OUString msBookmark; - ::rtl::OUString msVerb; + OUString msOnClick; + OUString msBookmark; + OUString msVerb; css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage; css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 5fccaed09ca2..032345b5491c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -44,7 +44,6 @@ using ::com::sun::star::presentation::XShapeEventListener; using ::com::sun::star::presentation::XSlideShowListener; using ::comphelper::ImplementationReference; -using ::rtl::OUString; using namespace ::com::sun::star; namespace sd diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 50f82bc6a2c5..6022d273b01a 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -87,16 +87,16 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH BitmapCache& rCache, sal_Int32 nMaximalCacheSize) { - static const ::rtl::OUString sNone ("None"); - static const ::rtl::OUString sCompress ("Compress"); - static const ::rtl::OUString sErase ("Erase"); - static const ::rtl::OUString sResolution ("ResolutionReduction"); - static const ::rtl::OUString sPNGCompression ("PNGCompression"); + static const OUString sNone ("None"); + static const OUString sCompress ("Compress"); + static const OUString sErase ("Erase"); + static const OUString sResolution ("ResolutionReduction"); + static const OUString sPNGCompression ("PNGCompression"); ::boost::shared_ptr<BitmapCompressor> pCompressor; - ::rtl::OUString sCompressionPolicy(sPNGCompression); + OUString sCompressionPolicy(sPNGCompression); Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue("CompressionPolicy")); - if (aCompressionPolicy.has<rtl::OUString>()) + if (aCompressionPolicy.has<OUString>()) aCompressionPolicy >>= sCompressionPolicy; if (sCompressionPolicy == sNone) pCompressor.reset(new NoBitmapCompression()); @@ -108,9 +108,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH pCompressor.reset(new PngCompression()); ::std::auto_ptr<CacheCompactor> pCompactor (NULL); - ::rtl::OUString sCompactionPolicy(sCompress); + OUString sCompactionPolicy(sCompress); Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue("CompactionPolicy")); - if (aCompactionPolicy.has<rtl::OUString>()) + if (aCompactionPolicy.has<OUString>()) aCompactionPolicy >>= sCompactionPolicy; if (sCompactionPolicy == sNone) pCompactor.reset(new NoCacheCompaction(rCache,nMaximalCacheSize)); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 0300bc0534c7..a67a16d37294 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -74,8 +74,8 @@ Timer CacheConfiguration::maReleaseTimer; CacheConfiguration::CacheConfiguration (void) { // Get the cache size from configuration. - const ::rtl::OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); - const ::rtl::OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache"); + const OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); + const OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache"); try { @@ -126,7 +126,7 @@ CacheConfiguration::CacheConfiguration (void) -Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) +Any CacheConfiguration::GetValue (const OUString& rName) { Any aResult; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 056d4988e56d..f44d7a4a172d 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -44,7 +44,7 @@ public: MultiPaneGUI/SlideSorter/PreviewCache. When the specified value does not exist then an empty Any is returned. */ - ::com::sun::star::uno::Any GetValue (const ::rtl::OUString& rName); + ::com::sun::star::uno::Any GetValue (const OUString& rName); private: /** When a caller holds a reference after we have released ours we use diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 322b20127fcd..fa4e09f955bc 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -1010,8 +1010,8 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs if (pChild == NULL || pChild->GetPage() == NULL) return; - ::rtl::OUString sOldName (rsOldName); - ::rtl::OUString sNewName (pChild->GetPage()->GetName()); + OUString sOldName (rsOldName); + OUString sNewName (pChild->GetPage()->GetName()); pChild->FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::NAME_CHANGED, makeAny(sOldName), diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1e7e11a58752..7d658eab6a9d 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -337,7 +337,7 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) sal_Int32 nInsertPageCount (0); if (pClipTransferable->HasPageBookmarks()) { - const std::vector<rtl::OUString> &rBookmarkList = pClipTransferable->GetPageBookmarks(); + const std::vector<OUString> &rBookmarkList = pClipTransferable->GetPageBookmarks(); const SolarMutexGuard aGuard; nInsertPageCount = (sal_uInt16) rBookmarkList.size(); @@ -367,7 +367,7 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) bMergeMasterPages = (pDataDoc != rModel.GetDocument()); nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD ); rModel.GetDocument()->InsertBookmarkAsPage( - std::vector<rtl::OUString>(), + std::vector<OUString>(), NULL, sal_False, sal_False, @@ -415,7 +415,7 @@ void Clipboard::CreateSlideTransferable ( ::Window* pWindow, bool bDrag) { - std::vector<rtl::OUString> aBookmarkList; + std::vector<OUString> aBookmarkList; // Insert all selected pages into a bookmark list and remember them in // maPagesToRemove for possible later removal. @@ -540,7 +540,7 @@ void Clipboard::CreateSlideTransferable ( INetBookmark aINetBookmark; if ( ! aDataHelper.GetINetBookmark(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark)) break; - const rtl::OUString sURL (aINetBookmark.GetURL()); + const OUString sURL (aINetBookmark.GetURL()); const sal_Int32 nIndex (sURL.indexOf((sal_Unicode)'#')); if (nIndex == -1) break; @@ -584,7 +584,7 @@ void Clipboard::CreateSlideTransferable ( // pTransferable->SetView(&mrSlideSorter.GetView()); // Set page bookmark list. - std::vector<rtl::OUString> aPageBookmarks; + std::vector<OUString> aPageBookmarks; aPageBookmarks.push_back(sBookmark); pTransferable->SetPageBookmarks(aPageBookmarks, false); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 45ae28150ff6..8518279d74ef 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -245,7 +245,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); xSet->setPropertyValue ( - rtl::OUString("CurrentPage"), + OUString("CurrentPage"), aPage); } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 439cc942d66d..17a8a141045b 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -224,7 +224,7 @@ void Listener::ConnectToController (void) { try { - xSet->addPropertyChangeListener(rtl::OUString("CurrentPage"), this); + xSet->addPropertyChangeListener(OUString("CurrentPage"), this); } catch (beans::UnknownPropertyException&) { @@ -232,7 +232,7 @@ void Listener::ConnectToController (void) } try { - xSet->addPropertyChangeListener(rtl::OUString("IsMasterPageMode"), this); + xSet->addPropertyChangeListener(OUString("IsMasterPageMode"), this); } catch (beans::UnknownPropertyException&) { @@ -268,10 +268,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - rtl::OUString("CurrentPage"), + OUString("CurrentPage"), this); xSet->removePropertyChangeListener ( - rtl::OUString("IsMasterPageMode"), + OUString("IsMasterPageMode"), this); } @@ -479,8 +479,8 @@ void SAL_CALL Listener::propertyChange ( { ThrowIfDisposed(); - static const ::rtl::OUString sCurrentPagePropertyName ("CurrentPage"); - static const ::rtl::OUString sEditModePropertyName ("IsMasterPageMode"); + static const OUString sCurrentPagePropertyName ("CurrentPage"); + static const OUString sEditModePropertyName ("IsMasterPageMode"); if (rEvent.PropertyName.equals(sCurrentPagePropertyName)) { diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index bc26e73bc5d9..87dcd7d8f105 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -55,7 +55,7 @@ public: private: SlideSorter& mrSlideSorter; model::SharedPageDescriptor mpDescriptor; - ::rtl::OUString msCurrentHelpText; + OUString msCurrentHelpText; sal_uLong mnHelpWindowHandle; Timer maShowTimer; Timer maHiddenTimer; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index a13af5a9dd95..5d9512156f3c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::slidesorter::view::Layouter; namespace sd { namespace slidesorter { @@ -68,7 +67,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( -::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) +OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideSorter"); } @@ -76,11 +75,11 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( -Sequence<rtl::OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideSorter"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.SlideSorter"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index e86b696c6bad..91dadc05807c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -131,7 +131,7 @@ SlideSorterViewShell::SlideSorterViewShell ( mpFrameView = new FrameView(GetDoc()); GetFrameView()->Connect(); - SetName (rtl::OUString("SlideSorterViewShell")); + SetName (OUString("SlideSorterViewShell")); pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } @@ -216,12 +216,12 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase SlideSorterViewShell* pViewShell = NULL; // Test the center, left, and then the right pane for showing a slide sorter. - ::rtl::OUString aPaneURLs[] = { + OUString aPaneURLs[] = { FrameworkHelper::msCenterPaneURL, FrameworkHelper::msFullScreenPaneURL, FrameworkHelper::msLeftImpressPaneURL, FrameworkHelper::msRightPaneURL, - ::rtl::OUString()}; + OUString()}; try { diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 196b99df6cbf..5186521bf6b4 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -743,7 +743,7 @@ void SlideSorterView::CompleteRedraw ( mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE); mrSlideSorter.GetContentWindow()->DrawText( gFrameTimeBox, - ::rtl::OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)), + OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)), TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); // mrSlideSorter.GetContentWindow()->Invalidate(gFrameTimeBox); #endif diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6aadcb720e14..fc5248384358 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -270,7 +270,7 @@ void InsertionIndicatorOverlay::PaintPageCount ( ::boost::shared_ptr<Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); if (pFont) { - ::rtl::OUString sNumber (::rtl::OUString::valueOf(nSelectionCount)); + OUString sNumber (OUString::valueOf(nSelectionCount)); // Determine the size of the (painted) text and create a bounding // box that centers the text on the first preview. diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 06750bf21e25..21c42ad78591 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -243,16 +243,16 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) String sPageNumberTemplate; if (nPageCount < 10) - sPageNumberTemplate = rtl::OUString("9"); + sPageNumberTemplate = OUString("9"); else if (nPageCount < 100) - sPageNumberTemplate = rtl::OUString("99"); + sPageNumberTemplate = OUString("99"); else if (nPageCount < 200) // Just for the case that 1 is narrower than 9. - sPageNumberTemplate = rtl::OUString("199"); + sPageNumberTemplate = OUString("199"); else if (nPageCount < 1000) - sPageNumberTemplate = rtl::OUString("999"); + sPageNumberTemplate = OUString("999"); else - sPageNumberTemplate = rtl::OUString("9999"); + sPageNumberTemplate = OUString("9999"); // More then 9999 pages are not handled. const Size aSize ( diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 2d8fcf584dd8..9bf75e6148f2 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -319,7 +319,7 @@ void PageObjectPainter::PaintPageNumber ( // Paint the page number. OSL_ASSERT(rpDescriptor->GetPage()!=NULL); const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1); - const rtl::OUString sPageNumber(rtl::OUString::valueOf(nPageNumber)); + const OUString sPageNumber(OUString::valueOf(nPageNumber)); rDevice.SetFont(*mpPageNumberFont); rDevice.SetTextColor(aPageNumberColor); rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index c0babd796165..9542055a5e0f 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -27,7 +27,6 @@ #include "glob.hrc" #include <vcl/help.hxx> -using ::rtl::OUString; namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 754801cf1055..8e44325f4a99 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -53,7 +53,6 @@ #include "sdresid.hxx" #include "EventMultiplexer.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 0714be8ba6fa..021bddc55161 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -78,7 +78,7 @@ private: private: ViewShellBase& mrBase; - const rtl::OUString msTableTemplate; + const OUString msTableTemplate; boost::scoped_ptr< Control > mxControls[DESIGNPANE_CONTROL_COUNT]; int mnOrgOffsetY[DESIGNPANE_CONTROL_COUNT]; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 57a9b69e85dc..950949cdbf6c 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -62,7 +62,6 @@ #include "sdresid.hxx" #include "undo/undoobjects.hxx" -using ::rtl::OUString; using namespace ::sd; using namespace ::sdr::table; using namespace ::com::sun::star; diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 24bcdc1d6284..8f444a355c6b 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -197,7 +197,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) SetExtraSpacing(2); SetSelectHdl (LINK(this, LayoutMenu, ClickHandler)); SetPool (&rDocumentShell.GetDoc()->GetPool()); - SetName(rtl::OUString("LayoutMenu")); + SetName(OUString("LayoutMenu")); InvalidateContent(); Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener)); @@ -759,7 +759,7 @@ void LayoutMenu::Fill (void) && pDocument->GetDefaultWritingMode() == WritingMode_RL_TB); // Get URL of the view in the center pane. - ::rtl::OUString sCenterPaneViewName; + OUString sCenterPaneViewName; try { Reference<XControllerManager> xControllerManager ( diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index ba7de514cfd5..8d9a6b0afc60 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -51,7 +51,7 @@ ScrollPanel::ScrollPanel ( void ScrollPanel::Construct() { - SetAccessibleName (::rtl::OUString("Sub Task Panel")); + SetAccessibleName (OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); @@ -107,7 +107,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - const rtl::OString& rHelpId) + const OString& rHelpId) { // We are interested only in the title. The control itself is // managed by the content object. diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 3206262eb74d..58999e88721d 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -43,7 +43,7 @@ SubToolPanel::SubToolPanel ( mnVerticalGap(3), mnHorizontalBorder(2) { - SetAccessibleName (::rtl::OUString("Sub Task Panel")); + SetAccessibleName (OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 0a366b4ff613..c89d64847faf 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -69,7 +69,7 @@ namespace sd { namespace toolpanel void ToolPanel::checkDisposed() { if ( m_pControl.get() == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index 9ae0087c08c4..e1c63e250e09 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -79,12 +79,12 @@ namespace sd { namespace toolpanel ToolPanelFactory( const Reference< XComponentContext >& i_rContext ); // XUIElementFactory - virtual Reference< XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException); + virtual Reference< XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); @@ -104,17 +104,17 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ToolPanelFactory_getImplementationName() throw(RuntimeException) + OUString ToolPanelFactory_getImplementationName() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.drawing.ToolPanelFactory" ) ; + return OUString( "com.sun.star.comp.drawing.ToolPanelFactory" ) ; } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) + Sequence< OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName( "com.sun.star.drawing.DefaultToolPanelFactory" ); - return Sequence< ::rtl::OUString >( &sServiceName, 1 ); + const OUString sServiceName( "com.sun.star.drawing.DefaultToolPanelFactory" ); + return Sequence< OUString >( &sServiceName, 1 ); } //------------------------------------------------------------------------------------------------------------------ @@ -129,7 +129,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) + Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -206,16 +206,16 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) { return ToolPanelFactory_getImplementationName(); } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString& i_rServiceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + const Sequence< OUString > aSupported( getSupportedServiceNames() ); + for ( const OUString* pSupported = aSupported.getConstArray(); pSupported != aSupported.getConstArray() + aSupported.getLength(); ++pSupported ) @@ -226,7 +226,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames( ) throw (RuntimeException) { return ToolPanelFactory_getSupportedServiceNames(); } diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx index 841edfc0a5d9..284bd44ef61f 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx @@ -55,7 +55,7 @@ namespace sd { namespace toolpanel //= ToolPanelUIElement //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const ::rtl::OUString& i_rResourceURL, + ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const OUString& i_rResourceURL, const Reference< XToolPanel >& i_rToolPanel ) :ToolPanelUIElement_Base( m_aMutex ) ,m_xFrame( i_rFrame ) @@ -73,7 +73,7 @@ namespace sd { namespace toolpanel void ToolPanelUIElement::checkDisposed() { if ( !m_xToolPanel.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } //------------------------------------------------------------------------------------------------------------------ @@ -84,7 +84,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) + OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) { UIElementMethodGuard aGuard( *this ); return m_sResourceURL; diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx index ff0dfdaec08c..567344d1101a 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx @@ -44,13 +44,13 @@ namespace sd { namespace toolpanel public: ToolPanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const ::rtl::OUString& i_rResourceURL, + const OUString& i_rResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >& i_rToolPanel ); // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw (::com::sun::star::uno::RuntimeException); @@ -65,7 +65,7 @@ namespace sd { namespace toolpanel private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - const ::rtl::OUString m_sResourceURL; + const OUString m_sResourceURL; const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; }; diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 08e8e7b2a9fb..1d43547aac01 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -118,7 +118,7 @@ namespace sd { namespace toolpanel { // = misc helper // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown ) +PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown ) { PanelId ePanelId( PID_UNKNOWN ); @@ -152,7 +152,7 @@ PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, cons } // --------------------------------------------------------------------------------------------------------------------- -PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) +PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ) { return GetStandardPanelId( i_rTaskPanelResourceURL, false ); } @@ -184,7 +184,7 @@ protected: void impl_checkDisposed_throw() { if ( !m_pShellImpl ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } private: @@ -218,13 +218,13 @@ public: /** activates the panel which has the given resource URL */ - void ActivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); + void ActivatePanelByResource( const OUString& i_rPanelResourceURL ); /** de-activates the panel given by its resource URL, bypassing the configuration controller If the panel is not active currently, nothing happens. */ - void DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); + void DeactivatePanelByResource( const OUString& i_rPanelResourceURL ); /** provides access to the VCL window of the panel deck */ @@ -248,12 +248,12 @@ private: virtual void Dying(); // IToolPanelCompare overridables - virtual short compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const; + virtual short compareToolPanelsURLs( const OUString& i_rLHS, const OUString& i_rRHS ) const; private: struct InitialPanel { - ::rtl::OUString sPanelResourceURL; + OUString sPanelResourceURL; bool bActivateDirectly; InitialPanel() :sPanelResourceURL() @@ -262,7 +262,7 @@ private: } }; InitialPanel impl_determineInitialPanel(); - ::rtl::OUString impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ); + OUString impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ); private: ToolPanelViewShell& m_rPanelViewShell; @@ -289,7 +289,7 @@ ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellI osl_atomic_increment( &m_refCount ); { - xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() ); + xBroadcaster->addConfigurationChangeListener( this, OUString(), Any() ); } osl_atomic_decrement( &m_refCount ); } @@ -315,7 +315,7 @@ void SAL_CALL ConfigurationListener::notifyConfigurationChange( const Configurat xAnchorId = i_rEvent.ResourceId->getAnchor(); if ( !xAnchorId.is() ) return; - const ::rtl::OUString sAnchorURL( xAnchorId->getResourceURL() ); + const OUString sAnchorURL( xAnchorId->getResourceURL() ); if ( sAnchorURL != FrameworkHelper::msTaskPaneURL ) return; @@ -376,7 +376,7 @@ ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineIni if ( aViewIds.getLength() > 0 ) { - const ::rtl::OUString sResourceURL( aViewIds[0]->getResourceURL() ); + const OUString sResourceURL( aViewIds[0]->getResourceURL() ); PanelId nRequestedPanel = GetStandardPanelId( sResourceURL ); if ( nRequestedPanel != PID_UNKNOWN ) { @@ -434,7 +434,7 @@ void ToolPanelViewShell_Impl::Cleanup() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_rResourceURL ) +void ToolPanelViewShell_Impl::ActivatePanelByResource( const OUString& i_rResourceURL ) { // determine position of the requested panel ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rResourceURL ); @@ -444,7 +444,7 @@ void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_ } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell_Impl::DeactivatePanelByResource( const OUString& i_rPanelResourceURL ) { // determine position of the requested panel ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rPanelResourceURL ); @@ -500,7 +500,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi mpHorizontalRuler.reset(); mpVerticalRuler.reset(); - SetName( rtl::OUString( "ToolPanelViewShell" ) ); + SetName( OUString( "ToolPanelViewShell" ) ); // enforce the creation of the Accessible object here. // In some not-always-to-reproduce situations, creating the accessible on demand only leads to some @@ -672,8 +672,8 @@ namespace struct PanelFactory { ControlFactoryFactory pFactory; - rtl::OString sHelpID; - PanelFactory( const ControlFactoryFactory i_pFactory, const rtl::OString& i_nHelpID ) + OString sHelpID; + PanelFactory( const ControlFactoryFactory i_pFactory, const OString& i_nHelpID ) :pFactory( i_pFactory ) ,sHelpID( i_nHelpID ) { @@ -702,7 +702,7 @@ namespace } //--------------------------------------------------------------------------------------------------------------------- -Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const ::rtl::OUString& i_rPanelResourceURL ) +Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const OUString& i_rPanelResourceURL ) { const PanelId ePanelId( GetStandardPanelId( i_rPanelResourceURL ) ); ENSURE_OR_RETURN( ePanelId != PID_UNKNOWN, "ToolPanelViewShell::CreatePanelUIElement: illegal panel URL!", NULL ); @@ -727,7 +727,7 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell::ActivatePanel( const OUString& i_rPanelResourceURL ) { OSL_ENSURE( i_rPanelResourceURL.indexOf( FrameworkHelper::msTaskPanelURLPrefix ) < 0, "ToolPanelViewShell::ActivatePanel: for drawing-framework-controller panels, please use FrameworkHelper::RequestTaskPanel!" ); @@ -735,7 +735,7 @@ void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceU } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell::DeactivatePanel( const OUString& i_rPanelResourceURL ) { mpImpl->DeactivatePanelByResource( i_rPanelResourceURL ); } @@ -777,15 +777,15 @@ void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ) +OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ) { - ::rtl::OUString sPanelURL; + OUString sPanelURL; if ( !!i_rPanel ) { sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rPanel ); const PanelId ePanelId( GetStandardPanelId( sPanelURL, true ) ); if ( ePanelId == PID_UNKNOWN ) - sPanelURL = ::rtl::OUString(); + sPanelURL = OUString(); } return sPanelURL; } @@ -796,8 +796,8 @@ void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_ // update the configuration controller, since this change in the active panel might have been triggered by means other // than the drawing framework, so it does not yet know about it. - const ::rtl::OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) ); - const ::rtl::OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) ); + const OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) ); + const OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) ); const ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); if ( !sNewPanelURL.isEmpty() ) @@ -842,7 +842,7 @@ void ToolPanelViewShell_Impl::Dying() } // --------------------------------------------------------------------------------------------------------------------- -short ToolPanelViewShell_Impl::compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const +short ToolPanelViewShell_Impl::compareToolPanelsURLs( const OUString& i_rLHS, const OUString& i_rRHS ) const { const PanelId eLHS( GetStandardPanelId( i_rLHS, true ) ); const PanelId eRHS( GetStandardPanelId( i_rRHS, true ) ); diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx index 5ec1a0d1a17f..fe6ca42c2a5d 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx @@ -89,7 +89,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( mrViewShell(rViewShell), mpSortedMasterPages(new SortedMasterPageDescriptorList()) { - SetName (rtl::OUString("AllMasterPagesSelector")); + SetName (OUString("AllMasterPagesSelector")); MasterPagesSelector::Fill(); } diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index f688f783327b..4d901cf91f7a 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -51,7 +51,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( const ::boost::shared_ptr<MasterPageContainer>& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName(rtl::OUString("CurrentMasterPagesSelector")); + SetName(OUString("CurrentMasterPagesSelector")); // For this master page selector only we change the default action for // left clicks. diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 58f8a525891b..25842f015b56 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -513,7 +513,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( SdPage* pMasterPageInDocument = NULL; // Search for a master page with the same name as the given one in // the target document. - const rtl::OUString sMasterPageLayoutName (pMasterPage->GetLayoutName()); + const OUString sMasterPageLayoutName (pMasterPage->GetLayoutName()); for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) { SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex)); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index f5bd19d90e52..1a59444fe92d 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -995,7 +995,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) ::comphelper::getProcessComponentContext() ); // Create a new model. - ::rtl::OUString sModelServiceName ( "com.sun.star.presentation.PresentationDocument"); + OUString sModelServiceName ( "com.sun.star.presentation.PresentationDocument"); mxModel = uno::Reference<frame::XModel>( ::comphelper::getProcessServiceFactory()->createInstance( sModelServiceName), diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index 68939582bb6a..7c5636f31301 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -163,7 +163,7 @@ private: /** Retrieve the preview of the document specified by the given URL. */ - static BitmapEx LoadPreviewFromURL (const ::rtl::OUString& aURL); + static BitmapEx LoadPreviewFromURL (const OUString& aURL); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 7bc2713abaad..a476219297a3 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -64,7 +64,7 @@ Image PagePreviewProvider::operator () ( aPreview = rRenderer.RenderPage( pPage, nWidth, - rtl::OUString(), + OUString(), false); } @@ -92,7 +92,7 @@ bool PagePreviewProvider::NeedsPageObject (void) //===== TemplatePreviewProvider =============================================== -TemplatePreviewProvider::TemplatePreviewProvider (const ::rtl::OUString& rsURL) +TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL) : msURL(rsURL) { } @@ -146,9 +146,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access Thumbnail/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -176,9 +176,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access Thumbnails/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -186,9 +186,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access tuhmbnail of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -229,7 +229,7 @@ bool TemplatePreviewProvider::NeedsPageObject (void) //===== TemplatePageObjectProvider ============================================= -TemplatePageObjectProvider::TemplatePageObjectProvider (const ::rtl::OUString& rsURL) +TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL) : msURL(rsURL), mxDocumentShell() { @@ -277,7 +277,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume -::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const ::rtl::OUString& sFileName) +::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const OUString& sFileName) { SfxApplication* pSfxApp = SFX_APP(); SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool()); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 8d09ff838c87..dfe4785357f7 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -124,15 +124,15 @@ private: class TemplatePageObjectProvider : public PageObjectProvider { public: - TemplatePageObjectProvider (const ::rtl::OUString& rsURL); + TemplatePageObjectProvider (const OUString& rsURL); virtual ~TemplatePageObjectProvider (void) {}; virtual SdPage* operator () (SdDrawDocument* pDocument); virtual int GetCostIndex (void); virtual bool operator== (const PageObjectProvider& rProvider); private: - ::rtl::OUString msURL; + OUString msURL; SfxObjectShellLock mxDocumentShell; - ::sd::DrawDocShell* LoadDocument (const ::rtl::OUString& sFileName); + ::sd::DrawDocShell* LoadDocument (const OUString& sFileName); }; @@ -144,13 +144,13 @@ private: class TemplatePreviewProvider : public PreviewProvider { public: - TemplatePreviewProvider (const ::rtl::OUString& rsURL); + TemplatePreviewProvider (const OUString& rsURL); virtual ~TemplatePreviewProvider (void) {}; virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); virtual int GetCostIndex (void); virtual bool NeedsPageObject (void); private: - ::rtl::OUString msURL; + OUString msURL; }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 692cdd27b8ae..d2fc2ccca2cb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -308,7 +308,7 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati //===== URLComparator ========================================================= -MasterPageDescriptor::URLComparator::URLComparator (const ::rtl::OUString& sURL) +MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL) : msURL(sURL) { } @@ -330,7 +330,7 @@ bool MasterPageDescriptor::URLComparator::operator() ( // ===== StyleNameComparator ================================================== -MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName) +MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& sStyleName) : msStyleName(sStyleName) { } diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 0896a093537e..5627b53c7e61 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -151,15 +151,15 @@ public: /** The URL is not empty for master pages loaded from a template document. */ - ::rtl::OUString msURL; + OUString msURL; /** Taken from the title of the template file. */ - ::rtl::OUString msPageName; + OUString msPageName; /** Taken from the master page object. */ - ::rtl::OUString msStyleName; + OUString msStyleName; const bool mbIsPrecious; @@ -203,13 +203,13 @@ public: sal_Int32 mnUseCount; class URLComparator { public: - ::rtl::OUString msURL; - URLComparator (const ::rtl::OUString& sURL); + OUString msURL; + URLComparator (const OUString& sURL); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; class StyleNameComparator { public: - ::rtl::OUString msStyleName; - StyleNameComparator (const ::rtl::OUString& sStyleName); + OUString msStyleName; + StyleNameComparator (const OUString& sStyleName); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; class PageObjectComparator { public: diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 1eb94c9db5a2..a8d9caf50b61 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -326,7 +326,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( aCurrentMasterPages.insert (pMasterPage->GetName()); OSL_TRACE("currently used master page %d is %s", nIndex, - ::rtl::OUStringToOString(pMasterPage->GetName(), + OUStringToOString(pMasterPage->GetName(), RTL_TEXTENCODING_UTF8).getStr()); } @@ -346,7 +346,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( ++J) OSL_TRACE("old used master page %d is %s", i++, - ::rtl::OUStringToOString(*J, + OUStringToOString(*J, RTL_TEXTENCODING_UTF8).getStr()); // Send events about the newly used master pages. @@ -359,7 +359,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( for (I=aNewMasterPages.begin(); I!=aNewMasterPages.end(); ++I) { OSL_TRACE(" added master page %s", - ::rtl::OUStringToOString(*I, + OUStringToOString(*I, RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( @@ -379,7 +379,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( for (I=aRemovedMasterPages.begin(); I!=aRemovedMasterPages.end(); ++I) { OSL_TRACE(" removed master page %s", - ::rtl::OUStringToOString(*I, + OUStringToOString(*I, RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 58fa05f86f49..cc806ca416be 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -743,7 +743,7 @@ void MasterPagesSelector::ClearPageSet (void) -void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) +void MasterPagesSelector::SetHelpId( const OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index c79d7cde1b86..ed1f83a768fb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -110,7 +110,7 @@ public: void ClearPageSet (void); using SfxShell::SetHelpId; - void SetHelpId( const rtl::OString& aId ); + void SetHelpId( const OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index c8472cecab71..e866a636aa75 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -39,7 +39,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( const ::boost::shared_ptr<MasterPageContainer>& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName (rtl::OUString("RecentMasterPagesSelector")); + SetName (OUString("RecentMasterPagesSelector")); } diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx index 257a246eefde..b471040d4b53 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx @@ -44,7 +44,6 @@ #include <osl/getglobalmutex.hxx> using namespace ::std; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,16 +65,16 @@ static const OUString& GetPathToSetNode (void) class Descriptor { public: - ::rtl::OUString msURL; - ::rtl::OUString msName; + OUString msURL; + OUString msName; ::sd::toolpanel::controls::MasterPageContainer::Token maToken; - Descriptor (const ::rtl::OUString& rsURL, const ::rtl::OUString& rsName) + Descriptor (const OUString& rsURL, const OUString& rsName) : msURL(rsURL), msName(rsName), maToken(::sd::toolpanel::controls::MasterPageContainer::NIL_TOKEN) {} Descriptor (::sd::toolpanel::controls::MasterPageContainer::Token aToken, - const ::rtl::OUString& rsURL, const ::rtl::OUString& rsName) + const OUString& rsURL, const OUString& rsName) : msURL(rsURL), msName(rsName), maToken(aToken) diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index ffe8e5c63317..1f57fed1d5ed 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace tools { @@ -130,8 +129,8 @@ Any ConfigurationAccess::GetConfigurationNode ( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } return Any(); @@ -180,7 +179,7 @@ void ConfigurationAccess::ForAll ( void ConfigurationAccess::FillList( const Reference<container::XNameAccess>& rxContainer, - const ::rtl::OUString& rsArgument, + const OUString& rsArgument, ::std::vector<OUString>& rList) { try diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index a6ccc572b04c..284c452bc64f 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; class SdDrawDocument; @@ -427,7 +426,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { try { - xSet->addPropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); + xSet->addPropertyChangeListener(OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -436,7 +435,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) try { - xSet->addPropertyChangeListener(rtl::OUString(aEditModePropertyName), this); + xSet->addPropertyChangeListener(OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -474,7 +473,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) { try { - xSet->removePropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); + xSet->removePropertyChangeListener(OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -483,7 +482,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) try { - xSet->removePropertyChangeListener(rtl::OUString(aEditModePropertyName), this); + xSet->removePropertyChangeListener(OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 35212dfafb8e..defe3f2b5939 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace tools { @@ -60,7 +59,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (voi void SAL_CALL PropertySet::setPropertyValue ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -104,7 +103,7 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) void SAL_CALL PropertySet::addPropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -126,7 +125,7 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( void SAL_CALL PropertySet::removePropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -157,7 +156,7 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( void SAL_CALL PropertySet::addVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -173,7 +172,7 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( void SAL_CALL PropertySet::removeVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -191,7 +190,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( //----------------------------------------------------------------------------- void PropertySet::CallListeners ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const beans::PropertyChangeEvent& rEvent) { ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator> diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 52bf38fbc890..00833dd2c270 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -37,7 +37,7 @@ namespace sd { namespace tools { SlotStateListener::SlotStateListener ( Link& rCallback, const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider, - const ::rtl::OUString& rSlotName) + const OUString& rSlotName) : SlotStateListenerInterfaceBase(maMutex), maCallback(), mxDispatchProviderWeak(NULL) @@ -84,7 +84,7 @@ void SlotStateListener::ConnectToDispatchProvider ( -void SlotStateListener::ObserveSlot (const ::rtl::OUString& rSlotName) +void SlotStateListener::ObserveSlot (const OUString& rSlotName) { ThrowIfDisposed(); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 22084783bf54..e45f4f1d0119 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -49,7 +49,6 @@ #include <boost/shared_ptr.hpp> using namespace ::std; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -516,7 +515,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() { OSL_FAIL( OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " + - ::rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index b0cfd043a1f5..ec0a54c17b7c 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -44,7 +44,6 @@ #include <vector> -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index e887e8952798..282b080be86b 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -32,7 +32,6 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 6e554e9f7583..f1eb8e4688ad 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -33,7 +33,6 @@ #include "sdpage.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 2711af2e34fe..22777ed698db 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -53,7 +53,6 @@ using namespace ::comphelper; using namespace ::osl; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -83,19 +82,19 @@ namespace sd // 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); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); @@ -115,7 +114,7 @@ namespace sd virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ); private: - bool LoadList( XPropertyListType t, const rtl::OUString &rPath, + bool LoadList( XPropertyListType t, const OUString &rPath, const uno::Reference< embed::XStorage > &xStorage ); void AssignURL( XPropertyListType t, const Any* pValue, bool *pOk, bool *pChanged ); void ExtractURL( XPropertyListType t, Any* pValue ); @@ -226,13 +225,13 @@ DocumentSettings::~DocumentSettings() throw() { } -bool DocumentSettings::LoadList( XPropertyListType t, const rtl::OUString &rInPath, +bool DocumentSettings::LoadList( XPropertyListType t, const OUString &rInPath, const uno::Reference< embed::XStorage > &xStorage ) { SdDrawDocument* pDoc = mpModel->GetDoc(); sal_Int32 nSlash = rInPath.lastIndexOf('/'); - rtl::OUString aPath, aName; + OUString aPath, aName; if (nSlash < -1) aName = rInPath; else { @@ -276,7 +275,7 @@ static struct { { "BitmapTableURL", XBITMAP_LIST } }; -static XPropertyListType getTypeOfName( const rtl::OUString &aName ) +static XPropertyListType getTypeOfName( const OUString &aName ) { for( size_t i = 0; i < SAL_N_ELEMENTS( aURLPropertyNames ); i++ ) { if( aName.equalsAscii( aURLPropertyNames[i].pName ) ) @@ -285,15 +284,15 @@ static XPropertyListType getTypeOfName( const rtl::OUString &aName ) return (XPropertyListType) -1; } -static rtl::OUString getNameOfType( XPropertyListType t ) +static OUString getNameOfType( XPropertyListType t ) { for( size_t i = 0; i < SAL_N_ELEMENTS( aURLPropertyNames ); i++ ) { if( t == aURLPropertyNames[i].t ) - return rtl::OUString( aURLPropertyNames[i].pName, + return OUString( aURLPropertyNames[i].pName, strlen( aURLPropertyNames[i].pName ) - 3, RTL_TEXTENCODING_UTF8 ); } - return rtl::OUString(); + return OUString(); } uno::Sequence<beans::PropertyValue> @@ -310,7 +309,7 @@ uno::Sequence<beans::PropertyValue> aRet[nRet++] = aConfigProps[i]; else { - rtl::OUString aURL; + OUString aURL; aConfigProps[i].Value >>= aURL; LoadList( t, aURL, xStorage ); } @@ -357,14 +356,14 @@ uno::Sequence<beans::PropertyValue> else { // Such specific path construction is grim. - rtl::OUString aValue; + OUString aValue; aRet[i].Value >>= aValue; - rtl::OUStringBuffer aName( getNameOfType( t ) ); - rtl::OUString aResult; + OUStringBuffer aName( getNameOfType( t ) ); + OUString aResult; if( pList->SaveTo( xSubStorage, aName.makeStringAndClear(), &aResult ) ) { - rtl::OUString aRealPath( "Settings/" ); + OUString aRealPath( "Settings/" ); aRealPath += aResult; aRet[i].Value <<= aRealPath; } @@ -382,7 +381,7 @@ uno::Sequence<beans::PropertyValue> } catch (const uno::Exception &e) { (void)e; // fprintf (stderr, "saving etc. exception '%s'\n", -// rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); +// OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } return aRet; diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 5f926805f20b..d3cdfc9b287b 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star; -using ::rtl::OUString; // Forward declarations of the factories. @@ -242,7 +241,7 @@ enum FactoryId SlideLayoutControllerFactoryId, InsertSlideControllerFactoryId, }; -typedef ::boost::unordered_map<OUString, FactoryId, rtl::OUStringHash, comphelper::UStringEqual> FactoryMap; +typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash, comphelper::UStringEqual> FactoryMap; namespace { diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 1844827b1f17..ee3c74b15e4d 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -35,7 +35,6 @@ using ::osl::Mutex; using ::osl::Guard; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index 2c58ef0b801f..adefbdb9b820 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -61,7 +61,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; #endif diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 4f29b0c58cd6..84f102f8a2c3 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -65,9 +65,9 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // 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); // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -85,8 +85,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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); // XComponent virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -114,32 +114,32 @@ private: // intern inline SdCustomShowList* GetCustomShowList() const throw(); - SdCustomShow * getSdCustomShow( const ::rtl::OUString& Name ) const throw(); + SdCustomShow * getSdCustomShow( const OUString& Name ) const throw(); public: SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw(); ~SdXCustomPresentationAccess() 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); // XSingleServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); 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); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::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 ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + 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 OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::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); + 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); // 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); diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index f5a7614d9c25..c33dd80697da 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -32,14 +32,14 @@ using namespace ::com::sun::star; // com.sun.star.comp.Draw.DrawingDocument -::rtl::OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); + return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq( 2 ); + uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocument"; aSeq[1] = "com.sun.star.drawing.DrawingDocumentFactory"; @@ -61,14 +61,14 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( // com.sun.star.comp.Draw.PresentationDocument -::rtl::OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); + return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq( 2 ); + uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory"; aSeq[1] = "com.sun.star.presentation.PresentationDocument"; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 16d37b1253a2..15dfadcde042 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -531,7 +531,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) ) { aLayerName = String(SdResId(STR_LAYER)); - aLayerName += rtl::OUString::valueOf(nLayer); + aLayerName += OUString::valueOf(nLayer); ++nLayer; } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 4f003e6b2b0c..220880255c2e 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -54,25 +54,25 @@ public: // intern SdrLayer* GetSdrLayer() const throw() { return pLayer; } - static String convertToInternalName( const ::rtl::OUString& rName ); - static ::rtl::OUString convertToExternalName( const String& rName ); + static String convertToInternalName( const OUString& rName ); + static OUString convertToExternalName( const String& rName ); // uno helper UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // 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); // ::com::sun::star::beans::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); // ::com::sun::star::container::XChild @@ -125,9 +125,9 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // 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); // XLayerManager virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -140,9 +140,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 32249c19df99..6ff443fc69d9 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -100,7 +100,6 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/util/DateTime.hpp> -using ::rtl::OUString; #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx> @@ -188,7 +187,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { - { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const OUString * >(0)), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, &::getCppuType((const awt::Rectangle*)0), 0, 0}, @@ -198,7 +197,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, &::getBooleanCppuType(), 0, 0}, { MAP_CHAR_LEN("BasicLibraries"), WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN("DialogLibraries"), WID_MODEL_DIALOGLIBS, &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, &::getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, &::getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN("Fonts"), WID_MODEL_FONTS, SEQTYPE(::getCppuType((uno::Sequence<uno::Any>*)0)), beans::PropertyAttribute::READONLY, 0}, { 0,0,0,0,0,0 } @@ -1544,7 +1543,7 @@ sal_Int32 ImplPDFGetBookmarkPage( const String& rBookmark, SdDrawDocument& rDoc sal_Int32 nPage = -1; OSL_TRACE("GotoBookmark %s", - ::rtl::OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); String aBookmark( rBookmark ); @@ -1605,9 +1604,9 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData ) { - const rtl::OUString sGroup ( "com.sun.star.drawing.GroupShape"); - const rtl::OUString sOnClick ( "OnClick" ); - const rtl::OUString sBookmark( "Bookmark" ); + const OUString sGroup ( "com.sun.star.drawing.GroupShape"); + const OUString sOnClick ( "OnClick" ); + const OUString sBookmark( "Bookmark" ); if ( xShape->getShapeType().equals( sGroup ) ) { @@ -1683,7 +1682,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd case presentation::ClickAction_BOOKMARK : case presentation::ClickAction_DOCUMENT : { - rtl::OUString aBookmark; + OUString aBookmark; xShapePropSet->getPropertyValue( sBookmark ) >>= aBookmark; if( !aBookmark.isEmpty() ) { @@ -1989,8 +1988,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // exporting transition effects to pdf if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() ) { - const rtl::OUString sEffect( "Effect" ); - const rtl::OUString sSpeed ( "Speed" ); + const OUString sEffect( "Effect" ); + const OUString sSpeed ( "Speed" ); sal_Int32 nTime = 800; presentation::AnimationSpeed aAs; if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) ) @@ -3036,7 +3035,7 @@ rtl::Reference< SdXImpressDocument > SdXImpressDocument::GetModel( SdDrawDocumen return xRet; } -void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName ) +void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName ) { rtl::Reference< SdXImpressDocument > xModel( SdXImpressDocument::GetModel( pDocument ) ); @@ -3048,7 +3047,7 @@ void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEvent } } -void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName, const uno::Reference< uno::XInterface >& xSource ) +void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const uno::Reference< uno::XInterface >& xSource ) { rtl::Reference< SdXImpressDocument > xModel( SdXImpressDocument::GetModel( pDocument ) ); diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 19bf68f23a68..04522e56dca6 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -68,12 +68,12 @@ public: // XDispatchProvider virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , - const ::rtl::OUString & sTargetFrameName, + const OUString & sTargetFrameName, sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ; // 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); }; #endif diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 73946fc36f37..1b9590be9a1b 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -79,8 +79,6 @@ #endif #endif -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::presentation; @@ -92,7 +90,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::drawing::XShape; extern OUString getPageApiNameFromUiName( const String& rUIName ); -extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName ); +extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); /////////////////////////////////////////////////////////////////////// @@ -478,7 +476,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) return pInfo; } -void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) +void SAL_CALL SdXShape::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) { SolarMutexGuard aGuard; @@ -695,7 +693,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, mpModel->SetModified(); } -::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const ::rtl::OUString& PropertyName ) +::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -864,7 +862,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const throw() return pInfo; } -uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); @@ -1122,21 +1120,21 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::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); + 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); // 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); virtual sal_Bool SAL_CALL hasElements( ) 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); }; // XEventsSupplier diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 37962db8c2e9..46e927fb9a41 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -62,7 +62,7 @@ private: void SetMasterDepend( sal_Bool bDepend ) throw(); SdrObject* GetSdrObject() const throw(); - ::rtl::OUString GetPlaceholderText() const; + OUString GetPlaceholderText() const; com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; @@ -83,17 +83,17 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::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 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); //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 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 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); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index a5c237b05cf0..94aac3c8795d 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -71,8 +71,6 @@ using ::com::sun::star::animations::XAnimationNode; using ::com::sun::star::animations::XAnimationNodeSupplier; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::com::sun::star; @@ -1526,7 +1524,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const } //---------------------------------------------------------------------- -void SdGenericDrawPage::setBookmarkURL( rtl::OUString& rURL ) +void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) { if( SvxFmDrawPage::mpPage ) { diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index e7f37e00c99c..a2b3a489c7f8 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -70,8 +70,8 @@ protected: virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); - rtl::OUString getBookmarkURL() const; - void setBookmarkURL( rtl::OUString& rURL ); + OUString getBookmarkURL() const; + void setBookmarkURL( OUString& rURL ); void SetLftBorder( sal_Int32 nValue ); void SetRgtBorder( sal_Int32 nValue ); @@ -123,25 +123,25 @@ 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 ) 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); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XLinkTargetSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XAnimationNodeSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException); @@ -172,9 +172,9 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdDrawPage ) - static ::rtl::OUString getPageApiName( SdPage* pPage ); - static ::rtl::OUString getPageApiNameFromUiName( const String& rUIName ); - static String getUiNameFromPageApiName( const ::rtl::OUString& rApiName ); + static OUString getPageApiName( SdPage* pPage ); + static OUString getPageApiNameFromUiName( const String& rUIName ); + static String getUiNameFromPageApiName( const OUString& rApiName ); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -186,9 +186,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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); // XMasterPageTarget virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException); @@ -198,8 +198,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) 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); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -243,9 +243,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -259,8 +259,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) 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); // XShapes virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); @@ -288,14 +288,14 @@ public: SdrObject* FindObject( const String& rName ) const 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); // 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); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 9fdc6283c2d3..5ee16950eeb7 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -129,7 +129,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -143,7 +143,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -158,7 +158,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) ) { setPropertyValue( aPropertyName, *pAny ); diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index e60d1c7c5964..851e8a3f59fd 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -47,7 +47,7 @@ protected: SfxItemSet* mpSet; SdrModel* mpDoc; - const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); + const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw(); public: SdUnoPageBackground( SdDrawDocument* pDoc = NULL, const SfxItemSet* pSet = NULL) throw(); ~SdUnoPageBackground() throw(); @@ -60,24 +60,24 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground ) // 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); // 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); }; #endif diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 83fe43a9ccf5..1ce91e46e96a 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -742,7 +742,7 @@ OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString() return maReplaceStr; } -void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const ::rtl::OUString& aReplaceString ) +void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException) { maReplaceStr = aReplaceString; @@ -756,7 +756,7 @@ uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdUnoSearch return mpPropSet->getPropertySetInfo(); } -void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) +void SAL_CALL SdUnoSearchReplaceDescriptor::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) { SolarMutexGuard aGuard; @@ -784,7 +784,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const ::rtl::OUStr throw lang::IllegalArgumentException(); } -uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const ::rtl::OUString& PropertyName ) +uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -811,10 +811,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const ::rtl::O return aAny; } -void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} /* ================================================================= */ diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index b250e8a71eaf..a6533b1898d2 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { @@ -195,7 +194,7 @@ namespace { OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 nCurrentPageIndex) const { sal_Int32 nContent = static_cast<sal_Int32>(mrProperties.getIntValue( "PrintContent", 0 )); - OUString sFullRange = ::rtl::OUStringBuffer() + OUString sFullRange = OUStringBuffer() .append(static_cast<sal_Int32>(1)) .append(static_cast<sal_Unicode>('-')) .append(nPageCount).makeStringAndClear(); @@ -291,8 +290,8 @@ namespace { const Printer* mpPrinter; sal_uLong mnDrawMode; - ::rtl::OUString msTimeDate; - ::rtl::OUString msPageString; + OUString msTimeDate; + OUString msPageString; Size maPrintSize; Size maPageSize; Orientation meOrientation; @@ -343,7 +342,7 @@ namespace { */ void PrintMessage ( Printer& rPrinter, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset) { const Font aOriginalFont (rPrinter.OutputDevice::GetFont()); @@ -397,11 +396,11 @@ namespace { { // load the writer PrinterOptions into the custom tab beans::PropertyValue aOptionsUIFile; - aOptionsUIFile.Name = rtl::OUString("OptionsUIFile"); + aOptionsUIFile.Name = OUString("OptionsUIFile"); if( mbImpress ) - aOptionsUIFile.Value <<= rtl::OUString("modules/simpress/ui/printeroptions.ui"); + aOptionsUIFile.Value <<= OUString("modules/simpress/ui/printeroptions.ui"); else - aOptionsUIFile.Value <<= rtl::OUString("modules/sdraw/ui/printeroptions.ui"); + aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/printeroptions.ui"); maProperties.push_back(aOptionsUIFile); SvtModuleOptions aOpt; @@ -410,7 +409,7 @@ namespace { aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage")); - uno::Sequence< rtl::OUString > aHelpIds, aWidgetIds; + uno::Sequence< OUString > aHelpIds, aWidgetIds; if( mbImpress ) { vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt; @@ -623,7 +622,7 @@ namespace { ); // create a choice for the content to create - rtl::OUString aPrintRangeName( "PrintContent" ); + OUString aPrintRangeName( "PrintContent" ); aHelpIds.realloc( 3 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ; @@ -656,22 +655,22 @@ namespace { maProperties.push_back( aVal ); } - Sequence<rtl::OUString> CreateChoice (const sal_uInt16 nResourceId) const + Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) const { SdResId aResourceId (nResourceId); ResStringArray aChoiceStrings (aResourceId); const sal_uInt32 nCount (aChoiceStrings.Count()); - Sequence<rtl::OUString> aChoices (nCount); + Sequence<OUString> aChoices (nCount); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) aChoices[nIndex] = aChoiceStrings.GetString(nIndex); return aChoices; } - Sequence<rtl::OUString> GetSlidesPerPageSequence() + Sequence<OUString> GetSlidesPerPageSequence() { - const Sequence<rtl::OUString> aChoice ( + const Sequence<OUString> aChoice ( CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); maSlidesPerPage.clear(); maSlidesPerPage.push_back(0); // first is using the default @@ -702,7 +701,7 @@ namespace { const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -737,7 +736,7 @@ namespace { const PageKind mePageKind; const MapMode maMap; const bool mbPrintMarkedOnly; - const ::rtl::OUString msPageString; + const OUString msPageString; const Point maPageStringOffset; const sal_uLong mnDrawMode; const Orientation meOrientation; @@ -758,7 +757,7 @@ namespace { const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -815,7 +814,7 @@ namespace { const PageKind ePageKind, const sal_Int32 nGap, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -975,7 +974,7 @@ namespace { const sal_uInt16 nHandoutPageIndex, const ::std::vector<sal_uInt16>& rPageIndices, const MapMode& rMapMode, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -999,7 +998,7 @@ namespace { SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT)); Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); - const rtl::OUString sPageNumber( "Number" ); + const OUString sPageNumber( "Number" ); // Collect the page objects of the handout master. std::vector<SdrPageObj*> aHandoutPageObjects; @@ -1120,7 +1119,7 @@ namespace { OutlinerPrinterPage ( OutlinerParaObject* pParaObject, const MapMode& rMapMode, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -1499,7 +1498,7 @@ private: if (mpOptions->IsDate()) { aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date( Date::SYSTEM ) ); - aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' '); + aInfo.msTimeDate += OUString((sal_Unicode)' '); } if (mpOptions->IsTime()) @@ -2006,7 +2005,7 @@ private: if (mpOptions->IsPrintPageName()) { rInfo.msPageString = pPage->GetName(); - rInfo.msPageString += rtl::OUString(sal_Unicode(' ')); + rInfo.msPageString += OUString(sal_Unicode(' ')); } else rInfo.msPageString = ""; diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 466c09b49608..aed500bef3c6 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -84,7 +84,7 @@ GraphicObjectBar::GraphicObjectBar ( SetUndoManager( pDocShell->GetUndoManager() ); SetRepeatTarget( mpView ); SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR ); - SetName( rtl::OUString( "Graphic objectbar" )); + SetName( OUString( "Graphic objectbar" )); } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 508a1b63f3a8..ccead8452eb9 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -68,7 +68,6 @@ #include <svx/svxids.hrc> #include <editeng/editerr.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1263,7 +1262,7 @@ void Outliner::SetViewMode (PageKind ePageKind) pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False); SetStatusEventHdl(Link()); - ::rtl::OUString sViewURL; + OUString sViewURL; switch (ePageKind) { case PK_STANDARD: diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index cc0e64655040..bb427ce30c74 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -67,7 +67,7 @@ private: }; -typedef ::std::vector<rtl::OUString> NameList; +typedef ::std::vector<OUString> NameList; /** Store a list of tool bars for each of the tool bar groups. From this the list of requested tool bars is built. @@ -78,14 +78,14 @@ public: ToolBarList (void); void ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup); - void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName); - bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName); + void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); + bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); void GetToolBarsToActivate (NameList& rToolBars) const; void GetToolBarsToDeactivate (NameList& rToolBars) const; - void MarkToolBarAsActive (const ::rtl::OUString& rsName); - void MarkToolBarAsNotActive (const ::rtl::OUString& rsName); + void MarkToolBarAsActive (const OUString& rsName); + void MarkToolBarAsNotActive (const OUString& rsName); void MarkAllToolBarsAsNotActive (void); private: @@ -263,9 +263,9 @@ public: void ResetToolBars (ToolBarGroup eGroup); void ResetAllToolBars (void); - void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); + void AddToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); - void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); + void RemoveToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); /** Release all tool bar shells and the associated framework tool bars. Typically called when the main view shell is being replaced by @@ -309,7 +309,7 @@ public: ToolBarRules& GetToolBarRules (void); private: - const static ::rtl::OUString msToolBarResourcePrefix; + const static OUString msToolBarResourcePrefix; mutable ::osl::Mutex maMutex; ViewShellBase& mrBase; @@ -335,8 +335,8 @@ private: sal_uLong mnPendingSetValidCall; ToolBarRules maToolBarRules; - ::rtl::OUString GetToolBarResourceName (const ::rtl::OUString& rsBaseName) const; - bool CheckPlugInMode (const ::rtl::OUString& rsName) const; + OUString GetToolBarResourceName (const OUString& rsBaseName) const; + bool CheckPlugInMode (const OUString& rsName) const; DECL_LINK(UpdateCallback, void *); DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*); @@ -347,21 +347,21 @@ private: //===== ToolBarManager ======================================================== -const ::rtl::OUString ToolBarManager::msToolBar("toolbar"); -const ::rtl::OUString ToolBarManager::msOptionsToolBar("optionsbar"); -const ::rtl::OUString ToolBarManager::msCommonTaskToolBar("commontaskbar"); -const ::rtl::OUString ToolBarManager::msViewerToolBar("viewerbar"); -const ::rtl::OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar"); -const ::rtl::OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar"); -const ::rtl::OUString ToolBarManager::msOutlineToolBar("outlinetoolbar"); -const ::rtl::OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar"); -const ::rtl::OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar"); -const ::rtl::OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar"); -const ::rtl::OUString ToolBarManager::msTextObjectBar("textobjectbar"); -const ::rtl::OUString ToolBarManager::msBezierObjectBar("bezierobjectbar"); -const ::rtl::OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar"); -const ::rtl::OUString ToolBarManager::msMediaObjectBar("mediaobjectbar"); -const ::rtl::OUString ToolBarManager::msTableObjectBar("tableobjectbar"); +const OUString ToolBarManager::msToolBar("toolbar"); +const OUString ToolBarManager::msOptionsToolBar("optionsbar"); +const OUString ToolBarManager::msCommonTaskToolBar("commontaskbar"); +const OUString ToolBarManager::msViewerToolBar("viewerbar"); +const OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar"); +const OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar"); +const OUString ToolBarManager::msOutlineToolBar("outlinetoolbar"); +const OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar"); +const OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar"); +const OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar"); +const OUString ToolBarManager::msTextObjectBar("textobjectbar"); +const OUString ToolBarManager::msBezierObjectBar("bezierobjectbar"); +const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar"); +const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar"); +const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); ::boost::shared_ptr<ToolBarManager> ToolBarManager::Create ( @@ -428,7 +428,7 @@ void ToolBarManager::ResetAllToolBars (void) void ToolBarManager::AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -456,7 +456,7 @@ void ToolBarManager::AddToolBarShell ( void ToolBarManager::RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -470,7 +470,7 @@ void ToolBarManager::RemoveToolBar ( void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -585,7 +585,7 @@ void ToolBarManager::ToolBarsDestroyed(void) //===== ToolBarManager::Implementation ======================================= -const ::rtl::OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/"); +const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/"); ToolBarManager::Implementation::Implementation ( ViewShellBase& rBase, @@ -705,7 +705,7 @@ void ToolBarManager::Implementation::ResetAllToolBars (void) void ToolBarManager::Implementation::AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { ::osl::MutexGuard aGuard(maMutex); @@ -724,7 +724,7 @@ void ToolBarManager::Implementation::AddToolBar ( void ToolBarManager::Implementation::RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { ::osl::MutexGuard aGuard(maMutex); @@ -796,9 +796,9 @@ void ToolBarManager::Implementation::PreUpdate (void) NameList::const_iterator iToolBar; for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) { - ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar)); + OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " << - ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); mxLayouter->destroyElement(sFullName); maToolBarList.MarkToolBarAsNotActive(*iToolBar); } @@ -830,9 +830,9 @@ void ToolBarManager::Implementation::PostUpdate (void) NameList::const_iterator iToolBar; for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) { - ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar)); + OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " << - ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); mxLayouter->requestElement(sFullName); maToolBarList.MarkToolBarAsActive(*iToolBar); } @@ -1029,10 +1029,10 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) -::rtl::OUString ToolBarManager::Implementation::GetToolBarResourceName ( - const ::rtl::OUString& rsBaseName) const +OUString ToolBarManager::Implementation::GetToolBarResourceName ( + const OUString& rsBaseName) const { - ::rtl::OUString sToolBarName (msToolBarResourcePrefix); + OUString sToolBarName (msToolBarResourcePrefix); sToolBarName += rsBaseName; return sToolBarName; } @@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) -bool ToolBarManager::Implementation::CheckPlugInMode (const ::rtl::OUString& rsName) const +bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) const { bool bValid (false); @@ -1400,7 +1400,7 @@ void ToolBarList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) void ToolBarList::AddToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, - const ::rtl::OUString& rsName) + const OUString& rsName) { Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup == maGroups.end()) @@ -1422,7 +1422,7 @@ void ToolBarList::AddToolBar ( bool ToolBarList::RemoveToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, - const ::rtl::OUString& rsName) + const OUString& rsName) { Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup != maGroups.end()) @@ -1496,7 +1496,7 @@ void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const -void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName) +void ToolBarList::MarkToolBarAsActive (const OUString& rsName) { maActiveToolBars.push_back(rsName); } @@ -1504,7 +1504,7 @@ void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName) -void ToolBarList::MarkToolBarAsNotActive (const ::rtl::OUString& rsName) +void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName) { maActiveToolBars.erase( ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName)); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 1f3597a3267a..867fa2a8bc68 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -74,7 +74,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) { do { - const std::vector<rtl::OUString> &rBookmarks = rTransferable.GetPageBookmarks(); + const std::vector<OUString> &rBookmarks = rTransferable.GetPageBookmarks(); if (rBookmarks.empty()) break; @@ -87,7 +87,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) if (pDocument == NULL) break; - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter ) { String sName (*pIter); @@ -207,7 +207,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); // Prepare the insertion. - const std::vector<rtl::OUString> *pBookmarkList = NULL; + const std::vector<OUString> *pBookmarkList = NULL; DrawDocShell* pDataDocSh; if (rTransferable.HasPageBookmarks()) { @@ -238,7 +238,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( pWin->LeaveWait(); rDoc.InsertBookmarkAsPage( - pBookmarkList ? *pBookmarkList : std::vector<rtl::OUString>(), + pBookmarkList ? *pBookmarkList : std::vector<OUString>(), NULL, sal_False, sal_False, diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 0cd5c67b7902..37c39bec67e1 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -87,7 +87,6 @@ using namespace sd; #include "sdslots.hxx" using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::frame; using namespace com::sun::star::container; @@ -177,8 +176,8 @@ public: */ void SetPaneVisibility ( const SfxRequest& rRequest, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL); + const OUString& rsPaneURL, + const OUString& rsViewURL); void GetSlotState (SfxItemSet& rSet); @@ -301,7 +300,7 @@ ViewShellBase::~ViewShellBase (void) -void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView) +void ViewShellBase::LateInit (const OUString& rsDefaultView) { StartListening(*GetViewFrame(),sal_True); StartListening(*GetDocShell(),sal_True); @@ -781,7 +780,7 @@ void ViewShellBase::ReadUserDataSequence ( case ViewShell::ST_NOTES: case ViewShell::ST_HANDOUT: { - ::rtl::OUString sViewURL; + OUString sViewURL; switch (PTR_CAST(DrawViewShell, pShell)->GetPageKind()) { default: @@ -1116,9 +1115,9 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB } -::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL ) +OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ) { - ::rtl::OUString aLabel; + OUString aLabel; if ( !aCmdURL.isEmpty() ) try { @@ -1128,7 +1127,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB Reference< XModuleManager2 > xModuleManager( ModuleManager::create(xContext) ); Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW ); - ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); + OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); if( !aModuleIdentifier.isEmpty() ) { @@ -1156,7 +1155,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB return aLabel; } -::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const +OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) const { Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); return ImplRetrieveLabelFromCommand( xFrame, aCmdURL ); @@ -1295,8 +1294,8 @@ void ViewShellBase::Implementation::ResizePixel ( void ViewShellBase::Implementation::SetPaneVisibility ( const SfxRequest& rRequest, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL) + const OUString& rsPaneURL, + const OUString& rsViewURL) { try { @@ -1587,7 +1586,7 @@ void CurrentPageSetter::operator() (bool) // Switch to the page last edited by setting the CurrentPage // property. Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW); - xSet->setPropertyValue (rtl::OUString("CurrentPage"), aPage); + xSet->setPropertyValue (OUString("CurrentPage"), aPage); } catch (const RuntimeException&) { diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 2df51ea80499..109da58163c0 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1304,7 +1304,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) if (*iEntry != NULL) SAL_INFO("sd.view", OSL_THIS_FUNC << ": " << *iEntry << " : " << - ::rtl::OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); else SAL_INFO("sd.view", OSL_THIS_FUNC << " null"); } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 167f2f752122..ae0891d90b4c 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; using ::sd::tools::EventMultiplexerEvent; -using ::rtl::OUString; namespace sd { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index bd12b3c987be..25eb71a565df 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -117,7 +117,7 @@ TextObjectBar::TextObjectBar ( } } - SetName( rtl::OUString( "TextObjectBar" )); + SetName( OUString( "TextObjectBar" )); // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR ); } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index e74f82c81413..c69c2efae8a2 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -232,9 +232,9 @@ void DrawViewShell::SelectionHasChanged (void) catch( ::com::sun::star::uno::Exception& ) { OSL_FAIL( - OString(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), " + OString(OString("sd::DrawViewShell::SelectionHasChanged(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 77a1c2acdcf2..d9cee3c2af1f 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -401,7 +401,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (pBookmark) { - rtl::OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET)); + OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET)); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if(xSlideshow.is() && xSlideshow->isRunning()) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 64100504a41f..d3651b09568e 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -80,7 +80,6 @@ #include "fubullet.hxx" #include "fuformatpaintbrush.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index b75289e456d3..840979562272 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -352,7 +352,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mbIsRulerDrag = sal_False; - rtl::OUString aName( "DrawViewShell" ); + OUString aName( "DrawViewShell" ); SetName (aName); mnLockCount = 0UL; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 969ac97cf826..02d9cbecc531 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -94,7 +94,6 @@ #include "Window.hxx" #include "fuformatpaintbrush.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index aa5ced7823f0..3e1a3af3dad1 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -58,7 +58,6 @@ #include "cfgids.hxx" #include "anminfo.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; namespace sd { diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index cc563af5f3f7..5e7a88b59a3a 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::std; -using ::rtl::OUString; namespace sd { @@ -94,7 +93,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { nSdViewShellCount++; - ::rtl::OUString sViewURL; + OUString sViewURL; Reference<drawing::framework::XView> xView ( framework::FrameworkHelper::Instance(*pBase)->GetView( drawing::framework::ResourceId::create( @@ -390,7 +389,7 @@ EditMode FrameView::GetViewShEditModeOnLoad (void) const static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) { - ::rtl::OUStringBuffer aLines; + OUStringBuffer aLines; const sal_uInt16 nCount = rHelpLines.GetCount(); for( sal_uInt16 nHlpLine = 0; nHlpLine < nCount; nHlpLine++ ) @@ -510,11 +509,11 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: } #undef addValue -static void createHelpLinesFromString( const rtl::OUString& rLines, SdrHelpLineList& rHelpLines ) +static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& rHelpLines ) { const sal_Unicode * pStr = rLines.getStr(); SdrHelpLine aNewHelpLine; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; while( *pStr ) { @@ -583,7 +582,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : sal_Bool bBool = sal_False; sal_Int32 nInt32 = 0; sal_Int16 nInt16 = 0; - rtl::OUString aString; + OUString aString; sal_Int32 aSnapGridWidthXNum = GetSnapGridWidthX().GetNumerator(); sal_Int32 aSnapGridWidthXDom = GetSnapGridWidthX().GetDenominator(); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1da13815f082..595886d3b07d 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -84,7 +84,6 @@ #include "DrawController.hxx" #include "framework/FrameworkHelper.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 9758fc94f57e..25c6ff0d8a1e 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -70,7 +70,6 @@ #include "undo/undomanager.hxx" #include "stlsheet.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 2bc148a4c1c9..a2a467cc4622 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -56,7 +56,6 @@ using namespace sd; #include "sdslots.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 3d804aed035f..eece2095344e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -757,7 +757,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) ) { // insert as clip action => jump - rtl::OUString aBookmark( aINetBookmark.GetURL() ); + OUString aBookmark( aINetBookmark.GetURL() ); SdAnimationInfo* pInfo = mrDoc.GetAnimationInfo( pPickObj ); sal_Bool bCreated = sal_False; @@ -841,20 +841,20 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv if( pPageObjsTransferable && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) { Point aPos; - rtl::OUString aBookmark; + OUString aBookmark; SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); sal_uInt16 nPgPos = 0xFFFF; if( pSdNavigatorDropEvent->mpTargetWindow ) aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel ); - const rtl::OUString aURL( aINetBookmark.GetURL() ); + const OUString aURL( aINetBookmark.GetURL() ); sal_Int32 nIndex = aURL.indexOf( (sal_Unicode)'#' ); if( nIndex != -1 ) aBookmark = aURL.copy( nIndex+1 ); - std::vector<rtl::OUString> aExchangeList; - std::vector<rtl::OUString> aBookmarkList(1,aBookmark); + std::vector<OUString> aExchangeList; + std::vector<OUString> aBookmarkList(1,aBookmark); if( !pPage->IsMasterPage() ) { @@ -889,8 +889,8 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv return 0; } -bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList, - std::vector<rtl::OUString> &rBookmarkList, +bool View::GetExchangeList (std::vector<OUString> &rExchangeList, + std::vector<OUString> &rBookmarkList, const sal_uInt16 nType) { assert(rExchangeList.empty()); @@ -898,7 +898,7 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList, bool bListIdentical = true; ///< Bookmark list and exchange list are identical bool bNameOK = true; ///< name is unique - std::vector<rtl::OUString>::const_iterator pIter; + std::vector<OUString>::const_iterator pIter; for ( pIter = rBookmarkList.begin(); bNameOK && pIter != rBookmarkList.end(); ++pIter ) { String aNewName = *pIter; @@ -910,8 +910,8 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList, { if( mrDoc.GetObj( aNewName ) ) { - rtl::OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP)); - rtl::OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); + OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP)); + OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxNameDialog* pDlg = 0; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 7d6bf5e696c9..cc201163496d 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -328,7 +328,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { xStm->Seek( 0 ); - rtl::OString aLine; + OString aLine; while (xStm->ReadLine(aLine)) { sal_Int32 x = aLine.indexOf( "\\trowd" ); @@ -785,7 +785,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ) ) { - ::rtl::OUString aOUString; + OUString aOUString; if( aDataHelper.GetString( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE, aOUString ) ) { @@ -867,7 +867,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer().InsertEmbeddedObject( xStm, aName ); if ( xObj.is() ) { @@ -995,7 +995,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aName; + OUString aName; if ( aDataHelper.GetInputStream( nFormat ? nFormat : SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, xStm ) || aDataHelper.GetInputStream( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, xStm ) ) @@ -1402,7 +1402,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, !aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && !aDataHelper.HasFormat( SOT_FORMATSTR_ID_FILENAME ) ) ) { - ::rtl::OUString aOUString; + OUString aOUString; if( aDataHelper.GetString( FORMAT_STRING, aOUString ) ) { diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index a58b387b141d..075cf79074be 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -261,11 +261,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, // ----------------------------------------------------------------------------- -SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, +SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ) { - ::rtl::OUString realURL; + OUString realURL; if (bLink) { realURL = rMediaURL; @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( pFoundFilter && !nErr ) { - ::std::vector< ::rtl::OUString > aFilterVector; + ::std::vector< OUString > aFilterVector; const String aFilterName( pFoundFilter->GetFilterName() ); String aLowerAsciiFileName( aCurrentDropFile ); aLowerAsciiFileName.ToLowerAscii(); @@ -466,10 +466,10 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) try { //TODO/MBA: testing - ::rtl::OUString aName; + OUString aName; uno::Sequence < beans::PropertyValue > aMedium(1); aMedium[0].Name = "URL" ; - aMedium[0].Value <<= ::rtl::OUString(aCurrentDropFile) ; + aMedium[0].Value <<= OUString(aCurrentDropFile) ; uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer(). InsertEmbeddedObject( aMedium, aName ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 4967cfea64de..d02f9c1703bd 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -1040,16 +1040,16 @@ void Window::DropScroll(const Point& rMousePos) } } -rtl::OUString Window::GetSurroundingText() const +OUString Window::GetSurroundingText() const { if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) - return rtl::OUString(); + return OUString(); else if ( mpViewShell->GetView()->IsTextEdit() ) { OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); return pOLV->GetEditView().GetSurroundingText(); } - return rtl::OUString(); + return OUString(); } Selection Window::GetSurroundingTextSelection() const diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 08a97b4dd490..068c28483277 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -169,7 +169,7 @@ ModifyPageUndoAction::~ModifyPageUndoAction() } -rtl::OUString ModifyPageUndoAction::GetComment() const +OUString ModifyPageUndoAction::GetComment() const { return maComment; } @@ -205,7 +205,7 @@ void RenameLayoutTemplateUndoAction::Redo() mpDoc->RenameLayoutTemplate( aLayoutName, maNewName ); } -rtl::OUString RenameLayoutTemplateUndoAction::GetComment() const +OUString RenameLayoutTemplateUndoAction::GetComment() const { return maComment; } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 0a9c9de0011a..e834999a5350 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -56,7 +56,6 @@ #include "drawdoc.hxx" #include "smarttag.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -190,7 +189,7 @@ void ImageButtonHdl::HideTip() // -------------------------------------------------------------------- -extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); +extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 69cc2be872a2..6f88cf1b73d6 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -741,14 +741,14 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); bool bChangeDefaultsForChart = false; - rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); if ( !xObj.is() ) { // provide OLE object to empty OLE object aName = pObj->GetProgName(); - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aClass; if( aName == "StarChart" || aName == "StarOrg" ) @@ -995,8 +995,8 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < sal_uInt16 nViewID (IMPRESS_FACTORY_ID); if (GetViewShellBase().GetMainViewShell().get() != NULL) nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId(); - rSequence[nIndex].Name = rtl::OUString( sUNO_View_ViewId ); - rtl::OUStringBuffer sBuffer( "view" ); + rSequence[nIndex].Name = OUString( sUNO_View_ViewId ); + OUStringBuffer sBuffer( "view" ); sBuffer.append( static_cast<sal_Int32>(nViewID)); rSequence[nIndex].Value <<= sBuffer.makeStringAndClear(); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 224e7e52acce..2b1060998376 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -208,7 +208,7 @@ void ViewShell::construct(void) mpScrollBarBox.reset(new ScrollBarBox(GetParentWindow(), WB_SIZEABLE)); } - rtl::OUString aName( "ViewShell" ); + OUString aName( "ViewShell" ); SetName (aName); GetDoc()->StartOnlineSpelling(sal_False); diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index 6e09e942699e..ab855a1564e1 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -86,7 +86,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( "window" ); + aWindow.WindowServiceName = OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; @@ -153,7 +153,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.get() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xWindow; } @@ -171,7 +171,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xResourceId; } @@ -180,7 +180,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return sal_False; } |