diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-29 23:36:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-30 11:22:09 +0100 |
| commit | 8a0685d49f679d6f98de2f357f1ec74590573852 (patch) | |
| tree | 97eb05105a45186049c1c3dad20233c29747ed9c /tools/inc | |
| parent | SVG: text elements and graphic elements should not share style ids (diff) | |
| download | core-8a0685d49f679d6f98de2f357f1ec74590573852.tar.gz core-8a0685d49f679d6f98de2f357f1ec74590573852.zip | |
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
Diffstat (limited to 'tools/inc')
| -rw-r--r-- | tools/inc/tools/config.hxx | 14 | ||||
| -rw-r--r-- | tools/inc/tools/resid.hxx | 10 |
2 files changed, 11 insertions, 13 deletions
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 59b813a83344..a40111838235 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -41,14 +41,14 @@ struct ImplGroupData; class TOOLS_DLLPUBLIC Config { private: - XubString maFileName; - rtl::OString maGroupName; + rtl::OUString maFileName; + rtl::OString maGroupName; ImplConfigData* mpData; ImplGroupData* mpActGroup; - sal_uIntPtr mnDataUpdateId; - sal_uInt16 mnLockCount; - sal_Bool mbPersistence; - sal_Bool mbDummy1; + sal_uIntPtr mnDataUpdateId; + sal_uInt16 mnLockCount; + sal_Bool mbPersistence; + sal_Bool mbDummy1; #ifdef _CONFIG_CXX TOOLS_DLLPRIVATE sal_Bool ImplUpdateConfig() const; @@ -59,7 +59,7 @@ public: Config( const XubString& rFileName ); ~Config(); - const XubString& GetPathName() const { return maFileName; } + const rtl::OUString& GetPathName() const { return maFileName; } void SetGroup(const rtl::OString& rGroup); const rtl::OString& GetGroup() const { return maGroupName; } diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx index 2230556354ae..a96c1e21f5ef 100644 --- a/tools/inc/tools/resid.hxx +++ b/tools/inc/tools/resid.hxx @@ -29,8 +29,9 @@ #ifndef _TOOLS_RESID_HXX #define _TOOLS_RESID_HXX -#include <tools/solar.h> #include <osl/diagnose.h> +#include <rtl/ustring.hxx> +#include <tools/solar.h> #include "tools/toolsdllapi.h" struct RSHEADER_TYPE; @@ -44,10 +45,6 @@ class ResMgr; //- ResId - //--------- -namespace rtl { - class OUString; -} - class ResId { /* @@ -164,7 +161,8 @@ class ResId sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } RSHEADER_TYPE* GetpResource() const { return m_pResource; } - static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& rId); + TOOLS_DLLPUBLIC rtl::OUString toString() const; + TOOLS_DLLPUBLIC operator rtl::OUString() const { return toString(); } }; #endif // _RESID_HXX |