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/inc | |
| 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/inc')
58 files changed, 238 insertions, 238 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: |