From 8a0685d49f679d6f98de2f357f1ec74590573852 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 29 Apr 2012 23:36:57 +0100
Subject: make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
---
cui/source/dialogs/about.cxx | 6 +++---
cui/source/dialogs/insrc.cxx | 4 ++--
cui/source/inc/about.hxx | 2 +-
cui/source/inc/dialmgr.hxx | 2 +-
cui/source/options/certpath.cxx | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'cui/source')
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21473b70a972..1667ea11e4d7 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -78,7 +78,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ),
aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ),
- aVersionTextStr(ResId::toString(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())).trim()),
+ m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())),
@@ -86,7 +86,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())),
m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())),
m_aLicenseLinkStr(ResId( ABOUT_STR_LINK_LICENSE, *rId.GetResMgr())),
- m_sBuildStr(ResId::toString(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))),
+ m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr())),
m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr()))
{
// Populate text items
@@ -368,7 +368,7 @@ rtl::OUString AboutDialog::GetBuildId()
rtl::OUString AboutDialog::GetVersionString()
{
- rtl::OUString sVersion = aVersionTextStr;
+ rtl::OUString sVersion = m_aVersionTextStr;
rtl::OUString sBuildId = GetBuildId();
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 279dba93d665..643f6d6432dd 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -50,8 +50,8 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString&
aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ),
aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ),
aPosFL( this, CUI_RES( FL_POS ) ),
- aRow(ResId::toString(CUI_RES(STR_ROW))),
- aCol(ResId::toString(CUI_RES(STR_COL))),
+ aRow(CUI_RESSTR(STR_ROW)),
+ aCol(CUI_RESSTR(STR_COL)),
aOKBtn( this, CUI_RES( BT_OK ) ),
aCancelBtn( this, CUI_RES( BT_CANCEL ) ),
aHelpBtn( this, CUI_RES( BT_HELP ) ),
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index a666c1a3991b..fb876a5efd56 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -57,7 +57,7 @@ private:
CancelButton aCancelButton;
String aVersionData;
- rtl::OUString aVersionTextStr;
+ rtl::OUString m_aVersionTextStr;
String m_aVendorTextStr;
String m_aCopyrightTextStr;
String m_aBasedTextStr;
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 9737fbb6419a..a2e33d4c46f5 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -36,7 +36,7 @@
#define CUI_MGR() (*CuiResMgr::GetResMgr())
#define CUI_RES(i) ResId(i,CUI_MGR())
-#define CUI_RESSTR(i) ResId::toString(ResId(i,CUI_MGR()))
+#define CUI_RESSTR(i) CUI_RES(i).toString()
class ResMgr;
struct CuiResMgr
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index b2201255d04b..417ab1f98191 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -55,8 +55,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
, m_aOKBtn ( this, CUI_RES( PB_OK ) )
, m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) )
, m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
- , m_sAddDialogText(ResId::toString(CUI_RES(STR_ADDDLGTEXT)))
- , m_sManual(ResId::toString(CUI_RES(STR_MANUAL)))
+ , m_sAddDialogText(CUI_RESSTR(STR_ADDDLGTEXT))
+ , m_sManual(CUI_RESSTR(STR_MANUAL))
{
static long aStaticTabs[]=
{
@@ -65,8 +65,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs );
- rtl::OUString sProfile(ResId::toString(CUI_RES(STR_PROFILE)));
- rtl::OUString sDirectory(ResId::toString(CUI_RES(STR_DIRECTORY)));
+ rtl::OUString sProfile(CUI_RESSTR(STR_PROFILE));
+ rtl::OUString sDirectory(CUI_RESSTR(STR_DIRECTORY));
rtl::OUStringBuffer sHeader;
sHeader.append('\t').append(sProfile).append('\t').append(sDirectory);
--
cgit