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 /svl | |
| 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 'svl')
80 files changed, 770 insertions, 774 deletions
diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index 613fca989aa4..7dd741592015 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -44,14 +44,14 @@ public: ~SfxAllEnumItem(); void InsertValue( sal_uInt16 nValue ); - void InsertValue( sal_uInt16 nValue, const rtl::OUString &rText ); + void InsertValue( sal_uInt16 nValue, const OUString &rText ); void RemoveValue( sal_uInt16 nValue ); sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; virtual sal_Bool IsEnabled( sal_uInt16 ) const; diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx index db213c8f16f7..9824a6a7a059 100644 --- a/svl/inc/svl/asiancfg.hxx +++ b/svl/inc/svl/asiancfg.hxx @@ -53,12 +53,12 @@ public: GetStartEndCharLocales() const; bool GetStartEndChars( - com::sun::star::lang::Locale const & locale, rtl::OUString & startChars, - rtl::OUString & endChars) const; + com::sun::star::lang::Locale const & locale, OUString & startChars, + OUString & endChars) const; void SetStartEndChars( com::sun::star::lang::Locale const & locale, - rtl::OUString const * startChars, rtl::OUString const * endChars); + OUString const * startChars, OUString const * endChars); private: struct Impl; diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx index 470c6d6f8cc4..35024c3a6d44 100644 --- a/svl/inc/svl/cenumitm.hxx +++ b/svl/inc/svl/cenumitm.hxx @@ -52,7 +52,7 @@ public: virtual sal_uInt16 GetValueCount() const = 0; - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const; @@ -158,7 +158,7 @@ public: virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const; + virtual OUString GetValueTextByVal(sal_Bool bTheValue) const; sal_Bool GetValue() const { return m_bValue; } diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index d810a1b4752b..581c558b2575 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -31,7 +31,7 @@ class SvStream; class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem { private: - rtl::OUString _aURL; + OUString _aURL; Color _nColor; sal_uInt16 _nStyle; @@ -55,11 +55,11 @@ public: virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - void SetBitmapURL( const rtl::OUString& rURL ) { _aURL = rURL; } + void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } void SetColor( Color nColor ) { _nColor = nColor; } void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; } - const rtl::OUString& GetBitmapURL() const { return _aURL; } + const OUString& GetBitmapURL() const { return _aURL; } Color GetColor() const { return _nColor; } sal_uInt16 GetStyle() const { return _nStyle; } }; diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index f0c105e17200..437b59fbf127 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -39,14 +39,14 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream(); - void WriteEntryToStream( ::com::sun::star::uno::Sequence< ::rtl::OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream ); + void WriteEntryToStream( ::com::sun::star::uno::Sequence< OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream ); public: - DocumentLockFile( const ::rtl::OUString& aOrigURL ); + DocumentLockFile( const OUString& aOrigURL ); ~DocumentLockFile(); sal_Bool CreateOwnLockFile(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetLockData(); + ::com::sun::star::uno::Sequence< OUString > GetLockData(); sal_Bool OverwriteOwnLockFile(); void RemoveFile(); diff --git a/svl/inc/svl/filenotation.hxx b/svl/inc/svl/filenotation.hxx index 91686dedf16c..00c2c16ed77c 100644 --- a/svl/inc/svl/filenotation.hxx +++ b/svl/inc/svl/filenotation.hxx @@ -34,8 +34,8 @@ namespace svt class SVL_DLLPUBLIC OFileNotation { protected: - ::rtl::OUString m_sSystem; - ::rtl::OUString m_sFileURL; + OUString m_sSystem; + OUString m_sFileURL; public: enum NOTATION @@ -44,15 +44,15 @@ namespace svt N_URL }; - OFileNotation( const ::rtl::OUString& _rUrlOrPath ); - OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ); + OFileNotation( const OUString& _rUrlOrPath ); + OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation ); - ::rtl::OUString get(NOTATION _eOutputNotation); + OUString get(NOTATION _eOutputNotation); private: - SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); - SVL_DLLPRIVATE bool implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ); - SVL_DLLPRIVATE bool implInitWithURLNotation( const ::rtl::OUString& _rURL ); + SVL_DLLPRIVATE void construct( const OUString& _rUrlOrPath ); + SVL_DLLPRIVATE bool implInitWithSystemNotation( const OUString& _rSystemPath ); + SVL_DLLPRIVATE bool implInitWithURLNotation( const OUString& _rURL ); }; //......................................................................... diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx index ec92dee4a8d0..9e69c6ed28ec 100644 --- a/svl/inc/svl/fstathelper.hxx +++ b/svl/inc/svl/fstathelper.hxx @@ -39,18 +39,18 @@ namespace FStatHelper { @return it was be able to get the date/time stamp */ -SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const rtl::OUString& rURL, +SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const OUString& rURL, Date* pDate, Time* pTime ); /** Return if under the URL a document exist. This is only a wrapper for the UCB.IsContent. */ -SVL_DLLPUBLIC sal_Bool IsDocument( const rtl::OUString& rURL ); +SVL_DLLPUBLIC sal_Bool IsDocument( const OUString& rURL ); /** Return if under the URL a folder exist. This is only a wrapper for the UCB.isFolder. */ -SVL_DLLPUBLIC sal_Bool IsFolder( const rtl::OUString& rURL ); +SVL_DLLPUBLIC sal_Bool IsFolder( const OUString& rURL ); } diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 3a2c208b654b..48fca19aa5d6 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -256,7 +256,7 @@ public: static INetContentType GetContentType(OUString const & rTypeName); - static rtl::OUString GetContentType(INetContentType eTypeID); + static OUString GetContentType(INetContentType eTypeID); static OUString GetPresentation(INetContentType eTypeID, const LanguageTag& aLocale); diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 8636c2847c7f..ab9ff84d173d 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -129,7 +129,7 @@ protected: public: SfxItemPool( const SfxItemPool &rPool, sal_Bool bCloneStaticDefaults = sal_False ); - SfxItemPool( const rtl::OUString &rName, + SfxItemPool( const OUString &rName, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxItemInfo *pItemInfos, SfxPoolItem **pDefaults = 0, @@ -158,7 +158,7 @@ public: const IntlWrapper * pIntlWrapper = 0 ) const; virtual SfxItemPool* Clone() const; - const rtl::OUString& GetName() const; + const OUString& GetName() const; virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx index 055948bad54e..c1b7ed68b400 100644 --- a/svl/inc/svl/itemprop.hxx +++ b/svl/inc/svl/itemprop.hxx @@ -72,7 +72,7 @@ struct SfxItemPropertySimpleEntry }; struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry { - ::rtl::OUString sName; + OUString sName; SfxItemPropertyNamedEntry( const String& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) : SfxItemPropertySimpleEntry( rSimpleEntry ), sName( rName ){} @@ -88,11 +88,11 @@ public: SfxItemPropertyMap( const SfxItemPropertyMap& rSource ); ~SfxItemPropertyMap(); - const SfxItemPropertySimpleEntry* getByName( const ::rtl::OUString &rName ) const; + const SfxItemPropertySimpleEntry* getByName( const OUString &rName ) const; com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const; - com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const + com::sun::star::beans::Property getPropertyByName( const OUString rName ) const throw( ::com::sun::star::beans::UnknownPropertyException ); - sal_Bool hasPropertyByName( const ::rtl::OUString& rName ) const; + sal_Bool hasPropertyByName( const OUString& rName ) const; void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq ); PropertyEntryVector_t getPropertyEntries() const; @@ -116,13 +116,13 @@ public: const SfxItemSet& rSet, com::sun::star::uno::Any& rAny) const throw(::com::sun::star::uno::RuntimeException); - void getPropertyValue( const ::rtl::OUString &rName, + void getPropertyValue( const OUString &rName, const SfxItemSet& rSet, com::sun::star::uno::Any& rAny) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); com::sun::star::uno::Any - getPropertyValue( const ::rtl::OUString &rName, + getPropertyValue( const OUString &rName, const SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); @@ -131,7 +131,7 @@ public: SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); - void setPropertyValue( const ::rtl::OUString& rPropertyName, + void setPropertyValue( const OUString& rPropertyName, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, @@ -139,7 +139,7 @@ public: ::com::sun::star::beans::UnknownPropertyException); com::sun::star::beans::PropertyState - getPropertyState(const ::rtl::OUString& rName, const SfxItemSet& rSet)const + getPropertyState(const OUString& rName, const SfxItemSet& rSet)const throw(com::sun::star::beans::UnknownPropertyException); com::sun::star::beans::PropertyState getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const @@ -166,12 +166,12 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::Property SAL_CALL - getPropertyByName( const ::rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const ::rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; @@ -190,11 +190,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::Property SAL_CALL - getPropertyByName( const ::rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const ::rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index 6bb0b5ed693a..ef8fb1b4ae5d 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -96,14 +96,14 @@ public: class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem { private: - ::rtl::OUString m_sWin16SystemLocale; + OUString m_sWin16SystemLocale; public: SvtSystemLanguageOptions(); ~SvtSystemLanguageOptions(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); LanguageType GetWin16SystemLanguage(); }; diff --git a/svl/inc/svl/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx index 72b5aab2b04a..c1b4a0160277 100644 --- a/svl/inc/svl/lngmisc.hxx +++ b/svl/inc/svl/lngmisc.hxx @@ -43,12 +43,12 @@ namespace linguistic return cChar < static_cast<sal_Unicode>(' '); } - SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const rtl::OUString &rTxt ); + SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const OUString &rTxt ); - SVL_DLLPUBLIC bool RemoveHyphens(rtl::OUString &rTxt); - SVL_DLLPUBLIC bool RemoveControlChars(rtl::OUString &rTxt); - SVL_DLLPUBLIC bool ReplaceControlChars(rtl::OUString &rTxt); - SVL_DLLPUBLIC ::rtl::OUString GetThesaurusReplaceText(const ::rtl::OUString &rText); + SVL_DLLPUBLIC bool RemoveHyphens(OUString &rTxt); + SVL_DLLPUBLIC bool RemoveControlChars(OUString &rTxt); + SVL_DLLPUBLIC bool ReplaceControlChars(OUString &rTxt); + SVL_DLLPUBLIC OUString GetThesaurusReplaceText(const OUString &rText); } // namespace linguistic #endif diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index bcf0d58088dd..b9f62cd78504 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -45,21 +45,21 @@ class SVL_DLLPUBLIC LockFileCommon { protected: ::osl::Mutex m_aMutex; - ::rtl::OUString m_aURL; + OUString m_aURL; INetURLObject ResolveLinks( const INetURLObject& aDocURL ); public: - LockFileCommon( const ::rtl::OUString& aOrigURL, const ::rtl::OUString& aPrefix ); + LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix ); ~LockFileCommon(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); - static ::rtl::OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); - static ::rtl::OUString EscapeCharacters( const ::rtl::OUString& aSource ); - static ::rtl::OUString GetOOOUserName(); - static ::rtl::OUString GetCurrentLocalTime(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > GenerateOwnEntry(); + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer ); + static ::com::sun::star::uno::Sequence< OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static OUString EscapeCharacters( const OUString& aSource ); + static OUString GetOOOUserName(); + static OUString GetCurrentLocalTime(); + static ::com::sun::star::uno::Sequence< OUString > GenerateOwnEntry(); }; } diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index 8433ddb664a5..9d73f6a3ded3 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -60,25 +60,25 @@ class SjJSbxObject; class SVL_DLLPUBLIC SvxMacro { - ::rtl::OUString aMacName; - ::rtl::OUString aLibName; + OUString aMacName; + OUString aLibName; // Fuer JavaScript muss ein Function-Objekt gehalten werden SjJSbxObjectBase* pFunctionObject; ScriptType eType; public: - SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage); + SvxMacro( const OUString &rMacName, const OUString &rLanguage); - SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName, + SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eType); // = STARBASIC entfernt - SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource ); + SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ); ~SvxMacro(); // noetig fuer pFunctionObject - const ::rtl::OUString &GetLibName() const { return aLibName; } - const ::rtl::OUString &GetMacName() const { return aMacName; } - ::rtl::OUString GetLanguage()const; + const OUString &GetLibName() const { return aLibName; } + const OUString &GetMacName() const { return aMacName; } + OUString GetLanguage()const; ScriptType GetScriptType() const { return eType; } @@ -93,12 +93,12 @@ public: SvxMacro& operator=( const SvxMacro& rBase ); }; -inline SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName, +inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eTyp ) : aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL), eType( eTyp ) {} -inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource ) +inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ) : aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType( JAVASCRIPT ) {} diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 5597f8ff10d6..e4cead159c8b 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -40,17 +40,17 @@ class SvCommand aus: Kommando = Argument. */ { - ::rtl::OUString aCommand; - ::rtl::OUString aArgument; + OUString aCommand; + OUString aArgument; public: SvCommand() {} - SvCommand( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg ) + SvCommand( const OUString & rCommand, const OUString & rArg ) { aCommand = rCommand; aArgument = rArg; } - const ::rtl::OUString & GetCommand() const { return aCommand; } - const ::rtl::OUString & GetArgument() const { return aArgument; } + const OUString & GetCommand() const { return aCommand; } + const OUString & GetArgument() const { return aArgument; } }; typedef ::std::vector< SvCommand > SvCommandList_impl; @@ -68,8 +68,8 @@ private: SvCommandList_impl aCommandList; public: - SvCommand& Append( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg ); - bool AppendCommands( const ::rtl::OUString & rCmd, sal_Int32 * pEaten ); + SvCommand& Append( const OUString & rCommand, const OUString & rArg ); + bool AppendCommands( const OUString & rCmd, sal_Int32 * pEaten ); bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 4e50e1ceb270..2feea5f5ddbd 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -234,7 +234,7 @@ public: @return True if the string was successfuly read and reconstructed. */ - static rtl::OUString readByteString(SvStream & rStream); + static OUString readByteString(SvStream & rStream); /** Write a byte string representation of a Unicode string into a stream. @@ -244,7 +244,7 @@ public: @param rString Some Unicode string. */ static void writeByteString(SvStream & rStream, - const rtl::OUString& rString); + const OUString& rString); /** Read in a Unicode string from either a streamed Unicode or byte string representation. @@ -257,7 +257,7 @@ public: @return On success, returns the reconstructed Unicode string. */ - static rtl::OUString readUnicodeString(SvStream & rStream, bool bUnicode); + static OUString readUnicodeString(SvStream & rStream, bool bUnicode); /** Write a Unicode string representation of a Unicode string into a stream. @@ -267,7 +267,7 @@ public: @param rString Some Unicode string. */ static void writeUnicodeString(SvStream & rStream, - const rtl::OUString& rString); + const OUString& rString); private: SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!! diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index 8ac3abacd969..d2c842d98ebb 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -47,7 +47,7 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > m_aUsersData; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > m_aUsersData; void OpenStream(); void Close(); @@ -59,14 +59,14 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon public: // The constructor will throw exception in case the stream can not be opened - ShareControlFile( const ::rtl::OUString& aOrigURL ); + ShareControlFile( const OUString& aOrigURL ); ~ShareControlFile(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > GetUsersData(); - void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aUserNames ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > InsertOwnEntry(); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > GetUsersData(); + void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aUserNames ); + ::com::sun::star::uno::Sequence< OUString > InsertOwnEntry(); bool HasOwnEntry(); - void RemoveEntry( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); + void RemoveEntry( const ::com::sun::star::uno::Sequence< OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< OUString >() ); void RemoveFile(); }; diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index a374377bfef0..90c873119b80 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -50,8 +50,8 @@ public: virtual void SetString( const XubString& ); virtual XubString GetString(); - void SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ); - void GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const; + void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); + void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx index 739b985278cb..5d4413ea8cab 100644 --- a/svl/inc/svl/srchitem.hxx +++ b/svl/inc/svl/srchitem.hxx @@ -92,7 +92,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); sal_uInt16 GetCommand() const { return nCommand; } diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index e1c1b554ee36..664ca5cb1ec2 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -110,10 +110,10 @@ public: /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ - virtual rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; // sets the display name of this style - virtual void SetDisplayName( const rtl::OUString& ); + virtual void SetDisplayName( const OUString& ); virtual const UniString& GetParent() const; virtual bool SetParent( const UniString& ); @@ -169,7 +169,7 @@ public: virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr); + virtual SfxStyleSheetBase* Find(const OUString& rStr); virtual ~SfxStyleSheetIterator(); protected: @@ -284,7 +284,7 @@ public: protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 - : SfxStyleSheetBase(rtl::OUString("dummy"), + : SfxStyleSheetBase(OUString("dummy"), NULL, SFX_STYLE_FAMILY_ALL, 0) { assert(false); diff --git a/svl/inc/svl/stylepool.hxx b/svl/inc/svl/stylepool.hxx index 172b152fd116..deaed2591a83 100644 --- a/svl/inc/svl/stylepool.hxx +++ b/svl/inc/svl/stylepool.hxx @@ -73,7 +73,7 @@ public: virtual ~StylePool(); - static ::rtl::OUString nameOf( SfxItemSet_Pointer_t pSet ); + static OUString nameOf( SfxItemSet_Pointer_t pSet ); }; class SVL_DLLPUBLIC IStylePoolIteratorAccess @@ -83,7 +83,7 @@ public: If there is no more SfxItemSet, the delivered share_pointer is empty. */ virtual StylePool::SfxItemSet_Pointer_t getNext() = 0; - virtual ::rtl::OUString getName() = 0; + virtual OUString getName() = 0; virtual ~IStylePoolIteratorAccess() {}; }; #endif diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 785c1f4183da..c8a08beffbb9 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -108,7 +108,7 @@ public: virtual ~DdeTransaction(); bool IsBusy() { return bBusy; } - const rtl::OUString GetName() const; + const OUString GetName() const; void Execute(); @@ -258,7 +258,7 @@ public: DdeItem( const DdeItem& ); virtual ~DdeItem(); - const rtl::OUString GetName() const; + const OUString GetName() const; short GetLinks(); void NotifyClient(); }; @@ -294,7 +294,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeItem( const rtl::OUString& rItem ); + virtual sal_Bool MakeItem( const OUString& rItem ); // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert // besagt ob es geklappt hat @@ -308,7 +308,7 @@ private: private: DdeString* pName; - rtl::OUString aItem; + OUString aItem; std::vector<DdeItem*> aItems; Link aConnectLink; Link aDisconnectLink; @@ -317,10 +317,10 @@ private: Link aExecLink; public: - DdeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& ); + DdeTopic( SAL_UNUSED_PARAMETER const OUString& ); virtual ~DdeTopic(); - const rtl::OUString GetName() const; + const OUString GetName() const; long GetConvId(); void SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; } @@ -340,7 +340,7 @@ public: void InsertItem( DdeItem* ); // fuer eigene Ableitungen! DdeItem* AddItem( const DdeItem& ); // werden kopiert ! void RemoveItem( const DdeItem& ); - const rtl::OUString& GetCurItem() { return aItem; } + const OUString& GetCurItem() { return aItem; } const std::vector<DdeItem*>& GetItems() const { return aItems; } private: @@ -360,7 +360,7 @@ public: virtual sal_Bool IsBusy(); virtual String GetHelp(); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeTopic( const rtl::OUString& rItem ); + virtual sal_Bool MakeTopic( const OUString& rItem ); protected: virtual String Topics(); @@ -385,7 +385,7 @@ public: DdeService( SAL_UNUSED_PARAMETER const String& ); virtual ~DdeService(); - const rtl::OUString GetName() const; + const OUString GetName() const; short GetError() { return nStatus; } static DdeServices& GetServices(); diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx index c00d5331472a..321d9cd2ae0b 100644 --- a/svl/inc/svl/urihelper.hxx +++ b/svl/inc/svl/urihelper.hxx @@ -92,7 +92,7 @@ SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference normalizedMakeRelative( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, - rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); + OUString const & baseUriReference, OUString const & uriReference); /** A variant of normalizedMakeRelative with a simplified interface. diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx index a5ad679f8665..adb72d0578e7 100644 --- a/svl/inc/svl/visitem.hxx +++ b/svl/inc/svl/visitem.hxx @@ -75,7 +75,7 @@ public: virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const; + virtual OUString GetValueTextByVal(sal_Bool bTheValue) const; sal_Bool GetValue() const { return m_nValue.bVisible; } diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index dd8e9ff60f50..20cc4d110c24 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -683,7 +683,7 @@ private: { return ImpGetNatNumString( rNum, nVal, nMinDigits ); } - return rtl::OUString::valueOf(nVal); + return OUString::valueOf(nVal); } // transliterate according to NativeNumber diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index d67a2c3b2168..ec88131b9e11 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -60,8 +60,6 @@ #endif using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #if DEBUG_UNIT_TEST using ::std::cout; @@ -73,7 +71,7 @@ namespace { #if DEBUG_UNIT_TEST ::std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } #endif diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 90ca5fa71044..3d160d66bee5 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -79,10 +79,10 @@ public: return m_identifier; } - virtual rtl::OUString SAL_CALL getContentType() + virtual OUString SAL_CALL getContentType() throw (css::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } virtual void SAL_CALL addContentEventListener( @@ -123,7 +123,7 @@ Content::Content( m_identifier(identifier) { assert(m_identifier.is()); - rtl::OUString uri(m_identifier->getContentIdentifier()); + OUString uri(m_identifier->getContentIdentifier()); if (!uri.matchIgnoreAsciiCase(m_prefix) || uri.indexOf('#', RTL_CONSTASCII_LENGTH(m_prefix)) != -1) { @@ -146,10 +146,10 @@ css::uno::Any Content::execute( // otherwise, if the last non-empty segment starts with '1', add a final // slash, and if the last non-empty segment starts with '2', remove a final // slash (if any); also, turn the given uri into all-lowercase: - rtl::OUString uri(m_identifier->getContentIdentifier()); + OUString uri(m_identifier->getContentIdentifier()); sal_Unicode c = '0'; for (sal_Int32 i = RTL_CONSTASCII_LENGTH(m_prefix); i != -1;) { - rtl::OUString seg(uri.getToken(0, '/', i)); + OUString seg(uri.getToken(0, '/', i)); if (seg.getLength() > 0) { c = seg[0]; if (c < '0' || c > '2') { @@ -228,7 +228,7 @@ void Test::finish() { void Test::testNormalizedMakeRelative() { css::ucb::UniversalContentBroker::create(m_context)-> registerContentProvider( - new Provider, rtl::OUString("test"), + new Provider, OUString("test"), true); struct Data { char const * base; @@ -259,14 +259,14 @@ void Test::testNormalizedMakeRelative() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { css::uno::Reference< css::uri::XUriReference > ref( URIHelper::normalizedMakeRelative( - m_context, rtl::OUString::createFromAscii(tests[i].base), - rtl::OUString::createFromAscii(tests[i].absolute))); + m_context, OUString::createFromAscii(tests[i].base), + OUString::createFromAscii(tests[i].absolute))); bool ok = tests[i].relative == 0 ? !ref.is() : ref.is() && ref->getUriReference().equalsAscii(tests[i].relative); - rtl::OString msg; + OString msg; if (!ok) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('<'); buf.append(tests[i].base); buf.append(">, <"); @@ -275,7 +275,7 @@ void Test::testNormalizedMakeRelative() { if (ref.is()) { buf.append('<'); buf.append( - rtl::OUStringToOString( + OUStringToOString( ref->getUriReference(), RTL_TEXTENCODING_UTF8)); buf.append('>'); } else { @@ -386,19 +386,19 @@ void Test::testFindFirstURLInText() { }; CharClass charClass( m_context, LanguageTag( com::sun::star::lang::Locale("en", "US", ""))); for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { - rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input)); + OUString input(OUString::createFromAscii(tests[i].input)); sal_Int32 begin = 0; sal_Int32 end = input.getLength(); - rtl::OUString result( + OUString result( URIHelper::FindFirstURLInText(input, begin, end, charClass)); bool ok = tests[i].result == 0 ? (result.getLength() == 0 && begin == input.getLength() && end == input.getLength()) : (result.equalsAscii(tests[i].result) && begin == tests[i].begin && end == tests[i].end); - rtl::OString msg; + OString msg; if (!ok) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('"'); buf.append(tests[i].input); buf.append("\" -> "); @@ -409,7 +409,7 @@ void Test::testFindFirstURLInText() { buf.append(static_cast< sal_Int32 >(tests[i].end)); buf.append(')'); buf.append(" != "); - buf.append(rtl::OUStringToOString(result, RTL_TEXTENCODING_UTF8)); + buf.append(OUStringToOString(result, RTL_TEXTENCODING_UTF8)); buf.append(" ("); buf.append(static_cast< sal_Int32 >(begin)); buf.append(", "); diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx index febc64b533b8..3381126aff1e 100644 --- a/svl/qa/unit/test_lngmisc.cxx +++ b/svl/qa/unit/test_lngmisc.cxx @@ -58,16 +58,16 @@ namespace void LngMiscTest::testRemoveHyphens() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("a-b--c---"); + OUString str1(""); + OUString str2("a-b--c---"); - ::rtl::OUStringBuffer str3Buf; + OUStringBuffer str3Buf; str3Buf.append(SVT_SOFT_HYPHEN); str3Buf.append(SVT_HARD_HYPHEN); str3Buf.append(SVT_HARD_HYPHEN); - ::rtl::OUString str3(str3Buf.makeStringAndClear()); + OUString str3(str3Buf.makeStringAndClear()); - ::rtl::OUString str4("asdf"); + OUString str4("asdf"); bool bModified = linguistic::RemoveHyphens(str1); CPPUNIT_ASSERT(!bModified); @@ -89,17 +89,17 @@ namespace void LngMiscTest::testRemoveControlChars() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("asdf"); - ::rtl::OUString str3("asdf\nasdf"); + OUString str1(""); + OUString str2("asdf"); + OUString str3("asdf\nasdf"); - ::rtl::OUStringBuffer str4Buf(33); + OUStringBuffer str4Buf(33); str4Buf.setLength(33); for(int i = 0; i < 33; i++) str4Buf[i] = static_cast<sal_Unicode>(i); // TODO: is this a bug? shouldn't RemoveControlChars remove this? // str4Buf[33] = static_cast<sal_Unicode>(0x7F); - ::rtl::OUString str4(str4Buf.makeStringAndClear()); + OUString str4(str4Buf.makeStringAndClear()); bool bModified = linguistic::RemoveControlChars(str1); CPPUNIT_ASSERT(!bModified); @@ -120,17 +120,17 @@ namespace void LngMiscTest::testReplaceControlChars() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("asdf"); - ::rtl::OUString str3("asdf\nasdf"); + OUString str1(""); + OUString str2("asdf"); + OUString str3("asdf\nasdf"); - ::rtl::OUStringBuffer str4Buf(33); + OUStringBuffer str4Buf(33); str4Buf.setLength(33); for(int i = 0; i < 33; i++) str4Buf[i] = static_cast<sal_Unicode>(i); // TODO: is this a bug? shouldn't RemoveControlChars remove this? // str4Buf[33] = static_cast<sal_Unicode>(0x7F); - ::rtl::OUString str4(str4Buf.makeStringAndClear()); + OUString str4(str4Buf.makeStringAndClear()); bool bModified = linguistic::ReplaceControlChars(str1); CPPUNIT_ASSERT(!bModified); @@ -153,16 +153,16 @@ namespace void LngMiscTest::testGetThesaurusReplaceText() { - const ::rtl::OUString str1(""); - const ::rtl::OUString str2("asdf"); - const ::rtl::OUString str3("asdf (abc)"); - const ::rtl::OUString str4("asdf*"); - const ::rtl::OUString str5("asdf * "); - const ::rtl::OUString str6("asdf (abc) *"); - const ::rtl::OUString str7("asdf asdf * (abc)"); - const ::rtl::OUString str8(" * (abc) asdf *"); - - ::rtl::OUString r = linguistic::GetThesaurusReplaceText(str1); + const OUString str1(""); + const OUString str2("asdf"); + const OUString str3("asdf (abc)"); + const OUString str4("asdf*"); + const OUString str5("asdf * "); + const OUString str6("asdf (abc) *"); + const OUString str7("asdf asdf * (abc)"); + const OUString str8(" * (abc) asdf *"); + + OUString r = linguistic::GetThesaurusReplaceText(str1); CPPUNIT_ASSERT(r.isEmpty()); r = linguistic::GetThesaurusReplaceText(str2); diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index 29868af5e5f7..57d903c91e1f 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -44,11 +44,11 @@ namespace { -rtl::OUString toString(css::lang::Locale const & locale) { +OUString toString(css::lang::Locale const & locale) { SAL_WARN_IF( locale.Language.indexOf('-') != -1, "svl", "Locale language \"" << locale.Language << "\" contains \"-\""); - rtl::OUStringBuffer buf(locale.Language); + OUStringBuffer buf(locale.Language); SAL_WARN_IF( locale.Country.isEmpty() && !locale.Variant.isEmpty(), "svl", "Locale has empty country but non-empty variant \"" << locale.Variant @@ -113,7 +113,7 @@ void SvxAsianConfig::SetCharDistanceCompression(sal_Int16 value) { css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() const { - css::uno::Sequence< rtl::OUString > ns( + css::uno::Sequence< OUString > ns( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( impl_->context)-> getElementNames()); @@ -128,8 +128,8 @@ css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() } bool SvxAsianConfig::GetStartEndChars( - css::lang::Locale const & locale, rtl::OUString & startChars, - rtl::OUString & endChars) const + css::lang::Locale const & locale, OUString & startChars, + OUString & endChars) const { css::uno::Reference< css::container::XNameAccess > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( @@ -143,20 +143,20 @@ bool SvxAsianConfig::GetStartEndChars( css::uno::Reference< css::beans::XPropertySet > el( v.get< css::uno::Reference< css::beans::XPropertySet > >(), css::uno::UNO_SET_THROW); - startChars = el->getPropertyValue("StartCharacters").get< rtl::OUString >(); - endChars = el->getPropertyValue("EndCharacters").get< rtl::OUString >(); + startChars = el->getPropertyValue("StartCharacters").get< OUString >(); + endChars = el->getPropertyValue("EndCharacters").get< OUString >(); return true; } void SvxAsianConfig::SetStartEndChars( - css::lang::Locale const & locale, rtl::OUString const * startChars, - rtl::OUString const * endChars) + css::lang::Locale const & locale, OUString const * startChars, + OUString const * endChars) { assert((startChars == 0) == (endChars == 0)); css::uno::Reference< css::container::XNameContainer > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( impl_->batch, impl_->context)); - rtl::OUString name(toString(locale)); + OUString name(toString(locale)); if (startChars == 0) { try { set->removeByName(name); diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 1ba855cb36cc..ed152c198e09 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -63,7 +63,7 @@ public: SvtCJKOptions_Impl(); ~SvtCJKOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); virtual void Commit(); void Load(); diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 78f0a548d3e9..05904ded71bf 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -61,7 +61,7 @@ public: SvtCTLOptions_Impl(); ~SvtCTLOptions_Impl(); - virtual void Notify( const Sequence< rtl::OUString >& _aPropertyNames ); + virtual void Notify( const Sequence< OUString >& _aPropertyNames ); virtual void Commit(); void Load(); @@ -92,7 +92,7 @@ public: namespace { struct PropertyNames - : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; + : public rtl::Static< Sequence< OUString >, PropertyNames > {}; } //------------------------------------------------------------------------------ bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const @@ -136,7 +136,7 @@ SvtCTLOptions_Impl::~SvtCTLOptions_Impl() Commit(); } // ----------------------------------------------------------------------------- -void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtCTLOptions_Impl::Notify( const Sequence< OUString >& ) { Load(); NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED); @@ -144,14 +144,14 @@ void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& ) // ----------------------------------------------------------------------------- void SvtCTLOptions_Impl::Commit() { - Sequence< rtl::OUString > &rPropertyNames = PropertyNames::get(); - rtl::OUString* pOrgNames = rPropertyNames.getArray(); + Sequence< OUString > &rPropertyNames = PropertyNames::get(); + OUString* pOrgNames = rPropertyNames.getArray(); sal_Int32 nOrgCount = rPropertyNames.getLength(); - Sequence< rtl::OUString > aNames( nOrgCount ); + Sequence< OUString > aNames( nOrgCount ); Sequence< Any > aValues( nOrgCount ); - rtl::OUString* pNames = aNames.getArray(); + OUString* pNames = aNames.getArray(); Any* pValues = aValues.getArray(); sal_Int32 nRealCount = 0; @@ -236,11 +236,11 @@ void SvtCTLOptions_Impl::Commit() // ----------------------------------------------------------------------------- void SvtCTLOptions_Impl::Load() { - Sequence< rtl::OUString >& rPropertyNames = PropertyNames::get(); + Sequence< OUString >& rPropertyNames = PropertyNames::get(); if ( !rPropertyNames.getLength() ) { rPropertyNames.realloc(6); - rtl::OUString* pNames = rPropertyNames.getArray(); + OUString* pNames = rPropertyNames.getArray(); pNames[0] = "CTLFont"; pNames[1] = "CTLSequenceChecking"; pNames[2] = "CTLCursorMovement"; diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index e8129d35a6c9..f2d9f71ec468 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -52,8 +52,8 @@ ItemHolder2::ItemHolder2() if(bMessage) { bMessage = sal_False; - ::rtl::OString sMsg("CreateInstance with arguments exception: "); - sMsg += ::rtl::OString(rEx.Message.getStr(), + OString sMsg("CreateInstance with arguments exception: "); + sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); OSL_FAIL(sMsg.getStr()); diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 98b9bdee1e91..eb7a711d54ff 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -171,8 +171,8 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang ) SvtSystemLanguageOptions::SvtSystemLanguageOptions() : utl::ConfigItem( "System/L10N") { - uno::Sequence< rtl::OUString > aPropertyNames(1); - rtl::OUString* pNames = aPropertyNames.getArray(); + uno::Sequence< OUString > aPropertyNames(1); + OUString* pNames = aPropertyNames.getArray(); pNames[0] = "SystemLocale"; uno::Sequence< uno::Any > aValues = GetProperties( aPropertyNames ); @@ -191,7 +191,7 @@ void SvtSystemLanguageOptions::Commit() //does nothing } -void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { // no listeners supported yet } diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index dc762a73ace0..ffe84f83be3c 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -37,18 +37,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.FileSystemStorageFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.FileSystemStorageFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() +OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); + return OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); } //------------------------------------------------------------------------- @@ -63,7 +63,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() throw ( uno::Exception, uno::RuntimeException ) { - ::rtl::OUString aTempURL; + OUString aTempURL; aTempURL = ::utl::TempFile( NULL, sal_True ).GetURL(); @@ -119,7 +119,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } // retrieve storage source URL - ::rtl::OUString aURL; + OUString aURL; if ( !( aArguments[0] >>= aURL ) || aURL.isEmpty() ) { @@ -165,17 +165,17 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FSStorageFactory::getImplementationName() +OUString SAL_CALL FSStorageFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL FSStorageFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -185,7 +185,7 @@ sal_Bool SAL_CALL FSStorageFactory::supportsService( const ::rtl::OUString& Serv } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 6cb798d0e38a..41bf495b4195 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -65,9 +65,9 @@ using namespace ::com::sun::star; //========================================================= // TODO: move to a standard helper -sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) +sal_Bool isLocalFile_Impl( OUString aURL ) { - ::rtl::OUString aSystemPath; + OUString aSystemPath; try { @@ -88,7 +88,7 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) struct FSStorage_Impl { - ::rtl::OUString m_aURL; + OUString m_aURL; ::ucbhelper::Content* m_pContent; sal_Int32 m_nMode; @@ -99,7 +99,7 @@ struct FSStorage_Impl uno::Reference< lang::XMultiServiceFactory > m_xFactory; - FSStorage_Impl( const ::rtl::OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory ) + FSStorage_Impl( const OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory ) : m_aURL( aURL ) , m_pContent( NULL ) , m_nMode( nMode ) @@ -168,10 +168,10 @@ FSStorage::~FSStorage() } //----------------------------------------------- -sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder ) +sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder ) { INetURLObject aURL( rFolder ); - ::rtl::OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); aURL.removeSegment(); ::ucbhelper::Content aParent; ::ucbhelper::Content aResultContent; @@ -206,9 +206,9 @@ sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder ) } //----------------------------------------------- -void FSStorage::CopyStreamToSubStream( const ::rtl::OUString& aSourceURL, +void FSStorage::CopyStreamToSubStream( const OUString& aSourceURL, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewEntryName ) + const OUString& aNewEntryName ) { if ( !xDest.is() ) throw uno::RuntimeException(); @@ -242,10 +242,10 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // get list of contents of the Content // create cursor for access to children - uno::Sequence< ::rtl::OUString > aProps( 2 ); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString("TargetURL"); - pProps[1] = ::rtl::OUString("IsFolder"); + uno::Sequence< OUString > aProps( 2 ); + OUString* pProps = aProps.getArray(); + pProps[0] = OUString("TargetURL"); + pProps[1] = OUString("IsFolder"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -258,11 +258,11 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // go through the list: insert files as streams, insert folders as substorages using recursion while ( xResultSet->next() ) { - ::rtl::OUString aSourceURL( xRow->getString( 1 ) ); + OUString aSourceURL( xRow->getString( 1 ) ); sal_Bool bIsFolder( xRow->getBoolean(2) ); // TODO/LATER: not sure whether the entry name must be encoded - ::rtl::OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT, + OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ) ); if ( bIsFolder ) @@ -429,7 +429,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -437,7 +437,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -538,7 +538,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -548,7 +548,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( - const ::rtl::OUString&, sal_Int32, const ::rtl::OUString& ) + const OUString&, sal_Int32, const OUString& ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -562,7 +562,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( //----------------------------------------------- uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nStorageMode ) + const OUString& aStorName, sal_Int32 nStorageMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -646,7 +646,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -655,7 +655,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( } //----------------------------------------------- -uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rtl::OUString& aStreamName ) +uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUString& aStreamName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -721,7 +721,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -731,8 +731,8 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement( - const ::rtl::OUString&, - const ::rtl::OUString& ) + const OUString&, + const OUString& ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -758,7 +758,7 @@ void SAL_CALL FSStorage::copyLastCommitTo( //----------------------------------------------- void SAL_CALL FSStorage::copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -777,7 +777,7 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo( } //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::isStreamElement( const ::rtl::OUString& aElementName ) +sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -798,7 +798,7 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const ::rtl::OUString& aElementNam } //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::isStorageElement( const ::rtl::OUString& aElementName ) +sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -819,7 +819,7 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const ::rtl::OUString& aElementNa } //----------------------------------------------- -void SAL_CALL FSStorage::removeElement( const ::rtl::OUString& aElementName ) +void SAL_CALL FSStorage::removeElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -846,7 +846,7 @@ void SAL_CALL FSStorage::removeElement( const ::rtl::OUString& aElementName ) } //----------------------------------------------- -void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, const ::rtl::OUString& aNewName ) +void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -919,16 +919,16 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } } //----------------------------------------------- -void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -1004,16 +1004,16 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } } //----------------------------------------------- -void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -1036,7 +1036,7 @@ void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, //____________________________________________________________________________________________________ //----------------------------------------------- -uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1084,7 +1084,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetException( ::rtl::OUString("Can not open element!\n"), + throw lang::WrappedTargetException( OUString("Can not open element!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1095,7 +1095,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) //----------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() +uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1106,12 +1106,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() if ( !GetContent() ) throw io::IOException(); // TODO: error handling - uno::Sequence< ::rtl::OUString > aProps( 1 ); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + OUString* pProps = aProps.getArray(); + pProps[0] = OUString("Title"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; - uno::Sequence< ::rtl::OUString > aResult; + uno::Sequence< OUString > aResult; sal_Int32 nSize = 0; try @@ -1124,7 +1124,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() // go through the list while ( xResultSet->next() ) { - ::rtl::OUString aName( xRow->getString( 1 ) ); + OUString aName( xRow->getString( 1 ) ); aResult.realloc( ++nSize ); aResult[nSize-1] = aName; } @@ -1137,7 +1137,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() else { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1150,7 +1150,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1161,7 +1161,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1184,7 +1184,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1222,8 +1222,8 @@ sal_Bool SAL_CALL FSStorage::hasElements() if ( !GetContent() ) throw io::IOException(); // TODO: error handling - uno::Sequence< ::rtl::OUString > aProps( 1 ); - aProps[0] = ::rtl::OUString("TargetURL"); + uno::Sequence< OUString > aProps( 1 ); + aProps[0] = OUString("TargetURL"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -1310,7 +1310,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo //----------------------------------------------- -void SAL_CALL FSStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& ) +void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -1330,7 +1330,7 @@ void SAL_CALL FSStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, //----------------------------------------------- -uno::Any SAL_CALL FSStorage::getPropertyValue( const ::rtl::OUString& aPropertyName ) +uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1351,7 +1351,7 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const ::rtl::OUString& aPropertyN //----------------------------------------------- void SAL_CALL FSStorage::addPropertyChangeListener( - const ::rtl::OUString& /*aPropertyName*/, + const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1368,7 +1368,7 @@ void SAL_CALL FSStorage::addPropertyChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::removePropertyChangeListener( - const ::rtl::OUString& /*aPropertyName*/, + const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1385,7 +1385,7 @@ void SAL_CALL FSStorage::removePropertyChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::addVetoableChangeListener( - const ::rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1402,7 +1402,7 @@ void SAL_CALL FSStorage::addVetoableChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::removeVetoableChangeListener( - const ::rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1420,7 +1420,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener( // XHierarchicalStorageAccess //____________________________________________________________________________________________________ //----------------------------------------------- -uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) +uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -1535,7 +1535,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -1544,7 +1544,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl } //----------------------------------------------- -uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const ::rtl::OUString& /*sPassword*/ ) +uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const OUString& /*sPassword*/ ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -1557,7 +1557,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncrypte } //----------------------------------------------- -void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath ) +void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& sStreamPath ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index 8c23e61665ee..71dcf676e5d6 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -57,14 +57,14 @@ public: ::ucbhelper::Content* GetContent(); - void CopyStreamToSubStream( const ::rtl::OUString& aSourceURL, + void CopyStreamToSubStream( const OUString& aSourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewEntryName ); + const OUString& aNewEntryName ); void CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ); - static sal_Bool MakeFolderNoUI( const ::rtl::OUString& rFolder ); + static sal_Bool MakeFolderNoUI( const OUString& rFolder ); //____________________________________________________________________________________________________ // XInterface @@ -99,7 +99,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -108,7 +108,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass ) + const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nStorageMode ) + const OUString& aStorName, sal_Int32 nStorageMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, @@ -126,7 +126,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -135,7 +135,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( - const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass ) + const OUString& aStreamName, const OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -153,7 +153,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -161,19 +161,19 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isStreamElement( const ::rtl::OUString& aElementName ) + virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isStorageElement( const ::rtl::OUString& aElementName ) + virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeElement( const ::rtl::OUString& aElementName ) + virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -181,7 +181,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL renameElement( const ::rtl::OUString& rEleName, const ::rtl::OUString& rNewName ) + virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -190,9 +190,9 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL copyElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL copyElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -201,9 +201,9 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL moveElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL moveElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -216,15 +216,15 @@ public: // XNameAccess //____________________________________________________________________________________________________ - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Type SAL_CALL getElementType() @@ -255,40 +255,40 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -297,7 +297,7 @@ public: // XHierarchicalStorageAccess //____________________________________________________________________________________________________ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -305,7 +305,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -314,7 +314,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeStreamElementByHierarchicalName( const ::rtl::OUString& sElementPath ) + virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index aa6269f3d219..2c08995f61ac 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -36,10 +36,10 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -51,9 +51,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 5dfd5c6685ab..1c079484361d 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -49,18 +49,18 @@ class NamePassRecord { - ::rtl::OUString m_aName; + OUString m_aName; // there are two lists of passwords, memory passwords and persistent passwords bool m_bHasMemPass; - ::std::vector< ::rtl::OUString > m_aMemPass; + ::std::vector< OUString > m_aMemPass; // persistent passwords are encrypted in one string bool m_bHasPersPass; - ::rtl::OUString m_aPersPass; + OUString m_aPersPass; - void InitArrays( bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - bool bHasPersistentList, const ::rtl::OUString& aPersistentList ) + void InitArrays( bool bHasMemoryList, const ::std::vector< OUString >& aMemoryList, + bool bHasPersistentList, const OUString& aPersistentList ) { m_bHasMemPass = bHasMemoryList; if ( bHasMemoryList ) @@ -73,14 +73,14 @@ class NamePassRecord public: - NamePassRecord( const ::rtl::OUString& aName ) + NamePassRecord( const OUString& aName ) : m_aName( aName ) , m_bHasMemPass( false ) , m_bHasPersPass( false ) { } - NamePassRecord( const ::rtl::OUString& aName, const ::std::vector< ::rtl::OUString >& aMemoryList ) + NamePassRecord( const OUString& aName, const ::std::vector< OUString >& aMemoryList ) : m_aName( aName ) , m_bHasMemPass( true ) , m_aMemPass( aMemoryList ) @@ -88,7 +88,7 @@ public: { } - NamePassRecord( const ::rtl::OUString& aName, const ::rtl::OUString& aPersistentList ) + NamePassRecord( const OUString& aName, const OUString& aPersistentList ) : m_aName( aName ) , m_bHasMemPass( false ) , m_bHasPersPass( true ) @@ -96,9 +96,9 @@ public: { } - NamePassRecord( const ::rtl::OUString& aName, - bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - bool bHasPersistentList, const ::rtl::OUString aPersistentList ) + NamePassRecord( const OUString& aName, + bool bHasMemoryList, const ::std::vector< OUString >& aMemoryList, + bool bHasPersistentList, const OUString aPersistentList ) : m_aName( aName ) , m_bHasMemPass( bHasMemoryList ) , m_bHasPersPass( bHasPersistentList ) @@ -119,13 +119,13 @@ public: m_aName = aRecord.m_aName; m_aMemPass.clear(); - m_aPersPass = ::rtl::OUString(); + m_aPersPass = OUString(); InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); return *this; } - ::rtl::OUString GetUserName() const + OUString GetUserName() const { return m_aName; } @@ -140,29 +140,29 @@ public: return sal_False; } - ::std::vector< ::rtl::OUString > GetMemPasswords() const + ::std::vector< OUString > GetMemPasswords() const { if ( m_bHasMemPass ) return m_aMemPass; - return ::std::vector< ::rtl::OUString >(); + return ::std::vector< OUString >(); } - ::rtl::OUString GetPersPasswords() const + OUString GetPersPasswords() const { if ( m_bHasPersPass ) return m_aPersPass; - return ::rtl::OUString(); + return OUString(); } - void SetMemPasswords( const ::std::vector< ::rtl::OUString >& aMemList ) + void SetMemPasswords( const ::std::vector< OUString >& aMemList ) { m_aMemPass = aMemList; m_bHasMemPass = true; } - void SetPersPasswords( const ::rtl::OUString& aPersList ) + void SetPersPasswords( const OUString& aPersList ) { m_aPersPass = aPersList; m_bHasPersPass = true; @@ -178,7 +178,7 @@ public: else if ( nStatus == PERSISTENT_RECORD ) { m_bHasPersPass = false; - m_aPersPass = ::rtl::OUString(); + m_aPersPass = OUString(); } } @@ -186,8 +186,8 @@ public: //---------------------------------------------------------------------------------- -typedef ::std::pair< const ::rtl::OUString, ::std::list< NamePassRecord > > PairUrlRecord; -typedef ::std::map< ::rtl::OUString, ::std::list< NamePassRecord > > PassMap; +typedef ::std::pair< const OUString, ::std::list< NamePassRecord > > PairUrlRecord; +typedef ::std::map< OUString, ::std::list< NamePassRecord > > PassMap; //---------------------------------------------------------------------------------- @@ -196,30 +196,30 @@ class PasswordContainer; class StorageItem : public ::utl::ConfigItem { PasswordContainer* mainCont; bool hasEncoded; - ::rtl::OUString mEncoded; + OUString mEncoded; public: - StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : + StorageItem( PasswordContainer* point, const OUString& path ) : ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ), mainCont( point ), hasEncoded( false ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 ); + ::com::sun::star::uno::Sequence< OUString > aNode( 1 ); *aNode.getArray() = path; *aNode.getArray() += "/Store"; EnableNotification( aNode ); } PassMap getInfo(); - void update( const ::rtl::OUString& url, const NamePassRecord& rec ); - void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec ); + void update( const OUString& url, const NamePassRecord& rec ); + void remove( const OUString& url, const OUString& rec ); void clear(); - bool getEncodedMP( ::rtl::OUString& aResult ); - void setEncodedMP( const ::rtl::OUString& aResult, bool bAcceptEnmpty = false ); + bool getEncodedMP( OUString& aResult ); + void setEncodedMP( const OUString& aResult, bool bAcceptEnmpty = false ); void setUseStorage( bool bUse ); bool useStorage(); - virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); }; @@ -240,7 +240,7 @@ private: PassMap m_aContainer; StorageItem* m_pStorageFile; ::osl::Mutex mMutex; - ::rtl::OUString m_aMasterPasswd; // master password is set when the string is not empty + OUString m_aMasterPasswd; // master password is set when the string is not empty ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mComponent; SysCredentialsConfig mUrlContainer; @@ -256,81 +256,81 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( const ::std::list< NamePassRecord >& userlist, - const ::rtl::OUString& name, + const OUString& name, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); bool createUrlRecord( const PassMap::iterator & rIter, bool bName, - const ::rtl::OUString & aName, + const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler, ::com::sun::star::task::UrlRecord & rRec ) throw( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::task::UrlRecord find( - const ::rtl::OUString& aURL, - const ::rtl::OUString& aName, + const OUString& aURL, + const OUString& aName, bool bName, // only needed to support empty user names const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString GetDefaultMasterPassword(); + OUString GetDefaultMasterPassword(); - ::rtl::OUString RequestPasswordFromUser( + OUString RequestPasswordFromUser( ::com::sun::star::task::PasswordRequestMode aRMode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); - ::rtl::OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) + void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) throw(::com::sun::star::uno::RuntimeException); - void PrivateAdd( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + void PrivateAdd( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, char aMode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - ::std::vector< ::rtl::OUString > DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPassword ) + ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString EncodePasswords( ::std::vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPassword ) + OUString EncodePasswords( ::std::vector< OUString > lines, const OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); public: PasswordContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); ~PasswordContainer(); - virtual void SAL_CALL add( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + virtual void SAL_CALL add( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + virtual void SAL_CALL addPersistent( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::task::UrlRecord SAL_CALL - find( const ::rtl::OUString& aUrl, + find( const OUString& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::task::UrlRecord SAL_CALL - findForName( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, + findForName( const OUString& aUrl, + const OUString& aUserName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL remove( const OUString& aUrl, + const OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL removePersistent( const OUString& aUrl, + const OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException); @@ -340,8 +340,8 @@ public: // provide factory - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException); @@ -349,10 +349,10 @@ public: impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) 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 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< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XEventListener @@ -373,10 +373,10 @@ public: virtual ::sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (::com::sun::star::uno::RuntimeException); // XUrlContainer - virtual void SAL_CALL addUrl( const ::rtl::OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL findUrl( const ::rtl::OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUrl( const ::rtl::OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException); void Notify(); }; diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 13477ebe278c..d3e2a8edb40e 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -66,7 +66,7 @@ struct SfxItemPool_Impl SfxBroadcaster aBC; std::vector<SfxPoolItemArray_Impl*> maPoolItems; std::vector<SfxItemPoolUser*> maSfxItemPoolUsers; /// ObjectUser section - rtl::OUString aName; + OUString aName; SfxPoolItem** ppPoolDefaults; SfxPoolItem** ppStaticDefaults; SfxItemPool* mpMaster; @@ -87,7 +87,7 @@ struct SfxItemPool_Impl bool bStreaming; // in Load() bzw. Store() bool mbPersistentRefCounts; - SfxItemPool_Impl( SfxItemPool* pMaster, const rtl::OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) + SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) : maPoolItems(nEnd - nStart + 1, static_cast<SfxPoolItemArray_Impl*>(NULL)) , aName(rName) , ppPoolDefaults(new SfxPoolItem* [nEnd - nStart + 1]) diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index a079d99d301e..e699bd07fe1f 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -34,7 +34,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem) struct SfxAllEnumValue_Impl { sal_uInt16 nValue; - rtl::OUString aText; + OUString aText; }; class SfxAllEnumValueArr : public std::vector<SfxAllEnumValue_Impl*> @@ -136,7 +136,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_CHKTHIS(SfxAllEnumItem, 0); DBG_ASSERT( pValues && nPos < pValues->size(), "enum overflow" ); @@ -216,7 +216,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const // ----------------------------------------------------------------------- -void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const rtl::OUString &rValue ) +void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue ) { DBG_CHKTHIS(SfxAllEnumItem, 0); SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl; diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 200618e7d206..e9cb52366ba6 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -82,10 +82,10 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, } //============================================================================ -rtl::OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const +OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); - return rtl::OUString(); + return OUString(); } //============================================================================ @@ -272,9 +272,9 @@ sal_uInt16 CntBoolItem::GetValueCount() const //============================================================================ // virtual -rtl::OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const +OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const { - return bTheValue ? rtl::OUString("TRUE") : rtl::OUString("FALSE"); + return bTheValue ? OUString("TRUE") : OUString("FALSE"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index b62254c4bf72..285f07bc30e1 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -74,7 +74,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, { // CntContentTypeItem used to be derived from CntStringItem, so take that // into account: - rtl::OUString aValue = readUnicodeString(rStream, nItemVersion >= 1); + OUString aValue = readUnicodeString(rStream, nItemVersion >= 1); sal_uInt32 nMagic = 0; rStream >> nMagic; if (nMagic == CNTSTRINGITEM_STREAM_MAGIC) @@ -199,7 +199,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) // virtual bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) const { - rVal <<= rtl::OUString(GetValue()); + rVal <<= OUString(GetValue()); return true; } @@ -207,7 +207,7 @@ bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) // virtual bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8) { - rtl::OUString aValue; + OUString aValue; if ( rVal >>= aValue ) { // SetValue with an empty string resets the item; so call that diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 7db9160139c0..9a127754ed16 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -74,7 +74,7 @@ bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() ); aSeq[1] = ::com::sun::star::uno::makeAny( pImp->nAngle ); aSeq[2] = ::com::sun::star::uno::makeAny( pImp->bMirrored ); - aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL )); + aSeq[3] = ::com::sun::star::uno::makeAny( OUString( pImp->aURL )); rVal = ::com::sun::star::uno::makeAny( aSeq ); return true; @@ -86,7 +86,7 @@ bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 )) { sal_Int16 nVal = sal_Int16(); - rtl::OUString aURL; + OUString aURL; if ( aSeq[0] >>= nVal ) SetValue( nVal ); aSeq[1] >>= pImp->nAngle; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 54593b34be82..89a661858167 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -94,7 +94,7 @@ SfxBroadcaster& SfxItemPool::BC() SfxItemPool::SfxItemPool ( - const rtl::OUString& rName, /* Name des Pools zur Idetifikation + const OUString& rName, /* Name des Pools zur Idetifikation im File-Format */ sal_uInt16 nStartWhich, /* erste Which-Id des Pools */ sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */ @@ -454,7 +454,7 @@ void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric ) pImp->eDefMetric = eNewMetric; } -const rtl::OUString& SfxItemPool::GetName() const +const OUString& SfxItemPool::GetName() const { return pImp->aName; } diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index b9a4cc6a4918..001ed129960c 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -33,15 +33,15 @@ using namespace com::sun::star::uno; struct equalOUString { - bool operator()(const ::rtl::OUString& r1, const ::rtl::OUString& r2) const + bool operator()(const OUString& r1, const OUString& r2) const { return r1.equals( r2 ); } }; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, SfxItemPropertySimpleEntry, - ::rtl::OUStringHash, + OUStringHash, equalOUString > SfxItemPropertyHashMap_t; class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t @@ -64,7 +64,7 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries { while( pEntries->pName ) { - ::rtl::OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US ); + OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US ); (*m_pImpl) [ sEntry ] = pEntries; ++pEntries; } @@ -80,7 +80,7 @@ SfxItemPropertyMap::~SfxItemPropertyMap() delete m_pImpl; } -const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const ::rtl::OUString &rName ) const +const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const OUString &rName ) const { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); if( aIter == m_pImpl->end() ) @@ -114,7 +114,7 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const return m_pImpl->m_aPropSeq; } -beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const +beans::Property SfxItemPropertyMap::getPropertyByName( const OUString rName ) const throw( beans::UnknownPropertyException ) { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); @@ -130,7 +130,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa return aProp; } -sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const +sal_Bool SfxItemPropertyMap::hasPropertyByName( const OUString& rName ) const { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); return aIter != m_pImpl->end(); @@ -217,7 +217,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn } } -void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, +void SfxItemPropertySet::getPropertyValue( const OUString &rName, const SfxItemSet& rSet, Any& rAny ) const throw(RuntimeException, UnknownPropertyException) { @@ -228,7 +228,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, getPropertyValue( *pEntry,rSet, rAny ); } -Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, +Any SfxItemPropertySet::getPropertyValue( const OUString &rName, const SfxItemSet& rSet ) const throw(RuntimeException, UnknownPropertyException) { @@ -276,7 +276,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn } } -void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName, +void SfxItemPropertySet::setPropertyValue( const OUString &rName, const Any& aVal, SfxItemSet& rSet ) const throw(RuntimeException, @@ -307,7 +307,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn return eRet; } PropertyState SfxItemPropertySet::getPropertyState( - const rtl::OUString& rName, const SfxItemSet& rSet) const + const OUString& rName, const SfxItemSet& rSet) const throw(UnknownPropertyException) { PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -372,14 +372,14 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo() } Property SAL_CALL - SfxItemPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) + SfxItemPropertySetInfo::getPropertyByName( const OUString& rName ) throw(UnknownPropertyException, RuntimeException) { return m_pImpl->m_pOwnMap->getPropertyByName( rName ); } sal_Bool SAL_CALL - SfxItemPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) + SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName ) throw(RuntimeException) { return m_pImpl->m_pOwnMap->hasPropertyByName( rName ); @@ -404,14 +404,14 @@ Sequence< Property > SAL_CALL } Property SAL_CALL -SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName ) +SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { return aExtMap.getPropertyByName( rPropertyName ); } sal_Bool SAL_CALL -SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName ) +SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName ) throw(RuntimeException) { return aExtMap.hasPropertyByName( rPropertyName ); diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 3bed1d719c4a..cd812c6c16d0 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -41,7 +41,7 @@ SjJSbxObjectBase* SjJSbxObjectBase::Clone( void ) return NULL; } -SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage) +SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage) : aMacName( rMacName ), aLibName( rLanguage), pFunctionObject(NULL), eType( EXTENDED_STYPE) { @@ -57,19 +57,19 @@ SvxMacro::~SvxMacro() delete pFunctionObject; } -::rtl::OUString SvxMacro::GetLanguage()const +OUString SvxMacro::GetLanguage()const { if(eType==STARBASIC) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_STARBASIC); + return OUString(SVX_MACRO_LANGUAGE_STARBASIC); } else if(eType==JAVASCRIPT) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); + return OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); } else if(eType==EXTENDED_STYPE) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_SF); + return OUString(SVX_MACRO_LANGUAGE_SF); } return aLibName; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index dc9bcc42948e..76ce00819a6d 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -550,7 +550,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // Einzel-Header int bOwnPool = sal_True; - rtl::OUString aExternName; + OUString aExternName; { // Header-Record suchen SfxMiniRecordReader aPoolHeaderRec( &rStream, SFX_ITEMPOOL_REC_HEADER ); @@ -705,7 +705,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // wenn nicht own-Pool, dann kein Name if ( aExternName != pImp->aName ) - pImp->aName = rtl::OUString(); + pImp->aName = OUString(); pImp->bStreaming = sal_False; return rStream; @@ -734,7 +734,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) } sal_uInt32 nAttribSize(0); int bOwnPool = sal_True; - rtl::OUString aExternName; + OUString aExternName; if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 2 ) rStream >> pImp->nLoadingVersion; aExternName = SfxPoolItem::readByteString(rStream); @@ -1011,7 +1011,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) } if ( aExternName != pImp->aName ) - pImp->aName = rtl::OUString(); + pImp->aName = OUString(); pImp->bStreaming = sal_False; return rStream; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 532107f7b14f..6fc44fbe03be 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -177,21 +177,21 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const //============================================================================ // static -rtl::OUString SfxPoolItem::readByteString(SvStream& rStream) +OUString SfxPoolItem::readByteString(SvStream& rStream) { return rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); } //============================================================================ // static -void SfxPoolItem::writeByteString(SvStream & rStream, const rtl::OUString& rString) +void SfxPoolItem::writeByteString(SvStream & rStream, const OUString& rString) { rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } //============================================================================ // static -rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) +OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) { return rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); @@ -199,7 +199,7 @@ rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) //============================================================================ // static -void SfxPoolItem::writeUnicodeString(SvStream & rStream, const rtl::OUString& rString) +void SfxPoolItem::writeUnicodeString(SvStream & rStream, const OUString& rString) { rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index ea34fde877e8..7e7ab2ea4df1 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -271,7 +271,7 @@ XubString SfxStringListItem::GetString() //------------------------------------------------------------------------ -void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ) +void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ) { DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0"); @@ -290,7 +290,7 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl: } //---------------------------------------------------------------------------- -void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const +void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const { long nCount = pImp->aList.size(); @@ -303,7 +303,7 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr // virtual bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { - com::sun::star::uno::Sequence< rtl::OUString > aValue; + com::sun::star::uno::Sequence< OUString > aValue; if ( rVal >>= aValue ) { SetStringList( aValue ); @@ -321,7 +321,7 @@ bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) // GetString() is not const!!! SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this ); - com::sun::star::uno::Sequence< rtl::OUString > aStringList; + com::sun::star::uno::Sequence< OUString > aStringList; pThis->GetStringList( aStringList ); rVal = ::com::sun::star::uno::makeAny( aStringList ); return true; diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 2560b0b78cda..e3212da4f9f8 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0)); // ----------------------------------------------------------------------- -static Sequence< ::rtl::OUString > lcl_GetNotifyNames() +static Sequence< OUString > lcl_GetNotifyNames() { // names of transliteration relevant properties static const char* aTranslitNames[] = @@ -86,10 +86,10 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() }; const int nCount = SAL_N_ELEMENTS( aTranslitNames ); - Sequence< ::rtl::OUString > aNames( nCount ); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames( nCount ); + OUString* pNames = aNames.getArray(); for (sal_Int32 i = 0; i < nCount; ++i) - pNames[i] = ::rtl::OUString::createFromAscii( aTranslitNames[i] ); + pNames[i] = OUString::createFromAscii( aTranslitNames[i] ); return aNames; } @@ -98,12 +98,12 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ), + ConfigItem( OUString(CFG_ROOT_NODE ) ), aSearchOpt ( SearchAlgorithms_ABSOLUTE, SearchFlags::LEV_RELAXED, - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), Locale(), 2, 2, 2, TransliterationModules_IGNORE_CASE ), @@ -186,7 +186,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), - ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ), + ConfigItem( OUString(CFG_ROOT_NODE ) ), aSearchOpt ( rItem.aSearchOpt ), eFamily ( rItem.eFamily ), @@ -268,7 +268,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & ) +void SvxSearchItem::Notify( const Sequence< OUString > & ) { // applies transliteration changes in the configuration database // to the current SvxSearchItem @@ -361,29 +361,29 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe case 0 : { Sequence< PropertyValue > aSeq( SRCH_PARAMS ); - aSeq[0].Name = rtl::OUString( SRCH_PARA_OPTIONS ); + aSeq[0].Name = OUString( SRCH_PARA_OPTIONS ); aSeq[0].Value <<= aSearchOpt; - aSeq[1].Name = rtl::OUString( SRCH_PARA_FAMILY ); + aSeq[1].Name = OUString( SRCH_PARA_FAMILY ); aSeq[1].Value <<= sal_Int16( eFamily ); - aSeq[2].Name = rtl::OUString( SRCH_PARA_COMMAND ); + aSeq[2].Name = OUString( SRCH_PARA_COMMAND ); aSeq[2].Value <<= nCommand; - aSeq[3].Name = rtl::OUString( SRCH_PARA_CELLTYPE ); + aSeq[3].Name = OUString( SRCH_PARA_CELLTYPE ); aSeq[3].Value <<= nCellType; - aSeq[4].Name = rtl::OUString( SRCH_PARA_APPFLAG ); + aSeq[4].Name = OUString( SRCH_PARA_APPFLAG ); aSeq[4].Value <<= nAppFlag; - aSeq[5].Name = rtl::OUString( SRCH_PARA_ROWDIR ); + aSeq[5].Name = OUString( SRCH_PARA_ROWDIR ); aSeq[5].Value <<= bRowDirection; - aSeq[6].Name = rtl::OUString( SRCH_PARA_ALLTABLES ); + aSeq[6].Name = OUString( SRCH_PARA_ALLTABLES ); aSeq[6].Value <<= bAllTables; - aSeq[6].Name = rtl::OUString( SRCH_PARA_SEARCHFILTERED ); + aSeq[6].Name = OUString( SRCH_PARA_SEARCHFILTERED ); aSeq[6].Value <<= bSearchFiltered; - aSeq[7].Name = rtl::OUString( SRCH_PARA_BACKWARD ); + aSeq[7].Name = OUString( SRCH_PARA_BACKWARD ); aSeq[7].Value <<= bBackward; - aSeq[8].Name = rtl::OUString( SRCH_PARA_PATTERN ); + aSeq[8].Name = OUString( SRCH_PARA_PATTERN ); aSeq[8].Value <<= bPattern; - aSeq[9].Name = rtl::OUString( SRCH_PARA_CONTENT ); + aSeq[9].Name = OUString( SRCH_PARA_CONTENT ); aSeq[9].Value <<= bContent; - aSeq[10].Name = rtl::OUString( SRCH_PARA_ASIANOPT ); + aSeq[10].Name = OUString( SRCH_PARA_ASIANOPT ); aSeq[10].Value <<= bAsianOptions; rVal <<= aSeq; } diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 3e0651257511..cd44bea2bbb7 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -182,7 +182,7 @@ bool SfxStyleSheetBase::SetName( const XubString& rName ) return sal_True; } -rtl::OUString SfxStyleSheetBase::GetDisplayName() const +OUString SfxStyleSheetBase::GetDisplayName() const { if( maDisplayName.isEmpty() ) { @@ -194,7 +194,7 @@ rtl::OUString SfxStyleSheetBase::GetDisplayName() const } } -void SfxStyleSheetBase::SetDisplayName( const rtl::OUString& rDisplayName ) +void SfxStyleSheetBase::SetDisplayName( const OUString& rDisplayName ) { maDisplayName = rDisplayName; } @@ -491,7 +491,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() } -SfxStyleSheetBase* SfxStyleSheetIterator::Find(const rtl::OUString& rStr) +SfxStyleSheetBase* SfxStyleSheetIterator::Find(const OUString& rStr) { for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); ++n ) { diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 3fdc6e8dfae4..c1577a4c7b3f 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -296,7 +296,7 @@ namespace { mbSkipIgnorable( bSkipIgnorable ) {} virtual StylePool::SfxItemSet_Pointer_t getNext(); - virtual ::rtl::OUString getName(); + virtual OUString getName(); }; StylePool::SfxItemSet_Pointer_t Iterator::getNext() @@ -331,9 +331,9 @@ namespace { return pReturn; } - ::rtl::OUString Iterator::getName() + OUString Iterator::getName() { - ::rtl::OUString aString; + OUString aString; if( mpNode && mpNode->hasItemSet( false ) ) { aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() ); @@ -346,9 +346,9 @@ namespace { /* This static method creates a unique name from a shared pointer to a SfxItemSet The name is the memory address of the SfxItemSet itself. */ -::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet ) +OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet ) { - return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 ); + return OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 ); } // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet. diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 6c130a882f5f..3e6440f04d46 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -53,8 +53,8 @@ namespace svt { sal_Bool DocumentLockFile::m_bAllowInteraction = sal_True; // ---------------------------------------------------------------------- -DocumentLockFile::DocumentLockFile( const ::rtl::OUString& aOrigURL ) -: LockFileCommon( aOrigURL, ::rtl::OUString( ".~lock." ) ) +DocumentLockFile::DocumentLockFile( const OUString& aOrigURL ) +: LockFileCommon( aOrigURL, OUString( ".~lock." ) ) { } @@ -64,11 +64,11 @@ DocumentLockFile::~DocumentLockFile() } // ---------------------------------------------------------------------- -void DocumentLockFile::WriteEntryToStream( uno::Sequence< ::rtl::OUString > aEntry, uno::Reference< io::XOutputStream > xOutput ) +void DocumentLockFile::WriteEntryToStream( uno::Sequence< OUString > aEntry, uno::Reference< io::XOutputStream > xOutput ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for ( sal_Int32 nEntryInd = 0; nEntryInd < aEntry.getLength(); nEntryInd++ ) { @@ -79,7 +79,7 @@ void DocumentLockFile::WriteEntryToStream( uno::Sequence< ::rtl::OUString > aEnt aBuffer.append( (sal_Unicode)';' ); } - ::rtl::OString aStringData( ::rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); + OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); uno::Sequence< sal_Int8 > aData( (sal_Int8*)aStringData.getStr(), aStringData.getLength() ); xOutput->writeBytes( aData ); } @@ -102,7 +102,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() if ( !xInput.is() || !xOutput.is() ) throw uno::RuntimeException(); - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); WriteEntryToStream( aNewEntry, xOutput ); xOutput->closeOutput(); @@ -116,11 +116,11 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() aInsertArg.ReplaceExisting = sal_False; uno::Any aCmdArg; aCmdArg <<= aInsertArg; - aTargetContent.executeCommand( ::rtl::OUString( "insert" ), aCmdArg ); + aTargetContent.executeCommand( OUString( "insert" ), aCmdArg ); // try to let the file be hidden if possible try { - aTargetContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) ); + aTargetContent.setPropertyValue( OUString( "IsHidden" ), uno::makeAny( sal_True ) ); } catch( uno::Exception& ) {} } catch( ucb::NameClashException& ) @@ -132,7 +132,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > DocumentLockFile::GetLockData() +uno::Sequence< OUString > DocumentLockFile::GetLockData() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -176,7 +176,7 @@ sal_Bool DocumentLockFile::OverwriteOwnLockFile() uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() ); - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); uno::Reference< io::XStream > xStream = aTargetContent.openWriteableStreamNoLock(); uno::Reference< io::XOutputStream > xOutput = xStream->getOutputStream(); @@ -200,8 +200,8 @@ void DocumentLockFile::RemoveFile() ::osl::MutexGuard aGuard( m_aMutex ); // TODO/LATER: the removing is not atomic, is it possible in general to make it atomic? - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); - uno::Sequence< ::rtl::OUString > aFileData = GetLockData(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aFileData = GetLockData(); if ( aFileData.getLength() < LOCKFILE_ENTRYSIZE ) throw io::WrongFormatException(); @@ -213,7 +213,7 @@ void DocumentLockFile::RemoveFile() uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aCnt(m_aURL, xEnv, comphelper::getProcessComponentContext()); - aCnt.executeCommand(rtl::OUString("delete"), + aCnt.executeCommand(OUString("delete"), uno::makeAny(sal_Bool(sal_True))); } diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index f5f902f4c1b9..1b7dee2067b5 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -31,13 +31,13 @@ namespace svt //= OFileNotation //===================================================================== //--------------------------------------------------------------------- - OFileNotation::OFileNotation( const ::rtl::OUString& _rUrlOrPath ) + OFileNotation::OFileNotation( const OUString& _rUrlOrPath ) { construct( _rUrlOrPath ); } //--------------------------------------------------------------------- - OFileNotation::OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ) + OFileNotation::OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation ) { if ( _eInputNotation == N_URL ) { @@ -52,7 +52,7 @@ namespace svt } //--------------------------------------------------------------------- - bool OFileNotation::implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ) + bool OFileNotation::implInitWithSystemNotation( const OUString& _rSystemPath ) { bool bSuccess = false; @@ -79,7 +79,7 @@ namespace svt } //--------------------------------------------------------------------- - bool OFileNotation::implInitWithURLNotation( const ::rtl::OUString& _rURL ) + bool OFileNotation::implInitWithURLNotation( const OUString& _rURL ) { m_sFileURL = _rURL; osl_getSystemPathFromFileURL( _rURL.pData, &m_sSystem.pData ); @@ -87,7 +87,7 @@ namespace svt } //--------------------------------------------------------------------- - void OFileNotation::construct( const ::rtl::OUString& _rUrlOrPath ) + void OFileNotation::construct( const OUString& _rUrlOrPath ) { bool bSuccess = false; // URL notation? @@ -117,7 +117,7 @@ namespace svt } //--------------------------------------------------------------------- - ::rtl::OUString OFileNotation::get(NOTATION _eOutputNotation) + OUString OFileNotation::get(NOTATION _eOutputNotation) { switch (_eOutputNotation) { @@ -126,7 +126,7 @@ namespace svt } OSL_FAIL("OFileNotation::get: inavlid enum value!"); - return ::rtl::OUString(); + return OUString(); } //......................................................................... diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx index 908b7dc7a631..17562510cc44 100644 --- a/svl/source/misc/folderrestriction.cxx +++ b/svl/source/misc/folderrestriction.cxx @@ -26,7 +26,7 @@ //----------------------------------------------------------------------------- static void convertStringListToUrls ( - const rtl::OUString& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) + const OUString& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) { const sal_Unicode cSeparator = #if defined(WNT) @@ -40,12 +40,12 @@ static void convertStringListToUrls ( do { // the current token in the list - rtl::OUString sCurrentToken = _rColonSeparatedList.getToken( 0, cSeparator, nIndex ); + OUString sCurrentToken = _rColonSeparatedList.getToken( 0, cSeparator, nIndex ); if (!sCurrentToken.isEmpty()) { INetURLObject aCurrentURL; - rtl::OUString sURL; + OUString sURL; if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) ) aCurrentURL = INetURLObject( sURL ); else @@ -67,10 +67,10 @@ static void convertStringListToUrls ( /** retrieves the value of an environment variable @return <TRUE/> if and only if the retrieved string value is not empty */ -static bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, ::rtl::OUString& _rValue ) +static bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue ) { - _rValue = ::rtl::OUString(); - ::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName ); + _rValue = OUString(); + OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName ); osl_getEnvironment( sEnvName.pData, &_rValue.pData ); return !_rValue.isEmpty(); } @@ -83,7 +83,7 @@ namespace svt void getUnrestrictedFolders( ::std::vector< String >& _rFolders ) { _rFolders.resize( 0 ); - ::rtl::OUString sRestrictedPathList; + OUString sRestrictedPathList; if ( getEnvironmentValue( "RestrictedPath", sRestrictedPathList ) ) { // append a final slash. This ensures that when we later on check diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 3e0a08001ef8..f1692f256e18 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::rtl; -sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL, +sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL, Date* pDate, Time* pTime ) { sal_Bool bRet = sal_False; @@ -59,7 +59,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL, return bRet; } -sal_Bool FStatHelper::IsDocument( const rtl::OUString& rURL ) +sal_Bool FStatHelper::IsDocument( const OUString& rURL ) { sal_Bool bExist = sal_False; try @@ -75,7 +75,7 @@ sal_Bool FStatHelper::IsDocument( const rtl::OUString& rURL ) return bExist; } -sal_Bool FStatHelper::IsFolder( const rtl::OUString& rURL ) +sal_Bool FStatHelper::IsFolder( const OUString& rURL ) { sal_Bool bExist = sal_False; try diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index faed06461969..f59295e4ed50 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -42,7 +42,7 @@ public: SimpleResMgr * get(LanguageTag const & locale); private: - typedef std::map< rtl::OUString, SimpleResMgr * > Map; + typedef std::map< OUString, SimpleResMgr * > Map; Map map_; // one SimpleResMgr for each language for which a resource was requested @@ -76,7 +76,7 @@ struct theResMgrMap: public rtl::Static< ResMgrMap, theResMgrMap > {}; namespace svl { -rtl::OUString getStringResource(sal_uInt16 id, LanguageTag const & locale) +OUString getStringResource(sal_uInt16 id, LanguageTag const & locale) { return theResMgrMap::get().get(locale)->ReadString(id); } diff --git a/svl/source/misc/getstringresource.hxx b/svl/source/misc/getstringresource.hxx index 1410c1577e99..4fedb5987bc8 100644 --- a/svl/source/misc/getstringresource.hxx +++ b/svl/source/misc/getstringresource.hxx @@ -31,7 +31,7 @@ namespace rtl { class OUString; } namespace svl { -rtl::OUString getStringResource( +OUString getStringResource( sal_uInt16 id, LanguageTag const & locale); } diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 71da0c842659..032f0b169beb 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -432,14 +432,14 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTP_PORT); if (!rUrl.HasURLPath()) - rUrl.SetURLPath (rtl::OString("/")); + rUrl.SetURLPath (OString("/")); break; case INET_PROT_HTTPS: if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTPS_PORT); if (!rUrl.HasURLPath()) - rUrl.SetURLPath (rtl::OString("/")); + rUrl.SetURLPath (OString("/")); break; default: diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index 5797c256160c..2deb2d3d2843 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -26,7 +26,7 @@ namespace linguistic { - sal_Int32 GetNumControlChars(const rtl::OUString &rTxt) + sal_Int32 GetNumControlChars(const OUString &rTxt) { sal_Int32 nCnt = 0; for (sal_Int32 i = 0; i < rTxt.getLength(); ++i) @@ -35,7 +35,7 @@ namespace linguistic return nCnt; } - bool RemoveHyphens(rtl::OUString &rTxt) + bool RemoveHyphens(OUString &rTxt) { sal_Int32 n = rTxt.getLength(); rTxt = comphelper::string::remove(rTxt, SVT_SOFT_HYPHEN); @@ -43,13 +43,13 @@ namespace linguistic return n != rTxt.getLength(); } - bool RemoveControlChars(rtl::OUString &rTxt) + bool RemoveControlChars(OUString &rTxt) { sal_Int32 nSize = rTxt.getLength() - GetNumControlChars(rTxt); if(nSize == rTxt.getLength()) return false; - rtl::OUStringBuffer aBuf(nSize); + OUStringBuffer aBuf(nSize); aBuf.setLength(nSize); for (sal_Int32 i = 0, j = 0; i < rTxt.getLength() && j < nSize; ++i) if (!IsControlChar(rTxt[i])) @@ -61,7 +61,7 @@ namespace linguistic return true; } - bool ReplaceControlChars(rtl::OUString &rTxt) + bool ReplaceControlChars(OUString &rTxt) { // non breaking field character static const sal_Char CH_TXTATR_INWORD = static_cast<sal_Char>(0x02); @@ -75,7 +75,7 @@ namespace linguistic sal_Int32 n = rTxt.getLength(); - rtl::OUStringBuffer aBuf(n); + OUStringBuffer aBuf(n); aBuf.setLength(n); sal_Int32 j = 0; @@ -93,14 +93,14 @@ namespace linguistic return true; } - ::rtl::OUString GetThesaurusReplaceText(const ::rtl::OUString &rText) + OUString GetThesaurusReplaceText(const OUString &rText) { // The strings for synonyms returned by the thesaurus sometimes have some // explanation text put in between '(' and ')' or a trailing '*'. // These parts should not be put in the ReplaceEdit Text that may get // inserted into the document. Thus we strip them from the text. - ::rtl::OUString aText(rText); + OUString aText(rText); sal_Int32 nPos = aText.indexOf('('); while (nPos >= 0) @@ -108,7 +108,7 @@ namespace linguistic sal_Int32 nEnd = aText.indexOf(')', nPos); if (nEnd >= 0) { - ::rtl::OUStringBuffer aTextBuf(aText); + OUStringBuffer aTextBuf(aText); aTextBuf.remove(nPos, nEnd - nPos + 1); aText = aTextBuf.makeStringAndClear(); } @@ -119,7 +119,7 @@ namespace linguistic nPos = aText.indexOf('*'); if(nPos == 0) - return ::rtl::OUString(); + return OUString(); else if(nPos > 0) aText = aText.copy(0, nPos); diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index bb5ae628bf6b..eb77be2b07c3 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -54,11 +54,11 @@ using namespace ::com::sun::star; namespace svt { // ---------------------------------------------------------------------- -LockFileCommon::LockFileCommon( const ::rtl::OUString& aOrigURL, const ::rtl::OUString& aPrefix ) +LockFileCommon::LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix ) { INetURLObject aDocURL = ResolveLinks( INetURLObject( aOrigURL ) ); - ::rtl::OUString aShareURLString = aDocURL.GetPartBeforeLastName(); + OUString aShareURLString = aDocURL.GetPartBeforeLastName(); aShareURLString += aPrefix; aShareURLString += aDocURL.GetName(); aShareURLString += "%23"; // '#' @@ -76,7 +76,7 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL ) if ( aDocURL.HasError() ) throw lang::IllegalArgumentException(); - ::rtl::OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::NO_DECODE); + OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::NO_DECODE); // there is currently no UCB functionality to resolve the symbolic links; // since the lock files are used only for local file systems the osl @@ -95,11 +95,11 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL ) } // ---------------------------------------------------------------------- -uno::Sequence< uno::Sequence< ::rtl::OUString > > LockFileCommon::ParseList( const uno::Sequence< sal_Int8 >& aBuffer ) +uno::Sequence< uno::Sequence< OUString > > LockFileCommon::ParseList( const uno::Sequence< sal_Int8 >& aBuffer ) { sal_Int32 nCurPos = 0; sal_Int32 nCurEntry = 0; - uno::Sequence< uno::Sequence< ::rtl::OUString > > aResult( 10 ); + uno::Sequence< uno::Sequence< OUString > > aResult( 10 ); while ( nCurPos < aBuffer.getLength() ) { @@ -114,9 +114,9 @@ uno::Sequence< uno::Sequence< ::rtl::OUString > > LockFileCommon::ParseList( con } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) +uno::Sequence< OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) { - uno::Sequence< ::rtl::OUString > aResult( LOCKFILE_ENTRYSIZE ); + uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE ); for ( int nInd = 0; nInd < LOCKFILE_ENTRYSIZE; nInd++ ) { @@ -131,9 +131,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) +OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) { - ::rtl::OStringBuffer aResult; + OStringBuffer aResult; sal_Bool bHaveName = sal_False; sal_Bool bEscape = sal_False; @@ -165,13 +165,13 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } } - return ::rtl::OStringToOUString( aResult.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); + return OStringToOUString( aResult.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::EscapeCharacters( const ::rtl::OUString& aSource ) +OUString LockFileCommon::EscapeCharacters( const OUString& aSource ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; const sal_Unicode* pStr = aSource.getStr(); for ( sal_Int32 nInd = 0; nInd < aSource.getLength() && pStr[nInd] != 0; nInd++ ) { @@ -184,10 +184,10 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::GetOOOUserName() +OUString LockFileCommon::GetOOOUserName() { SvtUserOptions aUserOpt; - ::rtl::OUString aName = aUserOpt.GetFirstName(); + OUString aName = aUserOpt.GetFirstName(); if ( !aName.isEmpty() ) aName += " "; aName += aUserOpt.GetLastName(); @@ -196,9 +196,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::GetCurrentLocalTime() +OUString LockFileCommon::GetCurrentLocalTime() { - ::rtl::OUString aTime; + OUString aTime; TimeValue aSysTime; if ( osl_getSystemTime( &aSysTime ) ) @@ -211,7 +211,7 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence { char pDateTime[20]; sprintf( pDateTime, "%02d.%02d.%4d %02d:%02d", aDateTime.Day, aDateTime.Month, aDateTime.Year, aDateTime.Hours, aDateTime.Minutes ); - aTime = ::rtl::OUString::createFromAscii( pDateTime ); + aTime = OUString::createFromAscii( pDateTime ); } } } @@ -220,9 +220,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > LockFileCommon::GenerateOwnEntry() +uno::Sequence< OUString > LockFileCommon::GenerateOwnEntry() { - uno::Sequence< ::rtl::OUString > aResult( LOCKFILE_ENTRYSIZE ); + uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE ); aResult[LOCKFILE_OOOUSERNAME_ID] = GetOOOUserName(); diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 21ad1599bb4e..24cdf8991a1a 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -29,9 +29,9 @@ using namespace com::sun::star; //============== SvCommandList ============================================ //========================================================================= -static ::rtl::OUString parseString(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static OUString parseString(const OUString & rCmd, sal_Int32 * pIndex) { - ::rtl::OUString result; + OUString result; if(rCmd[*pIndex] == sal_Unicode('\"')) { (*pIndex) ++; @@ -46,7 +46,7 @@ static ::rtl::OUString parseString(const ::rtl::OUString & rCmd, sal_Int32 * pIn return result; } -static ::rtl::OUString parseWord(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static OUString parseWord(const OUString & rCmd, sal_Int32 * pIndex) { sal_Int32 begin = *pIndex; @@ -58,7 +58,7 @@ static ::rtl::OUString parseWord(const ::rtl::OUString & rCmd, sal_Int32 * pInde return rCmd.copy(begin, *pIndex - begin); } -static void eatSpace(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static void eatSpace(const OUString & rCmd, sal_Int32 * pIndex) { while(*pIndex < rCmd.getLength() && isspace(sal::static_int_cast<int>(rCmd[*pIndex]))) (*pIndex) ++; @@ -68,7 +68,7 @@ static void eatSpace(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) //========================================================================= bool SvCommandList::AppendCommands ( - const ::rtl::OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ + const OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ sal_Int32 * pEaten /* Anzahl der Zeichen, die gelesen wurden */ ) /* [Beschreibung] @@ -87,10 +87,10 @@ bool SvCommandList::AppendCommands { eatSpace(rCmd, &index); - ::rtl::OUString name = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); + OUString name = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); eatSpace(rCmd, &index); - ::rtl::OUString value; + OUString value; if(index < rCmd.getLength() && rCmd[index] == sal_Unicode('=')) { index ++; @@ -110,8 +110,8 @@ bool SvCommandList::AppendCommands //========================================================================= SvCommand & SvCommandList::Append ( - const ::rtl::OUString & rCommand, /* das Kommando */ - const ::rtl::OUString & rArg /* dasArgument des Kommandos */ + const OUString & rCommand, /* das Kommando */ + const OUString & rArg /* dasArgument des Kommandos */ ) /* [Beschreibung] @@ -130,8 +130,8 @@ SvCommand & SvCommandList::Append bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence ) { const sal_Int32 nCount = aCommandSequence.getLength(); - ::rtl::OUString aCommand, aArg; - ::rtl::OUString aApiArg; + OUString aCommand, aArg; + OUString aApiArg; for( sal_Int32 nIndex=0; nIndex<nCount; nIndex++ ) { aCommand = aCommandSequence[nIndex].Name; diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 9d6c481d89a0..dd3c5fbf7d7f 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -52,8 +52,8 @@ using namespace ::com::sun::star; namespace svt { // ---------------------------------------------------------------------- -ShareControlFile::ShareControlFile( const ::rtl::OUString& aOrigURL ) -: LockFileCommon( aOrigURL, ::rtl::OUString( ".~sharing." ) ) +ShareControlFile::ShareControlFile( const OUString& aOrigURL ) +: LockFileCommon( aOrigURL, OUString( ".~sharing." ) ) { OpenStream(); @@ -106,11 +106,11 @@ void ShareControlFile::OpenStream() ucb::InsertCommandArgument aInsertArg; aInsertArg.Data = xInput; aInsertArg.ReplaceExisting = sal_False; - aContent.executeCommand( rtl::OUString("insert"), uno::makeAny( aInsertArg ) ); + aContent.executeCommand( OUString("insert"), uno::makeAny( aInsertArg ) ); // try to let the file be hidden if possible try { - aContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) ); + aContent.setPropertyValue( OUString( "IsHidden" ), uno::makeAny( sal_True ) ); } catch( uno::Exception& ) {} // Try to open one more time @@ -155,7 +155,7 @@ void ShareControlFile::Close() } // ---------------------------------------------------------------------- -uno::Sequence< uno::Sequence< ::rtl::OUString > > ShareControlFile::GetUsersData() +uno::Sequence< uno::Sequence< OUString > > ShareControlFile::GetUsersData() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ uno::Sequence< uno::Sequence< ::rtl::OUString > > ShareControlFile::GetUsersData } // ---------------------------------------------------------------------- -void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< ::rtl::OUString > >& aUsersData ) +void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< OUString > >& aUsersData ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -205,7 +205,7 @@ void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< m_xTruncate->truncate(); m_xSeekable->seek( 0 ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for ( sal_Int32 nInd = 0; nInd < aUsersData.getLength(); nInd++ ) { if ( aUsersData[nInd].getLength() != SHARED_ENTRYSIZE ) @@ -221,14 +221,14 @@ void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< } } - ::rtl::OString aStringData( ::rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); + OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); uno::Sequence< sal_Int8 > aData( (sal_Int8*)aStringData.getStr(), aStringData.getLength() ); m_xOutputStream->writeBytes( aData ); m_aUsersData = aUsersData; } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > ShareControlFile::InsertOwnEntry() +uno::Sequence< OUString > ShareControlFile::InsertOwnEntry() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -236,8 +236,8 @@ uno::Sequence< ::rtl::OUString > ShareControlFile::InsertOwnEntry() throw io::NotConnectedException(); GetUsersData(); - uno::Sequence< ::uno::Sequence< ::rtl::OUString > > aNewData( m_aUsersData.getLength() + 1 ); - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< ::uno::Sequence< OUString > > aNewData( m_aUsersData.getLength() + 1 ); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); sal_Bool bExists = sal_False; sal_Int32 nNewInd = 0; @@ -284,7 +284,7 @@ bool ShareControlFile::HasOwnEntry() } GetUsersData(); - uno::Sequence< ::rtl::OUString > aEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aEntry = GenerateOwnEntry(); for ( sal_Int32 nInd = 0; nInd < m_aUsersData.getLength(); ++nInd ) { @@ -301,7 +301,7 @@ bool ShareControlFile::HasOwnEntry() } // ---------------------------------------------------------------------- -void ShareControlFile::RemoveEntry( const uno::Sequence< ::rtl::OUString >& aArgEntry ) +void ShareControlFile::RemoveEntry( const uno::Sequence< OUString >& aArgEntry ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -310,11 +310,11 @@ void ShareControlFile::RemoveEntry( const uno::Sequence< ::rtl::OUString >& aArg GetUsersData(); - uno::Sequence< ::rtl::OUString > aEntry = aArgEntry; + uno::Sequence< OUString > aEntry = aArgEntry; if ( aEntry.getLength() != SHARED_ENTRYSIZE ) aEntry = GenerateOwnEntry(); - uno::Sequence< ::uno::Sequence< ::rtl::OUString > > aNewData( m_aUsersData.getLength() + 1 ); + uno::Sequence< ::uno::Sequence< OUString > > aNewData( m_aUsersData.getLength() + 1 ); sal_Int32 nNewInd = 0; for ( sal_Int32 nInd = 0; nInd < m_aUsersData.getLength(); nInd++ ) diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index 1f6c4ff1964e..0ea2de5e81a8 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -57,45 +57,45 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SAL_CALL getNumberFormatsSupplier() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const ::rtl::OUString& aString ) + virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) throw(::com::sun::star::util::NotNumericException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const ::rtl::OUString& aString ) + virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) throw(::com::sun::star::util::NotNumericException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) + virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey, double fValue, ::com::sun::star::util::Color aDefaultColor ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL formatString( sal_Int32 nKey, const ::rtl::OUString& aString ) + virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::util::Color SAL_CALL queryColorForString( sal_Int32 nKey, - const ::rtl::OUString& aString, + const OUString& aString, ::com::sun::star::util::Color aDefaultColor ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) + virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) throw(::com::sun::star::uno::RuntimeException); // XNumberFormatPreviewer - virtual ::rtl::OUString SAL_CALL convertNumberToPreviewString( - const ::rtl::OUString& aFormat, double fValue, + virtual OUString SAL_CALL convertNumberToPreviewString( + const OUString& aFormat, double fValue, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish ) throw(::com::sun::star::util::MalformedNumberFormatException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::util::Color SAL_CALL queryPreviewColorForNumber( - const ::rtl::OUString& aFormat, double fValue, + const OUString& aFormat, double fValue, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish, ::com::sun::star::util::Color aDefaultColor ) throw(::com::sun::star::util::MalformedNumberFormatException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -120,20 +120,20 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bCreate ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL queryKey( const ::rtl::OUString& aFormat, + virtual sal_Int32 SAL_CALL queryKey( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bScan ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL addNew( const ::rtl::OUString& aFormat, + virtual sal_Int32 SAL_CALL addNew( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale ) throw(::com::sun::star::util::MalformedNumberFormatException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL addNewConverted( const ::rtl::OUString& aFormat, + virtual sal_Int32 SAL_CALL addNewConverted( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale, const ::com::sun::star::lang::Locale& nNewLocale ) throw(::com::sun::star::util::MalformedNumberFormatException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL generateFormat( sal_Int32 nBaseKey, + virtual OUString SAL_CALL generateFormat( sal_Int32 nBaseKey, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bThousands, sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) throw(::com::sun::star::uno::RuntimeException); @@ -154,11 +154,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: @@ -184,7 +184,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + 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, @@ -192,29 +192,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + 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, @@ -233,11 +233,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -259,7 +259,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + 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, @@ -267,29 +267,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + 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, @@ -297,11 +297,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index bcf572235ac1..1114d780ab93 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::utl; -#define PERSISTENT_SERVICE_NAME ::rtl::OUString("com.sun.star.util.NumberFormatsSupplier"); +#define PERSISTENT_SERVICE_NAME OUString("com.sun.star.util.NumberFormatsSupplier"); //------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) @@ -117,16 +117,16 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); + return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices = getSupportedServiceNames(); - const ::rtl::OUString* pServices = aServices.getConstArray(); + Sequence< OUString > aServices = getSupportedServiceNames(); + const OUString* pServices = aServices.getConstArray(); for (sal_Int32 i=0; i<aServices.getLength(); ++i, ++pServices) if (pServices->equals(_rServiceName)) return sal_True; @@ -135,15 +135,15 @@ sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const : } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported.getArray()[0] = PERSISTENT_SERVICE_NAME; return aSupported; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException) +OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException) { return PERSISTENT_SERVICE_NAME; } diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index 3d4cf2955fe0..fe6dc2fb9b8c 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -67,12 +67,12 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // 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); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 2ce50974321a..fd7d9c8247e4 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1952,9 +1952,9 @@ input for the following reasons: uno::Reference< i18n::XCalendar3 > xCal = i18n::LocaleCalendar::create(xContext); for ( const entry* p = cals; p->lan; ++p ) { - aLocale.Language = ::rtl::OUString::createFromAscii( p->lan ); - aLocale.Country = ::rtl::OUString::createFromAscii( p->cou ); - xCal->loadCalendar( ::rtl::OUString::createFromAscii( p->cal ), + aLocale.Language = OUString::createFromAscii( p->lan ); + aLocale.Country = OUString::createFromAscii( p->cou ); + xCal->loadCalendar( OUString::createFromAscii( p->cal ), aLocale ); double nDateTime = 0.0; // 1-Jan-1970 00:00:00 nZO = xCal->getValue( i18n::CalendarFieldIndex::ZONE_OFFSET ); @@ -3303,7 +3303,7 @@ void ImpSvNumberInputScan::InvalidateDateAcceptancePatterns() { if (sDateAcceptancePatterns.getLength()) { - sDateAcceptancePatterns = ::com::sun::star::uno::Sequence< ::rtl::OUString >(); + sDateAcceptancePatterns = ::com::sun::star::uno::Sequence< OUString >(); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 77bcf77e5f17..88f55d0cf3bb 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1896,19 +1896,19 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, } // static -rtl::OUString SvNumberformat::LoadString( SvStream& rStream ) +OUString SvNumberformat::LoadString( SvStream& rStream ) { CharSet eStream = rStream.GetStreamCharSet(); - rtl::OString aStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); + OString aStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if (aStr.indexOf(cStream) < 0) { // simple conversion to unicode - return rtl::OStringToOUString(aStr, eStream); + return OStringToOUString(aStr, eStream); } sal_Unicode cSource = OUString(&cStream, 1, eStream).toChar(); sal_Unicode cTarget = NfCurrencyEntry::GetEuroSymbol(); - rtl::OUStringBuffer aBuf(rtl::OStringToOUString(aStr, eStream)); + OUStringBuffer aBuf(OStringToOUString(aStr, eStream)); aBuf.replace(cSource, cTarget); return aBuf.makeStringAndClear(); @@ -2115,7 +2115,7 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, OUString& rOutS #if 0 { // debugger test case for ANSI standard correctness - ::rtl::OUString aTest; + OUString aTest; // expect 0.00123 OK aTest = ::rtl::math::doubleToUString( 0.001234567, rtl_math_StringFormat_G, 3, '.', true ); @@ -2325,7 +2325,7 @@ void lcl_GetOutputStringScientific(double fNumber, sal_uInt16 nCharCount, sal_Int32 lcl_GetForcedDenominator(const ImpSvNumberformatInfo &rInfo, sal_uInt16 nAnz) { sal_uInt16 i; - rtl::OUString aDiv; + OUString aDiv; for( i = 0; i < nAnz; i++ ) { if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV ) @@ -3416,11 +3416,11 @@ void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar, double& fOrgDateTime ) const { CalendarWrapper& rCal = GetCal(); - const rtl::OUString &rGregorian = Gregorian::get(); + const OUString &rGregorian = Gregorian::get(); if ( rCal.getUniqueID() == rGregorian ) { using namespace ::com::sun::star::i18n; - ::com::sun::star::uno::Sequence< ::rtl::OUString > xCals = rCal.getAllCalendars( + ::com::sun::star::uno::Sequence< OUString > xCals = rCal.getAllCalendars( rLoc().getLanguageTag().getLocale() ); sal_Int32 nCnt = xCals.getLength(); if ( nCnt > 1 ) @@ -3447,7 +3447,7 @@ void SvNumberformat::SwitchToGregorianCalendar( const OUString& rOrgCalendar, double fOrgDateTime ) const { CalendarWrapper& rCal = GetCal(); - const rtl::OUString &rGregorian = Gregorian::get(); + const OUString &rGregorian = Gregorian::get(); if ( rOrgCalendar.getLength() && rCal.getUniqueID() != rGregorian ) { rCal.loadCalendar( rGregorian, rLoc().getLanguageTag().getLocale() ); @@ -3459,7 +3459,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, dou { using namespace ::com::sun::star::i18n; CalendarWrapper& rCal = GetCal(); - const rtl::OUString &rGregorian = Gregorian::get(); + const OUString &rGregorian = Gregorian::get(); if ( rCal.getUniqueID() != rGregorian ) { sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::ERA ); @@ -5258,16 +5258,16 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Unicode aBuf[2]; aBuf[0] = '0'; aBuf[1] = '0' + nVal; - aStr = rtl::OUString(aBuf, SAL_N_ELEMENTS(aBuf)); + aStr = OUString(aBuf, SAL_N_ELEMENTS(aBuf)); } else { - aStr = rtl::OUString::valueOf( nVal ); + aStr = OUString::valueOf( nVal ); } } else { - OUString aValStr( rtl::OUString::valueOf( nVal ) ); + OUString aValStr( OUString::valueOf( nVal ) ); if ( aValStr.getLength() >= nMinDigits ) { aStr = aValStr; @@ -5286,7 +5286,7 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, } else { - aStr = rtl::OUString::valueOf( nVal ); + aStr = OUString::valueOf( nVal ); } return impTransliterate(aStr, rNum); } diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index f7c987a1a000..24bfde33a220 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -169,7 +169,7 @@ void ImpSvNumberformatScan::InitKeywords() const /** Extract the name of General, Standard, Whatever, ignoring leading modifiers such as [NatNum1]. */ -static OUString lcl_extractStandardGeneralName( const ::rtl::OUString & rCode ) +static OUString lcl_extractStandardGeneralName( const OUString & rCode ) { OUString aStr; const sal_Unicode* p = rCode.getStr(); @@ -2356,7 +2356,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) return nPos; } bThousand = true; // bei Time frei - cChar = pChrCls->uppercase(rtl::OUString(NextChar(i)))[0]; + cChar = pChrCls->uppercase(OUString(NextChar(i)))[0]; if ( cChar == cOldKeyH ) { nThousand = 1; // H diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index ed9435308dda..590c1deed85b 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -47,49 +47,49 @@ using namespace com::sun::star::ucb; //------------------------------------------------------------------------- //------------------------------------------------------------------------- -static ::rtl::OUString createIndex( vector< ::rtl::OUString > lines ) +static OUString createIndex( vector< OUString > lines ) { - ::rtl::OString aResult; + OString aResult; const sal_Char* pLine; for( unsigned int i = 0; i < lines.size(); i++ ) { if( i ) - aResult += ::rtl::OString( "__" ); - ::rtl::OString line = ::rtl::OUStringToOString( lines[i], RTL_TEXTENCODING_UTF8 ); + aResult += OString( "__" ); + OString line = OUStringToOString( lines[i], RTL_TEXTENCODING_UTF8 ); pLine = line.getStr(); while( *pLine ) { if (comphelper::string::isalnumAscii(*pLine)) { - aResult += ::rtl::OString::valueOf( *pLine ); + aResult += OString::valueOf( *pLine ); } else { - aResult += ::rtl::OString("_"); - aResult += ::rtl::OString::valueOf( (sal_Int32) *pLine, 16 ); + aResult += OString("_"); + aResult += OString::valueOf( (sal_Int32) *pLine, 16 ); } pLine++; } } - return ::rtl::OUString::createFromAscii( aResult.getStr() ); + return OUString::createFromAscii( aResult.getStr() ); } //------------------------------------------------------------------------- -static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd ) +static vector< OUString > getInfoFromInd( OUString aInd ) { - vector< ::rtl::OUString > aResult; + vector< OUString > aResult; sal_Bool aStart = sal_True; - ::rtl::OString line = ::rtl::OUStringToOString( aInd, RTL_TEXTENCODING_ASCII_US ); + OString line = OUStringToOString( aInd, RTL_TEXTENCODING_ASCII_US ); const sal_Char* pLine = line.getStr(); do { - ::rtl::OUString newItem; + OUString newItem; if( !aStart ) pLine += 2; else @@ -98,12 +98,12 @@ static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd ) while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' )) if( *pLine != '_' ) { - newItem += ::rtl::OUString::valueOf( (sal_Unicode) *pLine ); + newItem += OUString::valueOf( (sal_Unicode) *pLine ); pLine++; } else { - ::rtl::OUString aNum; + OUString aNum; for( int i = 1; i < 3; i++ ) { if( !pLine[i] @@ -115,10 +115,10 @@ static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd ) return aResult; } - aNum += ::rtl::OUString::valueOf( (sal_Unicode) pLine[i] ); + aNum += OUString::valueOf( (sal_Unicode) pLine[i] ); } - newItem += ::rtl::OUString::valueOf( (sal_Unicode) aNum.toInt32( 16 ) ); + newItem += OUString::valueOf( (sal_Unicode) aNum.toInt32( 16 ) ); pLine += 3; } @@ -133,7 +133,7 @@ static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd ) //------------------------------------------------------------------------- -static sal_Bool shorterUrl( ::rtl::OUString& aURL ) +static sal_Bool shorterUrl( OUString& aURL ) { sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); if( aInd > 0 && aURL.indexOf( "://" ) != aInd-2 ) @@ -147,9 +147,9 @@ static sal_Bool shorterUrl( ::rtl::OUString& aURL ) //------------------------------------------------------------------------- -static ::rtl::OUString getAsciiLine( const ::rtl::ByteSequence& buf ) +static OUString getAsciiLine( const ::rtl::ByteSequence& buf ) { - ::rtl::OUString aResult; + OUString aResult; ::rtl::ByteSequence outbuf( buf.getLength()*2+1 ); @@ -160,17 +160,17 @@ static ::rtl::OUString getAsciiLine( const ::rtl::ByteSequence& buf ) } outbuf[buf.getLength()*2] = '\0'; - aResult = ::rtl::OUString::createFromAscii( (sal_Char*)outbuf.getArray() ); + aResult = OUString::createFromAscii( (sal_Char*)outbuf.getArray() ); return aResult; } //------------------------------------------------------------------------- -static ::rtl::ByteSequence getBufFromAsciiLine( ::rtl::OUString line ) +static ::rtl::ByteSequence getBufFromAsciiLine( OUString line ) { OSL_ENSURE( line.getLength() % 2 == 0, "Wrong syntax!\n" ); - ::rtl::OString tmpLine = ::rtl::OUStringToOString( line, RTL_TEXTENCODING_ASCII_US ); + OString tmpLine = OUStringToOString( line, RTL_TEXTENCODING_ASCII_US ); ::rtl::ByteSequence aResult(line.getLength()/2); for( int ind = 0; ind < tmpLine.getLength()/2; ind++ ) @@ -183,18 +183,18 @@ static ::rtl::ByteSequence getBufFromAsciiLine( ::rtl::OUString line ) //------------------------------------------------------------------------- -static Sequence< ::rtl::OUString > copyVectorToSequence( const vector< ::rtl::OUString >& original ) +static Sequence< OUString > copyVectorToSequence( const vector< OUString >& original ) { - Sequence< ::rtl::OUString > newOne ( original.size() ); + Sequence< OUString > newOne ( original.size() ); for( unsigned int i = 0; i < original.size() ; i++ ) newOne[i] = original[i]; return newOne; } -static vector< ::rtl::OUString > copySequenceToVector( const Sequence< ::rtl::OUString >& original ) +static vector< OUString > copySequenceToVector( const Sequence< OUString >& original ) { - vector< ::rtl::OUString > newOne ( original.getLength() ); + vector< OUString > newOne ( original.getLength() ); for( int i = 0; i < original.getLength() ; i++ ) newOne[i] = original[i]; @@ -208,16 +208,16 @@ PassMap StorageItem::getInfo() { PassMap aResult; - Sequence< ::rtl::OUString > aNodeNames = ConfigItem::GetNodeNames( ::rtl::OUString("Store") ); + Sequence< OUString > aNodeNames = ConfigItem::GetNodeNames( OUString("Store") ); sal_Int32 aNodeCount = aNodeNames.getLength(); - Sequence< ::rtl::OUString > aPropNames( aNodeCount ); + Sequence< OUString > aPropNames( aNodeCount ); sal_Int32 aNodeInd; for( aNodeInd = 0; aNodeInd < aNodeCount; ++aNodeInd ) { - aPropNames[aNodeInd] = ::rtl::OUString("Store/Passwordstorage['"); + aPropNames[aNodeInd] = OUString("Store/Passwordstorage['"); aPropNames[aNodeInd] += aNodeNames[aNodeInd]; - aPropNames[aNodeInd] += ::rtl::OUString("']/Password"); + aPropNames[aNodeInd] += OUString("']/Password"); } Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aPropNames ); @@ -230,14 +230,14 @@ PassMap StorageItem::getInfo() for( aNodeInd = 0; aNodeInd < aNodeCount; ++aNodeInd ) { - vector< ::rtl::OUString > aUrlUsr = getInfoFromInd( aNodeNames[aNodeInd] ); + vector< OUString > aUrlUsr = getInfoFromInd( aNodeNames[aNodeInd] ); if( aUrlUsr.size() == 2 ) { - ::rtl::OUString aUrl = aUrlUsr[0]; - ::rtl::OUString aName = aUrlUsr[1]; + OUString aUrl = aUrlUsr[0]; + OUString aName = aUrlUsr[1]; - ::rtl::OUString aEPasswd; + OUString aEPasswd; aPropertyValues[aNodeInd] >>= aEPasswd; PassMap::iterator aIter = aResult.find( aUrl ); @@ -262,10 +262,10 @@ PassMap StorageItem::getInfo() void StorageItem::setUseStorage( bool bUse ) { - Sequence< ::rtl::OUString > sendNames(1); + Sequence< OUString > sendNames(1); Sequence< uno::Any > sendVals(1); - sendNames[0] = ::rtl::OUString("UseStorage"); + sendNames[0] = OUString("UseStorage"); sendVals[0] <<= bUse; @@ -277,8 +277,8 @@ void StorageItem::setUseStorage( bool bUse ) bool StorageItem::useStorage() { - Sequence< ::rtl::OUString > aNodeNames( 1 ); - aNodeNames[0] = ::rtl::OUString("UseStorage"); + Sequence< OUString > aNodeNames( 1 ); + aNodeNames[0] = OUString("UseStorage"); Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames ); @@ -296,7 +296,7 @@ bool StorageItem::useStorage() //------------------------------------------------------------------------- -bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) +bool StorageItem::getEncodedMP( OUString& aResult ) { if( hasEncoded ) { @@ -304,9 +304,9 @@ bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) return true; } - Sequence< ::rtl::OUString > aNodeNames( 2 ); - aNodeNames[0] = ::rtl::OUString("HasMaster"); - aNodeNames[1] = ::rtl::OUString("Master"); + Sequence< OUString > aNodeNames( 2 ); + aNodeNames[0] = OUString("HasMaster"); + aNodeNames[1] = OUString("Master"); Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames ); @@ -326,13 +326,13 @@ bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) //------------------------------------------------------------------------- -void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, bool bAcceptEmpty ) +void StorageItem::setEncodedMP( const OUString& aEncoded, bool bAcceptEmpty ) { - Sequence< ::rtl::OUString > sendNames(2); + Sequence< OUString > sendNames(2); Sequence< uno::Any > sendVals(2); - sendNames[0] = ::rtl::OUString("HasMaster"); - sendNames[1] = ::rtl::OUString("Master"); + sendNames[0] = OUString("HasMaster"); + sendNames[1] = OUString("Master"); sal_Bool bHasMaster = ( !aEncoded.isEmpty() || bAcceptEmpty ); sendVals[0] <<= bHasMaster; @@ -347,31 +347,31 @@ void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, bool bAcceptEmp //------------------------------------------------------------------------- -void StorageItem::remove( const ::rtl::OUString& aURL, const ::rtl::OUString& aName ) +void StorageItem::remove( const OUString& aURL, const OUString& aName ) { - vector < ::rtl::OUString > forIndex; + vector < OUString > forIndex; forIndex.push_back( aURL ); forIndex.push_back( aName ); - Sequence< ::rtl::OUString > sendSeq(1); + Sequence< OUString > sendSeq(1); sendSeq[0] = createIndex( forIndex ); - ConfigItem::ClearNodeElements( ::rtl::OUString("Store"), sendSeq ); + ConfigItem::ClearNodeElements( OUString("Store"), sendSeq ); } //------------------------------------------------------------------------- void StorageItem::clear() { - Sequence< ::rtl::OUString > sendSeq(1); + Sequence< OUString > sendSeq(1); - ConfigItem::ClearNodeSet( ::rtl::OUString("Store") ); + ConfigItem::ClearNodeSet( OUString("Store") ); } //------------------------------------------------------------------------- -void StorageItem::update( const ::rtl::OUString& aURL, const NamePassRecord& aRecord ) +void StorageItem::update( const OUString& aURL, const NamePassRecord& aRecord ) { if ( !aRecord.HasPasswords( PERSISTENT_RECORD ) ) { @@ -379,25 +379,25 @@ void StorageItem::update( const ::rtl::OUString& aURL, const NamePassRecord& aRe return; } - vector < ::rtl::OUString > forIndex; + vector < OUString > forIndex; forIndex.push_back( aURL ); forIndex.push_back( aRecord.GetUserName() ); Sequence< beans::PropertyValue > sendSeq(1); - sendSeq[0].Name = ::rtl::OUString("Store/Passwordstorage['"); + sendSeq[0].Name = OUString("Store/Passwordstorage['"); sendSeq[0].Name += createIndex( forIndex ); - sendSeq[0].Name += ::rtl::OUString("']/Password"); + sendSeq[0].Name += OUString("']/Password"); sendSeq[0].Value <<= aRecord.GetPersPasswords(); ConfigItem::SetModified(); - ConfigItem::SetSetProperties( ::rtl::OUString("Store"), sendSeq ); + ConfigItem::SetSetProperties( OUString("Store"), sendSeq ); } //------------------------------------------------------------------------- -void StorageItem::Notify( const Sequence< ::rtl::OUString >& ) +void StorageItem::Notify( const Sequence< OUString >& ) { // this feature still should not be used if( mainCont ) @@ -423,7 +423,7 @@ PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xSe mComponent = Reference< XComponent >( xServiceFactory, UNO_QUERY ); mComponent->addEventListener( this ); - m_pStorageFile = new StorageItem( this, ::rtl::OUString("Office.Common/Passwords") ); + m_pStorageFile = new StorageItem( this, OUString("Office.Common/Passwords") ); if( m_pStorageFile ) if( m_pStorageFile->useStorage() ) m_aContainer = m_pStorageFile->getInfo(); @@ -469,7 +469,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx //------------------------------------------------------------------------- -vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPasswd ) throw(RuntimeException) +vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException) { if( !aMasterPasswd.isEmpty() ) { @@ -497,7 +497,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr result = rtl_cipher_decode ( aDecoder, (sal_uInt8*)aSeq.getArray(), aSeq.getLength(), (sal_uInt8*)resSeq.getArray(), resSeq.getLength() ); - ::rtl::OUString aPasswd( ( sal_Char* )resSeq.getArray(), resSeq.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString aPasswd( ( sal_Char* )resSeq.getArray(), resSeq.getLength(), RTL_TEXTENCODING_UTF8 ); rtl_cipher_destroy (aDecoder); @@ -515,17 +515,17 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr // problems with decoding OSL_FAIL( "Problem with decoding\n" ); - throw RuntimeException( ::rtl::OUString("Can't decode!"), Reference< XInterface >() ); + throw RuntimeException( OUString("Can't decode!"), Reference< XInterface >() ); } //------------------------------------------------------------------------- -::rtl::OUString PasswordContainer::EncodePasswords( vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPasswd ) throw(RuntimeException) +OUString PasswordContainer::EncodePasswords( vector< OUString > lines, const OUString& aMasterPasswd ) throw(RuntimeException) { if( !aMasterPasswd.isEmpty() ) { - ::rtl::OString aSeq = ::rtl::OUStringToOString( createIndex( lines ), RTL_TEXTENCODING_UTF8 ); + OString aSeq = OUStringToOString( createIndex( lines ), RTL_TEXTENCODING_UTF8 ); rtlCipher aEncoder = rtl_cipher_create (rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream ); OSL_ENSURE( aEncoder, "Can't create encoder\n" ); @@ -558,7 +558,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr if( result == rtl_Cipher_E_None ) { - ::rtl::OUString testOU = getAsciiLine( resSeq ); + OUString testOU = getAsciiLine( resSeq ); ::rtl::ByteSequence aSeq1 = getBufFromAsciiLine( testOU ); ::rtl::ByteSequence resSeq1( aSeq1.getLength() ); @@ -567,13 +567,13 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr { for( int ind = 0; ind < aSeq1.getLength(); ind++ ) if( resSeq[ind] != aSeq1[ind] ) - testOU = ::rtl::OUString(); + testOU = OUString(); } result = rtl_cipher_decode ( aEncoder, (sal_uInt8*)aSeq1.getArray(), aSeq1.getLength(), (sal_uInt8*)resSeq1.getArray(), resSeq1.getLength() ); - ::rtl::OUString aPasswd( ( sal_Char* )resSeq1.getArray(), resSeq1.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString aPasswd( ( sal_Char* )resSeq1.getArray(), resSeq1.getLength(), RTL_TEXTENCODING_UTF8 ); } */ @@ -595,12 +595,12 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr // problems with encoding OSL_FAIL( "Problem with encoding\n" ); - throw RuntimeException( ::rtl::OUString("Can't encode!"), Reference< XInterface >() ); + throw RuntimeException( OUString("Can't encode!"), Reference< XInterface >() ); } //------------------------------------------------------------------------- -void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException) +void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException) { for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter ) if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) ) @@ -636,7 +636,7 @@ void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePas UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler ) { - ::std::vector< ::rtl::OUString > aPasswords; + ::std::vector< OUString > aPasswords; if( aRecord.HasPasswords( MEMORY_RECORD ) ) aPasswords = aRecord.GetMemPasswords(); @@ -644,7 +644,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, b { try { - ::std::vector< ::rtl::OUString > aDecodedPasswords = DecodePasswords( aRecord.GetPersPasswords(), GetMasterPassword( aHandler ) ); + ::std::vector< OUString > aDecodedPasswords = DecodePasswords( aRecord.GetPersPasswords(), GetMasterPassword( aHandler ) ); aPasswords.insert( aPasswords.end(), aDecodedPasswords.begin(), aDecodedPasswords.end() ); } catch( NoMasterException& ) @@ -677,7 +677,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::add( const ::rtl::OUString& Url, const ::rtl::OUString& UserName, const Sequence< ::rtl::OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { ::osl::MutexGuard aGuard( mMutex ); @@ -686,7 +686,7 @@ void SAL_CALL PasswordContainer::add( const ::rtl::OUString& Url, const ::rtl::O //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::addPersistent( const ::rtl::OUString& Url, const ::rtl::OUString& UserName, const Sequence< ::rtl::OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { ::osl::MutexGuard aGuard( mMutex ); @@ -695,10 +695,10 @@ void SAL_CALL PasswordContainer::addPersistent( const ::rtl::OUString& Url, cons //------------------------------------------------------------------------- -void PasswordContainer::PrivateAdd( const ::rtl::OUString& Url, const ::rtl::OUString& UserName, const Sequence< ::rtl::OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { NamePassRecord aRecord( UserName ); - ::std::vector< ::rtl::OUString > aStorePass = copySequenceToVector( Passwords ); + ::std::vector< OUString > aStorePass = copySequenceToVector( Passwords ); if( Mode == PERSISTENT_RECORD ) aRecord.SetPersPasswords( EncodePasswords( aStorePass, GetMasterPassword( aHandler ) ) ); @@ -732,21 +732,21 @@ void PasswordContainer::PrivateAdd( const ::rtl::OUString& Url, const ::rtl::OUS //------------------------------------------------------------------------- -UrlRecord SAL_CALL PasswordContainer::find( const ::rtl::OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { - return find( aURL, rtl::OUString(), false, aHandler ); + return find( aURL, OUString(), false, aHandler ); } //------------------------------------------------------------------------- -UrlRecord SAL_CALL PasswordContainer::findForName( const ::rtl::OUString& aURL, const ::rtl::OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { return find( aURL, aName, true, aHandler ); } //------------------------------------------------------------------------- -Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const ::rtl::OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { sal_uInt32 nInd = 0; for( list< NamePassRecord >::const_iterator aNPIter = userlist.begin(); @@ -771,7 +771,7 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& bool PasswordContainer::createUrlRecord( const PassMap::iterator & rIter, bool bName, - const ::rtl::OUString & aName, + const OUString & aName, const Reference< XInteractionHandler >& aHandler, UrlRecord & rRec ) throw( RuntimeException ) @@ -799,8 +799,8 @@ bool PasswordContainer::createUrlRecord( //------------------------------------------------------------------------- UrlRecord PasswordContainer::find( - const ::rtl::OUString& aURL, - const ::rtl::OUString& aName, + const OUString& aURL, + const OUString& aName, bool bName, // only needed to support empty user names const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -808,7 +808,7 @@ UrlRecord PasswordContainer::find( if( !m_aContainer.empty() && !aURL.isEmpty() ) { - ::rtl::OUString aUrl( aURL ); + OUString aUrl( aURL ); // each iteration remove last '/...' section from the aUrl // while it's possible, up to the most left '://' @@ -824,9 +824,9 @@ UrlRecord PasswordContainer::find( } else { - ::rtl::OUString tmpUrl( aUrl ); + OUString tmpUrl( aUrl ); if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' ) - tmpUrl += ::rtl::OUString("/"); + tmpUrl += OUString("/"); aIter = m_aContainer.lower_bound( tmpUrl ); if( aIter != m_aContainer.end() && aIter->first.match( tmpUrl ) ) @@ -844,20 +844,20 @@ UrlRecord PasswordContainer::find( } //------------------------------------------------------------------------- -::rtl::OUString PasswordContainer::GetDefaultMasterPassword() +OUString PasswordContainer::GetDefaultMasterPassword() { - ::rtl::OUString aResult; + OUString aResult; for ( sal_Int32 nInd = 0; nInd < RTL_DIGEST_LENGTH_MD5; nInd++ ) - aResult += ::rtl::OUString( "aa" ); + aResult += OUString( "aa" ); return aResult; } //------------------------------------------------------------------------- -::rtl::OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode, const uno::Reference< task::XInteractionHandler >& xHandler ) +OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode, const uno::Reference< task::XInteractionHandler >& xHandler ) { // empty string means that the call was cancelled or just failed - ::rtl::OUString aResult; + OUString aResult; if ( xHandler.is() ) { @@ -885,15 +885,15 @@ UrlRecord PasswordContainer::find( //------------------------------------------------------------------------- -::rtl::OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER; if( !m_pStorageFile || !m_pStorageFile->useStorage() ) - throw NoMasterException( ::rtl::OUString("Password storing is not active!"), Reference< XInterface >(), aRMode ); + throw NoMasterException( OUString("Password storing is not active!"), Reference< XInterface >(), aRMode ); if( m_aMasterPasswd.isEmpty() && aHandler.is() ) { - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; sal_Bool bAskAgain = sal_False; sal_Bool bDefaultPassword = sal_False; @@ -910,19 +910,19 @@ UrlRecord PasswordContainer::find( do { bAskAgain = sal_False; - ::rtl::OUString aPass = RequestPasswordFromUser( aRMode, aHandler ); + OUString aPass = RequestPasswordFromUser( aRMode, aHandler ); if ( !aPass.isEmpty() ) { if( aRMode == PasswordRequestMode_PASSWORD_CREATE ) { m_aMasterPasswd = aPass; - vector< ::rtl::OUString > aMaster( 1, m_aMasterPasswd ); + vector< OUString > aMaster( 1, m_aMasterPasswd ); m_pStorageFile->setEncodedMP( EncodePasswords( aMaster, m_aMasterPasswd ) ); } else { - vector< ::rtl::OUString > aRM( DecodePasswords( aEncodedMP, aPass ) ); + vector< OUString > aRM( DecodePasswords( aEncodedMP, aPass ) ); if( aRM.empty() || !aPass.equals( aRM[0] ) ) { bAskAgain = sal_True; @@ -938,18 +938,18 @@ UrlRecord PasswordContainer::find( } if ( m_aMasterPasswd.isEmpty() ) - throw NoMasterException( ::rtl::OUString("No master password!"), Reference< XInterface >(), aRMode ); + throw NoMasterException( OUString("No master password!"), Reference< XInterface >(), aRMode ); return m_aMasterPasswd; } //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rtl::OUString& aName ) throw(RuntimeException) +void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( mMutex ); - ::rtl::OUString aUrl( aURL ); + OUString aUrl( aURL ); if( !m_aContainer.empty() ) { PassMap::iterator aIter = m_aContainer.find( aUrl ); @@ -960,7 +960,7 @@ void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rt if( aInd > 0 && aUrl.getLength()-1 == aInd ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else - aUrl += ::rtl::OUString("/"); + aUrl += OUString("/"); aIter = m_aContainer.find( aUrl ); } @@ -987,11 +987,11 @@ void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rt //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::removePersistent( const ::rtl::OUString& aURL, const ::rtl::OUString& aName ) throw(RuntimeException) +void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( mMutex ); - ::rtl::OUString aUrl( aURL ); + OUString aUrl( aURL ); if( !m_aContainer.empty() ) { PassMap::iterator aIter = m_aContainer.find( aUrl ); @@ -1002,7 +1002,7 @@ void SAL_CALL PasswordContainer::removePersistent( const ::rtl::OUString& aURL, if( aInd > 0 && aUrl.getLength()-1 == aInd ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else - aUrl += ::rtl::OUString("/"); + aUrl += OUString("/"); aIter = m_aContainer.find( aUrl ); } @@ -1108,7 +1108,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R throw (uno::RuntimeException) { sal_Bool bResult = sal_False; - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler; ::osl::MutexGuard aGuard( mMutex ); @@ -1134,7 +1134,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R { // there is a password, it should be just rechecked PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER; - ::rtl::OUString aPass; + OUString aPass; do { aPass = RequestPasswordFromUser( aRMode, xTmpHandler ); @@ -1177,7 +1177,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< sal_Bool bCanChangePassword = sal_True; // if there is already a stored master password it should be entered by the user before the change happen - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; if( !m_aMasterPasswd.isEmpty() || m_pStorageFile->getEncodedMP( aEncodedMP ) ) bCanChangePassword = authorizateWithMasterPassword( xTmpHandler ); @@ -1185,7 +1185,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< { // ask for the new password, but do not set it PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_CREATE; - ::rtl::OUString aPass = RequestPasswordFromUser( aRMode, xTmpHandler ); + OUString aPass = RequestPasswordFromUser( aRMode, xTmpHandler ); if ( !aPass.isEmpty() ) { @@ -1197,7 +1197,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< // store the new master password m_aMasterPasswd = aPass; - vector< ::rtl::OUString > aMaster( 1, m_aMasterPasswd ); + vector< OUString > aMaster( 1, m_aMasterPasswd ); m_pStorageFile->setEncodedMP( EncodePasswords( aMaster, m_aMasterPasswd ) ); // store all the entries with the new password @@ -1226,8 +1226,8 @@ void SAL_CALL PasswordContainer::removeMasterPassword() ::osl::MutexGuard aGuard( mMutex ); if ( m_pStorageFile ) { - m_aMasterPasswd = ::rtl::OUString(); - m_pStorageFile->setEncodedMP( ::rtl::OUString() ); // let the master password be removed from configuration + m_aMasterPasswd = OUString(); + m_pStorageFile->setEncodedMP( OUString() ); // let the master password be removed from configuration } } @@ -1240,7 +1240,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() if ( !m_pStorageFile ) throw uno::RuntimeException(); - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; return ( m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) ); } @@ -1294,14 +1294,14 @@ void SAL_CALL PasswordContainer::removeMasterPassword() sal_Bool bCanChangePassword = sal_True; // if there is already a stored nondefault master password it should be entered by the user before the change happen - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; if( m_pStorageFile->getEncodedMP( aEncodedMP ) && !aEncodedMP.isEmpty() ) bCanChangePassword = authorizateWithMasterPassword( xTmpHandler ); if ( bCanChangePassword ) { // generate the default password - ::rtl::OUString aPass = GetDefaultMasterPassword(); + OUString aPass = GetDefaultMasterPassword(); if ( !aPass.isEmpty() ) { // get all the persistent entries if it is possible @@ -1312,7 +1312,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() // store the empty string to flag the default master password m_aMasterPasswd = aPass; - m_pStorageFile->setEncodedMP( ::rtl::OUString(), sal_True ); + m_pStorageFile->setEncodedMP( OUString(), sal_True ); // store all the entries with the new password for ( int nURLInd = 0; nURLInd < aPersistent.getLength(); nURLInd++ ) @@ -1340,34 +1340,34 @@ void SAL_CALL PasswordContainer::removeMasterPassword() if ( !m_pStorageFile ) throw uno::RuntimeException(); - ::rtl::OUString aEncodedMP; + OUString aEncodedMP; return ( m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) && aEncodedMP.isEmpty() ); } //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::addUrl( const ::rtl::OUString& Url, ::sal_Bool MakePersistent ) +void SAL_CALL PasswordContainer::addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (uno::RuntimeException) { mUrlContainer.add( Url, MakePersistent ); } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL PasswordContainer::findUrl( const ::rtl::OUString& Url ) +OUString SAL_CALL PasswordContainer::findUrl( const OUString& Url ) throw (uno::RuntimeException) { return mUrlContainer.find( Url ); } //------------------------------------------------------------------------- -void SAL_CALL PasswordContainer::removeUrl( const ::rtl::OUString& Url ) +void SAL_CALL PasswordContainer::removeUrl( const OUString& Url ) throw (uno::RuntimeException) { mUrlContainer.remove( Url ); } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::getUrls( ::sal_Bool OnlyPersistent ) +uno::Sequence< OUString > SAL_CALL PasswordContainer::getUrls( ::sal_Bool OnlyPersistent ) throw (uno::RuntimeException) { return mUrlContainer.list( OnlyPersistent ); @@ -1422,14 +1422,14 @@ void PasswordContainer::Notify() //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException) { return impl_getStaticImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL PasswordContainer::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { if ( ServiceName.compareToAscii("com.sun.star.task.PasswordContainer") == 0 ) return sal_True; @@ -1439,25 +1439,25 @@ sal_Bool SAL_CALL PasswordContainer::supportsService( const ::rtl::OUString& Ser //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException) +Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException) { return impl_getStaticSupportedServiceNames(); } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException) +Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException) { - Sequence< ::rtl::OUString > aRet(1); - *aRet.getArray() = ::rtl::OUString("com.sun.star.task.PasswordContainer"); + Sequence< OUString > aRet(1); + *aRet.getArray() = OUString("com.sun.star.task.PasswordContainer"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException) { - return ::rtl::OUString("stardiv.svl.PasswordContainer"); + return OUString("stardiv.svl.PasswordContainer"); } //------------------------------------------------------------------------- diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index f9cb5303dc97..83e3b11e02e2 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -24,19 +24,19 @@ using namespace com::sun::star; SysCredentialsConfigItem::SysCredentialsConfigItem( SysCredentialsConfig * pOwner ) -: utl::ConfigItem( rtl::OUString("Office.Common/Passwords"), +: utl::ConfigItem( OUString("Office.Common/Passwords"), CONFIG_MODE_IMMEDIATE_UPDATE ), m_bInited( false ), m_pOwner( pOwner ) { - uno::Sequence< ::rtl::OUString > aNode( 1 ); - aNode[ 0 ] = rtl::OUString( "Office.Common/Passwords/AuthenticateUsingSystemCredentials" ); + uno::Sequence< OUString > aNode( 1 ); + aNode[ 0 ] = OUString( "Office.Common/Passwords/AuthenticateUsingSystemCredentials" ); EnableNotification( aNode ); } //virtual void SysCredentialsConfigItem::Notify( - const uno::Sequence< rtl::OUString > & /*seqPropertyNames*/ ) + const uno::Sequence< OUString > & /*seqPropertyNames*/ ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -52,15 +52,15 @@ void SysCredentialsConfigItem::Commit() // does nothing } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SysCredentialsConfigItem::getSystemCredentialsURLs() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_bInited ) { // read config item - uno::Sequence< ::rtl::OUString > aPropNames( 1 ); - aPropNames[ 0 ] = rtl::OUString( "AuthenticateUsingSystemCredentials" ); + uno::Sequence< OUString > aPropNames( 1 ); + aPropNames[ 0 ] = OUString( "AuthenticateUsingSystemCredentials" ); uno::Sequence< uno::Any > aAnyValues( utl::ConfigItem::GetProperties( aPropNames ) ); @@ -69,7 +69,7 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() "SysCredentialsConfigItem::getSystemCredentialsURLs: " "Error reading config item!" ); - uno::Sequence< rtl::OUString > aValues; + uno::Sequence< OUString > aValues; if ( ( aAnyValues[ 0 ] >>= aValues ) || ( !aAnyValues[ 0 ].hasValue() ) ) { @@ -81,14 +81,14 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() } void SysCredentialsConfigItem::setSystemCredentialsURLs( - const uno::Sequence< rtl::OUString > & seqURLList ) + const uno::Sequence< OUString > & seqURLList ) { ::osl::MutexGuard aGuard( m_aMutex ); // write config item. - uno::Sequence< rtl::OUString > aPropNames( 1 ); + uno::Sequence< OUString > aPropNames( 1 ); uno::Sequence< uno::Any > aPropValues( 1 ); - aPropNames[ 0 ] = ::rtl::OUString( "AuthenticateUsingSystemCredentials" ); + aPropNames[ 0 ] = OUString( "AuthenticateUsingSystemCredentials" ); aPropValues[ 0 ] <<= seqURLList; utl::ConfigItem::SetModified(); @@ -103,7 +103,7 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( namespace { // TODO: This code is actually copied from svl/source/passwordcontainer.cxx - bool removeLastSegment( ::rtl::OUString & aURL ) + bool removeLastSegment( OUString & aURL ) { sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); @@ -121,12 +121,12 @@ namespace return false; } - bool findURL( StringSet const & rContainer, rtl::OUString const & aURL, rtl::OUString & aResult ) + bool findURL( StringSet const & rContainer, OUString const & aURL, OUString & aResult ) { // TODO: This code is actually copied from svl/source/passwordcontainer.cxx if( !rContainer.empty() && !aURL.isEmpty() ) { - ::rtl::OUString aUrl( aURL ); + OUString aUrl( aURL ); // each iteration remove last '/...' section from the aUrl // while it's possible, up to the most left '://' @@ -141,9 +141,9 @@ namespace } else { - ::rtl::OUString tmpUrl( aUrl ); + OUString tmpUrl( aUrl ); if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' ) - tmpUrl += ::rtl::OUString("/"); + tmpUrl += OUString("/"); aIter = rContainer.lower_bound( tmpUrl ); if( aIter != rContainer.end() && aIter->match( tmpUrl ) ) @@ -155,7 +155,7 @@ namespace } while( removeLastSegment( aUrl ) && !aUrl.isEmpty() ); } - aResult = rtl::OUString(); + aResult = OUString(); return false; } @@ -172,7 +172,7 @@ void SysCredentialsConfig::initCfg() osl::MutexGuard aGuard( m_aMutex ); if ( !m_bCfgInited ) { - uno::Sequence< rtl::OUString > aURLs( + uno::Sequence< OUString > aURLs( m_aConfigItem.getSystemCredentialsURLs() ); for ( sal_Int32 n = 0; n < aURLs.getLength(); ++n ) m_aCfgContainer.insert( aURLs[ n ] ); @@ -187,7 +187,7 @@ void SysCredentialsConfig::writeCfg() OSL_ENSURE( m_bCfgInited, "SysCredentialsConfig::writeCfg : not initialized!" ); - uno::Sequence< rtl::OUString > aURLs( m_aCfgContainer.size() ); + uno::Sequence< OUString > aURLs( m_aCfgContainer.size() ); StringSet::const_iterator it = m_aCfgContainer.begin(); const StringSet::const_iterator end = m_aCfgContainer.end(); sal_Int32 n = 0; @@ -202,10 +202,10 @@ void SysCredentialsConfig::writeCfg() m_aConfigItem.setSystemCredentialsURLs( aURLs ); } -rtl::OUString SysCredentialsConfig::find( rtl::OUString const & aURL ) +OUString SysCredentialsConfig::find( OUString const & aURL ) { osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString aResult; + OUString aResult; if ( findURL( m_aMemContainer, aURL, aResult ) ) return aResult; @@ -213,10 +213,10 @@ rtl::OUString SysCredentialsConfig::find( rtl::OUString const & aURL ) if ( findURL( m_aCfgContainer, aURL, aResult ) ) return aResult; - return rtl::OUString(); + return OUString(); } -void SysCredentialsConfig::add( rtl::OUString const & rURL, bool bPersistent ) +void SysCredentialsConfig::add( OUString const & rURL, bool bPersistent ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -238,7 +238,7 @@ void SysCredentialsConfig::add( rtl::OUString const & rURL, bool bPersistent ) } } -void SysCredentialsConfig::remove( rtl::OUString const & rURL ) +void SysCredentialsConfig::remove( OUString const & rURL ) { m_aMemContainer.erase( rURL ); @@ -247,12 +247,12 @@ void SysCredentialsConfig::remove( rtl::OUString const & rURL ) writeCfg(); } -uno::Sequence< rtl::OUString > SysCredentialsConfig::list( bool bOnlyPersistent ) +uno::Sequence< OUString > SysCredentialsConfig::list( bool bOnlyPersistent ) { initCfg(); sal_Int32 nCount = m_aCfgContainer.size() + ( bOnlyPersistent ? 0 : m_aMemContainer.size() ); - uno::Sequence< rtl::OUString > aResult( nCount ); + uno::Sequence< OUString > aResult( nCount ); StringSet::const_iterator it = m_aCfgContainer.begin(); StringSet::const_iterator end = m_aCfgContainer.end(); diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx index 6640eece8e90..e5dadaf48623 100644 --- a/svl/source/passwordcontainer/syscreds.hxx +++ b/svl/source/passwordcontainer/syscreds.hxx @@ -36,37 +36,37 @@ class SysCredentialsConfigItem : public utl::ConfigItem //virtual ~SysCredentialsConfigItem(); virtual void Notify( - const com::sun::star::uno::Sequence< rtl::OUString > & + const com::sun::star::uno::Sequence< OUString > & seqPropertyNames ); virtual void Commit(); - com::sun::star::uno::Sequence< rtl::OUString > + com::sun::star::uno::Sequence< OUString > getSystemCredentialsURLs(); void setSystemCredentialsURLs( - const com::sun::star::uno::Sequence< rtl::OUString > & + const com::sun::star::uno::Sequence< OUString > & seqURLList ); - //bool isSystemCredentialsURL( const rtl::OUString & rURL ) const; + //bool isSystemCredentialsURL( const OUString & rURL ) const; private: ::osl::Mutex m_aMutex; bool m_bInited; - com::sun::star::uno::Sequence< rtl::OUString > m_seqURLs; + com::sun::star::uno::Sequence< OUString > m_seqURLs; SysCredentialsConfig * m_pOwner; }; -typedef std::set< rtl::OUString > StringSet; +typedef std::set< OUString > StringSet; class SysCredentialsConfig { public: SysCredentialsConfig(); - rtl::OUString find( rtl::OUString const & rURL ); - void add( rtl::OUString const & rURL, bool bPersistent ); - void remove( rtl::OUString const & rURL ); - com::sun::star::uno::Sequence< rtl::OUString > list( bool bOnlyPersistent ); + OUString find( OUString const & rURL ); + void add( OUString const & rURL, bool bPersistent ); + void remove( OUString const & rURL ); + com::sun::star::uno::Sequence< OUString > list( bool bOnlyPersistent ); void persistentConfigChanged(); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 007fb3670624..5928211f00f8 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -341,7 +341,7 @@ void DdeTransaction::Execute() // --- DdeTransaction::GetName() ----------------------------------- -const rtl::OUString DdeTransaction::GetName() const +const OUString DdeTransaction::GetName() const { return pName->toOUString(); } diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index c47d390eee7e..4b4c051a8ca3 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -183,7 +183,7 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt ) TCHAR szName[ 256 ]; if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) ) - nFmt = SotExchange::RegisterFormatName( rtl::OUString(reinterpret_cast<const sal_Unicode*>(szName)) ); + nFmt = SotExchange::RegisterFormatName( OUString(reinterpret_cast<const sal_Unicode*>(szName)) ); } #endif break; diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 02e684129ee7..aea1b892887a 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -84,19 +84,19 @@ public: class DdeString { private: - rtl::OUString m_aString; + OUString m_aString; protected: HSZ hString; DWORD hInst; public: DdeString( DWORD, const sal_Unicode* ); - DdeString( DWORD, const rtl::OUString& ); + DdeString( DWORD, const OUString& ); ~DdeString(); int operator==( HSZ ); operator HSZ(); - rtl::OUString toOUString() const { return m_aString; } + OUString toOUString() const { return m_aString; } }; // -------------- diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 6a2564dd17a3..0a07a77e0fe8 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -34,7 +34,7 @@ DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) // --- DdeString::DdeString() -------------------------------------- -DdeString::DdeString( DWORD hDdeInst, const rtl::OUString& r) +DdeString::DdeString( DWORD hDdeInst, const OUString& r) : m_aString(r) { hString = DdeCreateStringHandle( hDdeInst, (LPTSTR)r.getStr(), CP_WINUNICODE ); diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 24817fce2b32..202d26d9f18f 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -95,7 +95,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( sal_Int32 n = 0; while( -1 != n ) { - rtl::OUString s( sTopics.GetToken( 0, '\t', n )); + OUString s( sTopics.GetToken( 0, '\t', n )); if( s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) ++nTopics; } @@ -123,7 +123,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( sal_Int32 n = 0; while( -1 != n ) { - rtl::OUString s( sTopics.GetToken( 0, '\t', n )); + OUString s( sTopics.GetToken( 0, '\t', n )); s = comphelper::string::remove(s, '\n'); s = comphelper::string::remove(s, '\r'); if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) @@ -224,7 +224,7 @@ found: if ( pItem ) pTopic->aItem = pItem->GetName(); else - pTopic->aItem = rtl::OUString(); + pTopic->aItem = OUString(); sal_Bool bRes = sal_False; pInst->hCurConvSvr = (long)hConv; @@ -519,7 +519,7 @@ DdeService::~DdeService() // --- DdeService::GetName() --------------------------------------- -const rtl::OUString DdeService::GetName() const +const OUString DdeService::GetName() const { return pName->toOUString(); } @@ -612,7 +612,7 @@ void DdeService::RemoveFormat( sal_uLong nFmt ) // --- DdeTopic::DdeTopic() ---------------------------------------- -DdeTopic::DdeTopic( const rtl::OUString& rName ) +DdeTopic::DdeTopic( const OUString& rName ) { DdeInstData* pInst = ImpGetInstData(); DBG_ASSERT(pInst,"SVDDE:No instance data"); @@ -635,7 +635,7 @@ DdeTopic::~DdeTopic() // --- DdeTopic::GetName() ----------------------------------------- -const rtl::OUString DdeTopic::GetName() const +const OUString DdeTopic::GetName() const { return pName->toOUString(); } @@ -838,7 +838,7 @@ DdeItem::~DdeItem() // --- DdeItem::GetName() ------------------------------------------ -const rtl::OUString DdeItem::GetName() const +const OUString DdeItem::GetName() const { return pName->toOUString(); } @@ -985,7 +985,7 @@ String DdeService::SysItems() s += '\t'; s += (*iterItem)->GetName(); } - s += rtl::OUString("\r\n"); + s += OUString("\r\n"); } } @@ -1006,7 +1006,7 @@ String DdeService::Topics() s += '\t'; s += (*iter)->GetName(); } - s += rtl::OUString("\r\n"); + s += OUString("\r\n"); return s; } @@ -1028,22 +1028,22 @@ String DdeService::Formats() switch( (sal_uInt16)f ) { case CF_TEXT: - s += rtl::OUString("TEXT"); + s += OUString("TEXT"); break; case CF_BITMAP: - s += rtl::OUString("BITMAP"); + s += OUString("BITMAP"); break; default: { TCHAR buf[128]; GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) ); - s += rtl::OUString(reinterpret_cast<sal_Unicode*>(buf)); + s += OUString(reinterpret_cast<sal_Unicode*>(buf)); } break; } } - s += rtl::OUString("\r\n"); + s += OUString("\r\n"); return s; } @@ -1052,7 +1052,7 @@ String DdeService::Formats() String DdeService::Status() { - return IsBusy() ? rtl::OUString("Busy\r\n") : rtl::OUString("Ready\r\n"); + return IsBusy() ? OUString("Busy\r\n") : OUString("Ready\r\n"); } // --- DdeService::IsBusy() ---------------------------------------- @@ -1069,12 +1069,12 @@ String DdeService::GetHelp() return String(); } -sal_Bool DdeTopic::MakeItem( const rtl::OUString& ) +sal_Bool DdeTopic::MakeItem( const OUString& ) { return sal_False; } -sal_Bool DdeService::MakeTopic( const rtl::OUString& ) +sal_Bool DdeService::MakeTopic( const OUString& ) { return sal_False; } diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index e35e3b89b4a8..012d2baec6d8 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -using rtl::OUString; // ----------------------------------------------------------------------- diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index b0f3b5bdbf4a..e188dbdb8055 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -27,7 +27,6 @@ using css::uno::Reference; using css::uno::Sequence; -using rtl::OUString; // ------------------------------------------------------------------------------------- diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index d38a3d1e628e..70104ef189bc 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -129,7 +129,7 @@ DdePoke::DdePoke( DdeConnection& rConnection, const String& rString, const DdeDa } -DdeTopic::DdeTopic( const rtl::OUString& ) +DdeTopic::DdeTopic( const OUString& ) { } @@ -163,7 +163,7 @@ DdeData* DdeTopic::Get( SAL_UNUSED_PARAMETER sal_uLong ) return NULL; } -sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const rtl::OUString& ) +sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const OUString& ) { return sal_False; } @@ -188,9 +188,9 @@ sal_Bool DdeTopic::Put( SAL_UNUSED_PARAMETER const DdeData* ) return sal_False; } -const rtl::OUString DdeTopic::GetName() const +const OUString DdeTopic::GetName() const { - return rtl::OUString(); + return OUString(); } DdeService::DdeService( const String& ) @@ -248,14 +248,14 @@ void DdeService::RemoveTopic( SAL_UNUSED_PARAMETER const DdeTopic& ) { } -sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& ) +sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const OUString& ) { return sal_False; } -const rtl::OUString DdeService::GetName() const +const OUString DdeService::GetName() const { - return rtl::OUString(); + return OUString(); } namespace |