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 /svtools | |
| 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 'svtools')
188 files changed, 1632 insertions, 1653 deletions
diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx index 33f9dc0f1c18..2b66d8f87229 100644 --- a/svtools/inc/svtools/DocumentInfoPreview.hxx +++ b/svtools/inc/svtools/DocumentInfoPreview.hxx @@ -53,16 +53,16 @@ public: void fill( com::sun::star::uno::Reference< com::sun::star::document::XDocumentProperties > const & xDocProps, - rtl::OUString const & rURL); + OUString const & rURL); private: ExtMultiLineEdit m_pEditWin; boost::scoped_ptr< SvtDocInfoTable_Impl > m_pInfoTable; com::sun::star::lang::Locale m_aLocale; - void insertEntry(rtl::OUString const & title, rtl::OUString const & value); + void insertEntry(OUString const & title, OUString const & value); - void insertNonempty(long id, rtl::OUString const & value); + void insertNonempty(long id, OUString const & value); void insertDateTime(long id, com::sun::star::util::DateTime const & value); }; diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/svtools/inc/svtools/PlaceEditDialog.hxx index 4db4316ab806..96afef7d1a3e 100644 --- a/svtools/inc/svtools/PlaceEditDialog.hxx +++ b/svtools/inc/svtools/PlaceEditDialog.hxx @@ -73,8 +73,8 @@ public : // Returns a place instance with given informations boost::shared_ptr<Place> GetPlace(); - rtl::OUString GetServerName() { return m_pEDServerName->GetText(); } - rtl::OUString GetServerUrl(); + OUString GetServerName() { return m_pEDServerName->GetText(); } + OUString GetServerUrl(); private: diff --git a/svtools/inc/svtools/ServerDetailsControls.hxx b/svtools/inc/svtools/ServerDetailsControls.hxx index 1dfc05110b1e..92077f2200a3 100644 --- a/svtools/inc/svtools/ServerDetailsControls.hxx +++ b/svtools/inc/svtools/ServerDetailsControls.hxx @@ -47,7 +47,7 @@ class DetailsContainer VclFrame* m_pFrame; public: - DetailsContainer( VclBuilderContainer* pBuilder, const rtl::OString& rFrame ); + DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame ); virtual ~DetailsContainer( ); void setChangeHdl( const Link& rLink ) { m_aChangeHdl = rLink; } @@ -62,7 +62,7 @@ class DetailsContainer */ virtual bool setUrl( const INetURLObject& rUrl ); - virtual void setUsername( const rtl::OUString& /*rUsername*/ ) { }; + virtual void setUsername( const OUString& /*rUsername*/ ) { }; protected: void notifyChange( ); @@ -73,7 +73,7 @@ class HostDetailsContainer : public DetailsContainer { private: sal_uInt16 m_nDefaultPort; - rtl::OUString m_sScheme; + OUString m_sScheme; protected: Edit* m_pEDHost; @@ -81,7 +81,7 @@ class HostDetailsContainer : public DetailsContainer Edit* m_pEDPath; public: - HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, rtl::OUString sScheme ); + HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, OUString sScheme ); virtual ~HostDetailsContainer( ) { }; virtual void show( bool bShow = true ); @@ -89,12 +89,12 @@ class HostDetailsContainer : public DetailsContainer virtual bool setUrl( const INetURLObject& rUrl ); protected: - void setScheme( rtl::OUString sScheme ) { m_sScheme = sScheme; } + void setScheme( OUString sScheme ) { m_sScheme = sScheme; } /** Verifies that the schement split from the URL can be handled by the container and set the proper controls accordingly if needed. */ - virtual bool verifyScheme( const rtl::OUString& rScheme ); + virtual bool verifyScheme( const OUString& rScheme ); }; class DavDetailsContainer : public HostDetailsContainer @@ -109,7 +109,7 @@ class DavDetailsContainer : public HostDetailsContainer virtual void show( bool bShow = true ); protected: - virtual bool verifyScheme( const rtl::OUString& rScheme ); + virtual bool verifyScheme( const OUString& rScheme ); private: DECL_LINK ( ToggledDavsHdl, CheckBox * pCheckBox ); @@ -133,11 +133,11 @@ class SmbDetailsContainer : public DetailsContainer class CmisDetailsContainer : public DetailsContainer { private: - rtl::OUString m_sUsername; + OUString m_sUsername; com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv; - std::vector< rtl::OUString > m_aServerTypesURLs; - std::vector< rtl::OUString > m_aRepoIds; - rtl::OUString m_sRepoId; + std::vector< OUString > m_aServerTypesURLs; + std::vector< OUString > m_aRepoIds; + OUString m_sRepoId; Edit* m_pEDBinding; ListBox* m_pLBRepository; @@ -151,7 +151,7 @@ class CmisDetailsContainer : public DetailsContainer virtual INetURLObject getUrl( ); virtual bool setUrl( const INetURLObject& rUrl ); - virtual void setUsername( const rtl::OUString& rUsername ); + virtual void setUsername( const OUString& rUsername ); private: void selectRepository( ); diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index a3661adfdcef..9b98e926a6f7 100644 --- a/svtools/inc/svtools/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -193,7 +193,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit * @param aKey The key event * @return The command or an empty string if the key event could not be found. */ - ::rtl::OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); + OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); //--------------------------------------- /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); @@ -226,7 +226,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit void operator=(const AcceleratorExecute&) {}; //--------------------------------------- /** TODO document me */ - SVT_DLLPRIVATE ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); + SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); //--------------------------------------- /** TODO document me */ diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx index 0b3ca19c0ce7..7b314df4f4bf 100644 --- a/svtools/inc/svtools/accessibletable.hxx +++ b/svtools/inc/svtools/accessibletable.hxx @@ -65,7 +65,7 @@ public: /** Creates and returns the accessible object of the whole GridControl. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0; - virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0; + virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0; virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; virtual sal_Bool HasColHeader() = 0; virtual sal_Bool HasRowHeader() = 0; @@ -78,7 +78,7 @@ public: @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const= 0; + virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const= 0; /** Fills the StateSet with all states (except DEFUNC and SHOWING, done by the accessible object), depending on the specified object type. */ @@ -104,12 +104,12 @@ public: virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0; - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const = 0; - virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const = 0; - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; - virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const = 0; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const = 0; + virtual OUString GetRowName(sal_Int32 _nIndex) const = 0; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; + virtual OUString GetColumnName( sal_Int32 _nIndex ) const = 0; virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; - virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; + virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const = 0; diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx index 76fc296592fb..775ac23c8ab2 100644 --- a/svtools/inc/svtools/accessibletableprovider.hxx +++ b/svtools/inc/svtools/accessibletableprovider.hxx @@ -62,10 +62,10 @@ public: /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const = 0; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const = 0; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; /** @return <TRUE/>, if the object has a row header. */ virtual sal_Bool HasRowHeader() const = 0; //GetColumnId @@ -105,8 +105,8 @@ public: virtual sal_Bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0; virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0; - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index c5e93c112b88..d9b5148ae0ff 100644 --- a/svtools/inc/svtools/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -103,8 +103,8 @@ namespace svt AddressBookSourceDialog( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTable, + const OUString& _rDataSourceName, + const OUString& _rTable, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping ); diff --git a/svtools/inc/svtools/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx index 80e8dcda0336..fdfb4ef0f671 100644 --- a/svtools/inc/svtools/apearcfg.hxx +++ b/svtools/inc/svtools/apearcfg.hxx @@ -55,14 +55,14 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem static sal_Bool bInitialized ; - SVT_DLLPRIVATE const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); + SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SvtTabAppearanceCfg( ); ~SvtTabAppearanceCfg( ); 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); sal_uInt16 GetDragMode () const { return nDragMode; } diff --git a/svtools/inc/svtools/bindablecontrolhelper.hxx b/svtools/inc/svtools/bindablecontrolhelper.hxx index d9e4e7d7aa28..0fdea457d5f5 100644 --- a/svtools/inc/svtools/bindablecontrolhelper.hxx +++ b/svtools/inc/svtools/bindablecontrolhelper.hxx @@ -40,7 +40,7 @@ namespace svt BindableControlHelper(); // never implemented public: - SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); + SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); }; //........................................................................ diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 4459d6dc69d4..128c57c699c2 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -751,7 +751,7 @@ public: @return The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; /** return the description of the specified object. @param eObjType @@ -761,13 +761,13 @@ public: @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; /** @return The header text of the specified row. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 nRow ) const; + virtual OUString GetRowDescription( sal_Int32 nRow ) const; /** @return The header text of the specified column. */ - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; /** Fills the StateSet with all states (except DEFUNC and SHOWING, done by the accessible object), depending on the specified object type. */ diff --git a/svtools/inc/svtools/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx index 566565708bfd..d8abf68ccf82 100644 --- a/svtools/inc/svtools/collatorres.hxx +++ b/svtools/inc/svtools/collatorres.hxx @@ -34,7 +34,7 @@ class SVT_DLLPUBLIC CollatorResource public: CollatorResource(); ~CollatorResource(); - const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm); + const OUString& GetTranslation (const OUString& r_Algorithm); }; #endif /* SVTOOLS_COLLATORRESOURCE_HXX */ diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx index f8d496b7b551..2ea6649bdb8c 100644 --- a/svtools/inc/svtools/colorcfg.hxx +++ b/svtools/inc/svtools/colorcfg.hxx @@ -115,12 +115,12 @@ public: EditableColorConfig(); ~EditableColorConfig(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSchemeNames() const; - void DeleteScheme(const ::rtl::OUString& rScheme ); - void AddScheme(const ::rtl::OUString& rScheme ); - sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); - const ::rtl::OUString& GetCurrentSchemeName()const; - void SetCurrentSchemeName(const ::rtl::OUString& rScheme); + ::com::sun::star::uno::Sequence< OUString > GetSchemeNames() const; + void DeleteScheme(const OUString& rScheme ); + void AddScheme(const OUString& rScheme ); + sal_Bool LoadScheme(const OUString& rScheme ); + const OUString& GetCurrentSchemeName()const; + void SetCurrentSchemeName(const OUString& rScheme); const ColorConfigValue& GetColorValue(ColorConfigEntry eEntry)const; void SetColorValue(ColorConfigEntry eEntry, const ColorConfigValue& rValue); diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx index e0e1f0d3a90f..258da5dedbfb 100644 --- a/svtools/inc/svtools/contextmenuhelper.hxx +++ b/svtools/inc/svtools/contextmenuhelper.hxx @@ -75,13 +75,13 @@ class SVT_DLLPUBLIC ContextMenuHelper void completeMenuProperties( Menu* pMenu ); // dispatch provided command - bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL ); + bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& aCommandURL ); // methods to retrieve a single command URL dependent value from a // ui configuratin manager - Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const; - rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; + Image getImageFromCommandURL( const OUString& aCmdURL ) const; + OUString getLabelFromCommandURL( const OUString& aCmdURL ) const; // creates an association between current module/controller bound to the // provided frame and their ui configuration managers. @@ -98,8 +98,8 @@ class SVT_DLLPUBLIC ContextMenuHelper } ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; - ::rtl::OUString m_aModuleIdentifier; - ::rtl::OUString m_aSelf; + OUString m_aModuleIdentifier; + OUString m_aSelf; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx index 606aad34f089..ba948376af9b 100644 --- a/svtools/inc/svtools/embedhlp.hxx +++ b/svtools/inc/svtools/embedhlp.hxx @@ -58,13 +58,13 @@ public: static bool TryRunningState( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, - const ::rtl::OUString& aName, - const ::rtl::OUString& aMediaType ); + const OUString& aName, + const OUString& aMediaType ); static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetGraphicReplacementStream( sal_Int64 nViewAspect, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, - ::rtl::OUString* pMediaType ) + OUString* pMediaType ) throw(); const com::sun::star::uno::Reference <com::sun::star::embed::XEmbeddedObject>& operator->() const; @@ -83,7 +83,7 @@ public: EmbeddedObjectRef( const EmbeddedObjectRef& ); // assigning to a container enables the object to exchange graphical representations with a storage - void AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ); + void AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const OUString& rPersistName ); comphelper::EmbeddedObjectContainer* GetContainer() const; sal_Int64 GetViewAspect() const; @@ -94,10 +94,10 @@ public: // no conversion is done if no target mode is provided Size GetSize( MapMode* pTargetMapMode = NULL ) const; - void SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType ); + void SetGraphic( const Graphic& rGraphic, const OUString& rMediaType ); void SetGraphicStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream, - const ::rtl::OUString& rMediaType ); + const OUString& rMediaType ); void UpdateReplacement(); void UpdateReplacementOnDemand(); diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx index 41dea5a209ab..226e6065d5b0 100644 --- a/svtools/inc/svtools/extcolorcfg.hxx +++ b/svtools/inc/svtools/extcolorcfg.hxx @@ -32,14 +32,14 @@ namespace svtools{ class ExtendedColorConfig_Impl; class ExtendedColorConfigValue { - ::rtl::OUString m_sName; - ::rtl::OUString m_sDisplayName; + OUString m_sName; + OUString m_sDisplayName; sal_Int32 m_nColor; sal_Int32 m_nDefaultColor; public: ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){} - ExtendedColorConfigValue(const ::rtl::OUString& _sName - ,const ::rtl::OUString& _sDisplayName + ExtendedColorConfigValue(const OUString& _sName + ,const OUString& _sDisplayName ,sal_Int32 _nColor ,sal_Int32 _nDefaultColor) : m_sName(_sName) @@ -48,8 +48,8 @@ public: ,m_nDefaultColor(_nDefaultColor) {} - inline ::rtl::OUString getName() const { return m_sName; } - inline ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + inline OUString getName() const { return m_sName; } + inline OUString getDisplayName() const { return m_sDisplayName; } inline sal_Int32 getColor() const { return m_nColor; } inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } @@ -71,12 +71,12 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // get the configured value - ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const; + ExtendedColorConfigValue GetColorValue(const OUString& _sComponentName,const OUString& _sName)const; sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const; + OUString GetComponentName(sal_uInt32 _nPos) const; + OUString GetComponentDisplayName(const OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sComponentName,sal_uInt32 _nPos) const; }; class SVT_DLLPUBLIC EditableExtendedColorConfig @@ -87,16 +87,16 @@ public: EditableExtendedColorConfig(); ~EditableExtendedColorConfig(); - void DeleteScheme(const ::rtl::OUString& rScheme ); - void AddScheme(const ::rtl::OUString& rScheme ); - sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); - void SetCurrentSchemeName(const ::rtl::OUString& rScheme); + void DeleteScheme(const OUString& rScheme ); + void AddScheme(const OUString& rScheme ); + sal_Bool LoadScheme(const OUString& rScheme ); + void SetCurrentSchemeName(const OUString& rScheme); sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; - void SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue); + OUString GetComponentName(sal_uInt32 _nPos) const; + sal_Int32 GetComponentColorCount(const OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const; + void SetColorValue(const OUString& _sComponentName, const ExtendedColorConfigValue& rValue); void SetModified(); void ClearModified(){m_bModified = sal_False;} sal_Bool IsModified()const{return m_bModified;} diff --git a/svtools/inc/svtools/extensionlistbox.hxx b/svtools/inc/svtools/extensionlistbox.hxx index 0202312145de..62f5c383579a 100644 --- a/svtools/inc/svtools/extensionlistbox.hxx +++ b/svtools/inc/svtools/extensionlistbox.hxx @@ -51,27 +51,27 @@ public: /** @return The item name of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemName( sal_Int32 index ) const = 0; + virtual OUString getItemName( sal_Int32 index ) const = 0; /** @return The version string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const = 0; + virtual OUString getItemVersion( sal_Int32 index ) const = 0; /** @return The description string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const = 0; + virtual OUString getItemDescription( sal_Int32 index ) const = 0; /** @return The publisher string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const = 0; + virtual OUString getItemPublisher( sal_Int32 index ) const = 0; /** @return The link behind the publisher text of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const = 0; + virtual OUString getItemPublisherLink( sal_Int32 index ) const = 0; /** The entry at the given position will be selected Index starts with 0. @@ -85,7 +85,7 @@ public: 1. the name is not unique 2. one extension can be installed as user and shared extension. */ - virtual void select( const ::rtl::OUString & sName ) = 0; + virtual void select( const OUString & sName ) = 0; }; // ============================================================================ diff --git a/svtools/inc/svtools/filechangedchecker.hxx b/svtools/inc/svtools/filechangedchecker.hxx index 5f6d03fb2ea6..2b8caa9d2da5 100644 --- a/svtools/inc/svtools/filechangedchecker.hxx +++ b/svtools/inc/svtools/filechangedchecker.hxx @@ -38,7 +38,7 @@ class SVT_DLLPUBLIC FileChangedChecker { private : Timer mTimer; - rtl::OUString mFileName; + OUString mFileName; TimeValue mLastModTime; ::boost::function0<void> mpCallback; @@ -48,7 +48,7 @@ private : public : void resetTimer(); bool hasFileChanged(); - FileChangedChecker(const rtl::OUString& rFilename, const ::boost::function0<void>& rCallback); + FileChangedChecker(const OUString& rFilename, const ::boost::function0<void>& rCallback); }; #endif diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx index c7fdd4262610..5654f004f69c 100644 --- a/svtools/inc/svtools/filectrl.hxx +++ b/svtools/inc/svtools/filectrl.hxx @@ -77,7 +77,7 @@ public: void SetText( const OUString& rStr ); OUString GetText() const; - rtl::OUString GetSelectedText() const { return maEdit.GetSelected(); } + OUString GetSelectedText() const { return maEdit.GetSelected(); } void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } Selection GetSelection() const { return maEdit.GetSelection(); } diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index b3460d63da96..d7cb77a19a47 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -71,7 +71,7 @@ private: SvtFileView_Impl* mpImp; sal_Bool bSortColumn; - ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; + ::com::sun::star::uno::Sequence< OUString > mpBlackList; DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); @@ -91,8 +91,8 @@ public: sal_Bool GetParentURL( String& _rParentURL ) const; void CreatedFolder( const String& rUrl, const String& rNewFolder ); - void SetHelpId( const rtl::OString& rHelpId ); - const rtl::OString& GetHelpId( ) const; + void SetHelpId( const OString& rHelpId ); + const OString& GetHelpId( ) const; void SetSizePixel( const Size& rNewSize ); virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); void SetSortColumn( sal_Bool bValue ) { bSortColumn = bValue; } @@ -112,7 +112,7 @@ public: const String& rFolderURL, const String& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); FileViewResult Initialize( @@ -124,7 +124,7 @@ public: This method will never return <member>eStillRunning</member>, since it will fill the view synchronously */ - sal_Bool Initialize( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); + sal_Bool Initialize( const ::com::sun::star::uno::Sequence< OUString >& aContents ); /** initializes the view with the content of a folder given by an UCB content */ @@ -205,9 +205,9 @@ protected: struct SvtContentEntry { sal_Bool mbIsFolder; - rtl::OUString maURL; + OUString maURL; - SvtContentEntry( const rtl::OUString& rURL, sal_Bool bIsFolder ) : + SvtContentEntry( const OUString& rURL, sal_Bool bIsFolder ) : mbIsFolder( bIsFolder ), maURL( rURL ) {} }; diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx index 6268b3c3d546..5221e29aa585 100644 --- a/svtools/inc/svtools/fontsubstconfig.hxx +++ b/svtools/inc/svtools/fontsubstconfig.hxx @@ -27,8 +27,8 @@ struct SvtFontSubstConfig_Impl; //----------------------------------------------------------------------------- struct SubstitutionStruct { - rtl::OUString sFont; - rtl::OUString sReplaceBy; + OUString sFont; + OUString sReplaceBy; sal_Bool bReplaceAlways; sal_Bool bReplaceOnScreenOnly; }; @@ -42,7 +42,7 @@ public: virtual ~SvtFontSubstConfig(); 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); sal_Bool IsEnabled() const {return bIsEnabled;} void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();} diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx index cc04fbaf7039..7543788f5afc 100644 --- a/svtools/inc/svtools/framestatuslistener.hxx +++ b/svtools/inc/svtools/framestatuslistener.hxx @@ -48,7 +48,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu virtual ~FrameStatusListener(); // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); + void addStatusListener( const OUString& aCommandURL ); void bindListener(); void unbindListener(); sal_Bool isBound() const; @@ -82,10 +82,10 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + OUStringHash, + ::std::equal_to< OUString > > URLToDispatchMap; sal_Bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx index e86ca6d3fa4e..50a374729b73 100644 --- a/svtools/inc/svtools/generictoolboxcontroller.hxx +++ b/svtools/inc/svtools/generictoolboxcontroller.hxx @@ -35,7 +35,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBox, sal_uInt16 nID, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~GenericToolboxController(); // XComponent diff --git a/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx index d1d532f7a1f1..808282255bf5 100644 --- a/svtools/inc/svtools/genericunodialog.hxx +++ b/svtools/inc/svtools/genericunodialog.hxx @@ -81,7 +81,7 @@ namespace svt bool m_bNeedInitialization : 1; /// do we need to be initialized before any other API call is allowed? // <properties> - ::rtl::OUString m_sTitle; /// title of the dialog + OUString m_sTitle; /// title of the dialog com::sun::star::uno::Reference<com::sun::star::awt::XWindow> m_xParent; /// parent window // </properties> @@ -104,8 +104,8 @@ namespace svt virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException) = 0; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException) = 0; - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) = 0; // OPropertySetHelper @@ -113,7 +113,7 @@ namespace svt virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index 1ae07ad03111..9a3bd8c1d1ff 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -187,7 +187,7 @@ private: void SVT_DLLPRIVATE ImplAssignGraphicData(); void SVT_DLLPRIVATE ImplSetGraphicManager( const GraphicManager* pMgr, - const rtl::OString* pID = NULL, + const OString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplAutoSwapIn(); @@ -315,7 +315,7 @@ public: GraphicObject( const GraphicManager* pMgr = NULL ); GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL ); GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL ); - explicit GraphicObject( const rtl::OString& rUniqueID, const GraphicManager* pMgr = NULL ); + explicit GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr = NULL ); ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); @@ -390,7 +390,7 @@ public: void SetUserData( const String& rUserData ); String GetUserData() const; - rtl::OString GetUniqueID() const; + OString GetUniqueID() const; GraphicType GetType() const { return meType; } const Size& GetPrefSize() const { return maPrefSize; } @@ -487,12 +487,12 @@ public: friend SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ); friend SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ); - static GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ); + static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL ); // will inspect an object ( e.g. a control ) for any 'ImageURL' // properties and return these in a vector. Note: this implementation // will cater for XNameContainer objects and deepinspect any containees // if they exist - static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< rtl::OUString >& rvEmbedImgUrls ); + static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< OUString >& rvEmbedImgUrls ); }; typedef ::std::vector< GraphicObject* > GraphicObjectList_impl; @@ -568,7 +568,7 @@ private: void SVT_DLLPRIVATE ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID = NULL, + const OString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); @@ -582,7 +582,7 @@ private: ); void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ); - rtl::OString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const; + OString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const; public: diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index 59a96fa84b05..9be63ce3229d 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -342,14 +342,14 @@ public: XubString GetItemText( sal_uInt16 nItemId ) const; XubString GetHelpText( sal_uInt16 nItemId ) const; - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + OString GetHelpId( sal_uInt16 nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( const rtl::OString& rId ) { Window::SetHelpId( rId ); } - inline const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } + inline const OString& GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx index 3c23b7fdf288..62640e2bffe6 100644 --- a/svtools/inc/svtools/htmlcfg.hxx +++ b/svtools/inc/svtools/htmlcfg.hxx @@ -42,8 +42,8 @@ struct HtmlOptions_Impl; class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem { HtmlOptions_Impl*pImp; - const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); - void Load( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); void CallListeners(); public: @@ -51,7 +51,7 @@ public: ~SvxHtmlOptions(); 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); sal_uInt16 GetFontSize(sal_uInt16 nPos) const; void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index 71c0dc350985..33c76fed1876 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -58,7 +58,7 @@ struct HTMLOutFuncs static const sal_Char sNewLine[]; // \015\012 #endif - SVT_DLLPUBLIC static rtl::OString ConvertStringToHTML( const String& sSrc, + SVT_DLLPUBLIC static OString ConvertStringToHTML( const String& sSrc, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); @@ -104,7 +104,7 @@ struct HTMLOutFuncs String *pNonConvertableChars = 0 ); // <TD SDVAL="..." SDNUM="..."> - SVT_DLLPUBLIC static rtl::OString CreateTableDataOptionsValNum( + SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum( sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, diff --git a/svtools/inc/svtools/hyperlabel.hxx b/svtools/inc/svtools/hyperlabel.hxx index be1fc21acc11..745c50798f1d 100644 --- a/svtools/inc/svtools/hyperlabel.hxx +++ b/svtools/inc/svtools/hyperlabel.hxx @@ -63,7 +63,7 @@ namespace svt void SetIndex( sal_Int32 _Index ); sal_Int32 GetIndex() const; - void SetLabel( const ::rtl::OUString& _rText ); + void SetLabel( const OUString& _rText ); void ToggleBackgroundColor( const Color& _rGBColor ); void SetInteractive( sal_Bool _bInteractive ); diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx index 4f3899b14c60..b8282da72167 100644 --- a/svtools/inc/svtools/imageresourceaccess.hxx +++ b/svtools/inc/svtools/imageresourceaccess.hxx @@ -46,7 +46,7 @@ namespace svt /** determines whether the given URL denotes an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) */ - SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); + SVT_DLLPUBLIC static bool isSupportedURL( const OUString& _rURL ); /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves an SvStream for this image. @@ -59,7 +59,7 @@ namespace svt */ SVT_DLLPUBLIC static SvStream* getImageStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rImageResourceURL + const OUString& _rImageResourceURL ); /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves @@ -68,7 +68,7 @@ namespace svt SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getImageXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rImageResourceURL + const OUString& _rImageResourceURL ); }; diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx index 84e84eefa99e..790cdebef60f 100644 --- a/svtools/inc/svtools/imap.hxx +++ b/svtools/inc/svtools/imap.hxx @@ -52,12 +52,12 @@ protected: sal_uLong ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); sal_uLong ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); - void ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseURL ); + void ImpReadCERNLine( const OString& rLine, const String& rBaseURL ); Point ImpReadCERNCoords( const char** ppStr ); long ImpReadCERNRadius( const char** ppStr ); String ImpReadCERNURL( const char** ppStr, const String& rBaseURL ); - void ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseURL ); + void ImpReadNCSALine( const OString& rLine, const String& rBaseURL ); String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ); Point ImpReadNCSACoords( const char** ppStr ); diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index 0043e8df2461..e90902bec0f0 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -70,10 +70,10 @@ protected: virtual void ReadIMapObject( SvStream& rIStm ) = 0; // Hilfsmethoden - void AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const; - void AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const; - void AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const; - void AppendNCSAURL(rtl::OStringBuffer&rBuf, const String& rBaseURL) const; + void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const; + void AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const; + void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const; + void AppendNCSAURL(OStringBuffer&rBuf, const String& rBaseURL) const; public: diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx index f6532b7f8f2b..9e2a54a8ef0b 100644 --- a/svtools/inc/svtools/indexentryres.hxx +++ b/svtools/inc/svtools/indexentryres.hxx @@ -33,7 +33,7 @@ class SVT_DLLPUBLIC IndexEntryResource public: IndexEntryResource (); ~IndexEntryResource (); - const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm); + const OUString& GetTranslation (const OUString& r_Algorithm); }; #endif /* SVTOOLS_INDEXENTRYRESOURCE_HXX */ diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index f06a53c6d24d..3c5aafc57848 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -231,7 +231,7 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString& rNewText, sal_Bool bCancelled ); + virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, sal_Bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx index 0649975e55b2..2c81cbf43d42 100644 --- a/svtools/inc/svtools/javacontext.hxx +++ b/svtools/inc/svtools/javacontext.hxx @@ -59,7 +59,7 @@ namespace svt virtual void SAL_CALL release() throw (); // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: diff --git a/svtools/inc/svtools/langhelp.hxx b/svtools/inc/svtools/langhelp.hxx index ccc946c305b6..b126292f65c2 100644 --- a/svtools/inc/svtools/langhelp.hxx +++ b/svtools/inc/svtools/langhelp.hxx @@ -29,7 +29,7 @@ #include <svtools/svtdllapi.h> -namespace rtl { class OUString; } +#include <rtl/ustring.hxx> /** Localize a URI to one of the foundation's webservices @@ -37,7 +37,7 @@ namespace rtl { class OUString; } URI to localize - depending on your UI locale, a country local part is appended to the URI (like "en", or "fr", or "es") */ -SVT_DLLPUBLIC void localizeWebserviceURI( ::rtl::OUString& io_rURI ); +SVT_DLLPUBLIC void localizeWebserviceURI( OUString& io_rURI ); #endif diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx index aeed99454006..1ef5875d2948 100644 --- a/svtools/inc/svtools/langtab.hxx +++ b/svtools/inc/svtools/langtab.hxx @@ -40,7 +40,7 @@ public: Tools->Options->LanguageSettings->UserInterface listbox. If FALSE, do replace. */ - const rtl::OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const; + const OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const; LanguageType GetType( const String& rStr ) const; sal_uInt32 GetEntryCount() const; diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index f8c0c61729f8..9011dad9a266 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -225,7 +225,7 @@ protected: static rtl_TextEncoding GetEncodingByMIME( const String& rMime ); /// template method: called when ParseMetaOptions adds a user-defined meta - virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName ); + virtual void AddMetaUserDefined( OUString const & i_rMetaName ); private: /// parse meta options into XDocumentProperties and encoding diff --git a/svtools/inc/svtools/place.hxx b/svtools/inc/svtools/place.hxx index 138186da6a98..f6ca8cd7f7b0 100644 --- a/svtools/inc/svtools/place.hxx +++ b/svtools/inc/svtools/place.hxx @@ -22,7 +22,7 @@ private: public: - Place( OUString sName, rtl::OUString sUrl, bool bEditable = false ) : + Place( OUString sName, OUString sUrl, bool bEditable = false ) : msName( sName ), maUrl( sUrl ), mbEditable( bEditable ) {}; diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/svtools/inc/svtools/popupmenucontrollerbase.hxx index a3f1095cb7b2..daddbed7e9fd 100644 --- a/svtools/inc/svtools/popupmenucontrollerbase.hxx +++ b/svtools/inc/svtools/popupmenucontrollerbase.hxx @@ -62,9 +62,9 @@ namespace svt virtual ~PopupMenuControllerBase(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; // XPopupMenuController virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ namespace svt virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); // XDispatch @@ -94,13 +94,13 @@ namespace svt // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - void dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); protected: void throwIfDisposed() throw ( ::com::sun::star::uno::RuntimeException ); /** helper method to cause statusChanged is called once for the given command url */ - void SAL_CALL updateCommand( const rtl::OUString& rCommandURL ); + void SAL_CALL updateCommand( const OUString& rCommandURL ); /** this function is called upon disposing the component */ @@ -109,15 +109,15 @@ namespace svt virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - ::rtl::OUString determineBaseURL( const ::rtl::OUString& aURL ); + OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); bool m_bInitialized; - rtl::OUString m_aCommandURL; - rtl::OUString m_aBaseURL; - rtl::OUString m_aModuleName; + OUString m_aCommandURL; + OUString m_aBaseURL; + OUString m_aModuleName; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xDispatch; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/svtools/inc/svtools/popupwindowcontroller.hxx index b4e62f809e79..a02281e17d4a 100644 --- a/svtools/inc/svtools/popupwindowcontroller.hxx +++ b/svtools/inc/svtools/popupwindowcontroller.hxx @@ -38,7 +38,7 @@ class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, publi public: PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); ~PopupWindowController(); virtual ::Window* createPopupWindow( ::Window* pParent ) = 0; @@ -49,9 +49,9 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; // XInitialization 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); diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx index da9b10336b8a..d36a1a3165bb 100644 --- a/svtools/inc/svtools/roadmap.hxx +++ b/svtools/inc/svtools/roadmap.hxx @@ -63,7 +63,7 @@ namespace svt void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); - void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); + void ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel, ItemIndex _nStartIndex = 0 ); void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); void SetRoadmapInteractive( sal_Bool _bInteractive ); @@ -75,8 +75,8 @@ namespace svt ItemIndex GetItemCount() const; ItemId GetItemID( ItemIndex _nIndex ) const; - void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); - void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); + void InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); + void ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); void DeleteRoadmapItem( ItemIndex _nIndex ); ItemId GetCurrentRoadmapItemID() const; @@ -110,7 +110,7 @@ namespace svt ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); RoadmapItem* GetByPointer(Window* pWindow); - RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); + RoadmapItem* InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); void UpdatefollowingHyperLabels( ItemIndex _Index ); }; diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 5cdf1a0e975c..aae7ebfc5d7b 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -79,7 +79,7 @@ namespace svt ); ~RoadmapWizard( ); - void SetRoadmapHelpId( const rtl::OString& _rId ); + void SetRoadmapHelpId( const OString& _rId ); void SetRoadmapInteractive( sal_Bool _bInteractive ); virtual void Resize(); diff --git a/svtools/inc/svtools/sampletext.hxx b/svtools/inc/svtools/sampletext.hxx index 5911eb7530f3..44693ffedcc2 100644 --- a/svtools/inc/svtools/sampletext.hxx +++ b/svtools/inc/svtools/sampletext.hxx @@ -47,18 +47,18 @@ SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice &rDevice); //These ones are typically for use in the font dropdown box beside the //fontname, so say things roughly like "Script/Alphabet/Name-Of-Major-Language" -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice); -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice); -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice); +SVT_DLLPUBLIC OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice); +SVT_DLLPUBLIC OUString makeShortRepresentativeTextForScript(UScriptCode eScript); //For the cases where the font doesn't fully support a script, but has partial support //for a useful subset -SVT_DLLPUBLIC rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont); -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang); -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript); -SVT_DLLPUBLIC rtl::OUString makeMinimalTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont); +SVT_DLLPUBLIC OUString makeRepresentativeTextForLanguage(LanguageType eLang); +SVT_DLLPUBLIC OUString makeRepresentativeTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeMinimalTextForScript(UScriptCode eScript); #endif diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx index 9d99588126c3..f25823e793f2 100644 --- a/svtools/inc/svtools/scriptedtext.hxx +++ b/svtools/inc/svtools/scriptedtext.hxx @@ -76,7 +76,7 @@ public: @param _xBreakIter The break iterator for iterating through the script portions. */ void SetText( - const ::rtl::OUString& _rText, + const OUString& _rText, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); /** Returns a size struct containing the width and height of the text in the current output device. diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx index 5042e6de54c0..eba45e543525 100644 --- a/svtools/inc/svtools/statusbarcontroller.hxx +++ b/svtools/inc/svtools/statusbarcontroller.hxx @@ -52,7 +52,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu public: StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL, + const OUString& aCommandURL, unsigned short nID ); StatusbarController(); virtual ~StatusbarController(); @@ -108,19 +108,19 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + OUStringHash, + ::std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); + void addStatusListener( const OUString& aCommandURL ); void bindListener(); // execute methods // execute bound status bar controller command/execute various commands void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + void execute( const OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); sal_Bool m_bInitialized : 1, m_bDisposed : 1; @@ -128,7 +128,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; URLToDispatchMap m_aListenerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; diff --git a/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx index a5b8e2d1678e..82c125442d1b 100644 --- a/svtools/inc/svtools/stringtransfer.hxx +++ b/svtools/inc/svtools/stringtransfer.hxx @@ -34,10 +34,10 @@ namespace svt class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper { protected: - ::rtl::OUString m_sContent; + OUString m_sContent; public: - OStringTransferable(const ::rtl::OUString& _rContent); + OStringTransferable(const OUString& _rContent); protected: // TransferableHelper overridables @@ -55,16 +55,16 @@ namespace svt <p>Beware: In opposite to the old DragServer::CopyString, this method does not <em>add</em> the string to the clipboard, instead the old clipboard content is <em>replaced</em>!</p> */ - SVT_DLLPUBLIC static void CopyString( const ::rtl::OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, Window* _pWindow = NULL ); /** extracts a string from the system clipboard given @return <TRUE/> if the extraction was successfull, i.e. if the clipboard contained a string content */ - SVT_DLLPUBLIC static sal_Bool PasteString( ::rtl::OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static sal_Bool PasteString( OUString& _rContent, Window* _pWindow = NULL ); /** starts dragging a simple string */ - SVT_DLLPUBLIC static void StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); + SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); }; //........................................................................ diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index 31cf6343def8..14784835fa6b 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -93,15 +93,15 @@ public: class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem { protected: - rtl::OUString maText; + OUString maText; public: - SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr); + SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); virtual sal_uInt16 GetType() const; virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); - rtl::OUString GetText() const { return maText; } - void SetText( const rtl::OUString& rText ) { maText = rText; } + OUString GetText() const { return maText; } + void SetText( const OUString& rText ) { maText = rText; } virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 208a8a70fbd9..7bcd0591b2d1 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -179,10 +179,10 @@ public: /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; /** @return <TRUE/>, if the object has a row header. */ virtual sal_Bool HasRowHeader() const; //GetColumnId @@ -224,8 +224,8 @@ public: virtual sal_Bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; virtual Window* GetWindowInstance(); using SvTreeListBox::FillAccessibleStateSet; diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx index 0a950081c20d..265723ecf8b8 100644 --- a/svtools/inc/svtools/tabbar.hxx +++ b/svtools/inc/svtools/tabbar.hxx @@ -513,7 +513,7 @@ public: void SetPageText( sal_uInt16 nPageId, const OUString& rText ); OUString GetPageText( sal_uInt16 nPageId ) const; XubString GetHelpText( sal_uInt16 nPageId ) const; - rtl::OString GetHelpId( sal_uInt16 nPageId ) const; + OString GetHelpId( sal_uInt16 nPageId ) const; long GetSplitSize() const { return mnSplitSize; } @@ -521,9 +521,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx index 66ef7c995613..21a096268fe1 100644 --- a/svtools/inc/svtools/table/gridtablerenderer.hxx +++ b/svtools/inc/svtools/table/gridtablerenderer.hxx @@ -94,7 +94,7 @@ namespace svt { namespace table virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, - ::rtl::OUString & o_cellString + OUString & o_cellString ) const; private: @@ -109,7 +109,7 @@ namespace svt { namespace table ); void impl_paintCellText( CellRenderContext const & i_context, - ::rtl::OUString const & i_text + OUString const & i_text ); }; //........................................................................ diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx index 193ac865d7a2..a170a38a4648 100644 --- a/svtools/inc/svtools/table/tablecontrol.hxx +++ b/svtools/inc/svtools/table/tablecontrol.hxx @@ -152,9 +152,9 @@ namespace svt { namespace table /** Creates and returns the accessible object of the whole GridControl. */ SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const; // temporary methods @@ -184,14 +184,14 @@ namespace svt { namespace table virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; - virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const; - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowName(sal_Int32 _nIndex) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; + virtual OUString GetColumnName( sal_Int32 _nIndex ) const; virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Bool HasRowHeader(); virtual sal_Bool HasColHeader(); - virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; + virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Int32 GetSelectedRowCount() const; virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const; diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx index be1951c8fb31..05ee87571c4c 100644 --- a/svtools/inc/svtools/table/tablerenderer.hxx +++ b/svtools/inc/svtools/table/tablerenderer.hxx @@ -268,7 +268,7 @@ namespace svt { namespace table virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, - ::rtl::OUString & o_cellString + OUString & o_cellString ) const = 0; /// deletes the renderer instance diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/svtools/inc/svtools/toolbarmenu.hxx index bc5b612ce0be..247483440947 100644 --- a/svtools/inc/svtools/toolbarmenu.hxx +++ b/svtools/inc/svtools/toolbarmenu.hxx @@ -95,7 +95,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); // todo: move to new base class that will replace SfxPopupWindow - void AddStatusListener( const rtl::OUString& rCommandURL ); + void AddStatusListener( const OUString& rCommandURL ); bool IsInPopupMode(); void EndPopupMode(); diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx index 461bfcd6a3c6..4cc240729df7 100644 --- a/svtools/inc/svtools/toolboxcontroller.hxx +++ b/svtools/inc/svtools/toolboxcontroller.hxx @@ -61,7 +61,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL public: ToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); ToolboxController(); virtual ~ToolboxController(); @@ -69,7 +69,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; - void updateStatus( const rtl::OUString aCommandURL ); + void updateStatus( const OUString aCommandURL ); void updateStatus(); // XInterface @@ -111,10 +111,10 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - const rtl::OUString& getCommandURL() const { return m_aCommandURL; } - const rtl::OUString& getModuleName() const; + const OUString& getCommandURL() const { return m_aCommandURL; } + const OUString& getModuleName() const; - void dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); void enable( bool bEnable ); @@ -130,14 +130,14 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + OUStringHash, + ::std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); + void addStatusListener( const OUString& aCommandURL ); + void removeStatusListener( const OUString& aCommandURL ); void bindListener(); void unbindListener(); sal_Bool isBound() const; @@ -150,7 +150,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ToolboxController_Impl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; URLToDispatchMap m_aListenerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener }; diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx index ee050bb4ed24..4c2d0f736ba0 100644 --- a/svtools/inc/svtools/toolpanel/toolpanel.hxx +++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx @@ -48,13 +48,13 @@ namespace svt { public: /// retrieves the display name of the panel - virtual ::rtl::OUString GetDisplayName() const = 0; + virtual OUString GetDisplayName() const = 0; /// retrieves the image associated with the panel, if any virtual Image GetImage() const = 0; /// retrieves the help ID associated with the panel, if any. - virtual rtl::OString GetHelpID() const = 0; + virtual OString GetHelpID() const = 0; /** activates the panel diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 342b29c51b0f..5d63d166bfa5 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -161,7 +161,7 @@ private: private: ::com::sun::star::uno::Any maAny; - ::rtl::OUString maLastFormat; + OUString maLastFormat; mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener > mxTerminateListener; DataFlavorExVector* mpFormats; @@ -223,7 +223,7 @@ protected: void ClearFormats(); sal_Bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetString( const ::rtl::OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + sal_Bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetBitmap( const Bitmap& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); @@ -318,8 +318,8 @@ public: sal_Bool GetString( SotFormatStringId nFormat, String& rStr ); sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, String& rStr ); - sal_Bool GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr ); - sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::rtl::OUString& rStr ); + sal_Bool GetString( SotFormatStringId nFormat, OUString& rStr ); + sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr ); sal_Bool GetBitmap( SotFormatStringId nFormat, Bitmap& rBmp ); sal_Bool GetBitmap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp ); @@ -504,7 +504,7 @@ public: void CopyString( sal_uInt16 nFmt, const String& rStr ); void CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny ); - void CopyByteString( sal_uLong nFormatId, const rtl::OString& rStr ); + void CopyByteString( sal_uLong nFormatId, const OString& rStr ); void CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ); sal_Bool HasAnyData() const; diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index 30d05bd2a23e..180050560bf9 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -650,7 +650,7 @@ public: // Edits the Entry's first StringItem, 0 == Cursor void EditEntry( SvTreeListEntry* pEntry = NULL ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); diff --git a/svtools/inc/svtools/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx index 2e41bdf945ff..581df582a64e 100644 --- a/svtools/inc/svtools/unoevent.hxx +++ b/svtools/inc/svtools/unoevent.hxx @@ -60,20 +60,20 @@ class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 ::com::sun::star::lang::XServiceInfo > { - const ::rtl::OUString sEventType; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sJavaScript; - const ::rtl::OUString sScript; - const ::rtl::OUString sNone; + const OUString sEventType; + const OUString sMacroName; + const OUString sLibrary; + const OUString sStarBasic; + const OUString sJavaScript; + const OUString sScript; + const OUString sNone; /// name of own service - const ::rtl::OUString sServiceName; + const OUString sServiceName; protected: - const ::rtl::OUString sEmpty; + const OUString sEmpty; /// last element is 0, 0 const SvEventDescription* mpSupportedMacroItems; @@ -89,7 +89,7 @@ public: // XNameReplace /// calls replaceByName(const sal_uInt16, const SvxMacro&) virtual void SAL_CALL replaceByName( - const ::rtl::OUString& rName, /// API name of event + const OUString& rName, /// API name of event const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) throw( ::com::sun::star::lang::IllegalArgumentException, @@ -100,20 +100,20 @@ public: // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName ) /// API name of event + const OUString& rName ) /// API name of event throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAxcess (via XNameReplace) - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( - const ::rtl::OUString& rName ) + const OUString& rName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess (via XNameReplace) @@ -126,15 +126,15 @@ public: // XServiceInfo /// must be implemented in subclass - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ) = 0; // XServiceInfo - 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 ); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -160,10 +160,10 @@ protected: ::com::sun::star::uno::RuntimeException) = 0; /// convert an API event name to the event ID as used by SvxMacroItem - sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; + sal_uInt16 mapNameToEventID(const OUString& rName) const; /// get the event ID for the name; return 0 if not supported - sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; + sal_uInt16 getMacroID(const OUString& rName) const; /// create PropertyValues and Any from macro void getAnyFromMacro( @@ -254,7 +254,7 @@ class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] SvxMacro** aMacros; - const ::rtl::OUString sImplName; + const OUString sImplName; public: @@ -263,7 +263,7 @@ public: virtual ~SvDetachedEventDescriptor(); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 41ef0242c337..1a809c63fb99 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -73,9 +73,9 @@ SAL_IMPLEMENT_MAIN() continue; } - rtl::OUString sTag( LanguageTag( eLang).getBcp47()); + OUString sTag( LanguageTag( eLang).getBcp47()); - std::cout << rtl::OUStringToOString(sTag, osl_getThreadTextEncoding()).getStr() + std::cout << OUStringToOString(sTag, osl_getThreadTextEncoding()).getStr() << std::endl; } } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index ed66e866fe58..5d59ff2cdc2f 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -230,7 +230,7 @@ void BrowseBox::SetFont( const Font& rNewFont ) sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const { - return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(rtl::OUString('0')) * 4; + return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } //------------------------------------------------------------------- @@ -550,8 +550,8 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle ) BrowserColumn *pCol = (*pCols)[ nItemPos ]; if ( pCol->Title() != rTitle ) { - ::rtl::OUString sNew(rTitle); - ::rtl::OUString sOld(pCol->Title()); + OUString sNew(rTitle); + OUString sOld(pCol->Title()); pCol->Title() = rTitle; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index ff34cb059317..6a3018553a5d 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -29,7 +29,6 @@ // Accessibility ============================================================== -using ::rtl::OUString; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; using namespace ::com::sun::star::accessibility; diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 1c9d839a8b7f..5249a14540a6 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -138,7 +138,7 @@ void SvtTabAppearanceCfg::Commit() PutProperties(rNames, aValues); } -void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 7b13df8e0964..f2dbec06358c 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -43,7 +43,6 @@ using namespace utl; using namespace com::sun::star; -using ::rtl::OUString; namespace svtools { @@ -63,32 +62,32 @@ class ColorConfig_Impl : public utl::ConfigItem { ColorConfigValue m_aConfigValues[ColorConfigEntryCount]; sal_Bool m_bEditMode; - rtl::OUString m_sIsVisible; - rtl::OUString m_sLoadedScheme; + OUString m_sIsVisible; + OUString m_sLoadedScheme; - uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme); + uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); public: ColorConfig_Impl(sal_Bool bEditMode = sal_False); virtual ~ColorConfig_Impl(); - void Load(const rtl::OUString& rScheme); + void Load(const OUString& rScheme); void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! - void SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} + void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} virtual void Commit(); - virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames); const ColorConfigValue& GetColorConfigValue(ColorConfigEntry eValue) {return m_aConfigValues[eValue];} void SetColorConfigValue(ColorConfigEntry eValue, const ColorConfigValue& rValue ); - const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;} + const OUString& GetLoadedScheme() const {return m_sLoadedScheme;} - uno::Sequence< ::rtl::OUString> GetSchemeNames(); + uno::Sequence< OUString> GetSchemeNames(); - sal_Bool AddScheme(const rtl::OUString& rNode); - sal_Bool RemoveScheme(const rtl::OUString& rNode); + sal_Bool AddScheme(const OUString& rNode); + sal_Bool RemoveScheme(const OUString& rNode); void SetModified(){ConfigItem::SetModified();} void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); @@ -99,7 +98,7 @@ public: void ImplUpdateApplicationSettings(); }; -uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme) +uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const OUString& rScheme) { uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount); OUString* pNames = aNames.getArray(); @@ -166,7 +165,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& const int nCount = ColorConfigEntryCount; for(sal_Int32 i = 0; i < 4 * nCount; i+= 4) { - rtl::OUString sBaseName(sBase); + OUString sBaseName(sBase); sal_Int32 nPos = i / 4; sBaseName += OUString(cNames[nPos].cName, cNames[nPos].nLength, cNames[nPos].eEncoding); pNames[nIndex] += sBaseName; @@ -189,10 +188,10 @@ ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) : if(!m_bEditMode) { //try to register on the root node - if possible - uno::Sequence < ::rtl::OUString > aNames(1); + uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); } - Load(::rtl::OUString()); + Load(OUString()); ImplUpdateApplicationSettings(); @@ -207,23 +206,23 @@ ColorConfig_Impl::~ColorConfig_Impl() ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) ); } -void ColorConfig_Impl::Load(const rtl::OUString& rScheme) +void ColorConfig_Impl::Load(const OUString& rScheme) { - rtl::OUString sScheme(rScheme); + OUString sScheme(rScheme); if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); + uno::Sequence < OUString > aCurrent(1); aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } m_sLoadedScheme = sScheme; // - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sScheme); + uno::Sequence < OUString > aColorNames = GetPropertyNames(sScheme); uno::Sequence< uno::Any > aColors = GetProperties( aColorNames ); const uno::Any* pColors = aColors.getConstArray(); - const ::rtl::OUString* pColorNames = aColorNames.getConstArray(); + const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; for(int i = 0; i < 2 * ColorConfigEntryCount && aColors.getLength() > nIndex; i+= 2) { @@ -243,16 +242,16 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme) void ColorConfig_Impl::Notify( const uno::Sequence<OUString>& ) { //loading via notification always uses the default setting - Load(::rtl::OUString()); + Load(OUString()); NotifyListeners(0); } void ColorConfig_Impl::Commit() { - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme); + uno::Sequence < OUString > aColorNames = GetPropertyNames(m_sLoadedScheme); uno::Sequence < beans::PropertyValue > aPropValues(aColorNames.getLength()); beans::PropertyValue* pPropValues = aPropValues.getArray(); - const ::rtl::OUString* pColorNames = aColorNames.getConstArray(); + const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; const uno::Type& rBoolType = ::getBooleanCppuType(); for(int i = 0; i < 2 * ColorConfigEntryCount && aColorNames.getLength() > nIndex; i+= 2) @@ -273,7 +272,7 @@ void ColorConfig_Impl::Commit() nIndex++; } } - rtl::OUString sNode("ColorSchemes"); + OUString sNode("ColorSchemes"); SetSetProperties(sNode, aPropValues); CommitCurrentSchemeName(); @@ -282,7 +281,7 @@ void ColorConfig_Impl::Commit() void ColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); + uno::Sequence < OUString > aCurrent(1); aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; @@ -298,12 +297,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC } } -uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames() +uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames() { return GetNodeNames("ColorSchemes"); } -sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) +sal_Bool ColorConfig_Impl::AddScheme(const OUString& rScheme) { if(ConfigItem::AddNode("ColorSchemes", rScheme)) { @@ -314,9 +313,9 @@ sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) return sal_False; } -sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme) +sal_Bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme) { - uno::Sequence< rtl::OUString > aElements(1); + uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; return ClearNodeElements("ColorSchemes", aElements); } @@ -499,22 +498,22 @@ EditableColorConfig::~EditableColorConfig() delete m_pImpl; } -uno::Sequence< ::rtl::OUString > EditableColorConfig::GetSchemeNames() const +uno::Sequence< OUString > EditableColorConfig::GetSchemeNames() const { return m_pImpl->GetSchemeNames(); } -void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme ) +void EditableColorConfig::DeleteScheme(const OUString& rScheme ) { m_pImpl->RemoveScheme(rScheme); } -void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme ) +void EditableColorConfig::AddScheme(const OUString& rScheme ) { m_pImpl->AddScheme(rScheme); } -sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) +sal_Bool EditableColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); @@ -527,13 +526,13 @@ sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) return sal_True; } -const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const +const OUString& EditableColorConfig::GetCurrentSchemeName()const { return m_pImpl->GetLoadedScheme(); } // Changes the name of the current scheme but doesn't load it! -void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme) +void EditableColorConfig::SetCurrentSchemeName(const OUString& rScheme) { m_pImpl->SetCurrentSchemeName(rScheme); m_pImpl->CommitCurrentSchemeName(); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index b5a94597daad..eee51dd35c26 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -41,7 +41,6 @@ using namespace utl; using namespace com::sun::star; -using ::rtl::OUString; namespace svtools { @@ -57,7 +56,7 @@ ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL; class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster { - DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, TDisplayNames); + DECLARE_STL_USTRINGACCESS_MAP( OUString, TDisplayNames); DECLARE_STL_USTRINGACCESS_MAP(ExtendedColorConfigValue,TConfigValues); typedef ::std::vector<TConfigValues::iterator> TMapPos; typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping; @@ -67,32 +66,32 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster ::std::vector<TComponents::iterator> m_aConfigValuesPos; sal_Bool m_bEditMode; - rtl::OUString m_sLoadedScheme; + OUString m_sLoadedScheme; sal_Bool m_bIsBroadcastEnabled; static sal_Bool m_bLockBroadcast; static sal_Bool m_bBroadcastWhenUnlocked; - uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme); - void FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames); + uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); + void FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames); public: ExtendedColorConfig_Impl(sal_Bool bEditMode = sal_False); virtual ~ExtendedColorConfig_Impl(); - void Load(const rtl::OUString& rScheme); + void Load(const OUString& rScheme); void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! - void SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} - sal_Bool ExistsScheme(const ::rtl::OUString& _sSchemeName); + void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} + sal_Bool ExistsScheme(const OUString& _sSchemeName); virtual void Commit(); - virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames); sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; + OUString GetComponentName(sal_uInt32 _nPos) const; + OUString GetComponentDisplayName(const OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const; - ExtendedColorConfigValue GetColorConfigValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName) + ExtendedColorConfigValue GetColorConfigValue(const OUString& _sComponentName,const OUString& _sName) { TComponents::iterator aFind = m_aConfigValues.find(_sComponentName); if ( aFind != m_aConfigValues.end() ) @@ -102,22 +101,22 @@ public: return aFind2->second; } #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage( "Could find the required config:\n" ); + OStringBuffer aMessage( "Could find the required config:\n" ); aMessage.append( "component: " ); - aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); aMessage.append( "\nname: " ); - aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return ExtendedColorConfigValue(); } - void SetColorConfigValue(const ::rtl::OUString& _sName, + void SetColorConfigValue(const OUString& _sName, const ExtendedColorConfigValue& rValue ); - const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;} + const OUString& GetLoadedScheme() const {return m_sLoadedScheme;} - sal_Bool AddScheme(const rtl::OUString& rNode); - sal_Bool RemoveScheme(const rtl::OUString& rNode); + sal_Bool AddScheme(const OUString& rNode); + sal_Bool RemoveScheme(const OUString& rNode); void SetModified(){ConfigItem::SetModified();} void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); @@ -133,12 +132,12 @@ public: DECL_LINK( DataChangedEventListener, VclWindowEvent* ); }; -uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme) +uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme) { uno::Sequence< OUString> aNames(GetNodeNames(rScheme)); - ::rtl::OUString* pIter = aNames.getArray(); - ::rtl::OUString* pEnd = pIter + aNames.getLength(); - ::rtl::OUString sSep("/"); + OUString* pIter = aNames.getArray(); + OUString* pEnd = pIter + aNames.getLength(); + OUString sSep("/"); for(;pIter != pEnd;++pIter) { *pIter = rScheme + sSep + *pIter; @@ -151,7 +150,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentCount() const return m_aConfigValues.size(); } // ----------------------------------------------------------------------------- -sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sName) const { sal_Int32 nSize = 0; TComponents::const_iterator aFind = m_aConfigValues.find(_sName); @@ -162,7 +161,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString return nSize; } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { TComponents::const_iterator aFind = m_aConfigValues.find(_sName); if ( aFind != m_aConfigValues.end() ) @@ -175,18 +174,18 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( return ExtendedColorConfigValue(); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const +OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sComponentName) const { - ::rtl::OUString sRet; + OUString sRet; TDisplayNames::const_iterator aFind = m_aComponentDisplayNames.find(_sComponentName); if ( aFind != m_aComponentDisplayNames.end() ) sRet = aFind->second; return sRet; } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const +OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const { - ::rtl::OUString sRet; + OUString sRet; if ( _nPos < m_aConfigValuesPos.size() ) sRet = m_aConfigValuesPos[_nPos]->first; return sRet; @@ -195,17 +194,17 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( sal_Bool ExtendedColorConfig_Impl::m_bLockBroadcast = sal_False; sal_Bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False; ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) : - ConfigItem(rtl::OUString("Office.ExtendedColorScheme")), + ConfigItem(OUString("Office.ExtendedColorScheme")), m_bEditMode(bEditMode), m_bIsBroadcastEnabled(sal_True) { if(!m_bEditMode) { //try to register on the root node - if possible - uno::Sequence < ::rtl::OUString > aNames(1); + uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); } - Load(::rtl::OUString()); + Load(OUString()); // #100822# ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); @@ -235,15 +234,15 @@ sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False; } -void lcl_addString(uno::Sequence < ::rtl::OUString >& _rSeq,const ::rtl::OUString& _sAdd) +void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd) { - ::rtl::OUString* pIter = _rSeq.getArray(); - ::rtl::OUString* pEnd = pIter + _rSeq.getLength(); + OUString* pIter = _rSeq.getArray(); + OUString* pEnd = pIter + _rSeq.getLength(); for(;pIter != pEnd;++pIter) *pIter += _sAdd; } // ----------------------------------------------------------------------------- -void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) +void ExtendedColorConfig_Impl::Load(const OUString& rScheme) { m_aComponentDisplayNames.clear(); m_aConfigValuesPos.clear(); @@ -251,58 +250,58 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) // fill display names TDisplayNames aDisplayNameMap; - ::rtl::OUString sEntryNames("EntryNames"); - uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sEntryNames); - ::rtl::OUString sDisplayName("/DisplayName"); - ::rtl::OUString* pIter = aComponentNames.getArray(); - ::rtl::OUString* pEnd = pIter + aComponentNames.getLength(); + OUString sEntryNames("EntryNames"); + uno::Sequence < OUString > aComponentNames = GetPropertyNames(sEntryNames); + OUString sDisplayName("/DisplayName"); + OUString* pIter = aComponentNames.getArray(); + OUString* pEnd = pIter + aComponentNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { - uno::Sequence < ::rtl::OUString > aComponentDisplayNames(1); + uno::Sequence < OUString > aComponentDisplayNames(1); aComponentDisplayNames[0] = *pIter; aComponentDisplayNames[0] += sDisplayName; uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties( aComponentDisplayNames ); - ::rtl::OUString sComponentDisplayName; + OUString sComponentDisplayName; if ( aComponentDisplayNamesValue.getLength() && (aComponentDisplayNamesValue[0] >>= sComponentDisplayName) ) { sal_Int32 nIndex = 0; m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName)); } - *pIter += ::rtl::OUString("/Entries"); - uno::Sequence < ::rtl::OUString > aDisplayNames = GetPropertyNames(*pIter); + *pIter += OUString("/Entries"); + uno::Sequence < OUString > aDisplayNames = GetPropertyNames(*pIter); lcl_addString(aDisplayNames,sDisplayName); uno::Sequence< uno::Any > aDisplayNamesValue = GetProperties( aDisplayNames ); - const ::rtl::OUString* pDispIter = aDisplayNames.getConstArray(); - const ::rtl::OUString* pDispEnd = pDispIter + aDisplayNames.getLength(); + const OUString* pDispIter = aDisplayNames.getConstArray(); + const OUString* pDispEnd = pDispIter + aDisplayNames.getLength(); for(sal_Int32 j = 0;pDispIter != pDispEnd;++pDispIter,++j) { sal_Int32 nIndex = 0; pDispIter->getToken(0,'/',nIndex); - ::rtl::OUString sName = pDispIter->copy(nIndex); + OUString sName = pDispIter->copy(nIndex); sName = sName.copy(0,sName.lastIndexOf(sDisplayName)); - ::rtl::OUString sCurrentDisplayName; + OUString sCurrentDisplayName; aDisplayNamesValue[j] >>= sCurrentDisplayName; aDisplayNameMap.insert(TDisplayNames::value_type(sName,sCurrentDisplayName)); } } // load color settings - rtl::OUString sScheme(rScheme); + OUString sScheme(rScheme); if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = ::rtl::OUString("ExtendedColorScheme/CurrentColorScheme"); + uno::Sequence < OUString > aCurrent(1); + aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) m_sLoadedScheme = sScheme; - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); + OUString sBase("ExtendedColorScheme/ColorSchemes/"); sBase += sScheme; sal_Bool bFound = ExistsScheme(sScheme); @@ -313,14 +312,14 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } if ( m_sLoadedScheme.isEmpty() ) - m_sLoadedScheme = ::rtl::OUString("default"); + m_sLoadedScheme = OUString("default"); if ( sScheme != "default" ) { - ::rtl::OUString sDefault("default"); + OUString sDefault("default"); if ( ExistsScheme(sDefault) ) { - ::rtl::OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default"); + OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default"); aComponentNames = GetPropertyNames(sBaseDefault); FillComponentColors(aComponentNames,aDisplayNameMap); } @@ -332,24 +331,24 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } } // ----------------------------------------------------------------------------- -void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames) +void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames) { - const ::rtl::OUString sColorEntries("/Entries"); - ::rtl::OUString* pIter = _rComponents.getArray(); - ::rtl::OUString* pEnd = pIter + _rComponents.getLength(); + const OUString sColorEntries("/Entries"); + OUString* pIter = _rComponents.getArray(); + OUString* pEnd = pIter + _rComponents.getLength(); for(;pIter != pEnd;++pIter) { - ::rtl::OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1); + OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1); if ( m_aConfigValues.find(sComponentName) == m_aConfigValues.end() ) { - ::rtl::OUString sEntry = *pIter; + OUString sEntry = *pIter; sEntry += sColorEntries; - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sEntry); - uno::Sequence < ::rtl::OUString > aDefaultColorNames = aColorNames; + uno::Sequence < OUString > aColorNames = GetPropertyNames(sEntry); + uno::Sequence < OUString > aDefaultColorNames = aColorNames; - const ::rtl::OUString sColor("/Color"); - const ::rtl::OUString sDefaultColor("/DefaultColor"); + const OUString sColor("/Color"); + const OUString sDefaultColor("/DefaultColor"); lcl_addString(aColorNames,sColor); lcl_addString(aDefaultColorNames,sDefaultColor); uno::Sequence< uno::Any > aColors = GetProperties( aColorNames ); @@ -359,8 +358,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri bool bDefaultColorFound = aDefaultColors.getLength() != 0; const uno::Any* pDefaultColors = aDefaultColors.getConstArray(); - ::rtl::OUString* pColorIter = aColorNames.getArray(); - ::rtl::OUString* pColorEnd = pColorIter + aColorNames.getLength(); + OUString* pColorIter = aColorNames.getArray(); + OUString* pColorEnd = pColorIter + aColorNames.getLength(); m_aConfigValuesPos.push_back(m_aConfigValues.insert(TComponents::value_type(sComponentName,TComponentMapping(TConfigValues(),TMapPos()))).first); TConfigValues& aConfigValues = (*m_aConfigValuesPos.rbegin())->second.first; @@ -371,8 +370,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri { sal_Int32 nIndex = 0; pColorIter->getToken(2,'/',nIndex); - ::rtl::OUString sName(pColorIter->copy(nIndex)),sDisplayName; - ::rtl::OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor)); + OUString sName(pColorIter->copy(nIndex)),sDisplayName; + OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor)); TDisplayNames::const_iterator aFind = _rDisplayNames.find(sTemp); nIndex = 0; @@ -400,7 +399,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri void ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rPropertyNames*/) { //loading via notification always uses the default setting - Load(::rtl::OUString()); + Load(OUString()); SolarMutexGuard aVclGuard; @@ -416,22 +415,22 @@ void ExtendedColorConfig_Impl::Commit() { if ( m_sLoadedScheme.isEmpty() ) return; - const ::rtl::OUString sColorEntries("Entries"); - const ::rtl::OUString sColor("/Color"); - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); - const ::rtl::OUString s_sSep("/"); + const OUString sColorEntries("Entries"); + const OUString sColor("/Color"); + OUString sBase("ExtendedColorScheme/ColorSchemes/"); + const OUString s_sSep("/"); sBase += m_sLoadedScheme; TComponents::iterator aIter = m_aConfigValues.begin(); TComponents::iterator aEnd = m_aConfigValues.end(); for( ;aIter != aEnd;++aIter ) { - ::rtl::OUString sEntry = aIter->first; + OUString sEntry = aIter->first; sEntry += sColorEntries; if ( ConfigItem::AddNode(sBase, aIter->first) ) { - rtl::OUString sNode = sBase; + OUString sNode = sBase; sNode += s_sSep; sNode += aIter->first; //ConfigItem::AddNode(sNode, sColorEntries); @@ -450,7 +449,7 @@ void ExtendedColorConfig_Impl::Commit() pPropValues->Value <<= aConIter->second.getColor(); // the default color will never be changed } - ::rtl::OUString s("ExtendedColorScheme/ColorSchemes"); + OUString s("ExtendedColorScheme/ColorSchemes"); SetSetProperties(s, aPropValues); } } @@ -461,27 +460,27 @@ void ExtendedColorConfig_Impl::Commit() void ExtendedColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = rtl::OUString("ExtendedColorScheme/CurrentColorScheme"); + uno::Sequence < OUString > aCurrent(1); + aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); } // ----------------------------------------------------------------------------- -sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName) +sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName) { - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes"); + OUString sBase("ExtendedColorScheme/ColorSchemes"); - uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase); - sBase += ::rtl::OUString("/") + _sSchemeName; - const ::rtl::OUString* pCompIter = aComponentNames.getConstArray(); - const ::rtl::OUString* pCompEnd = pCompIter + aComponentNames.getLength(); + uno::Sequence < OUString > aComponentNames = GetPropertyNames(sBase); + sBase += OUString("/") + _sSchemeName; + const OUString* pCompIter = aComponentNames.getConstArray(); + const OUString* pCompEnd = pCompIter + aComponentNames.getLength(); for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter) ; return pCompIter != pCompEnd; } -void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue ) +void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const ExtendedColorConfigValue& rValue ) { TComponents::iterator aFind = m_aConfigValues.find(_sName); if ( aFind != m_aConfigValues.end() ) @@ -493,9 +492,9 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName } } -sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) +sal_Bool ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme) { - if(ConfigItem::AddNode(rtl::OUString("ExtendedColorScheme/ColorSchemes"), rScheme)) + if(ConfigItem::AddNode(OUString("ExtendedColorScheme/ColorSchemes"), rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -504,11 +503,11 @@ sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) return sal_False; } -sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme) +sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme) { - uno::Sequence< rtl::OUString > aElements(1); + uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; - return ClearNodeElements(rtl::OUString("ExtendedColorScheme/ColorSchemes"), aElements); + return ClearNodeElements(OUString("ExtendedColorScheme/ColorSchemes"), aElements); } void ExtendedColorConfig_Impl::SettingsChanged() @@ -580,7 +579,7 @@ ExtendedColorConfig::~ExtendedColorConfig() } } -ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const +ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const OUString& _sComponentName,const OUString& _sName)const { return m_pImpl->GetColorConfigValue(_sComponentName,_sName); } @@ -590,22 +589,22 @@ sal_Int32 ExtendedColorConfig::GetComponentCount() const return m_pImpl->GetComponentCount(); } // ----------------------------------------------------------------------------- -sal_Int32 ExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 ExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const +OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const +OUString ExtendedColorConfig::GetComponentDisplayName(const OUString& _sComponentName) const { return m_pImpl->GetComponentDisplayName(_sComponentName); } @@ -634,17 +633,17 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig() delete m_pImpl; } -void EditableExtendedColorConfig::DeleteScheme(const ::rtl::OUString& rScheme ) +void EditableExtendedColorConfig::DeleteScheme(const OUString& rScheme ) { m_pImpl->RemoveScheme(rScheme); } -void EditableExtendedColorConfig::AddScheme(const ::rtl::OUString& rScheme ) +void EditableExtendedColorConfig::AddScheme(const OUString& rScheme ) { m_pImpl->AddScheme(rScheme); } -sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) +sal_Bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); @@ -658,14 +657,14 @@ sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme } // Changes the name of the current scheme but doesn't load it! -void EditableExtendedColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme) +void EditableExtendedColorConfig::SetCurrentSchemeName(const OUString& rScheme) { m_pImpl->SetCurrentSchemeName(rScheme); m_pImpl->CommitCurrentSchemeName(); } void EditableExtendedColorConfig::SetColorValue( - const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue) + const OUString& _sName, const ExtendedColorConfigValue& rValue) { m_pImpl->SetColorConfigValue(_sName, rValue); m_pImpl->ClearModified(); @@ -701,17 +700,17 @@ sal_Int32 EditableExtendedColorConfig::GetComponentCount() const return m_pImpl->GetComponentCount(); } // ----------------------------------------------------------------------------- -sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const +OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); } diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 03debe3783d3..b3ccb4fb725f 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; const sal_Char cReplacement[] = "Replacement"; const sal_Char cFontPairs[] = "FontPairs"; @@ -50,7 +49,7 @@ struct SvtFontSubstConfig_Impl }; SvtFontSubstConfig::SvtFontSubstConfig() : - ConfigItem(rtl::OUString("Office.Common/Font/Substitution")), + ConfigItem(OUString("Office.Common/Font/Substitution")), bIsEnabled(sal_False), pImpl(new SvtFontSubstConfig_Impl) { @@ -69,13 +68,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() : Sequence<OUString> aPropNames(aNodeNames.getLength() * 4); OUString* pNames = aPropNames.getArray(); sal_Int32 nName = 0; - sPropPrefix += rtl::OUString("/"); + sPropPrefix += OUString("/"); sal_Int32 nNode; for(nNode = 0; nNode < aNodeNames.getLength(); nNode++) { OUString sStart(sPropPrefix); sStart += pNodeNames[nNode]; - sStart += rtl::OUString("/"); + sStart += OUString("/"); pNames[nName] = sStart; pNames[nName++] += cReplaceFont; pNames[nName] = sStart; pNames[nName++] += cSubstituteFont; pNames[nName] = sStart; pNames[nName++] += cAlways; @@ -100,7 +99,7 @@ SvtFontSubstConfig::~SvtFontSubstConfig() delete pImpl; } -void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index f5a9d053eaa7..6380e9534a28 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -35,7 +35,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; static SvtHelpOptions_Impl* pOptions = NULL; static sal_Int32 nRefCount = 0; @@ -70,8 +69,8 @@ class SvtHelpOptions_Impl : public utl::ConfigItem public: SvtHelpOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + void Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames); virtual void Commit(); void SetExtendedHelp( sal_Bool b ) { bExtendedHelp= b; SetModified(); } @@ -102,7 +101,7 @@ protected: void implLoadURLCounters(); void implSaveURLCounters(); // to be called with aIgnoreCounterSafety locked - void implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); + void implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); }; Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() @@ -162,8 +161,8 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl() } // ----------------------------------------------------------------------- -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -173,9 +172,9 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, return -1; } -void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rPropertyNames) +void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > aValues = GetProperties( rPropertyNames ); const Any* pValues = aValues.getConstArray(); DBG_ASSERT( aValues.getLength() == rPropertyNames.getLength(), "GetProperties failed" ); @@ -189,7 +188,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty if ( pValues[nProp].hasValue() ) { sal_Bool bTmp = sal_Bool(); - ::rtl::OUString aTmpStr; + OUString aTmpStr; sal_Int32 nTmpInt = 0; if ( pValues[nProp] >>= bTmp ) { @@ -260,29 +259,29 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty // ----------------------------------------------------------------------- -void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) +void SvtHelpOptions_Impl::implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) { // the ignore counters for the help agent URLs - const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); - const ::rtl::OUString sPathSeparator( "/" ); - const ::rtl::OUString sURLLocalPath( "/Name" ); - const ::rtl::OUString sCounterLocalPath( "/Counter" ); + const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const OUString sPathSeparator( "/" ); + const OUString sURLLocalPath( "/Name" ); + const OUString sCounterLocalPath( "/Counter" ); // get the names of all the nodes containing ignore counters // collect the node names we have to ask // first get the node names of all children of HelpAgent/IgnoreList _rNodeNames = GetNodeNames(sIgnoreListNodePath); - const ::rtl::OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray(); - const ::rtl::OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength(); + const OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray(); + const OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength(); // then assemble the two lists (of node paths) for the URLs and the counters - Sequence< ::rtl::OUString > aIgnoredURLs(_rNodeNames.getLength()); - Sequence< ::rtl::OUString > aIgnoredURLsCounter(_rNodeNames.getLength()); - ::rtl::OUString* pIgnoredURLs = aIgnoredURLs.getArray(); - ::rtl::OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray(); + Sequence< OUString > aIgnoredURLs(_rNodeNames.getLength()); + Sequence< OUString > aIgnoredURLsCounter(_rNodeNames.getLength()); + OUString* pIgnoredURLs = aIgnoredURLs.getArray(); + OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray(); for (;pIgnoredURLsNodes != pIgnoredURLsNodesEnd; ++pIgnoredURLsNodes, ++pIgnoredURLs, ++pIgnoredURLsCounter) { - ::rtl::OUString sLocalURLAccess = sIgnoreListNodePath; + OUString sLocalURLAccess = sIgnoreListNodePath; sLocalURLAccess += sPathSeparator; sLocalURLAccess += *pIgnoredURLsNodes; @@ -323,36 +322,36 @@ void SvtHelpOptions_Impl::implSaveURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); - const ::rtl::OUString sPathSeparator( "/" ); - const ::rtl::OUString sURLLocalPath( "/Name" ); - const ::rtl::OUString sCounterLocalPath( "/Counter" ); + const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const OUString sPathSeparator( "/" ); + const OUString sURLLocalPath( "/Name" ); + const OUString sCounterLocalPath( "/Counter" ); // get the current URL/counter pairs (as they're persistent at the moment) - Sequence< ::rtl::OUString > aNodeNames; + Sequence< OUString > aNodeNames; Sequence< Any > aURLs; Sequence< Any > aCounters; implGetURLCounters(aNodeNames, aURLs, aCounters); sal_Int32 nKnownURLs = aURLs.getLength(); - const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); + const OUString* pNodeNames = aNodeNames.getConstArray(); const Any* pURLs = aURLs.getConstArray(); const Any* pCounters = aCounters.getConstArray(); // check which of them must be deleted/modified - Sequence< ::rtl::OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted - ::rtl::OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); - ::std::set< ::rtl::OUString > aAlreadyPresent; // URLs currently persistent + Sequence< OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted + OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); + ::std::set< OUString > aAlreadyPresent; // URLs currently persistent // for modifying already existent nodes - Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs); + Sequence< OUString > aNewCounterNodePaths(nKnownURLs); Sequence< Any > aNewCounterValues(nKnownURLs); - ::rtl::OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); + OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); Any* pNewCounterValues = aNewCounterValues.getArray(); // temporaries needed inside the loop - ::rtl::OUString sCurrentURL, sCurrentURLNodeName; + OUString sCurrentURL, sCurrentURLNodeName; for (sal_Int32 i=0; i<nKnownURLs; ++i, ++pNodeNames, ++pURLs, ++pCounters) { @@ -407,10 +406,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters() } // and for the new ones ... - ::rtl::OUString sNewNodeName; - Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2); + OUString sNewNodeName; + Sequence< OUString > aNewCounterDataNodeNames(2); Sequence< Any > aNewCounterDataValues(2); - const ::rtl::OUString sNodeNameBase( "URL" ); + const OUString sNodeNameBase( "URL" ); for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); aCollectNew != aURLIgnoreCounters.end(); ++aCollectNew @@ -451,7 +450,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - Sequence< ::rtl::OUString > aNodeNames; + Sequence< OUString > aNodeNames; Sequence< Any > aURLs; Sequence< Any > aCounters; @@ -461,7 +460,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters() const Any* pURLs = aURLs.getConstArray(); const Any* pCounters = aCounters.getConstArray(); - ::rtl::OUString sCurrentURL; + OUString sCurrentURL; sal_Int32 nCurrentCounter; for (sal_Int32 i=0; i<nKnownURLs; ++i, ++pURLs, ++pCounters) { @@ -504,14 +503,14 @@ void SvtHelpOptions_Impl::Commit() break; case LOCALE: - pValues[nProp] <<= ::rtl::OUString(aLocale); + pValues[nProp] <<= OUString(aLocale); break; case SYSTEM: - pValues[nProp] <<= ::rtl::OUString(aSystem); + pValues[nProp] <<= OUString(aSystem); break; case STYLESHEET : - pValues[nProp] <<= ::rtl::OUString(sHelpStyleSheet); + pValues[nProp] <<= OUString(sHelpStyleSheet); break; } @@ -524,7 +523,7 @@ void SvtHelpOptions_Impl::Commit() // ----------------------------------------------------------------------- -void SvtHelpOptions_Impl::Notify( const Sequence<rtl::OUString>& aPropertyNames ) +void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames ) { Load( aPropertyNames ); } diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 7cfcddf3706f..f3f2e7d03158 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -41,7 +41,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; struct HtmlOptions_Impl { @@ -249,7 +248,7 @@ void SvxHtmlOptions::CallListeners() } -void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { Load( GetPropertyNames() ); CallListeners(); diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index beb5e478c585..856125f4a8d2 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -61,8 +61,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/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 6b03eb937ad5..2191a9d020cd 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -181,13 +181,13 @@ class SvtMiscOptions_Impl : public ConfigItem { return m_bIsSymbolsSizeRO; } sal_Int16 GetSymbolsStyle() const; - ::rtl::OUString GetSymbolsStyleName() const; + OUString GetSymbolsStyleName() const; sal_Int16 GetCurrentSymbolsStyle() const; inline void SetSymbolsStyle( sal_Int16 nSet ) - { ImplSetSymbolsStyle( true, nSet, ::rtl::OUString() ); } + { ImplSetSymbolsStyle( true, nSet, OUString() ); } - inline void SetSymbolsStyleName( ::rtl::OUString &rName ) + inline void SetSymbolsStyleName( OUString &rName ) { ImplSetSymbolsStyle( false, 0, rName ); } inline sal_Bool IsGetSymbolsStyleReadOnly() @@ -247,7 +247,7 @@ class SvtMiscOptions_Impl : public ConfigItem static Sequence< OUString > GetPropertyNames(); protected: - void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName ); + void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName ); }; //***************************************************************************************************************** @@ -356,7 +356,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() case PROPERTYHANDLE_SYMBOLSTYLE : { - ::rtl::OUString aSymbolsStyle; + OUString aSymbolsStyle; if( seqValues[nProperty] >>= aSymbolsStyle ) SetSymbolsStyleName( aSymbolsStyle ); else @@ -411,8 +411,8 @@ SvtMiscOptions_Impl::~SvtMiscOptions_Impl() } } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -424,7 +424,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. @@ -483,7 +483,7 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) } break; case PROPERTYHANDLE_SYMBOLSTYLE : { - ::rtl::OUString aSymbolsStyle; + OUString aSymbolsStyle; if( seqValues[nProperty] >>= aSymbolsStyle ) SetSymbolsStyleName( aSymbolsStyle ); else @@ -550,7 +550,7 @@ sal_Int16 SvtMiscOptions_Impl::GetSymbolsStyle() const return (sal_Int16)Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); } -::rtl::OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const +OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const { return Application::GetSettings().GetStyleSettings().GetSymbolsStyleName(); } @@ -560,7 +560,7 @@ sal_Int16 SvtMiscOptions_Impl::GetCurrentSymbolsStyle() const return (sal_Int16)Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle(); } -void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName ) +void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName ) { if ( ( bValue && ( nSet != GetSymbolsStyle() ) ) || ( !bValue && ( rName != GetSymbolsStyleName() ) ) ) diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 415c501121fa..9af953964bdb 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -174,7 +174,7 @@ public: //--------------------------------------------------------------------------------------------------------- virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); //--------------------------------------------------------------------------------------------------------- // public interface @@ -684,7 +684,7 @@ void SvtOptionsDrawinglayer_Impl::Commit() PutProperties( aSeqNames, aSeqValues ); } -void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OUString>& ) { } diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 3dfbd2998a13..ffae299aafc9 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -105,9 +105,9 @@ public: //------------------------------------------------------------------------------------------------------------- private: - void impl_setValue (const ::rtl::OUString& sProp, + void impl_setValue (const OUString& sProp, ::sal_Bool bNew ); - void impl_setValue (const ::rtl::OUString& sProp, + void impl_setValue (const OUString& sProp, ::sal_Int16 nNew ); //------------------------------------------------------------------------------------------------------------- @@ -135,7 +135,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot) using comphelper::string::getTokenCount; using comphelper::string::getToken; sal_Int32 nTokenCount = getTokenCount(rConfigRoot, '/'); - rtl::OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/'); + OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/'); m_xCfg->getByName(sTok) >>= m_xNode; } } @@ -447,7 +447,7 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl() m_xCfg.clear(); } -void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, +void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, ::sal_Bool bNew ) { try @@ -475,7 +475,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, } } -void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, +void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, ::sal_Int16 nNew ) { try diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 5906a03cd4fd..cf0208ea0ac7 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -183,8 +183,8 @@ SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl() Commit(); } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -196,7 +196,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 8f92b94a323b..2e62765b49d1 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -181,8 +181,8 @@ SvtToolPanelOptions_Impl::~SvtToolPanelOptions_Impl() Commit(); } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -194,7 +194,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index dd4aae281288..7ee9dd96d0c0 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -58,12 +58,12 @@ void ODocumentInfoPreview::Resize() { } void ODocumentInfoPreview::clear() { - m_pEditWin.SetText(rtl::OUString()); + m_pEditWin.SetText(OUString()); } void ODocumentInfoPreview::fill( css::uno::Reference< css::document::XDocumentProperties > const & xDocProps, - rtl::OUString const & rURL) + OUString const & rURL) { assert(xDocProps.is()); @@ -102,15 +102,15 @@ void ODocumentInfoPreview::fill( user->getPropertySetInfo()); css::uno::Sequence< css::beans::Property > props(info->getProperties()); for (sal_Int32 i = 0; i < props.getLength(); ++i) { - rtl::OUString name(props[i].Name); + OUString name(props[i].Name); css::uno::Any aAny(user->getPropertyValue(name)); css::uno::Reference< css::script::XTypeConverter > conv( css::script::Converter::create( comphelper::getProcessComponentContext())); - rtl::OUString value; + OUString value; try { value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING). - get< rtl::OUString >(); + get< OUString >(); } catch (css::script::CannotConvertException & e) { SAL_INFO("svtools.contnr", "ignored CannotConvertException " << e.Message); } @@ -124,12 +124,12 @@ void ODocumentInfoPreview::fill( } void ODocumentInfoPreview::insertEntry( - rtl::OUString const & title, rtl::OUString const & value) + OUString const & title, OUString const & value) { if (!m_pEditWin.GetText().isEmpty()) { - m_pEditWin.InsertText(rtl::OUString("\n\n")); + m_pEditWin.InsertText(OUString("\n\n")); } - rtl::OUString caption(title + rtl::OUString(":\n")); + OUString caption(title + OUString(":\n")); m_pEditWin.InsertText(caption); m_pEditWin.SetAttrib( TextAttribFontWeight(WEIGHT_BOLD), m_pEditWin.GetParagraphCount() - 2, @@ -137,7 +137,7 @@ void ODocumentInfoPreview::insertEntry( m_pEditWin.InsertText(value); } -void ODocumentInfoPreview::insertNonempty(long id, rtl::OUString const & value) +void ODocumentInfoPreview::insertNonempty(long id, OUString const & value) { if (!value.isEmpty()) { insertEntry(m_pInfoTable->GetString(id), value); @@ -153,7 +153,7 @@ void ODocumentInfoPreview::insertDateTime( value.Hours, value.Minutes, value.Seconds, value.HundredthSeconds)); if (aToolsDT.IsValidAndGregorian()) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); - rtl::OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT)); + OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT)); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); buf.append(rLocaleWrapper.getTime(aToolsDT)); insertEntry(m_pInfoTable->GetString(id), buf.makeStringAndClear()); diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 16fd91535a54..7e62273bf460 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -74,7 +74,6 @@ namespace svt using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::document::DocumentProperties; - using ::rtl::OUString; using ::ucbhelper::ResultSetInclude; using ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; @@ -93,7 +92,7 @@ namespace svt ,m_pFilter ( NULL ) ,m_pTranslator ( _pTranslator ) ,m_bCancelled ( false ) - ,m_rBlackList ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() ) + ,m_rBlackList ( ::com::sun::star::uno::Sequence< OUString >() ) { } @@ -118,7 +117,7 @@ namespace svt EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( const FolderDescriptor& _rFolder, const IUrlFilter* _pFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -361,9 +360,9 @@ namespace svt //-------------------------------------------------------------------- - sal_Bool FileViewContentEnumerator::URLOnBlackList ( const ::rtl::OUString& sRealURL ) + sal_Bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) { - ::rtl::OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); + OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); for (int i = 0; i < m_rBlackList.getLength() ; i++) { diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index 775f2a661f25..ab4c3442f4b1 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -41,16 +41,16 @@ namespace svt struct SortingData_Impl { private: - ::rtl::OUString maFilename; // only filename in upper case - for compare purposes - ::rtl::OUString maTitle; // -> be carefull when changing maTitle to update maFilename only when new - ::rtl::OUString maLowerTitle; + OUString maFilename; // only filename in upper case - for compare purposes + OUString maTitle; // -> be carefull when changing maTitle to update maFilename only when new + OUString maLowerTitle; public: - ::rtl::OUString maType; - ::rtl::OUString maTargetURL; - ::rtl::OUString maImageURL; - ::rtl::OUString maDisplayText; + OUString maType; + OUString maTargetURL; + OUString maImageURL; + OUString maDisplayText; DateTime maModDate; Image maImage; sal_Int64 maSize; @@ -62,14 +62,14 @@ namespace svt sal_Bool mbIsCompactDisc; inline SortingData_Impl(); - inline const ::rtl::OUString& GetTitle() const; - inline const ::rtl::OUString& GetLowerTitle() const; - inline const ::rtl::OUString& GetFileName() const; - inline void SetNewTitle( const ::rtl::OUString& rNewTitle ); // new maTitle is set -> maFilename is set to same! - inline void ChangeTitle( const ::rtl::OUString& rChangedTitle ); // maTitle is changed, maFilename is unchanged! + inline const OUString& GetTitle() const; + inline const OUString& GetLowerTitle() const; + inline const OUString& GetFileName() const; + inline void SetNewTitle( const OUString& rNewTitle ); // new maTitle is set -> maFilename is set to same! + inline void ChangeTitle( const OUString& rChangedTitle ); // maTitle is changed, maFilename is unchanged! private: - inline void SetTitles( const ::rtl::OUString& rNewTitle ); + inline void SetTitles( const OUString& rNewTitle ); }; inline SortingData_Impl::SortingData_Impl() : @@ -84,33 +84,33 @@ namespace svt { } - inline const ::rtl::OUString& SortingData_Impl::GetTitle() const + inline const OUString& SortingData_Impl::GetTitle() const { return maTitle; } - inline const ::rtl::OUString& SortingData_Impl::GetLowerTitle() const + inline const OUString& SortingData_Impl::GetLowerTitle() const { return maLowerTitle; } - inline const ::rtl::OUString& SortingData_Impl::GetFileName() const + inline const OUString& SortingData_Impl::GetFileName() const { return maFilename; } - inline void SortingData_Impl::SetNewTitle( const ::rtl::OUString& rNewTitle ) + inline void SortingData_Impl::SetNewTitle( const OUString& rNewTitle ) { SetTitles( rNewTitle ); maFilename = rNewTitle.toAsciiUpperCase(); } - inline void SortingData_Impl::ChangeTitle( const ::rtl::OUString& rChangedTitle ) + inline void SortingData_Impl::ChangeTitle( const OUString& rChangedTitle ) { SetTitles( rChangedTitle ); } - inline void SortingData_Impl::SetTitles( const ::rtl::OUString& rNewTitle ) + inline void SortingData_Impl::SetTitles( const OUString& rNewTitle ) { maTitle = rNewTitle; maLowerTitle = rNewTitle.toAsciiLowerCase(); @@ -122,7 +122,7 @@ namespace svt class IContentTitleTranslation { public: - virtual sal_Bool GetTranslation( const ::rtl::OUString& _rOriginalName, ::rtl::OUString& _rTranslatedName ) const = 0; + virtual sal_Bool GetTranslation( const OUString& _rOriginalName, OUString& _rTranslatedName ) const = 0; protected: ~IContentTitleTranslation() {} @@ -202,9 +202,9 @@ namespace svt ::com::sun::star::document::XDocumentProperties> m_xDocProps; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_rBlackList; + ::com::sun::star::uno::Sequence< OUString > m_rBlackList; - sal_Bool URLOnBlackList ( const ::rtl::OUString& sRealURL ); + sal_Bool URLOnBlackList ( const OUString& sRealURL ); public: /** constructs an enumerator instance @@ -243,7 +243,7 @@ namespace svt EnumerationResult enumerateFolderContentSync( const FolderDescriptor& _rFolder, const IUrlFilter* _pFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); /** cancels the running operation. @@ -263,7 +263,7 @@ namespace svt virtual void execute(); private: - sal_Bool implGetDocTitle( const ::rtl::OUString& _rTargetURL, ::rtl::OUString& _rRet ) const; + sal_Bool implGetDocTitle( const OUString& _rTargetURL, OUString& _rRet ) const; }; //........................................................................ diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8213006459ea..827e9865ab44 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::beans; using namespace ::comphelper; using ::svt::SortingData_Impl; using ::svt::FolderDescriptor; -using ::rtl::OUString; #define ALL_FILES_FILTER "*.*" @@ -190,7 +189,7 @@ private: protected: virtual sal_Bool DoubleClickHdl(); - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const; public: ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); @@ -198,7 +197,7 @@ public: virtual void Resize(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); void ClearAll(); HeaderBar* GetHeaderBar() const { return mpHeaderBar; } @@ -288,8 +287,8 @@ class NameTranslationEntry : public HashedEntry protected: OUString maTranslatedName; public: - inline NameTranslationEntry( const rtl::OUString& rOriginalName, const rtl::OUString& rTranslatedName ); - inline NameTranslationEntry( const rtl::OString& rOriginalName, const rtl::OString& rTranslatedName ); + inline NameTranslationEntry( const OUString& rOriginalName, const OUString& rTranslatedName ); + inline NameTranslationEntry( const OString& rOriginalName, const OString& rTranslatedName ); inline const OUString& GetTranslation() const; }; @@ -300,9 +299,9 @@ inline NameTranslationEntry::NameTranslationEntry( const OUString& rOrg, const O { } -inline NameTranslationEntry::NameTranslationEntry( const rtl::OString& rOrg, const rtl::OString& rTrans ) - : HashedEntry(rtl::OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US)) - , maTranslatedName(rtl::OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8)) +inline NameTranslationEntry::NameTranslationEntry( const OString& rOrg, const OString& rTrans ) + : HashedEntry(OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US)) + , maTranslatedName(OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8)) { } @@ -365,7 +364,7 @@ void NameTranslationList::Init() String aFsysName( maTransFile.getFSysPath( INetURLObject::FSYS_DETECT ) ); Config aConfig( aFsysName ); - aConfig.SetGroup( rtl::OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) ); + aConfig.SetGroup( OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) ); sal_uInt16 nKeyCnt = aConfig.GetKeyCount(); @@ -379,7 +378,7 @@ void NameTranslationList::Init() NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ): maTransFile( rBaseURL ), maHashedURL( rBaseURL ), - maTransFileName( rtl::OUString(".nametranslation.table") ) + maTransFileName( OUString(".nametranslation.table") ) { maTransFile.insertName( maTransFileName ); Init(); @@ -489,12 +488,12 @@ public: FileViewResult GetFolderContent_Impl( const String& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); FileViewResult GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()); void FilterFolderContent_Impl( const OUString &rFilter ); void CancelRunningAsyncAction(); @@ -594,7 +593,7 @@ OUString CreateExactSizeText( sal_Int64 nSize ) long nMega = 1024 * 1024; long nGiga = nMega * 1024; - rtl::OUString aUnitStr(' '); + OUString aUnitStr(' '); if ( nSize < 10000 ) { @@ -906,7 +905,7 @@ void ViewTabListBox_Impl::DeleteEntries() SvTreeListEntry* pEntry = FirstSelected(); String aURL; - rtl::OString sDialogPosition; + OString sDialogPosition; while ( pEntry && ( eResult != svtools::QUERYDELETE_CANCEL ) ) { SvTreeListEntry *pCurEntry = pEntry; @@ -971,7 +970,7 @@ void ViewTabListBox_Impl::DeleteEntries() // ----------------------------------------------------------------------- sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, - const rtl::OUString& rNewText ) + const OUString& rNewText ) { sal_Bool bRet = sal_False; @@ -1082,9 +1081,9 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl() // who knows ...) } -::rtl::OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString sRet = SvHeaderTabListBox::GetAccessibleObjectDescription( _eType, _nPos ); + OUString sRet = SvHeaderTabListBox::GetAccessibleObjectDescription( _eType, _nPos ); if ( ::svt::BBTYPE_TABLECELL == _eType ) { sal_Int32 nRow = -1; @@ -1102,7 +1101,7 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl() String aText( msAccessibleDescText ); aText.SearchAndReplace( sVar1, pData->mbIsFolder ? msFolder : msFile ); aText.SearchAndReplace( sVar2, pData->maURL ); - sRet += ::rtl::OUString( aText ); + sRet += OUString( aText ); } } } @@ -1268,14 +1267,14 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const // ----------------------------------------------------------------------- -const rtl::OString& SvtFileView::GetHelpId( ) const +const OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } // ----------------------------------------------------------------------- -void SvtFileView::SetHelpId( const rtl::OString& rHelpId ) +void SvtFileView::SetHelpId( const OString& rHelpId ) { mpImp->mpView->SetHelpId( rHelpId ); } @@ -1323,7 +1322,7 @@ FileViewResult SvtFileView::Initialize( const String& rURL, const String& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { WaitObject aWaitCursor( this ); mpBlackList = rBlackList; @@ -1355,7 +1354,7 @@ FileViewResult SvtFileView::Initialize( const String& rFilter, const FileViewAsyncAction* pAsyncDescriptor ) { - return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< OUString >()); } // ----------------------------------------------------------------------- @@ -1716,7 +1715,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mxCmdEnv ( xEnv ) { - maAllFilter = rtl::OUString("*.*"); + maAllFilter = OUString("*.*"); mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags ); mpView->EnableCellFocus(); } @@ -1752,7 +1751,7 @@ void SvtFileView_Impl::Clear() FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { ::osl::ClearableMutexGuard aGuard( maMutex ); INetURLObject aFolderObj( rFolder ); @@ -1771,7 +1770,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { DBG_TESTSOLARMUTEX(); ::osl::ClearableMutexGuard aGuard( maMutex ); diff --git a/svtools/source/contnr/fileview.hxx b/svtools/source/contnr/fileview.hxx index d24d57b68422..9a2fb34ace80 100644 --- a/svtools/source/contnr/fileview.hxx +++ b/svtools/source/contnr/fileview.hxx @@ -23,10 +23,9 @@ #include "sal/config.h" #include "sal/types.h" +#include <rtl/ustring.hxx> -namespace rtl { class OUString; } - -rtl::OUString CreateExactSizeText(sal_Int64 nSize); +OUString CreateExactSizeText(sal_Int64 nSize); #endif diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index f49647144a20..86292294f3f7 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -95,7 +95,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con return pEntry; } -sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString&, sal_Bool ) +sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, sal_Bool ) { return sal_True; } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 1c37d6de2943..3e10acb130b8 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1045,7 +1045,7 @@ void SvImpLBox::DrawNet() Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) ); ControlState nState = CTRL_STATE_ENABLED; if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ) ) + aCtrlRegion, nState, aControlValue, OUString() ) ) { return; } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index d64735e77f02..bc349048c75e 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -189,7 +189,7 @@ sal_Bool SvLBoxButtonData::IsRadio() { DBG_NAME(SvLBoxString); -SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr) +SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr) : SvLBoxItem(pEntry, nFlags) { DBG_CTOR(SvLBoxString,0); @@ -390,7 +390,7 @@ void SvLBoxButton::Paint( aControlValue.setTristateVal( BUTTONVALUE_MIXED ); bNativeOK = rDev.DrawNativeControl( eCtrlType, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); } if( !bNativeOK) @@ -425,7 +425,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo aCtrlRegion, nState, aControlValue, - rtl::OUString(), + OUString(), aNativeBounds, aNativeContent ); if( bNativeOK ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index c433ef97a78a..3774a450f9bf 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -84,7 +84,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) - aToken = rtl::OUString(pCurToken, nCurTokenLen); + aToken = OUString(pCurToken, nCurTokenLen); else aToken.Erase(); SvLBoxString* pStr = new SvLBoxString( pEntry, 0, aToken ); @@ -331,7 +331,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, if( nCol == 0xffff ) { if( pCurToken ) - aTemp = rtl::OUString(pCurToken, nCurTokenLen); + aTemp = OUString(pCurToken, nCurTokenLen); else aTemp.Erase(); // delete all columns without a token ((SvLBoxString*)pStr)->SetText( aTemp ); @@ -342,7 +342,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, { if( !nCol ) { - aTemp = rtl::OUString(pCurToken, nCurTokenLen); + aTemp = OUString(pCurToken, nCurTokenLen); ((SvLBoxString*)pStr)->SetText( aTemp ); if( !pNextToken ) break; @@ -796,14 +796,14 @@ sal_uInt16 SvHeaderTabListBox::GetCurrColumn() const return nPos; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const +OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const { - return ::rtl::OUString( GetEntryText( _nRow ) ); + return OUString( GetEntryText( _nRow ) ); } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const +OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const { - return ::rtl::OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); + return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); } // ----------------------------------------------------------------------- sal_Bool SvHeaderTabListBox::HasRowHeader() const @@ -891,7 +891,7 @@ sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const // ----------------------------------------------------------------------- String SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const { - return ::rtl::OUString( GetTabEntryText( _nRow, _nColumnPos ) ); + return OUString( GetTabEntryText( _nRow, _nColumnPos ) ); } // ----------------------------------------------------------------------- Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen ) @@ -1050,16 +1050,16 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin return sal_False; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString aRetText; + OUString aRetText; switch( _eType ) { case ::svt::BBTYPE_BROWSEBOX: case ::svt::BBTYPE_TABLE: case ::svt::BBTYPE_COLUMNHEADERBAR: // should be empty now (see #i63983) - aRetText = ::rtl::OUString(); + aRetText = OUString(); break; case ::svt::BBTYPE_TABLECELL: @@ -1089,7 +1089,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin case ::svt::BBTYPE_ROWHEADERBAR: case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( "error" ); + aRetText = OUString( "error" ); break; default: @@ -1098,9 +1098,9 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin return aRetText; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString aRetText; + OUString aRetText; if( _eType == ::svt::BBTYPE_TABLECELL && _nPos != -1 ) { diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 2c27933710d8..793485cbf84f 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -117,7 +117,7 @@ struct FolderHistory m_sURL( _rURL ), m_nGroup( _nGroup ) {} }; -typedef ::std::vector< ::rtl::OUString* > NewDocList_Impl; +typedef ::std::vector< OUString* > NewDocList_Impl; // class SvtDummyHeaderBar_Impl ------------------------------------------ @@ -427,10 +427,10 @@ SvtFileViewWindow_Impl::~SvtFileViewWindow_Impl() void GetMenuEntry_Impl ( Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId + OUString& rTitle, + OUString& rURL, + OUString& rFrame, + OUString& rImageId ) { for ( int i = 0; i < aDynamicMenuEntry.getLength(); i++ ) @@ -446,20 +446,20 @@ void GetMenuEntry_Impl } } -Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const +Sequence< OUString > SvtFileViewWindow_Impl::GetNewDocContents() const { NewDocList_Impl aNewDocs; Sequence< Sequence< PropertyValue > > aDynamicMenuEntries; aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_NEWMENU ); - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aImageURL; - ::rtl::OUString aTargetFrame; + OUString aTitle; + OUString aURL; + OUString aImageURL; + OUString aTargetFrame; sal_uInt32 i, nCount = aDynamicMenuEntries.getLength(); - ::rtl::OUString sSeparator( "private:separator" ); - ::rtl::OUString sSlotURL( "slot:5500" ); + OUString sSeparator( "private:separator" ); + OUString sSlotURL( "slot:5500" ); for ( i = 0; i < nCount; ++i ) { @@ -469,7 +469,7 @@ Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const if( aURL == sSeparator ) { String aSeparator( aSeparatorStr ); - ::rtl::OUString* pSeparator = new ::rtl::OUString( aSeparator ); + OUString* pSeparator = new OUString( aSeparator ); aNewDocs.push_back( pSeparator ); } else @@ -495,17 +495,17 @@ Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const aRow += String( aImageURL ); } - ::rtl::OUString* pRow = new ::rtl::OUString( aRow ); + OUString* pRow = new OUString( aRow ); aNewDocs.push_back( pRow ); } } nCount = aNewDocs.size(); - Sequence < ::rtl::OUString > aRet( nCount ); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence < OUString > aRet( nCount ); + OUString* pRet = aRet.getArray(); for ( i = 0; i < nCount; ++i ) { - ::rtl::OUString* pNewDoc = aNewDocs[i]; + OUString* pNewDoc = aNewDocs[i]; pRet[i] = *( pNewDoc ); delete pNewDoc; } @@ -563,7 +563,7 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String& rURL ) const String SvtFileViewWindow_Impl::GetFolderTitle() const { - rtl::OUString aTitle; + OUString aTitle; ::utl::UCBContentHelper::GetTitle( aFolderURL, &aTitle ); return aTitle; } @@ -583,14 +583,14 @@ SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() : } // ----------------------------------------------------------------------- -rtl::OUString SvtDocInfoTable_Impl::GetString( long nId ) const +OUString SvtDocInfoTable_Impl::GetString( long nId ) const { sal_uInt32 nPos( FindIndex( nId ) ); if ( RESARRAY_INDEX_NOTFOUND != nPos ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } // class SvtFrameWindow_Impl --------------------------------------------- @@ -663,7 +663,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL ) uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); uno::Sequence < beans::PropertyValue> aProps(1); - aProps[0].Name = ::rtl::OUString( "InteractionHandler" ); + aProps[0].Name = OUString( "InteractionHandler" ); aProps[0].Value <<= xInteractionHandler; m_xDocProps->loadFromMedium( rURL, aProps ); pEditWin->fill( m_xDocProps, rURL ); @@ -745,14 +745,14 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); - aArgs[3].Name = ::rtl::OUString( "InteractionHandler" ); + aArgs[3].Name = OUString( "InteractionHandler" ); aArgs[3].Value <<= xInteractionHandler; b = sal_False; aArgs[2].Value.setValue( &b, ::getBooleanCppuType() ); xDisp->dispatch( aURL, aArgs ); - ::rtl::OUString aDispURL; + OUString aDispURL; Reference< ::com::sun::star::frame::XController > xCtrl = xFrame->getController(); if( xCtrl.is() ) { @@ -765,7 +765,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B { xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() ); ViewEmptyWin(); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } else m_aOpenURL = aDispURL; @@ -778,13 +778,13 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B aArgs[0].Name = "AsTemplate"; aArgs[0].Value <<= bAsTemplate; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } else { Sequence < PropertyValue > aArgs; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } } } @@ -1309,7 +1309,7 @@ void SvtTemplateWindow::ReadViewSettings() sal_Int32 nSelectedGroup = ICON_POS_TEMPLATES; sal_Int32 nSelectedView = TI_DOCTEMPLATE_DOCINFO; double nSplitRatio = 0.5; - ::rtl::OUString sLastFolder; + OUString sLastFolder; SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); if ( aViewSettings.Exists() ) @@ -1380,7 +1380,7 @@ void SvtTemplateWindow::WriteViewSettings() // last folder aSettings[3].Name = VIEWSETTING_LASTFOLDER; - aSettings[3].Value <<= ::rtl::OUString( pFileWin->GetFolderURL() ); + aSettings[3].Value <<= OUString( pFileWin->GetFolderURL() ); // write SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); @@ -1532,10 +1532,10 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const { sal_Bool bEnable = sal_False; - ::rtl::OUString aFolderURL = pImpl->pWin->GetFolderURL(); + OUString aFolderURL = pImpl->pWin->GetFolderURL(); if ( pImpl->pWin->IsFileSelected() && !aFolderURL.isEmpty() ) { - ::rtl::OUString aFileTargetURL = pImpl->pWin->GetSelectedFile(); + OUString aFileTargetURL = pImpl->pWin->GetSelectedFile(); bEnable = !aFileTargetURL.isEmpty(); } @@ -1627,7 +1627,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl) Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); Reference < XDispatch > xDisp; - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -1649,9 +1649,9 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, PackageHdl_Impl) { using namespace org::freedesktop::PackageKit; Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()), UNO_QUERY); - Sequence< ::rtl::OUString > vPackages(1); + Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-templates"; - ::rtl::OUString sInteraction(""); + OUString sInteraction(""); xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); } catch (Exception & e) @@ -1702,7 +1702,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) { - ::rtl::OUString sURL( aMoreTemplatesLink.GetURL() ); + OUString sURL( aMoreTemplatesLink.GetURL() ); if ( !sURL.isEmpty() ) { localizeWebserviceURI(sURL); @@ -1713,13 +1713,13 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell( com::sun::star::system::SystemShellExecute::create(xContext) ); if ( xSystemShell.is() ) - xSystemShell->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShell->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); EndDialog( RET_CANCEL ); } catch( const uno::Exception& e ) { OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } } return 0; diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index b0807e79c34b..6de3ba541d1d 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -127,7 +127,7 @@ private: sal_Bool bIsTemplateFolder; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > GetNewDocContents() const; public: @@ -161,7 +161,7 @@ class SvtDocInfoTable_Impl : public ResStringArray public: SvtDocInfoTable_Impl(); - rtl::OUString GetString( long nId ) const; + OUString GetString( long nId ) const; }; class SvtFrameWindow_Impl : public Window @@ -181,7 +181,7 @@ private: ::com::sun::star::lang::Locale aLocale; SvtDocInfoTable_Impl aInfoTable; String aCurrentURL; - ::rtl::OUString m_aOpenURL; + OUString m_aOpenURL; sal_Bool bDocInfo; void ShowDocInfo( const String& rURL ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index c39051814e5d..f19018246040 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2154,7 +2154,7 @@ sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& ) return sal_True; } -sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/) +sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const OUString& /*rNewText*/) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; @@ -2206,7 +2206,7 @@ void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); if( !pParent->HasChildren() ) - InsertEntry( rtl::OUString("<dummy>"), pParent, sal_False, LIST_APPEND ); + InsertEntry( OUString("<dummy>"), pParent, sal_False, LIST_APPEND ); } void SvTreeListBox::GetFocus() @@ -2319,7 +2319,7 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic ) { DBG_CHKTHIS(SvTreeListBox,0); short nOffset = 0; - aSizeLogic = Size(GetTextWidth(rtl::OUString('X')), GetTextHeight()); + aSizeLogic = Size(GetTextWidth(OUString('X')), GetTextHeight()); if( GetEntryHeight() > aSizeLogic.Height() ) nOffset = ( GetEntryHeight() - (short)aSizeLogic.Height()) / 2; return nOffset; @@ -3190,7 +3190,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT } bNativeOK = DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); } if( !bNativeOK) { diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index d0601b5d514f..8ef2de24ef0c 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -191,7 +191,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbAllSel = sal_False; mbDropPos = sal_False; - ::rtl::OUString aGregorian( "gregorian"); + OUString aGregorian( "gregorian"); maCalendarWrapper.loadCalendar( aGregorian, Application::GetAppLocaleDataWrapper().getLanguageTag().getLocale()); if (maCalendarWrapper.getUniqueID() != aGregorian) @@ -329,7 +329,7 @@ void Calendar::ImplFormat() if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) ) return; - rtl::OUString a99Text("99"); + OUString a99Text("99"); Font aOldFont = GetFont(); @@ -958,7 +958,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) for ( sal_uInt16 nWeekCount = 0; nWeekCount < 6; nWeekCount++ ) { sal_Int32 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR); - rtl::OUString aWeekText(rtl::OUString::valueOf(nWeek)); + OUString aWeekText(OUString::valueOf(nWeek)); long nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText ); long nOffY = (mnDayHeight-GetTextHeight())/2; DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText ); @@ -2146,7 +2146,7 @@ void Calendar::EndSelection() Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, long nCalcLines ) const { - rtl::OUString a99Text("99"); + OUString a99Text("99"); Font aOldFont = GetFont(); // Wochenanzeige beruecksichtigen diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 91e7d2c3f2e9..cc2d73062955 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -32,17 +32,17 @@ class CollatorResourceData { friend class CollatorResource; private: /* data */ - rtl::OUString ma_Name; - rtl::OUString ma_Translation; + OUString ma_Name; + OUString ma_Translation; private: /* member functions */ CollatorResourceData () {} public: - CollatorResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation) + CollatorResourceData ( const OUString &r_Algorithm, const OUString &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const rtl::OUString& GetAlgorithm () const { return ma_Name; } + const OUString& GetAlgorithm () const { return ma_Name; } - const rtl::OUString& GetTranslation () const { return ma_Translation; } + const OUString& GetTranslation () const { return ma_Translation; } ~CollatorResourceData () {} @@ -87,11 +87,11 @@ CollatorResource::~CollatorResource() delete[] mp_Data; } -const rtl::OUString& -CollatorResource::GetTranslation(const rtl::OUString &r_Algorithm) +const OUString& +CollatorResource::GetTranslation(const OUString &r_Algorithm) { sal_Int32 nIndex = r_Algorithm.indexOf('.'); - rtl::OUString aLocaleFreeAlgorithm; + OUString aLocaleFreeAlgorithm; if (nIndex == -1) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 53b8bd14fcb8..a51f14eb5d29 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -82,7 +82,7 @@ public: void ColorListBox::ImplInit() { pColorList = new ImpColorList(); - aImageSize.Width() = GetTextWidth( rtl::OUString("xxx") ); + aImageSize.Width() = GetTextWidth( OUString("xxx") ); aImageSize.Height() = GetTextHeight(); aImageSize.Height() -= 2; @@ -120,7 +120,7 @@ namespace bool extractDropdown(VclBuilder::stringmap &rMap) { bool bDropdown = true; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("dropdown"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("dropdown"))); if (aFind != rMap.end()) { bDropdown = toBool(aFind->second); @@ -746,7 +746,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, void LineListBox::ImplInit() { - aTxtSize.Width() = GetTextWidth( rtl::OUString( " " ) ); + aTxtSize.Width() = GetTextWidth( OUString( " " ) ); aTxtSize.Height() = GetTextHeight(); pLineList = new ImpLineList(); eUnit = FUNIT_POINT; @@ -974,7 +974,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) GetColorLine2( GetEntryCount( ) ), GetColorDist( GetEntryCount( ) ), pData->GetStyle(), aBmp ); - ListBox::InsertEntry( rtl::OUString( " " ), aBmp, LISTBOX_APPEND ); + ListBox::InsertEntry( OUString( " " ), aBmp, LISTBOX_APPEND ); if ( n == nTypePos ) SelectEntryPos( GetEntryCount() - 1 ); } @@ -1072,7 +1072,7 @@ FontNameBox::~FontNameBox() void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) const { - rtl::OString aEntries(rtl::OUStringToOString(GetMRUEntries(cSep), + OString aEntries(OUStringToOString(GetMRUEntries(cSep), RTL_TEXTENCODING_UTF8)); if (aEntries.isEmpty() || !aFontMRUEntriesFile.Len()) @@ -1083,14 +1083,14 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode if( ! (aStream.IsOpen() && aStream.IsWritable()) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontNameBox::SaveMRUEntries: opening mru entries file %s failed\n", rtl::OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( stderr, "FontNameBox::SaveMRUEntries: opening mru entries file %s failed\n", OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif return; } aStream.SetLineDelimiter( LINEEND_LF ); aStream.WriteLine( aEntries ); - aStream.WriteLine( rtl::OString() ); + aStream.WriteLine( OString() ); } // ------------------------------------------------------------------- @@ -1104,14 +1104,14 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode if( ! aStream.IsOpen() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontNameBox::LoadMRUEntries: opening mru entries file %s failed\n", rtl::OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8).getStr() ); + fprintf( stderr, "FontNameBox::LoadMRUEntries: opening mru entries file %s failed\n", OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8).getStr() ); #endif return; } - rtl::OString aLine; + OString aLine; aStream.ReadLine( aLine ); - rtl::OUString aEntries = rtl::OStringToOUString(aLine, + OUString aEntries = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8); SetMRUEntries( aEntries, cSep ); } @@ -1120,7 +1120,7 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode void FontNameBox::InitFontMRUEntriesFile() { - rtl::OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); + OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); rtl::Bootstrap::expandMacros(sUserConfigDir); maFontMRUEntriesFile = sUserConfigDir; @@ -1208,7 +1208,7 @@ void FontNameBox::ImplCalcUserItemSize() namespace { - long shrinkFontToFit(rtl::OUString &rSampleText, long nH, Font &rFont, OutputDevice &rDevice, Rectangle &rTextRect) + long shrinkFontToFit(OUString &rSampleText, long nH, Font &rFont, OutputDevice &rDevice, Rectangle &rTextRect) { long nWidth = 0; @@ -1264,7 +1264,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) Rectangle aTextRect; // Preview the font name - rtl::OUString sFontName = rInfo.GetName(); + OUString sFontName = rInfo.GetName(); //If it shouldn't or can't draw its own name because it doesn't have the glyphs if (!canRenderNameOfSelectedFont(*rUDEvt.GetDevice())) @@ -1291,7 +1291,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) if (!bUsingCorrectFont) rUDEvt.GetDevice()->SetFont( aFont ); - rtl::OUString sSampleText; + OUString sSampleText; if (!bSymbolFont) { @@ -1343,7 +1343,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) for (size_t i = 0; i < SAL_N_ELEMENTS(aScripts); ++i) { - rtl::OUString sText = makeShortRepresentativeTextForScript(aScripts[i]); + OUString sText = makeShortRepresentativeTextForScript(aScripts[i]); if (!sText.isEmpty()) { bool bHasSampleTextGlyphs = (STRING_LEN == rUDEvt.GetDevice()->HasGlyphs(aFont, sText)); @@ -1363,7 +1363,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) for (size_t i = 0; i < SAL_N_ELEMENTS(aMinimalScripts); ++i) { - rtl::OUString sText = makeShortMinimalTextForScript(aMinimalScripts[i]); + OUString sText = makeShortMinimalTextForScript(aMinimalScripts[i]); if (!sText.isEmpty()) { bool bHasSampleTextGlyphs = (STRING_LEN == rUDEvt.GetDevice()->HasGlyphs(aFont, sText)); @@ -1913,7 +1913,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText(rtl::OUString('%')); + SetCustomUnitText(OUString('%')); SetUnit( FUNIT_CUSTOM ); Clear(); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index fe1201c6495a..e225bc3c50e2 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -584,7 +584,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const namespace { - FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const rtl::OUString &rName, + FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName, FontWeight eWeight, FontItalic eItalic) { FontInfo aInfo; @@ -592,7 +592,7 @@ namespace if (pFontNameInfo) { aInfo = *pFontNameInfo; - aInfo.SetStyleName(rtl::OUString()); + aInfo.SetStyleName(OUString()); } aInfo.SetWeight(eWeight); @@ -600,7 +600,7 @@ namespace //If this is a known but uninstalled symbol font which we can remap to //OpenSymbol then toggle its charset to be a symbol font - if (ConvertChar::GetRecodeData(rName, rtl::OUString("OpenSymbol"))) + if (ConvertChar::GetRecodeData(rName, OUString("OpenSymbol"))) aInfo.SetCharSet(RTL_TEXTENCODING_SYMBOL); return aInfo; @@ -891,7 +891,7 @@ long FontSizeNames::Name2Size( const String& rName ) const { if ( mnElem ) { - rtl::OString aName(rtl::OUStringToOString(rName, + OString aName(OUStringToOString(rName, RTL_TEXTENCODING_UTF8)); // linear search is sufficient for this rare case diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 1365975a15bb..f605f8a8ab59 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -157,7 +157,7 @@ void FileControl::Resize() } else { - rtl::OUString aSmallText( "..." ); + OUString aSmallText( "..." ); maButton.SetText( aSmallText ); nButtonTextWidth = maButton.GetTextWidth( aSmallText ); } diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index bf69f32cc55b..0dcb13a6bcea 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -40,13 +40,13 @@ void FileControl::ImplBrowseFile( ) Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference < dialogs::XFilePicker3 > xFilePicker = dialogs::FilePicker::createWithMode( xContext, dialogs::TemplateDescription::FILEOPEN_SIMPLE ); // transform the system notation text into a file URL - ::rtl::OUString sSystemNotation = GetText(), sFileURL; + OUString sSystemNotation = GetText(), sFileURL; oslFileError nError = osl_getFileURLFromSystemPath( sSystemNotation.pData, &sFileURL.pData ); if ( nError == osl_File_E_INVAL ) sFileURL = GetText(); // #97709# Maybe URL is already a file URL... //#90430# Check if URL is really a file URL - ::rtl::OUString aTmp; + OUString aTmp; if ( osl_getSystemPathFromFileURL( sFileURL.pData, &aTmp.pData ) == osl_File_E_None ) { // initially set this directory @@ -55,7 +55,7 @@ void FileControl::ImplBrowseFile( ) if ( xFilePicker->execute() ) { - Sequence < rtl::OUString > aPathSeq = xFilePicker->getFiles(); + Sequence < OUString > aPathSeq = xFilePicker->getFiles(); if ( aPathSeq.getLength() ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index f3931bbad7ea..53ccc338e2a7 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1262,7 +1262,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat() { sNewFormat.append(aLocaleInfo.getNumDecimalSep()); - rtl::OUStringBuffer sTemp; + OUStringBuffer sTemp; comphelper::string::padToLength(sTemp, nDigits, '0'); sNewFormat.append(sTemp); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 82dad150d8c1..6e7f88e4b8b3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -36,7 +36,7 @@ public: sal_uInt16 mnId; HeaderBarItemBits mnBits; long mnSize; - rtl::OString maHelpId; + OString maHelpId; Image maImage; XubString maOutText; XubString maText; @@ -347,7 +347,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, aCtrlRegion=aRect; pWin->DrawNativeControl( CTRL_WINDOW_BACKGROUND, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else @@ -381,7 +381,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, nState|=CTRL_STATE_PRESSED; pWin->DrawNativeControl( CTRL_LISTHEADER, PART_BUTTON, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else { @@ -605,7 +605,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, nState|=CTRL_STATE_PRESSED; pWin->DrawNativeControl( CTRL_LISTHEADER, PART_ARROW, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else { @@ -1153,7 +1153,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // Wenn eine Hilfe existiert, dann ausloesen @@ -1482,7 +1482,7 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -1493,10 +1493,10 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -rtl::OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const +OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); - rtl::OString aRet; + OString aRet; if ( nPos != HEADERBAR_ITEM_NOTFOUND ) return (*mpItemList)[ nPos ]->maHelpId; return aRet; diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 8b6f6be9ad0a..a67c3842b547 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -203,7 +203,7 @@ namespace svt m_pImpl->Index = _Index; } - void HyperLabel::SetLabel( const ::rtl::OUString& _rText ) + void HyperLabel::SetLabel( const OUString& _rText ) { SetText(_rText); } diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 0a495447a29d..c80507f015a7 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -32,17 +32,17 @@ class IndexEntryResourceData { friend class IndexEntryResource; private: /* data */ - rtl::OUString ma_Name; - rtl::OUString ma_Translation; + OUString ma_Name; + OUString ma_Translation; private: /* member functions */ IndexEntryResourceData () {} public: - IndexEntryResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation) + IndexEntryResourceData ( const OUString &r_Algorithm, const OUString &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const rtl::OUString& GetAlgorithm () const { return ma_Name; } + const OUString& GetAlgorithm () const { return ma_Name; } - const rtl::OUString& GetTranslation () const { return ma_Translation; } + const OUString& GetTranslation () const { return ma_Translation; } ~IndexEntryResourceData () {} @@ -99,10 +99,10 @@ IndexEntryResource::~IndexEntryResource() delete[] mp_Data; } -const rtl::OUString& IndexEntryResource::GetTranslation(const rtl::OUString &r_Algorithm) +const OUString& IndexEntryResource::GetTranslation(const OUString &r_Algorithm) { sal_Int32 nIndex = r_Algorithm.indexOf('.'); - rtl::OUString aLocaleFreeAlgorithm; + OUString aLocaleFreeAlgorithm; if (nIndex == -1) aLocaleFreeAlgorithm = r_Algorithm; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 603e5ee38f91..c7779c5702d1 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -76,8 +76,8 @@ using namespace ::com::sun::star::uno; class SvtURLBox_Impl { public: - std::vector<rtl::OUString> aURLs; - std::vector<rtl::OUString> aCompletions; + std::vector<OUString> aURLs; + std::vector<OUString> aCompletions; const IUrlFilter* pUrlFilter; ::std::vector< WildCard > m_aFilters; @@ -94,9 +94,9 @@ class SvtMatchContext_Impl: public salhelper::Thread { static ::osl::Mutex* pDirMutex; - std::vector<rtl::OUString> aPickList; - std::vector<rtl::OUString> aCompletions; - std::vector<rtl::OUString> aURLs; + std::vector<OUString> aPickList; + std::vector<OUString> aCompletions; + std::vector<OUString> aURLs; svtools::AsynchronLink aLink; String aBaseURL; String aText; @@ -116,7 +116,7 @@ class SvtMatchContext_Impl: public salhelper::Thread void doExecute(); void Insert( const String& rCompletion, const String& rURL, sal_Bool bForce = sal_False); void ReadFolder( const String& rURL, const String& rMatch, sal_Bool bSmart ); - void FillPicklist(std::vector<rtl::OUString>& rPickList); + void FillPicklist(std::vector<OUString>& rPickList); public: SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ); @@ -151,7 +151,7 @@ SvtMatchContext_Impl::~SvtMatchContext_Impl() aLink.ClearPendingCall(); } -void SvtMatchContext_Impl::FillPicklist(std::vector<rtl::OUString>& rPickList) +void SvtMatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList) { // Einlesung der Historypickliste Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( eHISTORY ); @@ -231,12 +231,12 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, ) // insert all completed strings into the listbox pBox->Clear(); - for(std::vector<rtl::OUString>::iterator i = pThis->aCompletions.begin(); i != pThis->aCompletions.end(); ++i) + for(std::vector<OUString>::iterator i = pThis->aCompletions.begin(); i != pThis->aCompletions.end(); ++i) { String sCompletion(*i); // convert the file into an URL - rtl::OUString sURL( sCompletion ); + OUString sURL( sCompletion ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCompletion, sURL ); // note: if this doesn't work, we're not interested in: we're checking the // untouched sCompletion then @@ -303,7 +303,7 @@ void SvtMatchContext_Impl::Insert( const String& rCompletion, if( !bForce ) { // avoid doubles - if(find(aCompletions.begin(), aCompletions.end(), rtl::OUString(rCompletion)) != aCompletions.end()) + if(find(aCompletions.begin(), aCompletions.end(), OUString(rCompletion)) != aCompletions.end()) return; } @@ -333,7 +333,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, // for pure home paths ( ~username ) the '.' at the end of rMatch // means that it poits to root catalog // this is done only for file contents since home paths parsing is useful only for them - if ( bPureHomePath && rMatch.Equals( rtl::OUString("file:///.") ) ) + if ( bPureHomePath && rMatch.Equals( OUString("file:///.") ) ) { // a home that refers to / @@ -721,7 +721,7 @@ void SvtMatchContext_Impl::doExecute() aObj.SetSmartProtocol( eSmartProt == INET_PROT_NOT_VALID ? INET_PROT_HTTP : eSmartProt ); for( ;; ) { - for(std::vector<rtl::OUString>::iterator i = aPickList.begin(); schedule() && i != aPickList.end(); ++i) + for(std::vector<OUString>::iterator i = aPickList.begin(); schedule() && i != aPickList.end(); ++i) { aCurObj.SetURL(*i); aCurObj.SetSmartURL( aCurObj.GetURLNoPass()); @@ -1193,7 +1193,7 @@ String SvtURLBox::GetURL() return aPlaceHolder; // try to get the right case preserving URL from the list of URLs - for(std::vector<rtl::OUString>::iterator i = pImp->aCompletions.begin(), j = pImp->aURLs.begin(); i != pImp->aCompletions.end() && j != pImp->aURLs.end(); ++i, ++j) + for(std::vector<OUString>::iterator i = pImp->aCompletions.begin(), j = pImp->aURLs.begin(); i != pImp->aCompletions.end() && j != pImp->aURLs.end(); ++i, ++j) { if((*i).equals(aText)) return *j; @@ -1223,9 +1223,9 @@ String SvtURLBox::GetURL() if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() ); + OUString aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() ); aObj.SetURL(aName); - ::rtl::OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aURL.isEmpty() ) // aText itself is invalid, and even together with aBaseURL, it could not // made valid -> no chance @@ -1233,13 +1233,13 @@ String SvtURLBox::GetURL() bool bSlash = aObj.hasFinalSlash(); { - const rtl::OUString aPropName("CasePreservingURL"); + const OUString aPropName("CasePreservingURL"); - rtl::OUString aFileURL; + OUString aFileURL; Any aAny = UCBContentHelper::GetProperty(aURL, aPropName); sal_Bool success = (aAny >>= aFileURL); - rtl::OUString aTitle; + OUString aTitle; if(success) aTitle = String( INetURLObject(aFileURL).getName( @@ -1306,7 +1306,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aHomeLocation ) aHomeLocation = ""; - aParseTilde = rtl::OUString::createFromAscii(aHomeLocation); + aParseTilde = OUString::createFromAscii(aHomeLocation); // in case the whole path is just "~" then there should // be no trailing slash at the end @@ -1317,7 +1317,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( { // covers "~username" and "~username/..." cases xub_StrLen nNameEnd = aText.Search( '/' ); - rtl::OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); + OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); struct passwd* pPasswd = NULL; #ifdef SOLARIS @@ -1329,13 +1329,13 @@ sal_Bool SvtURLBox_Impl::TildeParsing( 1024, &pPasswd ); if( !nRes && pPasswd ) - aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); + aParseTilde = OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #else pPasswd = getpwnam( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr() ); if( pPasswd ) - aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); + aParseTilde = OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #endif @@ -1351,7 +1351,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aParseTilde.Len() || aParseTilde.EqualsAscii( "/" ) ) { // "/" path should be converted to "/." - aParseTilde = rtl::OUString("/."); + aParseTilde = OUString("/."); } else { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 93e57f345946..a07a1eacd5e6 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -96,7 +96,7 @@ namespace svt void SetIndex( ItemIndex _Index ); ItemIndex GetIndex() const; - void Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ); + void Update( ItemIndex _RMIndex, const OUString& _rText ); void SetPosition( RoadmapItem* OldHyperLabel ); @@ -267,7 +267,7 @@ namespace svt //--------------------------------------------------------------------- - RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled) + RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled) { if ( m_pImpl->getItemCount() == 0 ) m_pImpl->initItemSize(); @@ -338,7 +338,7 @@ namespace svt } } else if ( bWasComplete ) - m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), rtl::OUString("..."), RMINCOMPLETE ); + m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), OUString("..."), RMINCOMPLETE ); } //--------------------------------------------------------------------- @@ -363,12 +363,12 @@ namespace svt { RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() ); m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem ); - m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), rtl::OUString("...") ); + m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), OUString("...") ); } } //--------------------------------------------------------------------- - void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled ) + void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled ) { RoadmapItem* pItem = GetByIndex( _Index); if ( pItem != NULL ) @@ -395,7 +395,7 @@ namespace svt } //--------------------------------------------------------------------- - void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) + void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) { InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled ); // Todo: YPos is superfluous, if items are always appended @@ -427,7 +427,7 @@ namespace svt } //--------------------------------------------------------------------- - void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& _sLabel, ItemIndex _nStartIndex ) + void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); if ( pItem != NULL ) @@ -762,7 +762,7 @@ namespace svt if ( mpID ) { - ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( "." ); + OUString aIDText = OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + OUString( "." ); mpID->SetText( aIDText ); } @@ -838,7 +838,7 @@ namespace svt { // calculate widths long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( "100." ) ); + long nMaxIDWidth = mpID->GetTextWidth( OUString( "100." ) ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need @@ -854,7 +854,7 @@ namespace svt } //--------------------------------------------------------------------- - void RoadmapItem::Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ) + void RoadmapItem::Update( ItemIndex _RMIndex, const OUString& _rText ) { // update description label mpDescription->SetLabel( _rText ); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 5e19a661dff1..ab7e320c03fe 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -277,7 +277,7 @@ void Ruler::ImplInit( WinBits nWinBits ) // Setup the default size Rectangle aRect; - GetTextBoundRect( aRect, rtl::OUString( "0123456789" ) ); + GetTextBoundRect( aRect, OUString( "0123456789" ) ); long nDefHeight = aRect.GetHeight() + RULER_OFF*2 + RULER_TEXTOFF*2 + mnBorderWidth; Size aDefSize; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 34ab2900a024..0d4eb047e617 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -53,7 +53,7 @@ struct ImplTabBarItem OUString maHelpText; Rectangle maRect; long mnWidth; - rtl::OString maHelpId; + OString maHelpId; sal_Bool mbShort; sal_Bool mbSelect; sal_Bool mbEnable; @@ -1323,7 +1323,7 @@ void TabBar::Paint( const Rectangle& rect ) { if(IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL)) DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rect, - CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString()); + CTRL_STATE_ENABLED,ImplControlValue(0),OUString()); // Items berechnen und ausgeben sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size(); @@ -1542,7 +1542,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // Wenn eine Hilfe existiert, dann ausloesen @@ -2489,7 +2489,7 @@ XubString TabBar::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2499,10 +2499,10 @@ XubString TabBar::GetHelpText( sal_uInt16 nPageId ) const // ----------------------------------------------------------------------- -rtl::OString TabBar::GetHelpId( sal_uInt16 nPageId ) const +OString TabBar::GetHelpId( sal_uInt16 nPageId ) const { sal_uInt16 nPos = GetPagePos( nPageId ); - rtl::OString aRet; + OString aRet; if ( nPos != PAGE_NOT_FOUND ) return (*mpItemList)[ nPos ]->maHelpId; return aRet; diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 4b817c110da6..d8d9b396f2ab 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -31,7 +31,6 @@ #include "svtools/toolbarmenu.hxx" #include "toolbarmenuimp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -1301,7 +1300,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rRect, nState, aControlValue, - rtl::OUString() ); + OUString() ); } if( ! bNativeOk ) @@ -1566,7 +1565,7 @@ Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAcc // -------------------------------------------------------------------- // todo: move to new base class that will replace SfxPopupWindo -void ToolbarMenu::AddStatusListener( const rtl::OUString& rCommandURL ) +void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) { initStatusListener(); mpImpl->mxStatusListener->addStatusListener( rCommandURL ); diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 7694838759da..4291e0686752 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -30,7 +30,6 @@ #include "toolbarmenuimp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -282,7 +281,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; Reference< XAccessible > xParent( getAccessibleParent() ); Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -597,7 +596,7 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { - throw DisposedException ( ::rtl::OUString("object has been already disposed"), static_cast<XWeak*>(this)); + throw DisposedException ( OUString("object has been already disposed"), static_cast<XWeak*>(this)); } } @@ -727,14 +726,14 @@ sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeExcept // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException) { const SolarMutexGuard aSolarGuard; String aRet; @@ -791,7 +790,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); Reference< XAccessible > xParent( getAccessibleParent() ); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 81c71a3955aa..2747e01e6336 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -145,8 +145,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -233,8 +233,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 0a7273f6cb42..53c443266bfe 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -266,7 +266,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleDescription() +OUString SAL_CALL ValueSetAcc::getAccessibleDescription() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleName() +OUString SAL_CALL ValueSetAcc::getAccessibleName() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -336,7 +336,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -745,7 +745,7 @@ void ValueSetAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString("object has been already disposed"), + OUString("object has been already disposed"), static_cast<uno::XWeak*>(this)); } else @@ -927,19 +927,19 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueItemAcc::getAccessibleDescription() +OUString SAL_CALL ValueItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueItemAcc::getAccessibleName() +OUString SAL_CALL ValueItemAcc::getAccessibleName() throw (uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; if( mpParent ) { @@ -947,7 +947,7 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() if( aRet.isEmpty() ) { - rtl::OUStringBuffer aBuffer("Item "); + OUStringBuffer aBuffer("Item "); aBuffer.append(static_cast<sal_Int32>(mpParent->mnId)); aRet = aBuffer.makeStringAndClear(); } @@ -1002,7 +1002,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 47bfacfc0b34..9095903576f5 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -121,8 +121,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c0afffd44508..d26c3805991e 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V { WinBits nWinBits = WB_TABSTOP; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString("border")); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("border")); if (aFind != rMap.end()) { if (toBool(aFind->second)) @@ -2162,7 +2162,7 @@ void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) // Remember old and new name for accessibility event. ::com::sun::star::uno::Any aOldName, aNewName; - ::rtl::OUString sString (pItem->maText); + OUString sString (pItem->maText); aOldName <<= sString; sString = rText; aNewName <<= sString; diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 55e208d7c5e8..cf350ea13bed 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -104,13 +104,13 @@ PlaceEditDialog::~PlaceEditDialog() { } -rtl::OUString PlaceEditDialog::GetServerUrl() +OUString PlaceEditDialog::GetServerUrl() { - rtl::OUString sUrl; + OUString sUrl; if ( m_pCurrentDetails.get( ) ) { INetURLObject aUrl = m_pCurrentDetails->getUrl(); - rtl::OUString sUsername = rtl::OUString( m_pEDUsername->GetText( ) ).trim( ); + OUString sUsername = OUString( m_pEDUsername->GetText( ) ).trim( ); if ( !sUsername.isEmpty( ) ) aUrl.SetUser( sUsername ); if ( !aUrl.HasError( ) ) @@ -171,8 +171,8 @@ IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG ) IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG ) { - rtl::OUString sUrl = GetServerUrl( ); - rtl::OUString sName = rtl::OUString( m_pEDServerName->GetText() ).trim( ); + OUString sUrl = GetServerUrl( ); + OUString sName = OUString( m_pEDServerName->GetText() ).trim( ); m_pBTOk->Enable( !sName.isEmpty( ) && !sUrl.isEmpty( ) ); return 1; } @@ -182,7 +182,7 @@ IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG ) for ( std::vector< boost::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( ); it != m_aDetailsContainers.end( ); ++it ) { - ( *it )->setUsername( rtl::OUString( m_pEDUsername->GetText() ) ); + ( *it )->setUsername( OUString( m_pEDUsername->GetText() ) ); } return 1; } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 51b93e538db8..91b95629a1aa 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder, const rtl::OString& rFrame ) +DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame ) { pBuilder->get( m_pFrame, rFrame ); } @@ -87,7 +87,7 @@ IMPL_LINK( DetailsContainer, ValueChangeHdl, void *, EMPTYARG ) return 0; } -HostDetailsContainer::HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, rtl::OUString sScheme ) : +HostDetailsContainer::HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, OUString sScheme ) : DetailsContainer( pBuilder, "HostDetails" ), m_nDefaultPort( nPort ), m_sScheme( sScheme ) @@ -113,16 +113,16 @@ void HostDetailsContainer::show( bool bShow ) INetURLObject HostDetailsContainer::getUrl( ) { - rtl::OUString sHost = rtl::OUString( m_pEDHost->GetText() ).trim( ); + OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); sal_Int64 nPort = m_pEDPort->GetValue(); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sHost.isEmpty( ) ) { sUrl = m_sScheme + "://" + sHost; if ( nPort != m_nDefaultPort ) - sUrl += ":" + rtl::OUString::valueOf( nPort ); + sUrl += ":" + OUString::valueOf( nPort ); if ( !sPath.isEmpty( ) ) if ( sPath.indexOf( '/' ) != 0 ) sUrl += "/"; @@ -146,7 +146,7 @@ bool HostDetailsContainer::setUrl( const INetURLObject& rUrl ) return bSuccess; } -bool HostDetailsContainer::verifyScheme( const rtl::OUString& sScheme ) +bool HostDetailsContainer::verifyScheme( const OUString& sScheme ) { return sScheme.equals( m_sScheme + "://" ); } @@ -170,7 +170,7 @@ void DavDetailsContainer::show( bool bShow ) m_pCBDavs->Check( false ); } -bool DavDetailsContainer::verifyScheme( const rtl::OUString& rScheme ) +bool DavDetailsContainer::verifyScheme( const OUString& rScheme ) { bool bValid = false; if ( rScheme.equals( "http://" ) ) @@ -195,7 +195,7 @@ IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, CheckBox*, pCheckBox ) else if ( m_pEDPort->GetValue() == 443 && bCheckedDavs == sal_False ) m_pEDPort->SetValue( 80 ); - rtl::OUString sScheme( "http" ); + OUString sScheme( "http" ); if ( bCheckedDavs ) sScheme = "https"; setScheme( sScheme ); @@ -222,11 +222,11 @@ SmbDetailsContainer::SmbDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject SmbDetailsContainer::getUrl( ) { - rtl::OUString sHost = rtl::OUString( m_pEDHost->GetText() ).trim( ); - rtl::OUString sShare = rtl::OUString( m_pEDShare->GetText() ).trim( ); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); + OUString sShare = OUString( m_pEDShare->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sHost.isEmpty( ) ) { sUrl = "smb://" + sHost + "/"; @@ -247,9 +247,9 @@ bool SmbDetailsContainer::setUrl( const INetURLObject& rUrl ) if ( bSuccess ) { - rtl::OUString sShare = rUrl.getName( 0 ); - rtl::OUString sFullPath = rUrl.GetURLPath( ); - rtl::OUString sPath; + OUString sShare = rUrl.getName( 0 ); + OUString sFullPath = rUrl.GetURLPath( ); + OUString sPath; if ( sFullPath.getLength( ) > sShare.getLength( ) ) { sal_Int32 nPos = sShare.getLength( ); @@ -297,8 +297,8 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : show( false ); // Load the ServerType entries - Sequence< ::rtl::OUString > aTypesUrlsList( officecfg::Office::Common::Misc::CmisServersUrls::get( xContext ) ); - Sequence< ::rtl::OUString > aTypesNamesList( officecfg::Office::Common::Misc::CmisServersNames::get( xContext ) ); + Sequence< OUString > aTypesUrlsList( officecfg::Office::Common::Misc::CmisServersUrls::get( xContext ) ); + Sequence< OUString > aTypesNamesList( officecfg::Office::Common::Misc::CmisServersNames::get( xContext ) ); for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && aTypesNamesList.getLength( ); ++i ) { m_pLBServerType->InsertEntry( aTypesNamesList[i] ); @@ -308,13 +308,13 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject CmisDetailsContainer::getUrl( ) { - rtl::OUString sBindingUrl = rtl::OUString( m_pEDBinding->GetText() ).trim( ); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sBindingUrl.isEmpty( ) && !m_sRepoId.isEmpty() ) { - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sEncodedBinding = rtl::Uri::encode( sBindingUrl + "#" + m_sRepoId, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, @@ -332,10 +332,10 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) if ( bSuccess ) { - rtl::OUString sBindingUrl; - rtl::OUString sRepositoryId; + OUString sBindingUrl; + OUString sRepositoryId; - rtl::OUString sDecodedHost = rUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sDecodedHost = rUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); INetURLObject aHostUrl( sDecodedHost ); sBindingUrl = aHostUrl.GetURLNoMark( ); sRepositoryId = aHostUrl.GetMark( ); @@ -346,9 +346,9 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) return bSuccess; } -void CmisDetailsContainer::setUsername( const rtl::OUString& rUsername ) +void CmisDetailsContainer::setUsername( const OUString& rUsername ) { - m_sUsername = rtl::OUString( rUsername ); + m_sUsername = OUString( rUsername ); } void CmisDetailsContainer::selectRepository( ) @@ -370,17 +370,17 @@ IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG ) IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) { - rtl::OUString sBindingUrl = rtl::OUString( m_pEDBinding->GetText() ).trim( ); + OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); // Clean the listbox m_pLBRepository->Clear( ); m_aRepoIds.clear( ); // Compute the URL - rtl::OUString sUrl; + OUString sUrl; if ( !sBindingUrl.isEmpty( ) ) { - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sEncodedBinding = rtl::Uri::encode( sBindingUrl, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, @@ -390,8 +390,8 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) // Get the Content ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() ); - Sequence< rtl::OUString > aProps( 1 ); - aProps[0] = rtl::OUString( "Title" ); + Sequence< OUString > aProps( 1 ); + aProps[0] = OUString( "Title" ); try { @@ -399,14 +399,14 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) Reference< XContentAccess > xAccess( xResultSet, UNO_QUERY_THROW ); while ( xResultSet->next() ) { - rtl::OUString sURL = xAccess->queryContentIdentifierString( ); + OUString sURL = xAccess->queryContentIdentifierString( ); INetURLObject aURL( sURL ); - rtl::OUString sId = aURL.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); + OUString sId = aURL.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); sId = sId.copy( 1 ); m_aRepoIds.push_back( sId ); Reference< XRow > xRow( xResultSet, UNO_QUERY ); - rtl::OUString sName = xRow->getString( 1 ); + OUString sName = xRow->getString( 1 ); m_pLBRepository->InsertEntry( sName ); } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 74984e68b55e..e15faf7ed2c7 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -71,8 +71,8 @@ namespace svt using namespace ::utl; DECLARE_STL_VECTOR( String, StringArray ); - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag ); - DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String ); + DECLARE_STL_STDKEY_SET( OUString, StringBag ); + DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); namespace { @@ -98,10 +98,10 @@ namespace svt virtual ~IAssigmentData(); /// the data source to use for the address book - virtual ::rtl::OUString getDatasourceName() const = 0; + virtual OUString getDatasourceName() const = 0; /// the command to use for the address book - virtual ::rtl::OUString getCommand() const = 0; + virtual OUString getCommand() const = 0; /** the command type to use for the address book @return @@ -110,17 +110,17 @@ namespace svt virtual sal_Int32 getCommandType() const = 0; /// checks whether or not there is an assignment for a given logical field - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName) = 0; /// retrieves the assignment for a given logical field - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual OUString getFieldAssignment(const OUString& _rLogicalName) = 0; /// set the assignment for a given logical field - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) = 0; /// clear the assignment for a given logical field - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual void clearFieldAssignment(const OUString& _rLogicalName) = 0; - virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; - virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; + virtual void setDatasourceName(const OUString& _rName) = 0; + virtual void setCommand(const OUString& _rCommand) = 0; }; // ------------------------------------------------------------------- @@ -135,35 +135,35 @@ namespace svt { protected: Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDSName; - ::rtl::OUString m_sTableName; + OUString m_sDSName; + OUString m_sTableName; MapString2String m_aAliases; public: AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTableName, + const OUString& _rDataSourceName, + const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ); // IAssigmentData overridables - virtual ::rtl::OUString getDatasourceName() const; - virtual ::rtl::OUString getCommand() const; + virtual OUString getDatasourceName() const; + virtual OUString getCommand() const; virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName); + virtual OUString getFieldAssignment(const OUString& _rLogicalName); + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment); + virtual void clearFieldAssignment(const OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const OUString& _rName); + virtual void setCommand(const OUString& _rCommand); }; // ------------------------------------------------------------------- AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, - const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rTableName, + const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) :m_xDataSource( _rxDataSource ) ,m_sDSName( _rDataSourceName ) @@ -173,11 +173,11 @@ public: // first collect all known programmatic names StringBag aKnownNames; - rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nIndex = 0; do { - rtl::OUString aToken = sLogicalFieldNames.getToken(0, ';', nIndex); + OUString aToken = sLogicalFieldNames.getToken(0, ';', nIndex); aKnownNames.insert(aToken); } while ( nIndex >= 0); @@ -194,9 +194,9 @@ public: } else { - OSL_FAIL( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") - += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString(")!") + OSL_FAIL( ( OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + += OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) + += OString(")!") ).getStr() ); } @@ -204,13 +204,13 @@ public: } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getDatasourceName() const + OUString AssigmentTransientData::getDatasourceName() const { return m_sDSName; } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getCommand() const + OUString AssigmentTransientData::getCommand() const { return m_sTableName; } @@ -222,7 +222,7 @@ public: } // ------------------------------------------------------------------- - sal_Bool AssigmentTransientData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName) + sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName) { ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); return ( m_aAliases.end() != aPos ) @@ -230,9 +230,9 @@ public: } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getFieldAssignment(const ::rtl::OUString& _rLogicalName) + OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName) { - ::rtl::OUString sReturn; + OUString sReturn; ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) sReturn = aPos->second; @@ -241,13 +241,13 @@ public: } // ------------------------------------------------------------------- - void AssigmentTransientData::setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) + void AssigmentTransientData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { m_aAliases[ _rLogicalName ] = _rAssignment; } // ------------------------------------------------------------------- - void AssigmentTransientData::clearFieldAssignment(const ::rtl::OUString& _rLogicalName) + void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName) { MapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) @@ -255,13 +255,13 @@ public: } // ------------------------------------------------------------------- - void AssigmentTransientData::setDatasourceName(const ::rtl::OUString&) + void AssigmentTransientData::setDatasourceName(const OUString&) { OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); } // ------------------------------------------------------------------- - void AssigmentTransientData::setCommand(const ::rtl::OUString&) + void AssigmentTransientData::setCommand(const OUString&) { OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); } @@ -278,40 +278,40 @@ public: protected: ::com::sun::star::uno::Any - getProperty(const ::rtl::OUString& _rLocalName) const; + getProperty(const OUString& _rLocalName) const; ::com::sun::star::uno::Any getProperty(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; + OUString getStringProperty(const sal_Char* _pLocalName) const; sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; + OUString getStringProperty(const OUString& _rLocalName) const; - void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); + void setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue); public: AssignmentPersistentData(); ~AssignmentPersistentData(); // IAssigmentData overridables - virtual ::rtl::OUString getDatasourceName() const; - virtual ::rtl::OUString getCommand() const; + virtual OUString getDatasourceName() const; + virtual OUString getCommand() const; virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName); + virtual OUString getFieldAssignment(const OUString& _rLogicalName); + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment); + virtual void clearFieldAssignment(const OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const OUString& _rName); + virtual void setCommand(const OUString& _rCommand); - 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(); }; -void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<OUString>& ) { } @@ -321,10 +321,10 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- AssignmentPersistentData::AssignmentPersistentData() - :ConfigItem( ::rtl::OUString( "Office.DataAccess/AddressBook" )) + :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) { - Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString("Fields")); - const ::rtl::OUString* pStoredNames = aStoredNames.getConstArray(); + Sequence< OUString > aStoredNames = GetNodeNames(OUString("Fields")); + const OUString* pStoredNames = aStoredNames.getConstArray(); for (sal_Int32 i=0; i<aStoredNames.getLength(); ++i, ++pStoredNames) m_aStoredFields.insert(*pStoredNames); } @@ -335,20 +335,20 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - sal_Bool AssignmentPersistentData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName) + sal_Bool AssignmentPersistentData::hasFieldAssignment(const OUString& _rLogicalName) { return (m_aStoredFields.end() != m_aStoredFields.find(_rLogicalName)); } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getFieldAssignment(const ::rtl::OUString& _rLogicalName) + OUString AssignmentPersistentData::getFieldAssignment(const OUString& _rLogicalName) { - ::rtl::OUString sAssignment; + OUString sAssignment; if (hasFieldAssignment(_rLogicalName)) { - ::rtl::OUString sFieldPath("Fields/"); + OUString sFieldPath("Fields/"); sFieldPath += _rLogicalName; - sFieldPath += ::rtl::OUString("/AssignedFieldName"); + sFieldPath += OUString("/AssignedFieldName"); sAssignment = getStringProperty(sFieldPath); } return sAssignment; @@ -357,30 +357,30 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- Any AssignmentPersistentData::getProperty(const sal_Char* _pLocalName) const { - return getProperty(::rtl::OUString::createFromAscii(_pLocalName)); + return getProperty(OUString::createFromAscii(_pLocalName)); } // ------------------------------------------------------------------- - Any AssignmentPersistentData::getProperty(const ::rtl::OUString& _rLocalName) const + Any AssignmentPersistentData::getProperty(const OUString& _rLocalName) const { - Sequence< ::rtl::OUString > aProperties(&_rLocalName, 1); + Sequence< OUString > aProperties(&_rLocalName, 1); Sequence< Any > aValues = const_cast<AssignmentPersistentData*>(this)->GetProperties(aProperties); DBG_ASSERT(aValues.getLength() == 1, "AssignmentPersistentData::getProperty: invalid sequence length!"); return aValues[0]; } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const + OUString AssignmentPersistentData::getStringProperty(const OUString& _rLocalName) const { - ::rtl::OUString sReturn; + OUString sReturn; getProperty( _rLocalName ) >>= sReturn; return sReturn; } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const + OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { - ::rtl::OUString sReturn; + OUString sReturn; getProperty( _pLocalName ) >>= sReturn; return sReturn; } @@ -394,17 +394,17 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue) + void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue) { - Sequence< ::rtl::OUString > aNames(1); + Sequence< OUString > aNames(1); Sequence< Any > aValues(1); - aNames[0] = ::rtl::OUString::createFromAscii(_pLocalName); + aNames[0] = OUString::createFromAscii(_pLocalName); aValues[0] <<= _rValue; PutProperties(aNames, aValues); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) + void AssignmentPersistentData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { if (_rAssignment.isEmpty()) { @@ -417,21 +417,21 @@ void AssignmentPersistentData::Commit() } // Fields - ::rtl::OUString sDescriptionNodePath("Fields"); + OUString sDescriptionNodePath("Fields"); // Fields/<field> - ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath); - sFieldElementNodePath += ::rtl::OUString("/"); + OUString sFieldElementNodePath(sDescriptionNodePath); + sFieldElementNodePath += OUString("/"); sFieldElementNodePath += _rLogicalName; Sequence< PropertyValue > aNewFieldDescription(2); // Fields/<field>/ProgrammaticFieldName aNewFieldDescription[0].Name = sFieldElementNodePath; - aNewFieldDescription[0].Name += ::rtl::OUString("/ProgrammaticFieldName"); + aNewFieldDescription[0].Name += OUString("/ProgrammaticFieldName"); aNewFieldDescription[0].Value <<= _rLogicalName; // Fields/<field>/AssignedFieldName aNewFieldDescription[1].Name = sFieldElementNodePath; - aNewFieldDescription[1].Name += ::rtl::OUString("/AssignedFieldName"); + aNewFieldDescription[1].Name += OUString("/AssignedFieldName"); aNewFieldDescription[1].Value <<= _rAssignment; // just set the new value @@ -443,37 +443,37 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - void AssignmentPersistentData::clearFieldAssignment(const ::rtl::OUString& _rLogicalName) + void AssignmentPersistentData::clearFieldAssignment(const OUString& _rLogicalName) { if (!hasFieldAssignment(_rLogicalName)) // nothing to do return; - ::rtl::OUString sDescriptionNodePath("Fields"); - Sequence< ::rtl::OUString > aNames(&_rLogicalName, 1); + OUString sDescriptionNodePath("Fields"); + Sequence< OUString > aNames(&_rLogicalName, 1); ClearNodeElements(sDescriptionNodePath, aNames); } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getDatasourceName() const + OUString AssignmentPersistentData::getDatasourceName() const { return getStringProperty( "DataSourceName" ); } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getCommand() const + OUString AssignmentPersistentData::getCommand() const { return getStringProperty( "Command" ); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setDatasourceName(const ::rtl::OUString& _rName) + void AssignmentPersistentData::setDatasourceName(const OUString& _rName) { setStringProperty( "DataSourceName", _rName ); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setCommand(const ::rtl::OUString& _rCommand) + void AssignmentPersistentData::setCommand(const OUString& _rCommand) { setStringProperty( "Command", _rCommand ); } @@ -524,8 +524,8 @@ void AssignmentPersistentData::Commit() } // ................................................................ - AddressBookSourceDialogData( const Reference< XDataSource >& _rxTransientDS, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) + AddressBookSourceDialogData( const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, + const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) :m_xTransientDataSource( _rxTransientDS ) ,nFieldScrollPos(0) ,nLastVisibleListIndex(0) @@ -573,8 +573,8 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, - const Reference< XDataSource >& _rxTransientDS, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) + const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, + const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) :INIT_FIELDS() ,m_pImpl( new AddressBookSourceDialogData( _rxTransientDS, _rDataSourceName, _rTable, _rMapping ) ) { @@ -685,7 +685,7 @@ void AssignmentPersistentData::Commit() implScrollFields(0, sal_False, sal_False); // the logical names - rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); @@ -722,7 +722,7 @@ void AssignmentPersistentData::Commit() _rMapping.realloc( m_pImpl->aLogicalFieldNames.size() ); AliasProgrammaticPair* pPair = _rMapping.getArray(); - ::rtl::OUString sCurrent; + OUString sCurrent; for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); aProgrammatic != m_pImpl->aLogicalFieldNames.end(); ++aProgrammatic @@ -744,7 +744,7 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- void AddressBookSourceDialog::loadConfiguration() { - ::rtl::OUString sName = m_pImpl->pConfigData->getDatasourceName(); + OUString sName = m_pImpl->pConfigData->getDatasourceName(); INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { @@ -798,7 +798,7 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!m_xDatabaseContext.is()) { - const rtl::OUString sContextServiceName("com.sun.star.sdb.DatabaseContext"); + const OUString sContextServiceName("com.sun.star.sdb.DatabaseContext"); ShowServiceNotAvailableError( this, sContextServiceName, sal_False); return; } @@ -806,7 +806,7 @@ void AssignmentPersistentData::Commit() m_aDatasource.Clear(); // fill the datasources listbox - Sequence< ::rtl::OUString > aDatasourceNames; + Sequence< OUString > aDatasourceNames; try { aDatasourceNames = m_xDatabaseContext->getElementNames(); @@ -815,8 +815,8 @@ void AssignmentPersistentData::Commit() { OSL_FAIL("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!"); } - const ::rtl::OUString* pDatasourceNames = aDatasourceNames.getConstArray(); - const ::rtl::OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength(); + const OUString* pDatasourceNames = aDatasourceNames.getConstArray(); + const OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength(); for (; pDatasourceNames < pEnd; ++pDatasourceNames) m_aDatasource.InsertEntry(*pDatasourceNames); } @@ -850,20 +850,20 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!xHandler.is()) { - const rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); + const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(this, sInteractionHandlerServiceName, sal_True); return; } // the currently selected table - ::rtl::OUString sOldTable = m_aTable.GetText(); + OUString sOldTable = m_aTable.GetText(); m_aTable.Clear(); m_xCurrentDatasourceTables= NULL; // get the tables of the connection - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; Any aException; try { @@ -917,8 +917,8 @@ void AssignmentPersistentData::Commit() sal_Bool bKnowOldTable = sal_False; // fill the table list - const ::rtl::OUString* pTableNames = aTableNames.getConstArray(); - const ::rtl::OUString* pEnd = pTableNames + aTableNames.getLength(); + const OUString* pTableNames = aTableNames.getConstArray(); + const OUString* pEnd = pTableNames + aTableNames.getLength(); for (;pTableNames != pEnd; ++pTableNames) { m_aTable.InsertEntry(*pTableNames); @@ -928,7 +928,7 @@ void AssignmentPersistentData::Commit() // set the old table, if the new data source knows a table with this name, too. Else reset the tables edit field. if (!bKnowOldTable) - sOldTable = ::rtl::OUString(); + sOldTable = OUString(); m_aTable.SetText(sOldTable); resetFields(); @@ -943,7 +943,7 @@ void AssignmentPersistentData::Commit() m_aDatasource.SaveValue(); String sSelectedTable = m_aTable.GetText(); - Sequence< ::rtl::OUString > aColumnNames; + Sequence< OUString > aColumnNames; try { if (m_xCurrentDatasourceTables.is()) @@ -965,8 +965,8 @@ void AssignmentPersistentData::Commit() } - const ::rtl::OUString* pColumnNames = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pColumnNames + aColumnNames.getLength(); + const OUString* pColumnNames = aColumnNames.getConstArray(); + const OUString* pEnd = pColumnNames + aColumnNames.getLength(); // for quicker access ::std::set< String > aColumnNameSet; @@ -1223,7 +1223,7 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!xAdminDialog.is()) { - ShowServiceNotAvailableError(this, rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), sal_True); + ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), sal_True); return 1L; } @@ -1235,8 +1235,8 @@ void AssignmentPersistentData::Commit() Reference<XPropertySet> xProp(xAdminDialog,UNO_QUERY); if ( xProp.is() ) { - ::rtl::OUString sName; - xProp->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sName; + OUString sName; + xProp->getPropertyValue(OUString("DataSourceName")) >>= sName; INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 38e738e1a102..21a70661dd11 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -30,7 +30,6 @@ #include <svtools/colrdlg.hxx> -using rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index b268cc4b2a3e..f26d72f09a97 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -105,11 +105,11 @@ void SvObjectServerList::FillInsertObjects() uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory = configuration::theDefaultProvider::get(xContext); - ::rtl::OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); + OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = ::rtl::OUString( "nodepath" ); - aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); + aPathProp.Name = OUString( "nodepath" ); + aPathProp.Value <<= OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); aArguments[0] <<= aPathProp; uno::Reference< container::XNameAccess > xNameAccess( @@ -118,13 +118,13 @@ void SvObjectServerList::FillInsertObjects() if( xNameAccess.is()) { - uno::Sequence< ::rtl::OUString > seqNames= xNameAccess->getElementNames(); + uno::Sequence< OUString > seqNames= xNameAccess->getElementNames(); sal_Int32 nInd; - ::rtl::OUString aStringProductName( "%PRODUCTNAME" ); + OUString aStringProductName( "%PRODUCTNAME" ); sal_Int32 nStringProductNameLength = aStringProductName.getLength(); - ::rtl::OUString aStringProductVersion( "%PRODUCTVERSION" ); + OUString aStringProductVersion( "%PRODUCTVERSION" ); sal_Int32 nStringProductVersionLength = aStringProductVersion.getLength(); for( nInd = 0; nInd < seqNames.getLength(); nInd++ ) @@ -133,10 +133,10 @@ void SvObjectServerList::FillInsertObjects() xNameAccess->getByName( seqNames[nInd] ) >>= xEntry; if ( xEntry.is() ) { - ::rtl::OUString aUIName; - ::rtl::OUString aClassID; - xEntry->getByName( ::rtl::OUString( "ObjectUIName" ) ) >>= aUIName; - xEntry->getByName( ::rtl::OUString( "ClassID" ) ) >>= aClassID; + OUString aUIName; + OUString aClassID; + xEntry->getByName( OUString( "ObjectUIName" ) ) >>= aUIName; + xEntry->getByName( OUString( "ClassID" ) ) >>= aClassID; if ( !aUIName.isEmpty() ) { diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index b240f0b52ecf..ff289d2c59c8 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -29,7 +29,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, { ImplFreePrnDlgListBox( pBox ); - const std::vector<rtl::OUString>& rPrinters = Printer::GetPrinterQueues(); + const std::vector<OUString>& rPrinters = Printer::GetPrinterQueues(); unsigned int nCount = rPrinters.size(); if ( nCount ) { diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 11b3480f3e55..3b785a04aff7 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -217,7 +217,7 @@ namespace svt } //-------------------------------------------------------------------- - void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId ) + void RoadmapWizard::SetRoadmapHelpId( const OString& _rId ) { m_pImpl->pRoadmap->SetHelpId( _rId ); } diff --git a/svtools/source/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter/SvFilterOptionsDialog.hxx index 3bbc3cff35b0..37e0888aed27 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.hxx +++ b/svtools/source/filter/SvFilterOptionsDialog.hxx @@ -48,7 +48,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5 com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSourceDocument; - rtl::OUString maDialogTitle; + OUString maDialogTitle; FieldUnit meFieldUnit; sal_Bool mbExportSelection; @@ -66,11 +66,11 @@ public: throw ( com::sun::star::uno::Exception, 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 ); // XPropertyAccess @@ -84,7 +84,7 @@ public: // XExecuteDialog virtual sal_Int16 SAL_CALL execute() throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( ::com::sun::star::uno::RuntimeException ); // XExporter diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index dac63180f188..9c8ca91dc769 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -78,7 +78,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ); @@ -92,7 +92,7 @@ void GraphicDescriptor::init( const ::rtl::OUString& rURL ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rxIStm ); @@ -106,7 +106,7 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, // ------------------------------------------------------------------------------ -void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ) +void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) { String aURL; if( pURL ) @@ -114,7 +114,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ::GraphicDescriptor aDescriptor( rIStm, &aURL ); mpGraphic = NULL; - maMimeType = ::rtl::OUString(); + maMimeType = OUString(); meType = GRAPHIC_NONE; mnBitsPerPixel = 0; mbTransparent = false; @@ -172,20 +172,20 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL // ------------------------------------------------------------------------------ -::rtl::OUString GraphicDescriptor::getImplementationName_Static() +OUString GraphicDescriptor::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); + return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicDescriptor" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicDescriptor" ); return aSeq; } @@ -239,7 +239,7 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() +OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -247,11 +247,11 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -262,7 +262,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -307,7 +307,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() static ::comphelper::PropertyMapEntry aEntries[] = { { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const ::rtl::OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 }, @@ -358,7 +358,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( UNOGRAPHIC_MIMETYPE ): { - ::rtl::OUString aMimeType; + OUString aMimeType; if( mpGraphic ) { @@ -384,11 +384,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } if( pMimeType ) - aMimeType = ::rtl::OUString::createFromAscii( pMimeType ); + aMimeType = OUString::createFromAscii( pMimeType ); } if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) - aMimeType = ::rtl::OUString(MIMETYPE_VCLGRAPHIC ); + aMimeType = OUString(MIMETYPE_VCLGRAPHIC ); } else aMimeType = maMimeType; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index aab4b13f74fc..e5babc70764e 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -77,11 +77,11 @@ public: ~GraphicDescriptor() throw(); void init( const ::Graphic& rGraphic ) throw(); - void init( const ::rtl::OUString& rURL ) throw(); - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) throw(); + void init( const OUString& rURL ) throw(); + void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const OUString& rURL ) throw(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -94,9 +94,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ private: const ::Graphic* mpGraphic; GraphicType meType; - ::rtl::OUString maMimeType; + OUString maMimeType; Size maSizePixel; Size maSize100thMM; sal_uInt16 mnBitsPerPixel; @@ -122,7 +122,7 @@ private: GraphicDescriptor& operator=( const GraphicDescriptor& ); - void implCreate( SvStream& rIStm, const ::rtl::OUString* pPath ); + void implCreate( SvStream& rIStm, const OUString* pPath ); }; } diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index ee322a14152a..a3c17517fb11 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -116,27 +116,27 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() // ------------------------------------------------------------------------------ -::rtl::OUString Graphic::getImplementationName_Static() +OUString Graphic::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.Graphic" ); + return OUString( "com.sun.star.comp.graphic.Graphic" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() +uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.Graphic" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.Graphic" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL Graphic::getImplementationName() +OUString SAL_CALL Graphic::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -144,15 +144,15 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName ) throw( uno::RuntimeException ) { if( ::unographic::GraphicDescriptor::supportsService( rServiceName ) ) return true; else { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == rServiceName ) @@ -164,11 +164,11 @@ sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); - uno::Sequence< ::rtl::OUString > aNew( getSupportedServiceNames_Static() ); + uno::Sequence< OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); + uno::Sequence< OUString > aNew( getSupportedServiceNames_Static() ); sal_Int32 nOldCount = aRet.getLength(); aRet.realloc( nOldCount + aNew.getLength() ); diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx index 33319357b83b..adecace1c5ce 100644 --- a/svtools/source/graphic/graphic.hxx +++ b/svtools/source/graphic/graphic.hxx @@ -54,8 +54,8 @@ public: static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -66,9 +66,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index bcd652c14057..b7fffe7645ec 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -42,17 +42,17 @@ public: // XGraphicObject virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException); virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException); - ::rtl::OUString SAL_CALL getUniqueID() throw (uno::RuntimeException); + OUString SAL_CALL getUniqueID() throw (uno::RuntimeException); }; GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & /*xComponentContext*/ ) throw (uno::RuntimeException) { if ( args.getLength() == 1 ) { - rtl::OUString sId; + OUString sId; if ( !( args[ 0 ] >>= sId ) || sId.isEmpty() ) throw lang::IllegalArgumentException(); - rtl::OString bsId(rtl::OUStringToOString(sId, RTL_TEXTENCODING_UTF8)); + OString bsId(OUStringToOString(sId, RTL_TEXTENCODING_UTF8)); mpGObject.reset( new GraphicObject( bsId ) ); } else @@ -76,12 +76,12 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic > mpGObject->SetGraphic( aGraphic ); } -::rtl::OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException) +OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString sId; + OUString sId; if ( mpGObject.get() ) - sId = rtl::OStringToOUString(mpGObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); + sId = OStringToOUString(mpGObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); return sId; } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 0e5a763e9a32..372ecf96f1e0 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -56,7 +56,7 @@ public: rID.mnID3 == mnID3 && rID.mnID4 == mnID4 ); } - rtl::OString GetIDString() const; + OString GetIDString() const; sal_Bool IsEmpty() const { return( 0 == mnID4 ); } }; @@ -118,9 +118,9 @@ GraphicID::GraphicID( const GraphicObject& rObj ) } } -rtl::OString GraphicID::GetIDString() const +OString GraphicID::GetIDString() const { - rtl::OStringBuffer aHexStr; + OStringBuffer aHexStr; sal_Int32 nShift, nIndex = 0; aHexStr.setLength(32); @@ -845,7 +845,7 @@ GraphicCache::~GraphicCache() void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, + const OString* pID, const GraphicObject* pCopyObj ) { @@ -1103,9 +1103,9 @@ sal_Bool GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, c return bFound; } -rtl::OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const +OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const { - rtl::OString aRet; + OString aRet; GraphicCacheEntry* pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); // ensure that the entry is correctly initialized (it has to be read at least once) diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 1ae4c00cc63c..ac5428729200 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -67,7 +67,7 @@ public: void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, + const OString* pID, const GraphicObject* pCopyObj ); @@ -77,7 +77,7 @@ public: sal_Bool FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); - rtl::OString GetUniqueID( const GraphicObject& rObj ) const; + OString GetUniqueID( const GraphicObject& rObj ) const; public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 3d21da07c949..136aa578e961 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -89,7 +89,7 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan ImplSetGraphicManager( pMgr, NULL, &rGraphicObj ); } -GraphicObject::GraphicObject( const rtl::OString& rUniqueID, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr ) : mpLink ( NULL ), mpUserData ( NULL ) { @@ -146,7 +146,7 @@ void GraphicObject::ImplAssignGraphicData() mnAnimationLoopCount = ( mbAnimated ? maGraphic.GetAnimationLoopCount() : 0 ); } -void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const rtl::OString* pID, const GraphicObject* pCopyObj ) +void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const OString* pID, const GraphicObject* pCopyObj ) { if( !mpMgr || ( pMgr != mpMgr ) ) { @@ -208,7 +208,7 @@ void GraphicObject::ImplAutoSwapIn() { if( HasLink() ) { - rtl::OUString aURLStr; + OUString aURLStr; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( GetLink(), aURLStr ) ) { @@ -364,12 +364,12 @@ void GraphicObject::Assign( const SvDataCopyStream& rCopyStream ) *this = (const GraphicObject& ) rCopyStream; } -rtl::OString GraphicObject::GetUniqueID() const +OString GraphicObject::GetUniqueID() const { if ( !IsInSwapIn() && IsEPS() ) const_cast<GraphicObject*>(this)->FireSwapInRequest(); - rtl::OString aRet; + OString aRet; if( mpMgr ) aRet = mpMgr->ImplGetUniqueID( *this ); @@ -1096,7 +1096,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, RTL_TEXTENCODING_UTF8); + OUString aLink = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, RTL_TEXTENCODING_UTF8); rGraphicObj.SetLink(aLink); } else @@ -1122,13 +1122,13 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) +GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL ) { const String aURL( rURL ), aPrefix( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) ); if( aURL.Search( aPrefix ) == 0 ) { // graphic manager url - rtl::OString aUniqueID(rtl::OUStringToOString(rURL.copy(sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX) - 1), RTL_TEXTENCODING_UTF8)); + OString aUniqueID(OUStringToOString(rURL.copy(sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX) - 1), RTL_TEXTENCODING_UTF8)); return GraphicObject( aUniqueID ); } else @@ -1146,16 +1146,16 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString & } void -GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< rtl::OUString >& rvEmbedImgUrls ) +GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< OUString >& rvEmbedImgUrls ) { - static rtl::OUString sImageURL( "ImageURL" ); + static OUString sImageURL( "ImageURL" ); Reference< XPropertySet > xProps( xIf, UNO_QUERY ); if ( xProps.is() ) { if ( xProps->getPropertySetInfo()->hasPropertyByName( sImageURL ) ) { - rtl::OUString sURL; + OUString sURL; xProps->getPropertyValue( sImageURL ) >>= sURL; if ( !sURL.isEmpty() && sURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) rvEmbedImgUrls.push_back( sURL ); @@ -1164,7 +1164,7 @@ GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& x Reference< XNameContainer > xContainer( xIf, UNO_QUERY ); if ( xContainer.is() ) { - Sequence< rtl::OUString > sNames = xContainer->getElementNames(); + Sequence< OUString > sNames = xContainer->getElementNames(); sal_Int32 nContainees = sNames.getLength(); for ( sal_Int32 index = 0; index < nContainees; ++index ) { diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 6439ff7b37c4..7eb8233fb9fa 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -139,7 +139,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si } void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, const GraphicObject* pCopyObj ) + const OString* pID, const GraphicObject* pCopyObj ) { maObjList.push_back( (GraphicObject*)&rObj ); mpCache->AddGraphicObject( rObj, rSubstitute, pID, pCopyObj ); @@ -162,7 +162,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ) mpCache->GraphicObjectWasSwappedOut( rObj ); } -rtl::OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const +OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const { return mpCache->GetUniqueID( rObj ); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index e7435569d400..18a68f9fe36e 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -67,27 +67,27 @@ GraphicProvider::~GraphicProvider() // ------------------------------------------------------------------------------ -::rtl::OUString GraphicProvider::getImplementationName_Static() +OUString GraphicProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicProvider" ); + return OUString( "com.sun.star.comp.graphic.GraphicProvider" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicProvider::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicProvider" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicProvider::getImplementationName() +OUString SAL_CALL GraphicProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -95,11 +95,11 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -110,7 +110,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -144,14 +144,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; if( rResourceURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) { // graphic manager url String aTmpStr( rResourceURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ) ); - rtl::OString aUniqueID(rtl::OUStringToOString(aTmpStr, + OString aUniqueID(OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); GraphicObject aGrafObj(aUniqueID); // I don't call aGrafObj.GetXGraphic because it will call us back @@ -163,7 +163,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co return xRet; } -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -186,7 +186,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::r // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -207,14 +207,14 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) ) { - rtl::OUString sImageName( rResourceURL.copy( nIndex ) ); + OUString sImageName( rResourceURL.copy( nIndex ) ); if ( sImageName == "info" ) { xRet = InfoBox::GetStandardImage().GetXGraphic(); @@ -270,21 +270,21 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:resource" ) ) ) { - rtl::OString aResMgrName(rtl::OUStringToOString( + OString aResMgrName(OUStringToOString( rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ); if( pResMgr ) { - const ::rtl::OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); + const OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr ); if( !aResourceType.isEmpty() ) @@ -355,13 +355,13 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc { uno::Reference< beans::XPropertySet > xRet; - ::rtl::OUString aURL; + OUString aURL; uno::Reference< io::XInputStream > xIStm; uno::Reference< awt::XBitmap >xBtm; for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) @@ -435,12 +435,12 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !pIStm && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { - ::rtl::OUString aURL; + OUString aURL; aValue >>= aURL; aPath = aURL; } @@ -464,7 +464,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co sal_uInt16 nExtMapMode = 0; for( sal_Int32 i = 0; i < aFilterData.getLength(); ++i ) { - const ::rtl::OUString aName( aFilterData[ i ].Name ); + const OUString aName( aFilterData[ i ].Name ); const uno::Any aValue( aFilterData[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "ExternalWidth" ) ) @@ -637,7 +637,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal for( sal_Int32 i = 0; i < rFilterData.getLength(); ++i ) { - const ::rtl::OUString aName( rFilterData[ i ].Name ); + const OUString aName( rFilterData[ i ].Name ); const uno::Any aValue( rFilterData[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "PixelWidth" ) ) @@ -773,12 +773,12 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG for( i = 0; ( i < rMediaProperties.getLength() ) && !pOStm; ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { - ::rtl::OUString aURL; + OUString aURL; aValue >>= aURL; pOStm = ::utl::UcbStreamHelper::CreateStream( aURL, STREAM_WRITE | STREAM_TRUNC ); @@ -802,7 +802,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG for( i = 0; i < rMediaProperties.getLength(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "FilterData" ) ) @@ -811,7 +811,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG } else if( COMPARE_EQUAL == aName.compareToAscii( "MimeType" ) ) { - ::rtl::OUString aMimeType; + OUString aMimeType; aValue >>= aMimeType; @@ -876,7 +876,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG else { rFilter.ExportGraphic( aGraphic, aPath, aMemStrm, - rFilter.GetExportFormatNumberForShortName( ::rtl::OUString::createFromAscii( pFilterShortName ) ), + rFilter.GetExportFormatNumberForShortName( OUString::createFromAscii( pFilterShortName ) ), ( aFilterDataSeq.getLength() ? &aFilterDataSeq : NULL ) ); } aMemStrm.Seek( STREAM_SEEK_TO_END ); diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 2f90fa39a885..95097fbe7bd1 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -64,20 +64,20 @@ GraphicRendererVCL::~GraphicRendererVCL() // ------------------------------------------------------------------------------ -::rtl::OUString GraphicRendererVCL::getImplementationName_Static() +OUString GraphicRendererVCL::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); + return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicRendererVCL::getSupportedServiceNames_Static() throw( ) { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicRendererVCL" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicRendererVCL" ); return aSeq; } @@ -133,7 +133,7 @@ void SAL_CALL GraphicRendererVCL::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName() +OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -141,11 +141,11 @@ void SAL_CALL GraphicRendererVCL::release() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -156,7 +156,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& Serv // ------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 4057f6a5180d..35233046d4d8 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -87,7 +87,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq xWindow->setVisible( sal_False ); // reparent the window - xWinPeer->setProperty( ::rtl::OUString( "PluginParent" ), + xWinPeer->setProperty( OUString( "PluginParent" ), uno::makeAny( (sal_Int64) 0 ) ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -206,13 +206,13 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg sal_Int32 nLen = aArguments.getLength(); if ( nLen != 1 ) throw lang::IllegalArgumentException( - ::rtl::OUString("Wrong count of parameters!" ), + OUString("Wrong count of parameters!" ), uno::Reference< uno::XInterface >(), 0 ); if ( !( aArguments[0] >>= m_xFrame ) || !m_xFrame.is() ) throw lang::IllegalArgumentException( - ::rtl::OUString("Nonempty reference is expected as the first argument!" ), + OUString("Nonempty reference is expected as the first argument!" ), uno::Reference< uno::XInterface >(), 0 ); @@ -222,17 +222,17 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo // -------------------------------------------------------- -::rtl::OUString SAL_CALL ODocumentCloser::getImplementationName( ) +OUString SAL_CALL ODocumentCloser::getImplementationName( ) throw (uno::RuntimeException) { return impl_staticGetImplementationName(); } // -------------------------------------------------------- -::sal_Bool SAL_CALL ODocumentCloser::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL ODocumentCloser::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 ) @@ -242,7 +242,7 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg } // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() throw (uno::RuntimeException) { return impl_staticGetSupportedServiceNames(); @@ -250,16 +250,16 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNa // Static methods // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames() { - const rtl::OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); - return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); + const OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); + return uno::Sequence< OUString >( &aServiceName, 1 ); } // -------------------------------------------------------- -::rtl::OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName() +OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName() { - return rtl::OUString( "com.sun.star.comp.embed.DocumentCloser" ); + return OUString( "com.sun.star.comp.embed.DocumentCloser" ); } // -------------------------------------------------------- diff --git a/svtools/source/hatchwindow/documentcloser.hxx b/svtools/source/hatchwindow/documentcloser.hxx index c07168634ed7..f5658229d80f 100644 --- a/svtools/source/hatchwindow/documentcloser.hxx +++ b/svtools/source/hatchwindow/documentcloser.hxx @@ -53,10 +53,10 @@ public: ODocumentCloser( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~ODocumentCloser(); - 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( @@ -71,9 +71,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // 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/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 033710bc439a..5f93ebdc3b2b 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -28,18 +28,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString( "com.sun.star.embed.HatchWindowFactory" ); - aRet[1] = ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString( "com.sun.star.embed.HatchWindowFactory" ); + aRet[1] = OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName() +OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); + return OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); } //------------------------------------------------------------------------- @@ -67,17 +67,17 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OHatchWindowFactory::getImplementationName() +OUString SAL_CALL OHatchWindowFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OHatchWindowFactory::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 ) @@ -87,7 +87,7 @@ sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const ::rtl::OUString& S } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx index 205f82742356..9f9e68541df8 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.hxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -54,9 +54,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, const ::com::sun::star::awt::Rectangle& aBounds, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index c1c111a4405c..6095e5f8fed1 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -40,15 +40,15 @@ public: GraphicProvider(); ~GraphicProvider(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // 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 ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -61,12 +61,12 @@ protected: private: - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ) const; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ) const; }; } diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index 69a662c40001..58d2774c8a82 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -49,8 +49,8 @@ public: GraphicRendererVCL(); ~GraphicRendererVCL() throw(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -63,9 +63,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index f047c1df37c1..d7be59c24710 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -76,10 +76,10 @@ public: // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -88,7 +88,7 @@ public: sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException); //XTextArea - ::rtl::OUString SAL_CALL getTextLines( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getTextLines( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException); @@ -100,8 +100,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XWindow void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException); @@ -138,10 +138,10 @@ public: // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -158,7 +158,7 @@ public: ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -183,8 +183,8 @@ public: ~SVTXFormattedField(); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; @@ -231,7 +231,7 @@ struct RMItemData { sal_Bool b_Enabled; sal_Int32 n_ID; - ::rtl::OUString Label; + OUString Label; }; typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl @@ -261,9 +261,9 @@ public: void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { VCLXWindow::disposing( Source ); } // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XContainerListener void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); @@ -347,8 +347,8 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XCurrencyField void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException); @@ -407,8 +407,8 @@ public: sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -424,7 +424,7 @@ public: ~SVTXDateField(); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 279b9d2e7370..93e42e3c3a1a 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -61,7 +61,7 @@ void SAL_CALL JavaContext::release( ) throw () delete this; } -Any SAL_CALL JavaContext::getValueByName( const ::rtl::OUString& Name) throw (RuntimeException) +Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeException) { Any retVal; diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index b167234f937d..b86d31aed27c 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -178,7 +178,7 @@ sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey) //----------------------------------------------- sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) { - ::rtl::OUString sCommand = impl_ts_findCommand(aAWTKey); + OUString sCommand = impl_ts_findCommand(aAWTKey); // No Command found? Do nothing! User isnt interested on any error handling .-) if (sCommand.isEmpty()) @@ -199,7 +199,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) xParser->parseStrict(aURL); // ask for dispatch object - css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0); + css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0); sal_Bool bRet = xDispatch.is(); if ( bRet ) { @@ -241,12 +241,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } //----------------------------------------------- -::rtl::OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey) +OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey) { return impl_ts_findCommand(aKey); } //----------------------------------------------- -::rtl::OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) +OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -258,7 +258,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) aLock.clear(); // <- SAFE ---------------------------------- - ::rtl::OUString sCommand; + OUString sCommand; try { @@ -296,71 +296,71 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) switch( aKey.KeyCode ) { case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:DelToStartOfLine" ); + return OUString( ".uno:DelToStartOfLine" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: - return rtl::OUString( ".uno:DelToEndOfLine" ); + return OUString( ".uno:DelToEndOfLine" ); case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:DelToStartOfPara" ); + return OUString( ".uno:DelToStartOfPara" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:DelToEndOfPara" ); + return OUString( ".uno:DelToEndOfPara" ); case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - return rtl::OUString( ".uno:DelToStartOfWord" ); + return OUString( ".uno:DelToStartOfWord" ); case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - return rtl::OUString( ".uno:DelToEndOfWord" ); + return OUString( ".uno:DelToEndOfWord" ); case com::sun::star::awt::Key::INSERT_LINEBREAK: - return rtl::OUString( ".uno:InsertLinebreak" ); + return OUString( ".uno:InsertLinebreak" ); case com::sun::star::awt::Key::INSERT_PARAGRAPH: - return rtl::OUString( ".uno:InsertPara" ); + return OUString( ".uno:InsertPara" ); case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - return rtl::OUString( ".uno:GoToPrevWord" ); + return OUString( ".uno:GoToPrevWord" ); case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - return rtl::OUString( ".uno:GoToNextWord" ); + return OUString( ".uno:GoToNextWord" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:GoToStartOfLine" ); + return OUString( ".uno:GoToStartOfLine" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - return rtl::OUString( ".uno:GoToEndOfLine" ); + return OUString( ".uno:GoToEndOfLine" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:GoToStartOfPara" ); + return OUString( ".uno:GoToStartOfPara" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:GoToEndOfPara" ); + return OUString( ".uno:GoToEndOfPara" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( ".uno:GoToStartOfDoc" ); + return OUString( ".uno:GoToStartOfDoc" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - return rtl::OUString( ".uno:GoToEndOfDoc" ); + return OUString( ".uno:GoToEndOfDoc" ); case com::sun::star::awt::Key::SELECT_BACKWARD: - return rtl::OUString( ".uno:CharLeftSel" ); + return OUString( ".uno:CharLeftSel" ); case com::sun::star::awt::Key::SELECT_FORWARD: - return rtl::OUString( ".uno:CharRightSel" ); + return OUString( ".uno:CharRightSel" ); case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - return rtl::OUString( ".uno:WordLeftSel" ); + return OUString( ".uno:WordLeftSel" ); case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - return rtl::OUString( ".uno:WordRightSel" ); + return OUString( ".uno:WordRightSel" ); case com::sun::star::awt::Key::SELECT_WORD: - return rtl::OUString( ".uno:SelectWord" ); + return OUString( ".uno:SelectWord" ); case com::sun::star::awt::Key::SELECT_LINE: - return rtl::OUString(); + return OUString(); case com::sun::star::awt::Key::SELECT_PARAGRAPH: - return rtl::OUString( ".uno:SelectText" ); + return OUString( ".uno:SelectText" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:StartOfLineSel" ); + return OUString( ".uno:StartOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - return rtl::OUString( ".uno:EndOfLineSel" ); + return OUString( ".uno:EndOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:StartOfParaSel" ); + return OUString( ".uno:StartOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:EndOfParaSel" ); + return OUString( ".uno:EndOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( ".uno:StartOfDocumentSel" ); + return OUString( ".uno:StartOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: - return rtl::OUString( ".uno:EndOfDocumentSel" ); + return OUString( ".uno:EndOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_ALL: - return rtl::OUString( ".uno:SelectAll" ); + return OUString( ".uno:SelectAll" ); default: break; } } - return ::rtl::OUString(); + return OUString(); } //----------------------------------------------- @@ -370,7 +370,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st css::uno::Reference< css::frame::XModuleManager2 > xModuleDetection( css::frame::ModuleManager::create(rxContext)); - ::rtl::OUString sModule; + OUString sModule; try { sModule = xModuleDetection->identify(xFrame); diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index 904d2b5d768c..c6243c1c9169 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -38,10 +38,10 @@ namespace svt using namespace ::com::sun::star; -bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) +bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) { bool bRes = false; - const static rtl::OUString sNamedRanges("NamedRanges"); + const static OUString sNamedRanges("NamedRanges"); uno::Reference< sheet::XCellRangeReferrer > xReferrer; try { @@ -67,7 +67,7 @@ bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< fram void -BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab ) +BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab ) { // XBindable etc. uno::Reference< lang::XMultiServiceFactory > xFac; diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c94ea3a2cce6..e6a9eff4184a 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -84,9 +84,9 @@ static sal_uInt16 aWndFunc( String aErr(SvtResId(STR_ERR_HDLMESS).toString()); String aAction(rAction); if ( aAction.Len() ) - aAction += rtl::OUString(":\n"); - aErr.SearchAndReplace(rtl::OUString("$(ACTION)"), aAction); - aErr.SearchAndReplace(rtl::OUString("$(ERROR)"), rErr); + aAction += OUString(":\n"); + aErr.SearchAndReplace(OUString("$(ACTION)"), aAction); + aErr.SearchAndReplace(OUString("$(ERROR)"), rErr); MessBox* pBox; switch ( nFlags & 0xf000 ) @@ -191,7 +191,7 @@ sal_Bool SfxErrorHandler::CreateString( StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr); if(pStringInfo) { - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), + rStr = rStr.replaceAll(OUString("$(ARG1)"), pStringInfo->GetErrorString()); } else @@ -349,7 +349,7 @@ sal_Bool SfxErrorHandler::GetErrorString( sal_uInt16 nResFlags = aErrorString.GetFlags(); if ( nResFlags ) nFlags = nResFlags; - rStr = rStr.replaceAll(rtl::OUString("$(ERROR)"), aErrorString.GetString()); + rStr = rStr.replaceAll(OUString("$(ERROR)"), aErrorString.GetString()); bRet = sal_True; } else @@ -362,8 +362,8 @@ sal_Bool SfxErrorHandler::GetErrorString( GetClassString(lErrId & ERRCODE_CLASS_MASK, aErrStr); if(aErrStr.Len()) - aErrStr += rtl::OUString(".\n"); - rStr = rStr.replaceAll(rtl::OUString("$(CLASS)"),aErrStr); + aErrStr += OUString(".\n"); + rStr = rStr.replaceAll(OUString("$(CLASS)"),aErrStr); } return bRet; @@ -417,7 +417,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) if ( aTestEr ) { rStr = ( (ResString)aTestEr ).GetString(); - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), aArg1 ); + rStr = rStr.replaceAll(OUString("$(ARG1)"), aArg1 ); bRet = true; } else @@ -431,7 +431,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR; ResId aSfxResId( RID_ERRCTX, *pMgr ); ErrorResource_Impl aEr( aSfxResId, nId ); - rStr = rStr.replaceAll( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); + rStr = rStr.replaceAll( OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); } } diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index ad57f9ff28e4..e074a30424de 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -222,8 +222,8 @@ struct EmbeddedObjectRef_Impl uno::Reference <embed::XEmbeddedObject> mxObj; EmbedEventListener_Impl* xListener; - ::rtl::OUString aPersistName; - ::rtl::OUString aMediaType; + OUString aPersistName; + OUString aMediaType; comphelper::EmbeddedObjectContainer* pContainer; Graphic* pGraphic; sal_Int64 nViewAspect; @@ -372,13 +372,13 @@ bool EmbeddedObjectRef::is() const return mpImpl->mxObj.is(); } -void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ) +void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const OUString& rPersistName ) { mpImpl->pContainer = pContainer; mpImpl->aPersistName = rPersistName; if ( mpImpl->pGraphic && !mpImpl->bNeedUpdate && pContainer ) - SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, ::rtl::OUString() ); + SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, OUString() ); } comphelper::EmbeddedObjectContainer* EmbeddedObjectRef::GetContainer() const @@ -411,7 +411,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) if ( bUpdate ) { DELETEZ( mpImpl->pGraphic ); - mpImpl->aMediaType = ::rtl::OUString(); + mpImpl->aMediaType = OUString(); mpImpl->pGraphic = new Graphic; mpImpl->mnGraphicVersion++; } @@ -510,7 +510,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const } void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream >& xInGrStream, - const ::rtl::OUString& rMediaType ) + const OUString& rMediaType ) { if ( mpImpl->pGraphic ) delete mpImpl->pGraphic; @@ -541,7 +541,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream } -void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType ) +void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const OUString& rMediaType ) { if ( mpImpl->pGraphic ) delete mpImpl->pGraphic; @@ -617,7 +617,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUSt { MapMode aMM( MAP_APPFONT ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL ); - Font aFnt( rtl::OUString("Helvetica"), aAppFontSz ); + Font aFnt( OUString("Helvetica"), aAppFontSz ); aFnt.SetTransparent( true ); aFnt.SetColor( Color( COL_LIGHTRED ) ); aFnt.SetWeight( WEIGHT_BOLD ); @@ -739,8 +739,8 @@ bool EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbedded void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, - const ::rtl::OUString& aName, - const ::rtl::OUString& aMediaType ) + const OUString& aName, + const OUString& aMediaType ) { SvMemoryStream aStream; aStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); @@ -758,7 +758,7 @@ void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic, uno::Reference< io::XInputStream > EmbeddedObjectRef::GetGraphicReplacementStream( sal_Int64 nViewAspect, const uno::Reference< embed::XEmbeddedObject >& xObj, - ::rtl::OUString* pMediaType ) + OUString* pMediaType ) throw() { return ::comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(nViewAspect,xObj,pMediaType); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 9dfb5208eeaf..3c87d03144e3 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -105,7 +105,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D if ( xPers.is() ) { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage(); - ::rtl::OUString aName( "Dummy" ); + OUString aName( "Dummy" ); SvStream* pStream = NULL; sal_Bool bDeleteStream = sal_False; uno::Sequence < beans::PropertyValue > aEmpty; diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index 7ee8d850c0ca..88342c6fe419 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -26,7 +26,7 @@ #include "svtools/filechangedchecker.hxx" -FileChangedChecker::FileChangedChecker(const rtl::OUString& rFilename, const ::boost::function0<void>& rCallback) : +FileChangedChecker::FileChangedChecker(const OUString& rFilename, const ::boost::function0<void>& rCallback) : mTimer(), mFileName(rFilename), mLastModTime(), diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 749bc20c01a7..fc5ce1cc5f4c 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -209,7 +209,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) if ( aPath.EqualsAscii( Fac2ExtMap_Impl[ nIndex ]._pFactory ) ) { // extension found - aExtension = rtl::OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension); + aExtension = OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension); // and return it return aExtension; } @@ -227,7 +227,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext), ::com::sun::star::uno::UNO_QUERY ); - ::rtl::OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); + OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > xAccess( xTypeDetector, ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aTypeProps; if ( !aInternalType.isEmpty() && xAccess->hasByName( aInternalType ) ) @@ -239,10 +239,10 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) const ::com::sun::star::beans::PropertyValue& rProp = aTypeProps[i]; if ( rProp.Name.compareToAscii("Extensions") == COMPARE_EQUAL ) { - ::com::sun::star::uno::Sequence < ::rtl::OUString > aExtensions; + ::com::sun::star::uno::Sequence < OUString > aExtensions; if ( ( rProp.Value >>= aExtensions ) && aExtensions.getLength() > 0 ) { - const ::rtl::OUString* pExtensions = aExtensions.getConstArray(); + const OUString* pExtensions = aExtensions.getConstArray(); aExtension = String( pExtensions[0] ); break; } @@ -454,7 +454,7 @@ static String GetDescriptionByFactory_Impl( const String& rFactory ) SolarMutexGuard aGuard; return SvtResId(nResId).toString(); } - return rtl::OUString(); + return OUString(); } static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL ) diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index b21d576ab632..40df75d7e98f 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -124,7 +124,7 @@ namespace svt //= GraphicAccess //==================================================================== //-------------------------------------------------------------------- - bool GraphicAccess::isSupportedURL( const ::rtl::OUString& _rURL ) + bool GraphicAccess::isSupportedURL( const OUString& _rURL ) { if ( ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/" ) ) == 0 ) || ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository/" ) ) == 0 ) @@ -137,7 +137,7 @@ namespace svt } //-------------------------------------------------------------------- - SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) + SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { SvStream* pReturn = NULL; @@ -148,7 +148,7 @@ namespace svt // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= _rImageResourceURL; Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) ); OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" ); @@ -163,10 +163,10 @@ namespace svt ); aMediaProperties.realloc( 2 ); - aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); + aMediaProperties[0].Name = OUString( "OutputStream" ); aMediaProperties[0].Value <<= xBufferAccess; - aMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); - aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" ); + aMediaProperties[1].Name = OUString( "MimeType" ); + aMediaProperties[1].Value <<= OUString( "image/png" ); xProvider->storeGraphic( xGraphic, aMediaProperties ); pMemBuffer->Seek( 0 ); @@ -181,7 +181,7 @@ namespace svt } //-------------------------------------------------------------------- - Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) + Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), sal_True ); // take ownership } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index ea8e24fb7e92..597d90a34a3b 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -86,7 +86,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const rOStm << GetVersion(); rOStm << ( (sal_uInt16) eEncoding ); - const rtl::OString aRelURL = rtl::OUStringToOString( + const OString aRelURL = OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding); @@ -951,7 +951,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const rOStm << IMAPMAGIC; rOStm << GetVersion(); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); //dummy rOStm << nCount; write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 562daab907de..456db307cead 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -39,7 +39,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap ); -void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); @@ -50,7 +50,7 @@ void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint1 rBuf.append(RTL_CONSTASCII_STRINGPARAM(") ")); } -void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); @@ -60,20 +60,20 @@ void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint1 rBuf.append(' '); } -void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const +void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const { - rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); } -void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const +void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const String& rBaseURL) const { - rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); rBuf.append(' '); } void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle ")); AppendCERNCoords(aStrBuf, aRect.TopLeft()); AppendCERNCoords(aStrBuf, aRect.BottomRight()); @@ -84,7 +84,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) c void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect ")); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aRect.TopLeft()); @@ -95,7 +95,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) c void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); AppendCERNCoords(aStrBuf, aCenter); aStrBuf.append(nRadius); @@ -107,7 +107,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) cons void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aCenter); @@ -118,7 +118,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon ")); const sal_uInt16 nCount = aPoly.GetSize(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -131,7 +131,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) co void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly ")); const sal_uInt16 nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 ); AppendNCSAURL(aStrBuf, rBaseURL); @@ -241,16 +241,16 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) // alten Inhalt loeschen ClearImageMap(); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) ) ImpReadCERNLine( aStr, rBaseURL ); return IMAP_ERR_OK; } -void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseURL ) +void ImageMap::ImpReadCERNLine( const OString& rLine, const String& rBaseURL ) { - rtl::OString aStr = comphelper::string::stripStart(rLine, ' '); + OString aStr = comphelper::string::stripStart(rLine, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); aStr = comphelper::string::remove(aStr, ';'); aStr = aStr.toAsciiLowerCase(); @@ -259,13 +259,13 @@ void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseUR char cChar = *pStr++; // Anweisung finden - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) { aBuf.append(cChar); cChar = *pStr++; } - rtl::OString aToken = aBuf.makeStringAndClear(); + OString aToken = aBuf.makeStringAndClear(); if ( NOTEOL( cChar ) ) { @@ -368,7 +368,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr ) String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL ) { - rtl::OUString aStr(rtl::OUString::createFromAscii(*ppStr)); + OUString aStr(OUString::createFromAscii(*ppStr)); aStr = comphelper::string::stripStart(aStr, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); @@ -383,16 +383,16 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) // alten Inhalt loeschen ClearImageMap(); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) ) ImpReadNCSALine( aStr, rBaseURL ); return IMAP_ERR_OK; } -void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseURL ) +void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL ) { - rtl::OString aStr = comphelper::string::stripStart(rLine, ' '); + OString aStr = comphelper::string::stripStart(rLine, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); aStr = comphelper::string::remove(aStr, ';'); aStr = aStr.toAsciiLowerCase(); @@ -401,13 +401,13 @@ void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseUR char cChar = *pStr++; // Anweisung finden - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) { aBuf.append(cChar); cChar = *pStr++; } - rtl::OString aToken = aBuf.makeStringAndClear(); + OString aToken = aBuf.makeStringAndClear(); if ( NOTEOL( cChar ) ) { @@ -519,7 +519,7 @@ sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm ) long nCount = 128; rIStm.Seek( nPos ); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) && nCount-- ) { aStr = aStr.toAsciiLowerCase(); diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 584a205ed9a7..b83443d2754e 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -134,7 +134,7 @@ SvtLanguageTable::~SvtLanguageTable() //------------------------------------------------------------------------ -const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const +const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const { LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection); sal_uInt32 nPos = FindIndex( eLang ); diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index c6d7a719338f..59bd9094a039 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -66,7 +66,7 @@ bool canRenderNameOfSelectedFont(OutputDevice &rDevice) return !isSymbolFont(rFont) && (STRING_LEN == rDevice.HasGlyphs(rFont, rFont.GetName())); } -rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) +OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) { const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont()); @@ -104,7 +104,7 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe aText[ i+1 ] = 0; } - return rtl::OUString(aText); + return OUString(aText); } } @@ -113,9 +113,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe static sal_Unicode aImplStarSymbolText[] = { 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0}; const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText; - rtl::OUString sSampleText(pText); + OUString sSampleText(pText); bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); - return bHasSampleTextGlyphs ? sSampleText : rtl::OUString(); + return bHasSampleTextGlyphs ? sSampleText : OUString(); } //These ones are typically for use in the font dropdown box beside the @@ -128,9 +128,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe //readers of the minor languages, e.g. Yiddish is written with the HEBREW //script as well, the vast majority of Yiddish readers will be able to read //Hebrew as well. -rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) +OUString makeShortRepresentativeTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_GREEK: @@ -138,7 +138,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aGrek[] = { 0x0391, 0x03BB, 0x03C6, 0x03AC, 0x03B2, 0x03B7, 0x03C4, 0x03BF }; - sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek)); + sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek)); break; } case USCRIPT_HEBREW: @@ -148,7 +148,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x05BC, 0x05D9, 0x05EA, 0x0020, 0x05E2, 0x05B4, 0x05D1, 0x05B0, 0x05E8, 0x05B4, 0x05D9 }; - sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr)); + sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr)); break; } case USCRIPT_ARABIC: @@ -157,7 +157,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0623, 0x0628, 0x062C, 0x062F, 0x064A, 0x0629, 0x0020, 0x0639, 0x0631, 0x0628, 0x064A, 0x0629 }; - sSampleText = rtl::OUString(aArab, SAL_N_ELEMENTS(aArab)); + sSampleText = OUString(aArab, SAL_N_ELEMENTS(aArab)); break; } case USCRIPT_DEVANAGARI: @@ -165,7 +165,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aDeva[] = { 0x0926, 0x0947, 0x0935, 0x0928, 0x093E, 0x0917, 0x0930, 0x0940 }; - sSampleText = rtl::OUString(aDeva, SAL_N_ELEMENTS(aDeva)); + sSampleText = OUString(aDeva, SAL_N_ELEMENTS(aDeva)); break; } case USCRIPT_BENGALI: @@ -174,7 +174,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x09AC, 0x09BE, 0x0982, 0x09B2, 0x09BE, 0x0020, 0x09B2, 0x09BF, 0x09AA, 0x09BF }; - sSampleText = rtl::OUString(aBeng, SAL_N_ELEMENTS(aBeng)); + sSampleText = OUString(aBeng, SAL_N_ELEMENTS(aBeng)); break; } case USCRIPT_GURMUKHI: @@ -182,7 +182,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aGuru[] = { 0x0A17, 0x0A41, 0x0A30, 0x0A2E, 0x0A41, 0x0A16, 0x0A40 }; - sSampleText = rtl::OUString(aGuru, SAL_N_ELEMENTS(aGuru)); + sSampleText = OUString(aGuru, SAL_N_ELEMENTS(aGuru)); break; } case USCRIPT_GUJARATI: @@ -191,7 +191,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0A97, 0x0AC1, 0x0A9C, 0x0AB0, 0x0ABE, 0x0AA4, 0x0aC0, 0x0020, 0x0AB2, 0x0ABF, 0x0AAA, 0x0ABF }; - sSampleText = rtl::OUString(aGujr, SAL_N_ELEMENTS(aGujr)); + sSampleText = OUString(aGujr, SAL_N_ELEMENTS(aGujr)); break; } case USCRIPT_ORIYA: @@ -200,7 +200,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0B09, 0x0B24, 0x0B4D, 0x0B15, 0x0B33, 0x0020, 0x0B32, 0x0B3F, 0x0B2A, 0x0B3F }; - sSampleText = rtl::OUString(aOrya, SAL_N_ELEMENTS(aOrya)); + sSampleText = OUString(aOrya, SAL_N_ELEMENTS(aOrya)); break; } case USCRIPT_TAMIL: @@ -209,7 +209,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0B85, 0x0BB0, 0x0BBF, 0x0B9A, 0x0BCD, 0x0B9A, 0x0BC1, 0x0BB5, 0x0B9F, 0x0BBF }; - sSampleText = rtl::OUString(aTaml, SAL_N_ELEMENTS(aTaml)); + sSampleText = OUString(aTaml, SAL_N_ELEMENTS(aTaml)); break; } case USCRIPT_TELUGU: @@ -217,7 +217,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTelu[] = { 0x0C24, 0x0C46, 0x0C32, 0x0C41, 0x0C17, 0x0C41 }; - sSampleText = rtl::OUString(aTelu, SAL_N_ELEMENTS(aTelu)); + sSampleText = OUString(aTelu, SAL_N_ELEMENTS(aTelu)); break; } case USCRIPT_KANNADA: @@ -226,7 +226,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0C95, 0x0CA8, 0x0CCD, 0x0CA8, 0x0CA1, 0x0020, 0x0CB2, 0x0CBF, 0x0CAA, 0x0CBF }; - sSampleText = rtl::OUString(aKnda, SAL_N_ELEMENTS(aKnda)); + sSampleText = OUString(aKnda, SAL_N_ELEMENTS(aKnda)); break; } case USCRIPT_MALAYALAM: @@ -235,7 +235,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0D2E, 0x0D32, 0x0D2F, 0x0D3E, 0x0D33, 0x0D32, 0x0D3F, 0x0D2A, 0x0D3F }; - sSampleText = rtl::OUString(aMlym, SAL_N_ELEMENTS(aMlym)); + sSampleText = OUString(aMlym, SAL_N_ELEMENTS(aMlym)); break; } case USCRIPT_THAI: @@ -243,7 +243,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aThai[] = { 0x0E2D, 0x0E31, 0x0E01, 0x0E29, 0x0E23, 0x0E44, 0x0E17, 0x0E22 }; - sSampleText = rtl::OUString(aThai, SAL_N_ELEMENTS(aThai)); + sSampleText = OUString(aThai, SAL_N_ELEMENTS(aThai)); break; } case USCRIPT_LAO: @@ -252,7 +252,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0EAD, 0x0EB1, 0x0E81, 0x0EAA, 0x0EAD, 0x0E99, 0x0EA5, 0x0EB2, 0x0EA7 }; - sSampleText = rtl::OUString(aLao, SAL_N_ELEMENTS(aLao)); + sSampleText = OUString(aLao, SAL_N_ELEMENTS(aLao)); break; } case USCRIPT_GEORGIAN: @@ -261,7 +261,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x10D3, 0x10D0, 0x10DB, 0x10EC, 0x10D4, 0x10E0, 0x10DA, 0x10DD, 0x10D1, 0x10D0 }; - sSampleText = rtl::OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian)); + sSampleText = OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian)); break; } case USCRIPT_HANGUL: @@ -270,7 +270,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHang[] = { 0xD55C, 0xAE00 }; - sSampleText = rtl::OUString(aHang, SAL_N_ELEMENTS(aHang)); + sSampleText = OUString(aHang, SAL_N_ELEMENTS(aHang)); break; } case USCRIPT_TIBETAN: @@ -278,7 +278,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTibt[] = { 0x0F51, 0x0F56, 0x0F74, 0x0F0B, 0x0F45, 0x0F53, 0x0F0B }; - sSampleText = rtl::OUString(aTibt, SAL_N_ELEMENTS(aTibt)); + sSampleText = OUString(aTibt, SAL_N_ELEMENTS(aTibt)); break; } case USCRIPT_SYRIAC: @@ -286,7 +286,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aSyri[] = { 0x0723, 0x071B, 0x072A, 0x0722, 0x0713, 0x0720, 0x0710 }; - sSampleText = rtl::OUString(aSyri, SAL_N_ELEMENTS(aSyri)); + sSampleText = OUString(aSyri, SAL_N_ELEMENTS(aSyri)); break; } case USCRIPT_THAANA: @@ -294,7 +294,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aThaa[] = { 0x078C, 0x07A7, 0x0782, 0x07A6 }; - sSampleText = rtl::OUString(aThaa, SAL_N_ELEMENTS(aThaa)); + sSampleText = OUString(aThaa, SAL_N_ELEMENTS(aThaa)); break; } case USCRIPT_SINHALA: @@ -303,7 +303,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0DC1, 0x0DD4, 0x0DAF, 0x0DCA, 0x0DB0, 0x0020, 0x0DC3, 0x0DD2, 0x0D82, 0x0DC4, 0x0DBD }; - sSampleText = rtl::OUString(aSinh, SAL_N_ELEMENTS(aSinh)); + sSampleText = OUString(aSinh, SAL_N_ELEMENTS(aSinh)); break; } case USCRIPT_MYANMAR: @@ -312,7 +312,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1019, 0x103C, 0x1014, 0x103A, 0x1019, 0x102C, 0x1021, 0x1000, 0x1039, 0x1001, 0x101B, 0x102C }; - sSampleText = rtl::OUString(aMymr, SAL_N_ELEMENTS(aMymr)); + sSampleText = OUString(aMymr, SAL_N_ELEMENTS(aMymr)); break; } case USCRIPT_ETHIOPIC: @@ -320,7 +320,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aEthi[] = { 0x130D, 0x12D5, 0x12DD }; - sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi)); + sSampleText = OUString(aEthi, SAL_N_ELEMENTS(aEthi)); break; } case USCRIPT_CHEROKEE: @@ -328,7 +328,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aCher[] = { 0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7 }; - sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher)); + sSampleText = OUString(aCher, SAL_N_ELEMENTS(aCher)); break; } case USCRIPT_KHMER: @@ -338,7 +338,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1798, 0x1781, 0x17C1, 0x1798, 0x179A, 0x1797, 0x17B6, 0x179F, 0x17B6 }; - sSampleText = rtl::OUString(aKhmr, SAL_N_ELEMENTS(aKhmr)); + sSampleText = OUString(aKhmr, SAL_N_ELEMENTS(aKhmr)); break; } case USCRIPT_MONGOLIAN: @@ -346,7 +346,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aMongolian[] = { 0x182A, 0x1822, 0x1834, 0x1822, 0x182D, 0x180C }; - sSampleText = rtl::OUString(aMongolian, SAL_N_ELEMENTS(aMongolian)); + sSampleText = OUString(aMongolian, SAL_N_ELEMENTS(aMongolian)); break; } case USCRIPT_TAGALOG: @@ -354,7 +354,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTagalog[] = { 0x170A, 0x170A, 0x170C, 0x1712 }; - sSampleText = rtl::OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); + sSampleText = OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); break; } case USCRIPT_NEW_TAI_LUE: @@ -362,7 +362,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTalu[] = { 0x1991, 0x19BA, 0x199F, 0x19B9, 0x19C9 }; - sSampleText = rtl::OUString(aTalu, SAL_N_ELEMENTS(aTalu)); + sSampleText = OUString(aTalu, SAL_N_ELEMENTS(aTalu)); break; } case USCRIPT_TRADITIONAL_HAN: @@ -370,7 +370,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHant[] = { 0x7E41 }; - sSampleText = rtl::OUString(aHant, SAL_N_ELEMENTS(aHant)); + sSampleText = OUString(aHant, SAL_N_ELEMENTS(aHant)); break; } case USCRIPT_SIMPLIFIED_HAN: @@ -378,7 +378,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHans[] = { 0x7B80 }; - sSampleText = rtl::OUString(aHans, SAL_N_ELEMENTS(aHans)); + sSampleText = OUString(aHans, SAL_N_ELEMENTS(aHans)); break; } case USCRIPT_HAN: @@ -386,7 +386,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aSimplifiedAndTraditionalChinese[] = { 0x7B80, 0x7E41 }; - sSampleText = rtl::OUString(aSimplifiedAndTraditionalChinese, + sSampleText = OUString(aSimplifiedAndTraditionalChinese, SAL_N_ELEMENTS(aSimplifiedAndTraditionalChinese)); break; } @@ -395,7 +395,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aJpan[] = { 0x65E5, 0x672C, 0x8A9E }; - sSampleText = rtl::OUString(aJpan, SAL_N_ELEMENTS(aJpan)); + sSampleText = OUString(aJpan, SAL_N_ELEMENTS(aJpan)); break; } case USCRIPT_YI: @@ -403,7 +403,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aYiii[] = { 0xA188, 0xA320, 0xA071, 0xA0B7 }; - sSampleText = rtl::OUString(aYiii, SAL_N_ELEMENTS(aYiii)); + sSampleText = OUString(aYiii, SAL_N_ELEMENTS(aYiii)); break; } case USCRIPT_PHAGS_PA: @@ -412,7 +412,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0xA84F, 0xA861, 0xA843, 0x0020, 0xA863, 0xA861, 0xA859, 0x0020, 0xA850, 0xA85C, 0xA85E }; - sSampleText = rtl::OUString(aPhag, SAL_N_ELEMENTS(aPhag)); + sSampleText = OUString(aPhag, SAL_N_ELEMENTS(aPhag)); break; } case USCRIPT_TAI_LE: @@ -421,11 +421,11 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1956, 0x196D, 0x1970, 0x1956, 0x196C, 0x1973, 0x1951, 0x1968, 0x1952, 0x1970 }; - sSampleText = rtl::OUString(aTale, SAL_N_ELEMENTS(aTale)); + sSampleText = OUString(aTale, SAL_N_ELEMENTS(aTale)); break; } case USCRIPT_LATIN: - sSampleText = rtl::OUString("Lorem ipsum"); + sSampleText = OUString("Lorem ipsum"); break; default: break; @@ -433,9 +433,9 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) +OUString makeRepresentativeTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_TRADITIONAL_HAN: @@ -446,7 +446,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aZh[] = { 0x4EBA, 0x4E4B, 0x521D, 0x0020, 0x6027, 0x672C, 0x5584 }; - sSampleText = rtl::OUString(aZh, SAL_N_ELEMENTS(aZh)); + sSampleText = OUString(aZh, SAL_N_ELEMENTS(aZh)); break; } case USCRIPT_JAPANESE: @@ -455,7 +455,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aJa[] = { 0x7F8E, 0x3057, 0x3044, 0x65E5, 0x672C, 0x8A9E }; - sSampleText = rtl::OUString(aJa, SAL_N_ELEMENTS(aJa)); + sSampleText = OUString(aJa, SAL_N_ELEMENTS(aJa)); break; } case USCRIPT_KOREAN: @@ -466,7 +466,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) 0xD0A4, 0xC2A4, 0xC758, 0x0020, 0xACE0, 0xC720, 0xC870, 0xAC74, 0xC740 }; - sSampleText = rtl::OUString(aKo, SAL_N_ELEMENTS(aKo)); + sSampleText = OUString(aKo, SAL_N_ELEMENTS(aKo)); break; } default: @@ -478,9 +478,9 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) +OUString makeShortMinimalTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_GREEK: @@ -488,7 +488,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) const sal_Unicode aGrek[] = { 0x0391, 0x0392 }; - sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek)); + sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek)); break; } case USCRIPT_HEBREW: @@ -496,7 +496,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) const sal_Unicode aHebr[] = { 0x05D0, 0x05D1 }; - sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr)); + sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr)); break; } default: @@ -505,7 +505,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeMinimalTextForScript(UScriptCode eScript) +OUString makeMinimalTextForScript(UScriptCode eScript) { return makeShortMinimalTextForScript(eScript); } @@ -518,9 +518,9 @@ rtl::OUString makeMinimalTextForScript(UScriptCode eScript) // //Currently we fall back to makeShortRepresentativeTextForScript when we don't //have suitable strings -rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) +OUString makeRepresentativeTextForLanguage(LanguageType eLang) { - rtl::OUString sRet; + OUString sRet; switch( eLang & LANGUAGE_MASK_PRIMARY ) { case LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY: @@ -545,7 +545,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) 0x0985, 0x09B8, 0x09AE, 0x09C0, 0x09AF, 0x09BC, 0x09BE, 0x0020, 0x0986, 0x0996, 0x09F0 }; - sRet = rtl::OUString(aAs, SAL_N_ELEMENTS(aAs)); + sRet = OUString(aAs, SAL_N_ELEMENTS(aAs)); break; } case LANGUAGE_BENGALI & LANGUAGE_MASK_PRIMARY: @@ -619,7 +619,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) const sal_Unicode aGa[] = { 'T', 0x00E9, 'a', 'c', 's', ' ', 'S', 'a', 'm', 'p', 'l', 'a', 'c', 'h' }; - sRet = rtl::OUString(aGa, SAL_N_ELEMENTS(aGa)); + sRet = OUString(aGa, SAL_N_ELEMENTS(aGa)); break; } default: @@ -1124,22 +1124,22 @@ namespace bool bKore = false, bJpan = false, bHant = false, bHans = false; const sal_Unicode aKorean[] = { 0x3131 }; - rtl::OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean)); + OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sKorean)) bKore = true; const sal_Unicode aJapanese[] = { 0x3007, 0x9F9D }; - rtl::OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese)); + OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sJapanese)) bJpan = true; const sal_Unicode aTraditionalChinese[] = { 0x570B }; - rtl::OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese)); + OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sTraditionalChinese)) bHant = true; const sal_Unicode aSimplifiedChinese[] = { 0x56FD }; - rtl::OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese)); + OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sSimplifiedChinese)) bHans = true; @@ -1157,15 +1157,15 @@ namespace } } -rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) +OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) { vcl::FontCapabilities aFontCapabilities; if (!rDevice.GetFontCapabilities(aFontCapabilities)) - return rtl::OUString(); + return OUString(); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "font is %s\n", - rtl::OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr()); lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange); lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange); #endif @@ -1177,13 +1177,13 @@ rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) //chunk of representative text for that script UScriptCode eScript = getScript(aFontCapabilities); if (!eScript != USCRIPT_COMMON) - return rtl::OUString(); + return OUString(); eScript = attemptToDisambiguateHan(eScript, rDevice); - rtl::OUString sSampleText = makeShortRepresentativeTextForScript(eScript); + OUString sSampleText = makeShortRepresentativeTextForScript(eScript); bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); - return bHasSampleTextGlyphs ? sSampleText : rtl::OUString(); + return bHasSampleTextGlyphs ? sSampleText : OUString(); } UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage) @@ -1507,9 +1507,9 @@ UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCove return eRet; } -rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont) +OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont) { - rtl::OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); + OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); VirtualDevice aDevice; if (sRet.isEmpty() || (STRING_LEN != aDevice.HasGlyphs(rFont, sRet))) diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index 0ceae6dccb8a..eba7a5697c0e 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -31,7 +31,7 @@ namespace svt //= OStringTransferable //==================================================================== //-------------------------------------------------------------------- - OStringTransferable::OStringTransferable(const ::rtl::OUString& _rContent) + OStringTransferable::OStringTransferable(const OUString& _rContent) :TransferableHelper() ,m_sContent( _rContent ) { @@ -57,7 +57,7 @@ namespace svt //= OStringTransfer //==================================================================== //-------------------------------------------------------------------- - void OStringTransfer::CopyString( const ::rtl::OUString& _rContent, Window* _pWindow ) + void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; @@ -65,7 +65,7 @@ namespace svt } //-------------------------------------------------------------------- - sal_Bool OStringTransfer::PasteString( ::rtl::OUString& _rContent, Window* _pWindow ) + sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow ) { TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow ); @@ -89,7 +89,7 @@ namespace svt } //-------------------------------------------------------------------- - void OStringTransfer::StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) + void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 84efebd54455..ee5a9c048ac8 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -279,11 +279,11 @@ namespace svt if ( !s_pFactory.get() ) { #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName( SVLIBRARY( "acc" )); + const OUString sModuleName( SVLIBRARY( "acc" )); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) { - const ::rtl::OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" ); + const OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" ); s_pAccessibleFactoryFunc = (GetSvtAccessibilityComponentFactory) osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData ); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 2039c3d41c5b..d8103cfcd050 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -470,7 +470,7 @@ namespace svt sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); - static rtl::OUString getCacheFileName(); + static OUString getCacheFileName(); static sal_Int32 getMagicNumber(); static void normalize( TemplateFolderContent& _rState ); @@ -513,9 +513,9 @@ namespace svt } //--------------------------------------------------------------------- - rtl::OUString TemplateFolderCacheImpl::getCacheFileName() + OUString TemplateFolderCacheImpl::getCacheFileName() { - return rtl::OUString(".templdir.cache"); + return OUString(".templdir.cache"); } @@ -581,7 +581,7 @@ namespace svt aParser.SetURL( _rPath, INetURLObject::WAS_ENCODED ); if ( INET_PROT_NOT_VALID == aParser.GetProtocol() ) { - rtl::OUString sURL; + OUString sURL; LocalFileHelper::ConvertPhysicalNameToURL( _rPath, sURL ); aParser.SetURL( sURL, INetURLObject::WAS_ENCODED ); } @@ -601,11 +601,11 @@ namespace svt { // create a content for the current folder root Reference< XResultSet > xResultSet; - Sequence< ::rtl::OUString > aContentProperties( 4); - aContentProperties[0] = ::rtl::OUString( "Title" ); - aContentProperties[1] = ::rtl::OUString( "DateModified" ); - aContentProperties[2] = ::rtl::OUString( "DateCreated" ); - aContentProperties[3] = ::rtl::OUString( "IsFolder" ); + Sequence< OUString > aContentProperties( 4); + aContentProperties[0] = OUString( "Title" ); + aContentProperties[1] = OUString( "DateModified" ); + aContentProperties[2] = OUString( "DateCreated" ); + aContentProperties[3] = OUString( "IsFolder" ); // get the set of sub contents in the folder try @@ -675,7 +675,7 @@ namespace svt // the template directories from the config const SvtPathOptions aPathOptions; - rtl::OUString aDirs = aPathOptions.GetTemplatePath(); + OUString aDirs = aPathOptions.GetTemplatePath(); // loop through all the root-level template folders sal_Int32 nIndex = 0; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index a682f54060ed..0d8ce74af190 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -142,22 +142,22 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD // a similar approach should be implemented for creation of the mimetype string; // for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype -static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) +static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) { - const ::rtl::OUString aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" )); - const ::rtl::OUString aClassName( rObjDesc.maClassName.GetHexName() ); - ::rtl::OUString aParams; + const OUString aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" )); + const OUString aClassName( rObjDesc.maClassName.GetHexName() ); + OUString aParams; if( !aClassName.isEmpty() ) { - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" )); aParams += aClassName; aParams += aChar; } if( !rObjDesc.maTypeName.isEmpty() ) { - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); aParams += rObjDesc.maTypeName; aParams += aChar; } @@ -180,29 +180,29 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto pToAccept[nChar] = sal_True; } - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" )); aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); aParams += aChar; } - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); aParams += OUString::number( rObjDesc.mnViewAspect ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Width() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); + aParams += OUString::valueOf( rObjDesc.maSize.Width() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Height() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" )); + aParams += OUString::valueOf( rObjDesc.maSize.Height() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" )); + aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" )); + aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; return aParams; @@ -222,14 +222,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons if( xMimeType.is() ) { - const ::rtl::OUString aClassNameString( "classname" ); - const ::rtl::OUString aTypeNameString( "typename" ); - const ::rtl::OUString aDisplayNameString( "displayname" ); - const ::rtl::OUString aViewAspectString( "viewaspect" ); - const ::rtl::OUString aWidthString( "width" ); - const ::rtl::OUString aHeightString( "height" ); - const ::rtl::OUString aPosXString( "posx" ); - const ::rtl::OUString aPosYString( "posy" ); + const OUString aClassNameString( "classname" ); + const OUString aTypeNameString( "typename" ); + const OUString aDisplayNameString( "displayname" ); + const OUString aViewAspectString( "viewaspect" ); + const OUString aWidthString( "width" ); + const OUString aHeightString( "height" ); + const OUString aPosXString( "posx" ); + const OUString aPosYString( "posy" ); if( xMimeType->hasParameter( aClassNameString ) ) { @@ -436,7 +436,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th #ifdef DEBUG if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() ) - fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", rtl::OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); + fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); #endif } catch( const ::com::sun::star::uno::Exception& ) @@ -645,7 +645,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) #ifdef DEBUG fprintf( stderr, "TransferableHelper exchanged objectdescriptor [ %s ]\n", - rtl::OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); + OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); #endif } @@ -742,7 +742,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) // ----------------------------------------------------------------------------- -sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const DataFlavor& rFlavor ) +sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -750,7 +750,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) && TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) ) { - const rtl::OString aByteStr(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + const OString aByteStr(OUStringToOString(rString, osl_getThreadTextEncoding())); Sequence< sal_Int8 > aSeq( aByteStr.getLength() + 1 ); memcpy( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() ); @@ -849,9 +849,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, { case( SOT_FORMATSTR_ID_SOLK ): { - rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet)); - rtl::OString sDesc(rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet)); - rtl::OStringBuffer sOut; + OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet)); + OString sDesc(OUStringToOString(rBmk.GetDescription(), eSysCSet)); + OStringBuffer sOut; sOut.append(sURL.getLength()); sOut.append('@').append(sURL); sOut.append(sDesc.getLength()); @@ -864,12 +864,12 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, break; case( FORMAT_STRING ): - maAny <<= ::rtl::OUString( rBmk.GetURL() ); + maAny <<= OUString( rBmk.GetURL() ); break; case( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ): { - rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet)); + OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet)); Sequence< sal_Int8 > aSeq( sURL.getLength() ); memcpy( aSeq.getArray(), sURL.getStr(), sURL.getLength() ); maAny <<= aSeq; @@ -881,8 +881,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, Sequence< sal_Int8 > aSeq( 2048 ); memset( aSeq.getArray(), 0, 2048 ); - strcpy( reinterpret_cast< char* >( aSeq.getArray() ), rtl::OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() ); - strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() ); + strcpy( reinterpret_cast< char* >( aSeq.getArray() ), OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() ); + strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() ); maAny <<= aSeq; } @@ -899,7 +899,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) ); rFDesc1.dwFlags = FD_LINKUI; - rtl::OStringBuffer aStr(rtl::OUStringToOString( + OStringBuffer aStr(OUStringToOString( rBmk.GetDescription(), eSysCSet)); for( sal_uInt16 nChar = 0; nChar < aStr.getLength(); ++nChar ) if( strchr( "\\/:*?\"<>|", aStr[nChar] ) ) @@ -916,7 +916,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, case SOT_FORMATSTR_ID_FILECONTENT: { String aStr( RTL_CONSTASCII_USTRINGPARAM( "[InternetShortcut]\x0aURL=" ) ); - maAny <<= ::rtl::OUString( aStr += rBmk.GetURL() ); + maAny <<= OUString( aStr += rBmk.GetURL() ); } break; #endif @@ -965,7 +965,7 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec // writes now UTF16 format into the stream //JP 6.8.2001: and now it writes UTF8 because then exist no problem with // little / big endians! - Bug 88121 - maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); + maAny <<= OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); } else maAny <<= aSeq; @@ -1332,7 +1332,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XMimeContentTypeFactory > xMimeFact = MimeContentTypeFactory::create( xContext ); DataFlavorEx aFlavorEx; - const ::rtl::OUString aCharsetStr( "charset" ); + const OUString aCharsetStr( "charset" ); for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ ) @@ -1380,33 +1380,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT; rDataFlavorExVector.push_back( aFlavorEx ); } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) ) { // add, if it is a UTF-8 byte buffer if( xMimeType->hasParameter( aCharsetStr ) ) { - if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) || - xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ) + if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) || + xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING; } } } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/rtf" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/html" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/uri-list" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice-objectdescriptor-xml" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR; } @@ -1597,7 +1597,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& rStr ) { - ::rtl::OUString aOUString; + OUString aOUString; sal_Bool bRet = GetString( nFormat, aOUString ); rStr = aOUString; @@ -1609,7 +1609,7 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& r sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& rStr ) { - ::rtl::OUString aOUString; + OUString aOUString; sal_Bool bRet = GetString( rFlavor, aOUString ); rStr = aOUString; @@ -1619,7 +1619,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& r // ----------------------------------------------------------------------------- -sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr ) +sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) ); @@ -1627,14 +1627,14 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OU // ----------------------------------------------------------------------------- -sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OUString& rStr ) +sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny( GetAny( rFlavor ) ); sal_Bool bRet = sal_False; if( aAny.hasValue() ) { - ::rtl::OUString aOUString; + OUString aOUString; Sequence< sal_Int8 > aSeq; if( aAny >>= aOUString ) @@ -1653,7 +1653,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU while( nLen && ( 0 == *( pChars + nLen - 1 ) ) ) --nLen; - rStr = ::rtl::OUString( pChars, nLen, osl_getThreadTextEncoding() ); + rStr = OUString( pChars, nLen, osl_getThreadTextEncoding() ); bRet = sal_True; } } @@ -1943,12 +1943,12 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pFDesc->cItems ) { - rtl::OString aDesc( pFDesc->fgd[ 0 ].cFileName ); + OString aDesc( pFDesc->fgd[ 0 ].cFileName ); rtl_TextEncoding eTextEncoding = osl_getThreadTextEncoding(); if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")) ) { - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( rtl::OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ ); if( !pStream || pStream->GetError() ) @@ -1969,7 +1969,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { - rtl::OString aLine; + OString aLine; sal_Bool bSttFnd = sal_False; while( pStream->ReadLine( aLine ) ) @@ -1978,8 +1978,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr bSttFnd = sal_True; else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("URL="))) { - rBmk = INetBookmark( rtl::OStringToOUString(aLine.copy(4), eTextEncoding), - rtl::OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) ); + rBmk = INetBookmark( OStringToOUString(aLine.copy(4), eTextEncoding), + OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) ); bRet = sal_True; break; } @@ -2050,11 +2050,11 @@ sal_Bool TransferableDataHelper::GetFileList( { if( aFlavor.MimeType.indexOf( "text/uri-list" ) > -1 ) { - rtl::OString aDiskString; + OString aDiskString; while( xStm->ReadLine( aDiskString ) ) if( !aDiskString.isEmpty() && aDiskString[0] != '#' ) - rFileList.AppendFile( rtl::OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); + rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); bRet = sal_True; } @@ -2256,22 +2256,22 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: { if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) ) { - if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) + if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) ) { // special handling for text/plain media types - const ::rtl::OUString aCharsetString( "charset" ); + const OUString aCharsetString( "charset" ); if( !xRequestType2->hasParameter( aCharsetString ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ) + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) || + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) ) { bRet = sal_True; } } - else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) ) + else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice" ) ) ) { // special handling for application/x-openoffice media types - const ::rtl::OUString aFormatString( "windows_formatname" ); + const OUString aFormatString( "windows_formatname" ); if( xRequestType1->hasParameter( aFormatString ) && xRequestType2->hasParameter( aFormatString ) && diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index f28c101eae40..5fc1d14ab3f6 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -498,7 +498,7 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId, // ----------------------------------------------------------------------------- void TransferDataContainer::CopyByteString( sal_uLong nFormatId, - const rtl::OString& rStr ) + const OString& rStr ) { CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() ); } @@ -553,7 +553,7 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr ) { TDataCntnrEntry_Impl aEntry; aEntry.nId = nFmt; - rtl::OUString aStr( rStr ); + OUString aStr( rStr ); aEntry.aAny <<= aStr; pImpl->aFmtList.push_back( aEntry ); AddFormat( aEntry.nId ); diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 14d62066d3f1..a126e4ea79f5 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -391,11 +391,11 @@ static const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, return pStr; } -static rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, +static OString lcl_ConvertCharToHTML( sal_Unicode c, HTMLOutContext& rContext, String *pNonConvertableChars ) { - rtl::OStringBuffer aDest; + OStringBuffer aDest; DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW != rContext.m_eDestEnc, "wrong destination encoding" ); const sal_Char *pStr = 0; @@ -478,9 +478,9 @@ static rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, return aDest.makeStringAndClear(); } -static rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) +static OString lcl_FlushToAscii( HTMLOutContext& rContext ) { - rtl::OStringBuffer aDest; + OStringBuffer aDest; sal_Unicode c = 0; sal_Char cBuffer[TXTCONV_BUFFER_SIZE]; @@ -502,11 +502,11 @@ static rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) return aDest.makeStringAndClear(); } -rtl::OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc, +OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { HTMLOutContext aContext( eDestEnc ); - rtl::OStringBuffer aDest; + OStringBuffer aDest; for( sal_uInt32 i=0UL, nLen = rSrc.Len(); i < nLen; i++ ) aDest.append(lcl_ConvertCharToHTML( rSrc.GetChar( (xub_StrLen)i ), aContext, pNonConvertableChars)); @@ -527,7 +527,7 @@ SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c, HTMLOutContext& rContext, String *pNonConvertableChars ) { - rtl::OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars ); + OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars ); rStream << sOut.getStr(); return rStream; } @@ -548,7 +548,7 @@ SvStream& HTMLOutFuncs::Out_String( SvStream& rStream, const String& rStr, SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, HTMLOutContext& rContext ) { - rtl::OString sOut = lcl_FlushToAscii( rContext ); + OString sOut = lcl_FlushToAscii( rContext ); if (!sOut.isEmpty()) rStream << sOut.getStr(); @@ -617,7 +617,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( !rOutName.Len() ) return rStream; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<') .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_map)) .append(' ') @@ -635,7 +635,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( pObj ) { const sal_Char *pShape = 0; - rtl::OString aCoords; + OString aCoords; switch( pObj->GetType() ) { case( IMAP_OBJ_RECTANGLE ): @@ -645,7 +645,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, pShape = OOO_STRING_SVTOOLS_HTML_SH_rect; Rectangle aRect( pRectObj->GetRectangle() ); - aCoords = rtl::OStringBuffer() + aCoords = OStringBuffer() .append(static_cast<sal_Int32>(aRect.Left())) .append(',') .append(static_cast<sal_Int32>(aRect.Top())) @@ -664,7 +664,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, Point aCenter( pCirc->GetCenter() ); long nOff = pCirc->GetRadius(); - aCoords = rtl::OStringBuffer() + aCoords = OStringBuffer() .append(static_cast<sal_Int32>(aCenter.X())) .append(',') .append(static_cast<sal_Int32>(aCenter.Y())) @@ -680,7 +680,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, pShape= OOO_STRING_SVTOOLS_HTML_SH_poly; Polygon aPoly( pPolyObj->GetPolygon() ); sal_uInt16 nCount = aPoly.GetSize(); - rtl::OStringBuffer aTmpBuf; + OStringBuffer aTmpBuf; if( nCount>0 ) { const Point& rPoint = aPoly[0]; @@ -795,7 +795,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, eDestEnc = osl_getThreadTextEncoding(); // Script wird komplett nicht eingerueckt! - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<') .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_script)); @@ -856,7 +856,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_library)) .append(' ') - .append(rtl::OUStringToOString(*pSBLibrary, eDestEnc)); + .append(OUStringToOString(*pSBLibrary, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << sNewLine; } @@ -865,7 +865,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_module)) .append(' ') - .append(rtl::OUStringToOString(*pSBModule, eDestEnc)); + .append(OUStringToOString(*pSBModule, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << sNewLine; } } @@ -874,7 +874,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { // Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit // System-Zeilenumbruechen raus. - const rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc)); + const OString sSource(OUStringToOString(rSource, eDestEnc)); rStrm << sSource.getStr() << sNewLine; } rStrm << sNewLine; @@ -917,7 +917,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, if( pStr ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(pStr).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -930,19 +930,19 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, return rStrm; } -rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum( +OString HTMLOutFuncs::CreateTableDataOptionsValNum( sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc, String* pNonConvertableChars) { - rtl::OStringBuffer aStrTD; + OStringBuffer aStrTD; if ( bValue ) { // printf / scanf ist zu ungenau String aValStr; rFormatter.GetInputLineString( fVal, 0, aValStr ); - rtl::OString sTmp(rtl::OUStringToOString(aValStr, eDestEnc)); + OString sTmp(OUStringToOString(aValStr, eDestEnc)); aStrTD.append(' '). append(OOO_STRING_SVTOOLS_HTML_O_SDval). append(RTL_CONSTASCII_STRINGPARAM("=\"")). @@ -958,7 +958,7 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum( append(';'); // Language fuer Format 0 if ( nFormat ) { - rtl::OString aNumStr; + OString aNumStr; LanguageType nLang; const SvNumberformat* pFormatEntry = rFormatter.GetEntry( nFormat ); if ( pFormatEntry ) diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index e34f16c8ced3..dd1b60d9658b 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -420,7 +420,7 @@ int HTMLParser::FilterToken( int nToken ) int HTMLParser::ScanText( const sal_Unicode cBreak ) { - ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN ); + OUStringBuffer sTmpBuffer( MAX_LEN ); int bContinue = true; int bEqSignFound = false; sal_Unicode cQuote = 0U; @@ -482,7 +482,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT; sal_Char cEncodedChar = static_cast<sal_Char>(cChar); - cChar = rtl::OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar(); + cChar = OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar(); if( 0U == cChar ) { // If the character could not be @@ -497,7 +497,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) } else if( HTML_ISALPHA( nNextCh ) ) { - ::rtl::OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); + OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); xub_StrLen nPos = 0L; do { @@ -510,7 +510,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( IsParserWorking() && !rInput.IsEof() ) { - rtl::OUString sEntity(sEntityBuffer.getStr(), nPos); + OUString sEntity(sEntityBuffer.getStr(), nPos); cChar = GetHTMLCharName( sEntity ); // not found ( == 0 ): plain text @@ -524,7 +524,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) { nNextCh = sEntityBuffer[i]; sEntityBuffer.setLength( i ); - sEntity = rtl::OUString(sEntityBuffer.getStr(), i); + sEntity = OUString(sEntityBuffer.getStr(), i); cChar = GetHTMLCharName( sEntity ); if( cChar ) { @@ -831,7 +831,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) int HTMLParser::_GetNextRawToken() { - ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN ); + OUStringBuffer sTmpBuffer( MAX_LEN ); if( bEndTokenFound ) { @@ -1100,7 +1100,7 @@ int HTMLParser::_GetNextToken() } if( HTML_ISALPHA( nNextCh ) || '!'==nNextCh ) { - ::rtl::OUStringBuffer sTmpBuffer; + OUStringBuffer sTmpBuffer; do { sTmpBuffer.append( nNextCh ); if( MAX_LEN == sTmpBuffer.getLength() ) @@ -1867,7 +1867,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, // ^<! // // where the underlined subexpression has to be a HTML token - rtl::OString sCmp; + OString sCmp; bool bUCS2B = false; if( bSwitchToUCS2 ) { @@ -1901,7 +1901,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, nLen+=2 ) ; - ::rtl::OStringBuffer sTmp( (nLen - 2)/2 ); + OStringBuffer sTmp( (nLen - 2)/2 ); for( xub_StrLen nPos = 2; nPos < nLen; nPos += 2 ) { sal_Unicode cUC; @@ -1945,7 +1945,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, // the string following '<' has to be a known HTML token. // <DIR> is not interpreted as HTML. Otherwise the output of the DOS command "DIR" // could be interpreted as HTML. - rtl::OUString sTest(rtl::OStringToOUString(sCmp.copy(nStart, nPos-nStart), RTL_TEXTENCODING_ASCII_US)); + OUString sTest(OStringToOUString(sCmp.copy(nStart, nPos-nStart), RTL_TEXTENCODING_ASCII_US)); int nTok = GetHTMLToken( sTest ); if( 0 != nTok && HTML_DIRLIST_ON != nTok ) return true; @@ -2067,7 +2067,7 @@ static HTMLOptionEnum const aHTMLMetaNameTable[] = }; -void HTMLParser::AddMetaUserDefined( ::rtl::OUString const & ) +void HTMLParser::AddMetaUserDefined( OUString const & ) { } @@ -2204,7 +2204,7 @@ bool HTMLParser::ParseMetaOptionsImpl( try { xUDProps->addProperty(aName, beans::PropertyAttribute::REMOVABLE, - uno::makeAny(::rtl::OUString(aContent))); + uno::makeAny(OUString(aContent))); AddMetaUserDefined(aName); bChanged = true; } catch (uno::Exception &) { @@ -2255,7 +2255,7 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime ) const INetContentTypeParameter * pCharset = aParameters.find("charset"); if (pCharset != 0) { - OString sValue(rtl::OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); + OString sValue(OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); return GetExtendedCompatibilityTextEncoding( rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); } } diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 3614de2dc075..1f4936ef8244 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -320,13 +320,13 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) case '\'': { - rtl::OStringBuffer aByteString; + OStringBuffer aByteString; while (1) { char c = (char)GetHexValue(); /* * Note: \'00 is a valid internal character in a - * string in RTF. rtl::OStringBuffer supports + * string in RTF. OStringBuffer supports * appending nulls fine */ aByteString.append(c); @@ -339,7 +339,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) if (__next>0xFF) // fix for #i43933# and #i35653# { if (aByteString.getLength()) - aStrBuffer.Append(String(rtl::OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); + aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); aStrBuffer.Append((sal_Unicode)__next); continue; @@ -374,7 +374,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) bNextCh = false; if (aByteString.getLength()) - aStrBuffer.Append(String(rtl::OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); + aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); } break; case '\\': diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 4c15bcf2db36..64a9a8b48c9f 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -25,8 +25,6 @@ #include <svtools/rtfkeywd.hxx> #include <svtools/rtfout.hxx> -using ::rtl::OUString; -using ::rtl::OString; #if defined(UNX) const sal_Char RTFOutFuncs::sNewLine = '\012'; @@ -133,11 +131,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; rStream << "\\uc" - << rtl::OString::valueOf(nLen).getStr() << " "; + << OString::valueOf(nLen).getStr() << " "; *pUCMode = nLen; } rStream << "\\u" - << rtl::OString::valueOf( + << OString::valueOf( static_cast<sal_Int32>(c)).getStr(); } diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index ad7213b622e2..0f26ab2811fb 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -98,7 +98,7 @@ namespace svt }; typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization; - typedef ::boost::unordered_map< ::rtl::OUString, PValueNormalization, ::rtl::OUStringHash > NormalizerCache; + typedef ::boost::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache; //================================================================================================================== //= CellValueConversion_Data @@ -334,7 +334,7 @@ namespace svt // ensure a NullDate we will assume later on UnoDate const aNullDate( 1, 1, 1900 ); Reference< XPropertySet > const xFormatSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW ); - xFormatSettings->setPropertyValue( ::rtl::OUString::createFromAscii( "NullDate" ), makeAny( aNullDate ) ); + xFormatSettings->setPropertyValue( OUString::createFromAscii( "NullDate" ), makeAny( aNullDate ) ); // knit xFormatter->attachNumberFormatsSupplier( xSupplier ); @@ -360,7 +360,7 @@ namespace svt // never encountered this type before o_formatter.reset(); - ::rtl::OUString const sTypeName( i_valueType.getTypeName() ); + OUString const sTypeName( i_valueType.getTypeName() ); TypeClass const eTypeClass = i_valueType.getTypeClass(); if ( sTypeName.equals( ::cppu::UnoType< DateTime >::get().getTypeName() ) ) @@ -423,9 +423,9 @@ namespace svt } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString CellValueConversion::convertToString( const Any& i_value ) + OUString CellValueConversion::convertToString( const Any& i_value ) { - ::rtl::OUString sStringValue; + OUString sStringValue; if ( !i_value.hasValue() ) return sStringValue; diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx index c9cb66b9d173..8c9f6b236d9f 100644 --- a/svtools/source/table/cellvalueconversion.hxx +++ b/svtools/source/table/cellvalueconversion.hxx @@ -40,7 +40,7 @@ namespace svt CellValueConversion(); ~CellValueConversion(); - ::rtl::OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue ); + OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue ); private: ::boost::scoped_ptr< CellValueConversion_Data > m_pData; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index a96c1c225e3b..0d56ee5b88ae 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -390,7 +390,7 @@ namespace svt { namespace table _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() ); Any const rowHeading( m_pImpl->rModel.getRowHeading( m_pImpl->nCurrentRow ) ); - ::rtl::OUString const rowTitle( m_pImpl->aStringConverter.convertToString( rowHeading ) ); + OUString const rowTitle( m_pImpl->aStringConverter.convertToString( rowHeading ) ); if ( !rowTitle.isEmpty() ) { ::Color const textColor = lcl_getEffectiveColor( m_pImpl->rModel.getHeaderTextColor(), _rStyle, &StyleSettings::GetFieldTextColor ); @@ -526,12 +526,12 @@ namespace svt { namespace table return; } - const ::rtl::OUString sText( m_pImpl->aStringConverter.convertToString( aCellContent ) ); + const OUString sText( m_pImpl->aStringConverter.convertToString( aCellContent ) ); impl_paintCellText( i_context, sText ); } //------------------------------------------------------------------------------------------------------------------ - void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, ::rtl::OUString const & i_text ) + void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, OUString const & i_text ) { if ( i_context.bSelected ) { @@ -586,7 +586,7 @@ namespace svt { namespace table return true; } - ::rtl::OUString const sText( m_pImpl->aStringConverter.convertToString( i_cellContent ) ); + OUString const sText( m_pImpl->aStringConverter.convertToString( i_cellContent ) ); if ( sText.isEmpty() ) return true; @@ -608,7 +608,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, ::rtl::OUString & o_cellString ) const + bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString ) const { o_cellString = m_pImpl->aStringConverter.convertToString( i_cellValue ); diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 6a1fc18447fe..877f32d12e3f 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -288,23 +288,23 @@ namespace svt { namespace table } // ----------------------------------------------------------------------------------------------------------------- - ::rtl::OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const + OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const { - ::rtl::OUString aRetText; + OUString aRetText; //Window* pWin; switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( "Grid control" ); + aRetText = OUString( "Grid control" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( "Grid conrol" ); + aRetText = OUString( "Grid conrol" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( "RowHeaderBar" ); + aRetText = OUString( "RowHeaderBar" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( "ColumnHeaderBar" ); + aRetText = OUString( "ColumnHeaderBar" ); break; case TCTYPE_TABLECELL: //the name of the cell constists of column name and row name if defined @@ -312,12 +312,12 @@ namespace svt { namespace table if(GetModel()->hasColumnHeaders()) { aRetText = GetColumnName(_nCol); - aRetText += rtl::OUString::createFromAscii(" , "); + aRetText += OUString::createFromAscii(" , "); } if(GetModel()->hasRowHeaders()) { aRetText += GetRowName(_nRow); - aRetText += rtl::OUString::createFromAscii(" , "); + aRetText += OUString::createFromAscii(" , "); } //aRetText = GetAccessibleCellText(_nRow, _nCol); break; @@ -334,22 +334,22 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const + OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const { - ::rtl::OUString aRetText; + OUString aRetText; switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( "Grid control description" ); + aRetText = OUString( "Grid control description" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( "TABLE description" ); + aRetText = OUString( "TABLE description" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( "ROWHEADERBAR description" ); + aRetText = OUString( "ROWHEADERBAR description" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( "COLUMNHEADERBAR description" ); + aRetText = OUString( "COLUMNHEADERBAR description" ); break; case TCTYPE_TABLECELL: // the description of the cell consists of column name and row name if defined @@ -357,7 +357,7 @@ namespace svt { namespace table if ( GetModel()->hasColumnHeaders() ) { aRetText = GetColumnName( GetCurrentColumn() ); - aRetText += rtl::OUString::createFromAscii( " , " ); + aRetText += OUString::createFromAscii( " , " ); } if ( GetModel()->hasRowHeaders() ) { @@ -365,39 +365,39 @@ namespace svt { namespace table } break; case TCTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( "ROWHEADERCELL description" ); + aRetText = OUString( "ROWHEADERCELL description" ); break; case TCTYPE_COLUMNHEADERCELL: - aRetText = ::rtl::OUString( "COLUMNHEADERCELL description" ); + aRetText = OUString( "COLUMNHEADERCELL description" ); break; } return aRetText; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetRowDescription( sal_Int32 _nRow) const + OUString TableControl::GetRowDescription( sal_Int32 _nRow) const { (void)_nRow; - return rtl::OUString( "row description" ); + return OUString( "row description" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetRowName( sal_Int32 _nIndex) const + OUString TableControl::GetRowName( sal_Int32 _nIndex) const { - ::rtl::OUString sRowName; + OUString sRowName; GetModel()->getRowHeading( _nIndex ) >>= sRowName; return sRowName; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const + OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const { (void)_nColumn; - return rtl::OUString( "col description" ); + return OUString( "col description" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetColumnName( sal_Int32 _nIndex) const + OUString TableControl::GetColumnName( sal_Int32 _nIndex) const { return GetModel()->getColumnModel(_nIndex)->getName(); } @@ -411,7 +411,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const + OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const { return m_pImpl->getCellContentAsString( _nRowPos, _nColPos ); } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index a02d64a2a000..5b059aedaab6 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2290,12 +2290,12 @@ namespace svt { namespace table } //-------------------------------------------------------------------- - ::rtl::OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col ) + OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col ) { Any aCellValue; m_pModel->getCellContent( i_col, i_row, aCellValue ); - ::rtl::OUString sCellStringContent; + OUString sCellStringContent; m_pModel->getRenderer()->GetFormattedCellString( aCellValue, i_col, i_row, sCellStringContent ); return sCellStringContent; diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index d8bf51f94b30..5c02c21c2d68 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -210,7 +210,7 @@ namespace svt { namespace table /** retrieves the content of the given cell, converted to a string */ - ::rtl::OUString getCellContentAsString( RowPos const i_row, ColPos const i_col ); + OUString getCellContentAsString( RowPos const i_row, ColPos const i_col ); /** returns the position of the current row in the selection vector */ int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current); diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index a797587a4b69..65703e5d45c5 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -87,7 +87,7 @@ namespace svt { namespace table return; } - ::rtl::OUString sHelpText; + OUString sHelpText; sal_uInt16 nHelpStyle = 0; Point const aMousePos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ) ); diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 87668a54a710..9be075276538 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -60,9 +60,9 @@ namespace svt } //-------------------------------------------------------------------- - ::rtl::OUString DummyPanel::GetDisplayName() const + OUString DummyPanel::GetDisplayName() const { - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- @@ -72,9 +72,9 @@ namespace svt } //-------------------------------------------------------------------- - rtl::OString DummyPanel::GetHelpID() const + OString DummyPanel::GetHelpID() const { - return rtl::OString(); + return OString(); } //-------------------------------------------------------------------- diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index b5d5f2751d83..58a1b9ded26b 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -40,9 +40,9 @@ namespace svt ~DummyPanel(); // IToolPanel - virtual ::rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; virtual Image GetImage() const; - virtual rtl::OString GetHelpID() const; + virtual OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 34ef11563289..c4cb2d5163ee 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -217,7 +217,7 @@ namespace svt // bool bNativeOK = m_rTargetWindow.GetNativeControlRegion( // CTRL_TOOLBAR, PART_BUTTON, // i_rContentArea, nState, -// aControlValue, ::rtl::OUString(), +// aControlValue, OUString(), // aBoundingRegion, aContentRegion // ); (void)i_nItemFlags; @@ -235,7 +235,7 @@ namespace svt ImplControlValue aControlValue; aControlValue.setTristateVal( ( i_nItemFlags & ITEM_STATE_ACTIVE ) ? BUTTONVALUE_ON : BUTTONVALUE_OFF ); - bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rContentRect, nState, aControlValue, rtl::OUString() ); + bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rContentRect, nState, aControlValue, OUString() ); (void)bNativeOK; OSL_ENSURE( bNativeOK, "NWFToolboxItemRenderer::preRenderItem: inconsistent NWF implementation!" ); // IsNativeControlSupported returned true, previously, otherwise we would not be here ... @@ -286,7 +286,7 @@ namespace svt aBackground.Top() = aBackground.Bottom(); getTargetDevice().DrawNativeControl( CTRL_TAB_PANE, PART_ENTIRE_CONTROL, aBackground, - CTRL_STATE_ENABLED, ImplControlValue(), ::rtl::OUString() ); + CTRL_STATE_ENABLED, ImplControlValue(), OUString() ); } //------------------------------------------------------------------------------------------------------------------ @@ -300,7 +300,7 @@ namespace svt bool bNativeOK = getTargetDevice().GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentArea, nState, - tiValue, ::rtl::OUString(), + tiValue, OUString(), aBoundingRegion, aContentRegion ); (void)bNativeOK; @@ -321,7 +321,7 @@ namespace svt tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP; - bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentRect, nState, tiValue, rtl::OUString() ); + bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentRect, nState, tiValue, OUString() ); (void)bNativeOK; OSL_ENSURE( bNativeOK, "NWFTabItemRenderer::preRenderItem: inconsistent NWF implementation!" ); // IsNativeControlSupported returned true, previously, otherwise we would not be here ... @@ -587,7 +587,7 @@ namespace svt const Image aImage( i_pPanel->GetImage() ); const bool bUseImage = !!aImage && ( i_eItemContent != TABITEM_TEXT_ONLY ); - const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() ); + const OUString sItemText( i_pPanel->GetDisplayName() ); const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY ); Size aItemContentSize; @@ -658,7 +658,7 @@ namespace svt m_rTabBar.DrawImage( aImagePos, aItemImage ); } - const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() ); + const OUString sItemText( i_pPanel->GetDisplayName() ); const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY ); if ( bUseText ) @@ -1173,7 +1173,7 @@ namespace svt // if the text is displayed for the item, we do not need to show it as tooltip return; - const ::rtl::OUString sItemText( rItem.pPanel->GetDisplayName() ); + const OUString sItemText( rItem.pPanel->GetDisplayName() ); if ( i_rHelpEvent.GetMode() == HELPMODE_BALLOON ) Help::ShowBalloon( this, OutputToScreenPixel( rItem.GetCurrentRect().Center() ), rItem.GetCurrentRect(), sItemText ); else diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index fcc452e3543f..31c307476f46 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -65,7 +65,7 @@ namespace svt { SolarMutexGuard aSolarGuard; if ( m_pTabBar == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 1496b753f407..f5a18d039272 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -65,7 +65,7 @@ namespace svt { SolarMutexGuard aSolarGuard; if ( m_pDeck == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 7d161c5bf38b..ba11c65931cf 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -70,7 +70,7 @@ namespace svt //= ToolPanelDrawer //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const ::rtl::OUString& i_rTitle ) + ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ) :Window( &i_rParent, WB_TABSTOP ) ,m_pPaintDevice( new VirtualDevice( *this ) ) ,m_aVisualization( *this ) diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index f380b74a6c21..f2dfea75b1ff 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -60,7 +60,7 @@ namespace svt class ToolPanelDrawer : public Window { public: - ToolPanelDrawer( Window& i_rParent, const ::rtl::OUString& i_rTitle ); + ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ); ~ToolPanelDrawer(); long GetPreferredHeightPixel() const; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index c7e6cebd0e23..691c278e0369 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -50,8 +50,8 @@ namespace svt protected: Sequence< AliasProgrammaticPair > m_aAliases; Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sTable; + OUString m_sDataSourceName; + OUString m_sTable; protected: OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB); @@ -61,12 +61,12 @@ namespace svt virtual Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException); // XServiceInfo - static methods - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); + static OUString getImplementationName_Static(void) throw( RuntimeException ); static Reference< XInterface > SAL_CALL Create(const Reference< com::sun::star::lang::XMultiServiceFactory >&); @@ -101,7 +101,7 @@ namespace svt OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, + registerProperty(OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, &m_aAliases, getCppuType(&m_aAliases)); } @@ -119,15 +119,15 @@ namespace svt } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- - ::rtl::OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException) + OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); + return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); } //------------------------------------------------------------------------- @@ -140,7 +140,7 @@ namespace svt ::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.ui.AddressBookSourceDialog" ); + aSupported.getArray()[0] = OUString( "com.sun.star.ui.AddressBookSourceDialog" ); return aSupported; } @@ -181,9 +181,9 @@ namespace svt { Reference<com::sun::star::awt::XWindow> xParentWindow; Reference<com::sun::star::beans::XPropertySet> xDataSource; - rtl::OUString sDataSourceName; - rtl::OUString sCommand; - rtl::OUString sTitle; + OUString sDataSourceName; + OUString sCommand; + OUString sTitle; if ( (rArguments[0] >>= xParentWindow) && (rArguments[1] >>= xDataSource) && (rArguments[2] >>= sDataSourceName) diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 4b1ba9410842..5ceaa94cc976 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -57,7 +57,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, public: StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider, const uno::Reference< util::XURLTransformer >& xURLTransformer, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); virtual ~StateEventHelper(); bool isCommandEnabled(); @@ -79,7 +79,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, StateEventHelper& operator=( const StateEventHelper& ); bool m_bCurrentCommandEnabled; - ::rtl::OUString m_aCommandURL; + OUString m_aCommandURL; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< util::XURLTransformer > m_xURLTransformer; osl::Condition m_aCondition; @@ -88,7 +88,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, StateEventHelper::StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider, const uno::Reference< util::XURLTransformer >& xURLTransformer, - const rtl::OUString& rCommandURL ) : + const OUString& rCommandURL ) : m_bCurrentCommandEnabled( true ), m_aCommandURL( rCommandURL ), m_xDispatchProvider( xDispatchProvider ), @@ -157,7 +157,7 @@ bool StateEventHelper::isCommandEnabled() SolarMutexGuard aSolarGuard; if ( m_xDispatchProvider.is() && m_xURLTransformer.is() ) { - ::rtl::OUString aSelf( "_self" ); + OUString aSelf( "_self" ); aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); @@ -238,13 +238,13 @@ static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sa return NULL; } -static ::rtl::OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId ) +static OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId ) { const PopupMenu* pPopup = lcl_FindPopupFromItemId( pPopupMenu, nItemId ); if ( pPopup ) return pPopup->GetItemCommand( nItemId ); else - return ::rtl::OUString(); + return OUString(); } /*************************************************************************/ @@ -318,7 +318,7 @@ ContextMenuHelper::executePopupMenu( if ( nResult > 0 ) { - ::rtl::OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult ); + OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult ); if ( !aCommand.isEmpty() ) dispatchCommand( xFrame, aCommand ); } @@ -330,7 +330,7 @@ ContextMenuHelper::executePopupMenu( bool ContextMenuHelper::dispatchCommand( const uno::Reference< ::frame::XFrame >& rFrame, - const ::rtl::OUString& aCommandURL ) + const OUString& aCommandURL ) { if ( !m_xURLTransformer.is() ) { @@ -412,7 +412,7 @@ ContextMenuHelper::associateUIConfigurationManagers() frame::ModuleManager::create( ::comphelper::getProcessComponentContext() ) ); uno::Reference< ui::XImageManager > xModuleImageManager; - rtl::OUString aModuleId; + OUString aModuleId; // retrieve module image manager aModuleId = xModuleManager->identify( xFrame ); @@ -456,14 +456,14 @@ ContextMenuHelper::associateUIConfigurationManagers() } Image -ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const +ContextMenuHelper::getImageFromCommandURL( const OUString& aCmdURL ) const { Image aImage; sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL| ui::ImageType::SIZE_DEFAULT ); uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq; - uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 ); + uno::Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCmdURL; if ( m_xDocImageMgr.is() ) @@ -509,11 +509,11 @@ ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) cons return aImage; } -rtl::OUString +OUString ContextMenuHelper::getLabelFromCommandURL( - const ::rtl::OUString& aCmdURL ) const + const OUString& aCmdURL ) const { - ::rtl::OUString aLabel; + OUString aLabel; if ( m_xUICommandLabels.is() ) { @@ -521,7 +521,7 @@ ContextMenuHelper::getLabelFromCommandURL( { if ( !aCmdURL.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; uno::Sequence< beans::PropertyValue > aPropSeq; uno::Any a( m_xUICommandLabels->getByName( aCmdURL )); if ( a >>= aPropSeq ) @@ -576,7 +576,7 @@ ContextMenuHelper::completeMenuProperties( completeMenuProperties( pPopupMenu ); if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { - ::rtl::OUString aCmdURL( pMenu->GetItemCommand( nId )); + OUString aCmdURL( pMenu->GetItemCommand( nId )); if ( bShowMenuImages ) { @@ -590,7 +590,7 @@ ContextMenuHelper::completeMenuProperties( if ( pMenu->GetItemText( nId ).Len() == 0 ) { - ::rtl::OUString aLabel( getLabelFromCommandURL( aCmdURL )); + OUString aLabel( getLabelFromCommandURL( aCmdURL )); pMenu->SetItemText( nId, aLabel ); } diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 5e42e7150d34..6070041dd7af 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -155,7 +155,7 @@ throw ( RuntimeException ) bindListener(); } -void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) +void FrameStatusListener::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -186,7 +186,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) ); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -263,7 +263,7 @@ void FrameStatusListener::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch (const Exception&) { diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 6841e3136d77..73bbeb0f2083 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -53,7 +53,7 @@ GenericToolboxController::GenericToolboxController( const Reference< XMultiServi const Reference< XFrame >& rFrame, ToolBox* pToolbox, sal_uInt16 nID, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbox( pToolbox ) , m_nID( nID ) @@ -86,7 +86,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - ::rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -142,7 +142,7 @@ throw ( RuntimeException ) TriState eTri = STATE_NOCHECK; sal_Bool bValue = sal_Bool(); - rtl::OUString aStrValue; + OUString aStrValue; ItemStatus aItemState; if ( Event.State >>= bValue ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 204ed20d4b9f..e3e0af5ef953 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -55,9 +55,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo ,m_bNeedInitialization( false ) ,m_aContext(_rxContext) { - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, + registerProperty(OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, &m_sTitle, getCppuType(&m_sTitle)); - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, + registerProperty(OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, &m_xParent, getCppuType(&m_xParent)); } @@ -98,10 +98,10 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException) } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -147,13 +147,13 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& } //------------------------------------------------------------------------- -void SAL_CALL OGenericUnoDialog::setTitle( const ::rtl::OUString& _rTitle ) throw(RuntimeException) +void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException) { UnoDialogEntryGuard aGuard( *this ); try { - setPropertyValue(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle)); + setPropertyValue(OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle)); } catch(RuntimeException&) { @@ -215,7 +215,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException) if (m_bExecuting) throw RuntimeException( - ::rtl::OUString( "already executing the dialog (recursive call)" ), + OUString( "already executing the dialog (recursive call)" ), *this ); @@ -307,7 +307,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); const Any* pArguments = aArguments.getConstArray(); for (sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments) diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index 5de9580fd3fa..406367971782 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; using namespace unographic; -using rtl::OUString; namespace sdecl = comphelper::service_decl; diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 140f37aa4060..c369bf8a2814 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -39,7 +39,6 @@ //_________________________________________________________________________________________________________________ // -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; @@ -110,10 +109,10 @@ void SAL_CALL PopupMenuControllerBase::disposing() // XServiceInfo -sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - const Sequence< rtl::OUString > aSNL( getSupportedServiceNames() ); - const rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -158,7 +157,7 @@ void SAL_CALL PopupMenuControllerBase::select( const awt::MenuEvent& rEvent ) th } } -void PopupMenuControllerBase::dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) +void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) { osl::MutexGuard aLock( m_aMutex ); @@ -206,7 +205,7 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::sta updateCommand( m_aCommandURL ); } -void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rCommandURL ) +void SAL_CALL PopupMenuControllerBase::updateCommand( const OUString& rCommandURL ) { osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); @@ -229,7 +228,7 @@ void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rComm Reference< XDispatch > SAL_CALL PopupMenuControllerBase::queryDispatch( const URL& /*aURL*/, - const rtl::OUString& /*sTarget*/, + const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { @@ -312,12 +311,12 @@ throw( ::com::sun::star::uno::RuntimeException ) rBHelper.removeListener( ::getCppuType( &xControl ), xControl ); } -::rtl::OUString PopupMenuControllerBase::determineBaseURL( const ::rtl::OUString& aURL ) +OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL ) { // Just use the main part of the URL for popup menu controllers sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); - rtl::OUString aMainURL( "vnd.sun.star.popup:" ); + OUString aMainURL( "vnd.sun.star.popup:" ); nSchemePart = aURL.indexOf( ':' ); if (( nSchemePart > 0 ) && @@ -342,7 +341,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum if ( !bInitalized ) { PropertyValue aPropValue; - rtl::OUString aCommandURL; + OUString aCommandURL; Reference< XFrame > xFrame; for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -386,7 +385,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu URL aTargetURL; aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); - m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); impl_setPopupMenu(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 0fbed242396c..c5ae27a27b40 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -26,7 +26,6 @@ #include "svtools/popupwindowcontroller.hxx" #include "svtools/toolbarmenu.hxx" -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index a6289f9f3f28..cee30a4f2d63 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -47,7 +47,7 @@ namespace svt StatusbarController::StatusbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const ::rtl::OUString& aCommandURL, + const OUString& aCommandURL, unsigned short nID ) : OWeakObject() , m_bInitialized( sal_False ) @@ -274,7 +274,7 @@ throw ( RuntimeException ) Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 ) { - rtl::OUString aStrValue; + OUString aStrValue; StatusBar* pStatusBar = (StatusBar *)pWindow; if ( Event.State >>= aStrValue ) @@ -340,7 +340,7 @@ void SAL_CALL StatusbarController::doubleClick() throw (::com::sun::star::uno::R execute( aArgs ); } -void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL ) +void StatusbarController::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -371,7 +371,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL ) Reference< XURLTransformer > xURLTransformer = getURLTransformer(); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -450,7 +450,7 @@ void StatusbarController::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch ( Exception& ) { @@ -524,7 +524,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com: { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -562,7 +562,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com: } void StatusbarController::execute( - const rtl::OUString& aCommandURL, + const OUString& aCommandURL, const Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) { Reference< XDispatch > xDispatch; @@ -591,7 +591,7 @@ void StatusbarController::execute( Reference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY ); if ( xDispatchProvider.is() ) - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } } } diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 59d1f6f22d6e..daaa2d405d32 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -99,14 +99,14 @@ void SVTXGridControl::SetWindow( Window* pWindow ) void SVTXGridControl::impl_checkColumnIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_columnIndex ) const { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= i_table.GetColumnCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SVTXGridControl* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } // --------------------------------------------------------------------------------------------------------------------- void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_rowIndex ) const { if ( ( i_rowIndex < 0 ) || ( i_rowIndex >= i_table.GetRowCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SVTXGridControl* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } // --------------------------------------------------------------------------------------------------------------------- @@ -184,7 +184,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSel } // --------------------------------------------------------------------------------------------------------------------- -void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) +void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -402,7 +402,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An { Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY ); if ( !xDataModel.is() ) - throw GridInvalidDataException( ::rtl::OUString( "Invalid data model." ), *this ); + throw GridInvalidDataException( OUString( "Invalid data model." ), *this ); m_pTableModel->setDataModel( xDataModel ); impl_checkTableModelInit(); @@ -414,7 +414,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An // obtain new col model Reference< XGridColumnModel > const xColumnModel( aValue, UNO_QUERY ); if ( !xColumnModel.is() ) - throw GridInvalidModelException( ::rtl::OUString( "Invalid column model." ), *this ); + throw GridInvalidModelException( OUString( "Invalid column model." ), *this ); // remove all old columns m_pTableModel->removeAllColumns(); @@ -468,7 +468,7 @@ namespace } } -Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) +Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 2d320f58538e..e406b7be0025 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -95,8 +95,8 @@ public: virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index becdcd04bbbf..4992c16c8c1e 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -36,7 +36,6 @@ const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE = 1; const char TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE[] = "SupportsVisible"; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::awt; @@ -63,7 +62,7 @@ struct ToolboxController_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; - rtl::OUString m_sModuleName; + OUString m_sModuleName; sal_uInt16 m_nToolBoxId; DECL_STATIC_LINK( ToolboxController_Impl, ExecuteHdl_Impl, DispatchInfo* ); @@ -77,7 +76,7 @@ ToolboxController::ToolboxController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const ::rtl::OUString& aCommandURL ) : + const OUString& aCommandURL ) : OPropertyContainer(GetBroadcastHelper()) , OWeakObject() , m_bSupportVisible(sal_False) @@ -88,7 +87,7 @@ ToolboxController::ToolboxController( , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) { - registerProperty(rtl::OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -112,7 +111,7 @@ ToolboxController::ToolboxController() : , m_bDisposed( sal_False ) , m_aListenerContainer( m_aMutex ) { - registerProperty(rtl::OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -148,7 +147,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const { try { - xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )),UNO_QUERY); + xLayoutManager.set(xPropSet->getPropertyValue( OUString( "LayoutManager" )),UNO_QUERY); } catch ( Exception& ) { @@ -351,7 +350,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) { Reference< XDispatch > xDispatch; - ::rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -380,7 +379,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence<PropertyValue> aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = rtl::OUString( "KeyModifier" ); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value = makeAny( KeyModifier ); aTargetURL.Complete = aCommandURL; @@ -416,7 +415,7 @@ throw (::com::sun::star::uno::RuntimeException) return Reference< XWindow >(); } -void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) +void ToolboxController::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -447,7 +446,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) m_pImpl->m_xUrlTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -482,7 +481,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) } } -void ToolboxController::removeStatusListener( const rtl::OUString& aCommandURL ) +void ToolboxController::removeStatusListener( const OUString& aCommandURL ) { SolarMutexGuard aSolarMutexGuard; @@ -553,7 +552,7 @@ void ToolboxController::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch ( Exception& ) { @@ -665,7 +664,7 @@ void ToolboxController::updateStatus() bindListener(); } -void ToolboxController::updateStatus( const rtl::OUString aCommandURL ) +void ToolboxController::updateStatus( const OUString aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -685,7 +684,7 @@ void ToolboxController::updateStatus( const rtl::OUString aCommandURL ) aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) m_pImpl->m_xUrlTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } } @@ -716,7 +715,7 @@ Reference< ::com::sun::star::awt::XWindow > ToolboxController::getParent() const return m_pImpl->m_xParentWindow; } -const rtl::OUString& ToolboxController::getModuleName() const +const OUString& ToolboxController::getModuleName() const { return m_pImpl->m_sModuleName; } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 692b23a9a9c2..a403e317b5ae 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -41,7 +41,6 @@ #include <map> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -95,7 +94,7 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); DECL_LINK(OnSelectionChangeHdl, void *); DECL_LINK(OnExpandingHdl, void *); @@ -707,7 +706,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com:: // -------------------------------------------------------------------- -void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL ) @@ -745,7 +744,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com: // -------------------------------------------------------------------- -void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL ) @@ -980,7 +979,7 @@ bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry ) return true; } -bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ) +bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText ) { if( mpTreeImpl && pEntry && pEntry->mxNode.is() ) try { @@ -1282,7 +1281,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere // ::com::sun::star::awt::XVclWindowPeer // -------------------------------------------------------------------- -void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) +void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -1385,7 +1384,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An } } -Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) +Any TreeControlPeer::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -1454,7 +1453,7 @@ void TreeControlPeer::onChangeRootDisplayed( sal_Bool bIsRootDisplayed ) } } -bool TreeControlPeer::loadImage( const ::rtl::OUString& rURL, Image& rImage ) +bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) { if( !mxGraphicProvider.is() ) { @@ -1571,7 +1570,7 @@ sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) // -------------------------------------------------------------------- -sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false; } @@ -1581,7 +1580,7 @@ sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OU // ==================================================================== UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) -: SvLBoxString(pEntry, 0, rtl::OUString()) +: SvLBoxString(pEntry, 0, OUString()) { } diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 4610b9540efd..8e3dcf77fd5d 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -75,10 +75,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTreeControl - virtual ::rtl::OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultExpandedGraphicURL( const ::rtl::OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultCollapsedGraphicURL( const ::rtl::OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeExpanded( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeCollapsed( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL makeNodeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException); @@ -112,8 +112,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); private: UnoTreeListEntry* getEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (::com::sun::star::lang::IllegalArgumentException ); @@ -121,7 +121,7 @@ private: void disposeControl(); bool onEditingEntry( UnoTreeListEntry* pEntry ); - bool onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ); + bool onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText ); void eraseTree( UnoTreeListBoxImpl& rTree ); void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel ); @@ -134,7 +134,7 @@ private: void updateNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bRecursive ); void updateChildNodes( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry ); - ::rtl::OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); + OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (::com::sun::star::uno::RuntimeException ); void ChangeNodesSelection( const ::com::sun::star::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); @@ -151,7 +151,7 @@ private: void addEntry( UnoTreeListEntry* pEntry ); void removeEntry( UnoTreeListEntry* pEntry ); - bool loadImage( const ::rtl::OUString& rURL, Image& rImage ); + bool loadImage( const OUString& rURL, Image& rImage ); private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >mxDataModel; @@ -161,8 +161,8 @@ private: sal_Bool mbIsRootDisplayed; UnoTreeListBoxImpl* mpTreeImpl; sal_Int32 mnEditLock; - ::rtl::OUString msDefaultCollapsedGraphicURL; - ::rtl::OUString msDefaultExpandedGraphicURL; + OUString msDefaultCollapsedGraphicURL; + OUString msDefaultExpandedGraphicURL; Image maDefaultExpandedImage; Image maDefaultCollapsedImage; TreeNodeMap* mpTreeNodeMap; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index ada18afb5981..0f967fe45709 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -35,8 +35,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; using ::cppu::WeakImplHelper2; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const sal_Char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace"; diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 2ee6782004f1..48e6319e6a70 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -267,7 +267,7 @@ namespace svt { namespace table //------------------------------------------------------------------------------------------------------------------ String UnoGridColumnFacade::getName() const { - ::rtl::OUString sName; + OUString sName; ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", sName ); try { @@ -297,7 +297,7 @@ namespace svt { namespace table //------------------------------------------------------------------------------------------------------------------ String UnoGridColumnFacade::getHelpText() const { - ::rtl::OUString sHelpText; + OUString sHelpText; ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", sHelpText ); try { diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 43612825ac3f..658623f8ca53 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -210,7 +210,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen maTextListeners.removeInterface( l ); } -void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -227,7 +227,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun } } -void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -239,22 +239,22 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel } } -::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) aText = pEdit->GetText( meLineEndType ); return aText; } -::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); if ( pMultiLineEdit) aText = pMultiLineEdit->GetSelected( meLineEndType ); @@ -321,11 +321,11 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0; } -::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) aText = pEdit->GetTextLines( meLineEndType ); @@ -407,7 +407,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven } } -void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -463,7 +463,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -562,7 +562,7 @@ IMPL_XTYPEPROVIDER_START( VCLXFileControl ) VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -612,7 +612,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference maTextListeners.removeInterface( l ); } -void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -627,7 +627,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun:: } } -void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -639,22 +639,22 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, } } -::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; } -::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl) aText = pFileControl->GetEdit().GetSelected(); @@ -831,7 +831,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow ) } // -------------------------------------------------------------------------------------- -void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -956,7 +956,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const } // -------------------------------------------------------------------------------------- -::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1053,12 +1053,12 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const rValue >>= d; String sConverted; pFormatter->GetOutputString(d, 0, sConverted, &pDum); - aReturn <<= ::rtl::OUString( sConverted ); + aReturn <<= OUString( sConverted ); } break; case ::com::sun::star::uno::TypeClass_STRING: { - ::rtl::OUString aStr; + OUString aStr; rValue >>= aStr; String sValue = aStr; if (pField->TreatingAsNumber()) @@ -1186,7 +1186,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu break; case ::com::sun::star::uno::TypeClass_STRING: { - ::rtl::OUString aStr; + OUString aStr; aConverted >>= aStr; pField->SetDefaultText( aStr ); } @@ -1209,7 +1209,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu if (pField->TreatingAsNumber()) aReturn <<= pField->GetDefaultValue(); else - aReturn <<= ::rtl::OUString( pField->GetDefaultText() ); + aReturn <<= OUString( pField->GetDefaultText() ); return aReturn; } @@ -1241,7 +1241,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) ::com::sun::star::uno::Any aReturn; if (!pField->TreatingAsNumber()) { - ::rtl::OUString sText = pField->GetTextValue(); + OUString sText = pField->GetTextValue(); aReturn <<= sText; } else @@ -1276,7 +1276,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) { DBG_ASSERT(rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !"); - ::rtl::OUString sText; + OUString sText; rValue >>= sText; String aStr( sText ); if (!pField->TreatingAsNumber()) @@ -1449,12 +1449,12 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE xRoadmapItem = evt.Source; sal_Int32 nID = 0; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(OUString( "ID" )); aValue >>= nID; ::com::sun::star::uno::Any rVal = evt.NewValue; evt.NewValue >>= rVal; - ::rtl::OUString sPropertyName = evt.PropertyName; + OUString sPropertyName = evt.PropertyName; if ( sPropertyName == "Enabled" ) { sal_Bool bEnable = false; @@ -1463,7 +1463,7 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE } else if ( sPropertyName == "Label" ) { - ::rtl::OUString sLabel; + OUString sLabel; evt.NewValue >>= sLabel; pField->ChangeRoadmapItemLabel( (RoadmapTypes::ItemId)nID , sLabel ); } @@ -1498,11 +1498,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); if ( xPropertySet.is() ) { - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Label" )); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(OUString( "Label" )); aValue >>= aCurRMItemData.Label; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); + aValue = xPropertySet->getPropertyValue(OUString( "ID" )); aValue >>= aCurRMItemData.n_ID; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Enabled" )); + aValue = xPropertySet->getPropertyValue(OUString( "Enabled" )); aValue >>= aCurRMItemData.b_Enabled; } return aCurRMItemData; @@ -1549,7 +1549,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE // -------------------------------------------------------------------------------------- -void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1585,7 +1585,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com: case BASEPROPERTY_TEXT: { - ::rtl::OUString aStr; + OUString aStr; Value >>= aStr; pField->SetText( aStr ); pField->Invalidate(); @@ -1604,7 +1604,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com: // -------------------------------------------------------------------------------------- -::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1980,7 +1980,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim return pField ? pField->IsStrictFormat() : sal_False; } -void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXCurrencyField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1994,7 +1994,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_CURRENCYSYMBOL: { - ::rtl::OUString aStr; + OUString aStr; Value >>= aStr; pField->setCurrencySymbol( aStr ); } @@ -2015,7 +2015,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const SVTXFormattedField::setProperty(PropertyName, Value); } -::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2029,7 +2029,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_CURRENCYSYMBOL: { - aReturn <<= ::rtl::OUString( pField->getCurrencySymbol() ); + aReturn <<= OUString( pField->getCurrencySymbol() ); } break; case BASEPROPERTY_CURSYM_POSITION: @@ -2198,7 +2198,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept } // ::com::sun::star::awt::VclWindowPeer -void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2256,7 +2256,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const :: } } -::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2314,7 +2314,7 @@ SVTXDateField::~SVTXDateField() { } -void SAL_CALL SVTXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { VCLXDateField::setProperty( PropertyName, Value ); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index a3272144fa68..d08a734e26f3 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -109,9 +109,9 @@ public: virtual Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); private: static PropertySetInfo* createPropertySetInfo( sal_uInt16 nType ); @@ -119,11 +119,11 @@ private: sal_uInt16 mnType; - ::rtl::OUString maURL; - ::rtl::OUString maAltText; - ::rtl::OUString maDesc; - ::rtl::OUString maTarget; - ::rtl::OUString maName; + OUString maURL; + OUString maAltText; + OUString maDesc; + OUString maTarget; + OUString maName; sal_Bool mbIsActive; awt::Rectangle maBoundary; awt::Point maCenter; @@ -141,11 +141,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aPolygonObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Polygon" ), HANDLE_POLYGON, SEQTYPE(::getCppuType((const PointSequence*)0)), 0, 0 }, {0,0,0,0,0,0} @@ -157,11 +157,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aCircleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Center" ), HANDLE_CENTER, &::getCppuType((const awt::Point*)0), 0, 0 }, { MAP_LEN( "Radius" ), HANDLE_RADIUS, &::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -175,11 +175,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aRectangleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Boundary" ), HANDLE_BOUNDARY, &::getCppuType((const awt::Rectangle*)0), 0, 0 }, {0,0,0,0,0,0} @@ -384,10 +384,10 @@ uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId() // XServiceInfo -sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); const sal_Int32 nCount = aSNL.getLength(); for( sal_Int32 i = 0; i < nCount; i++ ) @@ -397,38 +397,38 @@ sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const ::rtl::OUString& return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.image.ImageMapObject" ); + Sequence< OUString > aSNS( 2 ); + aSNS.getArray()[0] = OUString("com.sun.star.image.ImageMapObject" ); switch( mnType ) { case IMAP_OBJ_POLYGON: default: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapPolygonObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapPolygonObject" ); break; case IMAP_OBJ_RECTANGLE: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapRectangleObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapRectangleObject" ); break; case IMAP_OBJ_CIRCLE: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapCircleObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapCircleObject" ); break; } return aSNS; } -::rtl::OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException) +OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException) { switch( mnType ) { case IMAP_OBJ_POLYGON: default: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapPolygonObject"); + return OUString("org.openoffice.comp.svt.ImageMapPolygonObject"); case IMAP_OBJ_CIRCLE: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapCircleObject"); + return OUString("org.openoffice.comp.svt.ImageMapCircleObject"); case IMAP_OBJ_RECTANGLE: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapRectangleObject"); + return OUString("org.openoffice.comp.svt.ImageMapRectangleObject"); } } @@ -571,12 +571,12 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw( RuntimeException ); // XSerivceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); private: - ::rtl::OUString maName; + OUString maName; std::list< SvUnoImageMapObject* > maObjectList; }; @@ -718,17 +718,17 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException) } // XSerivceInfo -::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName( ) +OUString SAL_CALL SvUnoImageMap::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); + return OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); } -sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); const sal_Int32 nCount = aSNL.getLength(); for( sal_Int32 i = 0; i < nCount; i++ ) @@ -738,11 +738,11 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& Service return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) throw(RuntimeException) { - const ::rtl::OUString aSN( "com.sun.star.image.ImageMap" ); - return Sequence< ::rtl::OUString >( &aSN, 1 ); + const OUString aSN( "com.sun.star.image.ImageMap" ); + return Sequence< OUString >( &aSN, 1 ); } sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx index 1ef6f7d1a6d0..4ec9a4798a34 100644 --- a/svtools/source/uno/unowizard.hxx +++ b/svtools/source/uno/unowizard.hxx @@ -49,14 +49,14 @@ namespace svt { namespace uno Wizard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // ::com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static() throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw(::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static() throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); protected: // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); @@ -66,8 +66,8 @@ namespace svt { namespace uno virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // ::com::sun::star::ui::dialogs::XWizard - virtual ::rtl::OUString SAL_CALL getHelpURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpURL( const ::rtl::OUString& _helpurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getDialogWindow() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > SAL_CALL getCurrentPage( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, ::sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); @@ -81,7 +81,7 @@ namespace svt { namespace uno virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, ::sal_Bool Final ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization @@ -98,7 +98,7 @@ namespace svt { namespace uno ::comphelper::ComponentContext m_aContext; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > > m_aWizardSteps; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; }; //...................................................................................................................... diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index d2b3838e7fb2..963853c0bd8e 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -121,13 +121,13 @@ namespace svt { namespace uno { // need at least one path if ( i_rPaths.getLength() == 0 ) - throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 ); + throw IllegalArgumentException( OUString(), i_rContext, 2 ); // each path must be of length 1, at least for ( sal_Int32 i = 0; i < i_rPaths.getLength(); ++i ) { if ( i_rPaths[i].getLength() == 0 ) - throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 ); + throw IllegalArgumentException( OUString(), i_rContext, 2 ); // page IDs must be in ascending order sal_Int16 nPreviousPageID = i_rPaths[i][0]; @@ -135,12 +135,12 @@ namespace svt { namespace uno { if ( i_rPaths[i][j] <= nPreviousPageID ) { - ::rtl::OStringBuffer message; + OStringBuffer message; message.append( "Path " ); message.append( i ); message.append( ": invalid page ID sequence - each page ID must be greater than the previous one." ); throw IllegalArgumentException( - ::rtl::OStringToOUString( message.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ), + OStringToOUString( message.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ), i_rContext, 2 ); } nPreviousPageID = i_rPaths[i][j]; @@ -157,7 +157,7 @@ namespace svt { namespace uno { if ( i_rPaths[i][0] != nFirstPageId ) throw IllegalArgumentException( - ::rtl::OUString( "All paths must start with the same page id." ), + OUString( "All paths must start with the same page id." ), i_rContext, 2 ); } } @@ -168,15 +168,15 @@ namespace svt { namespace uno { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); if ( i_Arguments.getLength() != 2 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, -1 ); + throw IllegalArgumentException( OUString(), *this, -1 ); // the second argument must be a XWizardController, for each constructor m_xController.set( i_Arguments[1], UNO_QUERY ); if ( !m_xController.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); // the first arg is either a single path (short[]), or multiple paths (short[][]) Sequence< sal_Int16 > aSinglePath; @@ -196,21 +196,21 @@ namespace svt { namespace uno m_bInitialized = true; } - static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) + static OString lcl_getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId ) + static OUString lcl_getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( - rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); + OUStringBuffer aBuffer; + OUString aTmp( + OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); @@ -237,27 +237,27 @@ namespace svt { namespace uno } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException) + OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.svtools.uno.Wizard" ); + return OUString( "com.sun.star.comp.svtools.uno.Wizard" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices(1); - aServices[0] = ::rtl::OUString( "com.sun.star.ui.dialogs.Wizard" ); + Sequence< OUString > aServices(1); + aServices[0] = OUString( "com.sun.star.ui.dialogs.Wizard" ); return aServices; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException) + OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -283,7 +283,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException) + OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -295,7 +295,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL Wizard::setHelpURL( const ::rtl::OUString& i_HelpURL ) throw (RuntimeException) + void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,10 +374,10 @@ namespace svt { namespace uno ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::enablePage: invalid dialog implementation!" ); if ( !pWizardImpl->knowsPage( i_PageID ) ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); if ( i_PageID == pWizardImpl->getCurrentPage() ) - throw InvalidStateException( ::rtl::OUString(), *this ); + throw InvalidStateException( OUString(), *this ); pWizardImpl->enablePage( i_PageID, i_Enable ); } @@ -437,7 +437,7 @@ namespace svt { namespace uno ::osl::MutexGuard aGuard( m_aMutex ); if ( ( i_PathIndex < 0 ) || ( i_PathIndex >= m_aWizardSteps.getLength() ) ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog ); ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::activatePath: invalid dialog implementation!" ); @@ -446,7 +446,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL Wizard::setTitle( const ::rtl::OUString& i_Title ) throw (RuntimeException) + void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException) { // simply disambiguate Wizard_Base::OGenericUnoDialog::setTitle( i_Title ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 263404c171de..e57c194b8870 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -40,7 +40,7 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const sString += TOKEN_SEPARATOR; sString += OUString::number( aSizePixel.Height() ); - rtl::OString sOut(rtl::OUStringToOString(sString, + OString sOut(OUStringToOString(sString, RTL_TEXTENCODING_UTF8)); rOStm.Write(sOut.getStr(), sOut.getLength()); |