[Libreoffice-commits] .: 2 commits - basctl/source chart2/source cui/source dbaccess/source desktop/source editeng/inc editeng/source fpicker/source framework/inc framework/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source starmath/inc starmath/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source tools/inc tools/source uui/source vcl/inc vcl/source vcl/unx writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 30 03:22:54 PDT 2012
basctl/source/basicide/baside2.cxx | 14 +-
basctl/source/basicide/baside3.cxx | 26 +--
basctl/source/basicide/basides1.cxx | 4
basctl/source/basicide/basides2.cxx | 4
basctl/source/basicide/basidesh.cxx | 2
basctl/source/basicide/basobj2.cxx | 4
basctl/source/basicide/basobj3.cxx | 4
basctl/source/basicide/bastype2.cxx | 8 -
basctl/source/basicide/bastypes.cxx | 6
basctl/source/basicide/macrodlg.cxx | 4
basctl/source/basicide/moduldl2.cxx | 40 ++---
basctl/source/basicide/moduldlg.cxx | 16 +-
basctl/source/basicide/scriptdocument.cxx | 12 -
basctl/source/dlged/dlgedobj.cxx | 2
basctl/source/dlged/managelang.cxx | 12 -
basctl/source/dlged/propbrw.cxx | 10 -
basctl/source/inc/iderid.hxx | 1
chart2/source/controller/dialogs/DataBrowser.cxx | 2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 98 +++++++-------
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/inc/ResId.hxx | 4
chart2/source/tools/InternalData.cxx | 4
chart2/source/tools/RegressionCurveHelper.cxx | 10 -
chart2/source/tools/ResId.cxx | 10 -
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 -
dbaccess/source/ext/macromigration/migrationengine.cxx | 9 -
dbaccess/source/ui/browser/brwctrlr.cxx | 6
desktop/source/deployment/gui/dp_gui_shared.hxx | 2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 30 ++--
desktop/source/deployment/misc/dp_dependencies.cxx | 18 --
editeng/inc/editeng/eerdll.hxx | 2
editeng/inc/editeng/itemtype.hxx | 2
editeng/source/accessibility/AccessibleImageBullet.cxx | 4
editeng/source/editeng/editeng.cxx | 18 +-
editeng/source/editeng/editview.cxx | 4
editeng/source/items/optitems.cxx | 4
editeng/source/items/writingmodeitem.cxx | 2
fpicker/source/office/fpsofficeResMgr.hxx | 2
fpicker/source/office/iodlg.cxx | 4
framework/inc/classes/fwkresid.hxx | 2
framework/source/services/autorecovery.cxx | 4
sc/inc/scresid.hxx | 2
sc/source/core/data/dpobject.cxx | 2
sc/source/core/data/dpoutput.cxx | 2
sc/source/core/data/funcdesc.cxx | 8 -
sc/source/ui/dbgui/filtdlg.cxx | 20 +-
sc/source/ui/dbgui/pfiltdlg.cxx | 12 -
sc/source/ui/dbgui/pvlaydlg.cxx | 6
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 32 ++--
sc/source/ui/miscdlgs/filldlg.cxx | 2
sc/source/ui/miscdlgs/mvtabdlg.cxx | 6
sc/source/ui/namedlg/namedefdlg.cxx | 2
sc/source/ui/namedlg/namedlg.cxx | 4
sc/source/ui/view/gridwin.cxx | 8 -
sd/inc/sdresid.hxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/core/sdpage.cxx | 12 -
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 16 +-
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/sdview2.cxx | 4
sfx2/inc/sfx2/objface.hxx | 2
sfx2/inc/sfx2/sfxresid.hxx | 2
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 6
sfx2/source/doc/doctempl.cxx | 4
sfx2/source/doc/docvor.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
starmath/inc/smmod.hxx | 2
starmath/source/dialog.cxx | 4
starmath/source/parse.cxx | 2
svtools/inc/svtools/svtresid.hxx | 2
svtools/source/contnr/fileview.cxx | 24 +--
svtools/source/contnr/svtabbx.cxx | 4
svtools/source/contnr/templwin.cxx | 16 +-
svtools/source/control/calendar.cxx | 8 -
svtools/source/control/collatorres.cxx | 3
svtools/source/control/ctrlbox.cxx | 2
svtools/source/control/ctrltool.cxx | 38 +----
svtools/source/control/filectrl.cxx | 2
svtools/source/control/indexentryres.cxx | 2
svtools/source/control/tabbar.cxx | 8 -
svtools/source/dialogs/addresstemplate.cxx | 68 ++++-----
svtools/source/dialogs/filedlg2.cxx | 16 +-
svtools/source/dialogs/insdlg.cxx | 7 -
svtools/source/dialogs/prnsetup.cxx | 6
svtools/source/dialogs/roadmapwizard.cxx | 2
svtools/source/dialogs/wizardmachine.cxx | 6
svx/inc/svx/dialmgr.hxx | 2
svx/inc/svx/galmisc.hxx | 3
svx/source/dialog/langbox.cxx | 2
svx/source/form/ParseContext.cxx | 24 +--
svx/source/form/filtnav.cxx | 2
svx/source/form/fmundo.cxx | 2
svx/source/form/formcontroller.cxx | 4
svx/source/form/navigatortree.cxx | 8 -
svx/source/form/navigatortreemodel.cxx | 10 -
svx/source/gallery2/galbrws.cxx | 8 -
svx/source/gallery2/galbrws1.cxx | 10 -
svx/source/gallery2/galbrws2.cxx | 22 +--
svx/source/gallery2/galctrl.cxx | 8 -
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galmisc.cxx | 4
svx/source/gallery2/galobj.cxx | 4
svx/source/gallery2/galtheme.cxx | 2
sw/inc/swtypes.hxx | 2
sw/source/core/access/acccontext.cxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 6
sw/source/core/undo/rolbck.cxx | 4
sw/source/core/undo/undel.cxx | 2
sw/source/ui/dialog/swdlgfact.hxx | 5
sw/source/ui/dialog/swuiexp.cxx | 1
sw/source/ui/docvw/HeaderFooterWin.cxx | 4
sw/source/ui/docvw/edtwin2.cxx | 2
sw/source/ui/inc/dialmgr.hxx | 10 -
sw/source/ui/wrtsh/wrtsh1.cxx | 4
tools/inc/tools/config.hxx | 14 +-
tools/inc/tools/resid.hxx | 10 -
tools/source/rc/resmgr.cxx | 2
tools/source/string/strucvt.cxx | 12 -
uui/source/logindlg.cxx | 2
vcl/inc/vcl/stdtext.hxx | 2
vcl/source/app/stdtext.cxx | 7 -
vcl/source/app/svdata.cxx | 32 ++--
vcl/source/control/button.cxx | 3
vcl/source/gdi/outdev3.cxx | 2
vcl/source/gdi/print3.cxx | 2
vcl/source/window/brdwin.cxx | 2
vcl/source/window/menu.cxx | 8 -
vcl/source/window/msgbox.cxx | 4
vcl/source/window/printdlg.cxx | 8 -
vcl/source/window/splitwin.cxx | 2
vcl/unx/gtk/fpicker/resourceprovider.cxx | 6
writerfilter/source/rtftok/rtftokenizer.cxx | 2
143 files changed, 541 insertions(+), 570 deletions(-)
New commits:
commit f9ee230ba92309c11d1bf7a5c14d3502e86a77d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 30 11:20:05 2012 +0100
duplicate SwDialogsResMgr definition and unused macros
Change-Id: Ib7188a98230345557187b00826f33a2ad39a4f83
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 9111c35..d9190d6 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -445,7 +445,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
{
nType = FILETYPE_GRF; // If not set already
- SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK));
+ SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK).toString());
aDlg.EnableLink(sal_False);
aDlg.SetPath( sFile, sal_True );
aDlg.SetCurrentFilter( sTmpFilter );
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 2338412..75100f1 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -588,11 +588,6 @@ public:
};
-struct SwDialogsResMgr
-{
- static ResMgr* GetResMgr();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 2115ad9..051d1bf 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -31,6 +31,7 @@
#endif
#include "swdlgfact.hxx"
+#include "dialmgr.hxx"
namespace swui
{
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx
index f4533a5..562b1da 100644
--- a/sw/source/ui/inc/dialmgr.hxx
+++ b/sw/source/ui/inc/dialmgr.hxx
@@ -28,23 +28,13 @@
#ifndef _SW_DIALMGR_HXX
#define _SW_DIALMGR_HXX
-// include ---------------------------------------------------------------
-
#include <tools/resid.hxx>
-// forward ---------------------------------------------------------------
-
-class ResMgr;
-
struct SwDialogsResMgr
{
static ResMgr* GetResMgr();
};
-#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr()
-#define SW_RES(i) ResId(i,SWDIALOG_MGR())
-#define SW_RESSTR(i) ResId::toString(SW_RES(i))
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8a0685d49f679d6f98de2f357f1ec74590573852
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 29 23:36:57 2012 +0100
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 3e18278..500f377 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -127,7 +127,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
{
::rtl::OUStringBuffer aPageStr;
aPageStr.appendAscii( RTL_CONSTASCII_STRINGPARAM( " [" ) );
- aPageStr.append(ResId::toString( IDEResId( RID_STR_PAGE ) ));
+ aPageStr.append(IDE_RESSTR(RID_STR_PAGE));
aPageStr.append(' ');
aPageStr.append( nCurPage );
aPageStr.append(']');
@@ -303,7 +303,7 @@ sal_Bool ModulWindow::BasicExecute()
{
if ( !aDocument.allowMacros() )
{
- WarningBox( this, WB_OK, ResId::toString( IDEResId( RID_STR_CANNOTRUNMACRO ) ) ).Execute();
+ WarningBox( this, WB_OK, IDE_RESSTR(RID_STR_CANNOTRUNMACRO)).Execute();
return sal_False;
}
}
@@ -440,7 +440,7 @@ sal_Bool ModulWindow::LoadBasic()
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
- xFltMgr->appendFilter( ResId::toString(IDEResId( RID_STR_FILTER_ALLFILES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
+ xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) );
if( xFP->execute() == RET_OK )
@@ -468,7 +468,7 @@ sal_Bool ModulWindow::LoadBasic()
bDone = sal_True;
}
else
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_COULDNTREAD ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTREAD) ).Execute();
}
return bDone;
}
@@ -500,7 +500,7 @@ sal_Bool ModulWindow::SaveBasicSource()
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
- xFltMgr->appendFilter( ResId::toString(IDEResId( RID_STR_FILTER_ALLFILES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
+ xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) );
if( xFP->execute() == RET_OK )
@@ -677,10 +677,10 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
::rtl::OUStringBuffer aErrorTextPrefixBuf;
if( pBasic->IsCompilerError() )
- aErrorTextPrefixBuf.append(ResId::toString(IDEResId(RID_STR_COMPILEERROR)));
+ aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_COMPILEERROR));
else
{
- aErrorTextPrefixBuf.append(ResId::toString(IDEResId(RID_STR_RUNTIMEERROR)));
+ aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_RUNTIMEERROR));
aErrorTextPrefixBuf.append(StarBASIC::GetVBErrorCode(pBasic->GetErrorCode()));
aErrorTextPrefixBuf.append(' ');
pLayout->GetStackWindow().UpdateCalls();
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index a7acc1e..a1a0bf1 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -731,10 +731,10 @@ sal_Bool DialogWindow::SaveDialog()
xFP->setDefaultName( ::rtl::OUString( GetName() ) );
- ::rtl::OUString aDialogStr(ResId::toString(IDEResId(RID_STR_STDDIALOGNAME)));
+ ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) );
- xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
+ xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
xFltMgr->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK )
@@ -876,7 +876,7 @@ sal_Bool DialogWindow::SaveDialog()
}
}
else
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_COULDNTWRITE) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTWRITE)).Execute();
}
return bDone;
@@ -936,9 +936,9 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent,
maMessText = rMessage;
- AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_RENAME ) ), RET_YES,
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_RENAME), RET_YES,
BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 );
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO, 0 );
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
SetImage( QueryBox::GetStandardImage() );
@@ -960,9 +960,9 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
SetText( rTitle );
maMessText = rMessage;
- AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_ADD ) ), RET_YES,
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES,
BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_OMIT ) ), RET_NO, 0 );
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO, 0 );
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 );
@@ -993,10 +993,10 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const
if ( !aCurPath.isEmpty() )
xFP->setDisplayDirectory ( aCurPath );
- ::rtl::OUString aDialogStr(ResId::toString(IDEResId(RID_STR_STDDIALOGNAME)));
+ ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) );
- xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
+ xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
xFltMgr->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK )
@@ -1060,8 +1060,8 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const
NameClashMode eNameClashMode = NO_CLASH;
if( bDialogAlreadyExists )
{
- ::rtl::OUString aQueryBoxTitle(ResId::toString(IDEResId(RID_STR_DLGIMP_CLASH_TITLE)));
- ::rtl::OUString aQueryBoxText(ResId::toString(IDEResId(RID_STR_DLGIMP_CLASH_TEXT)));
+ ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE));
+ ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT));
aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName);
NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
@@ -1124,8 +1124,8 @@ sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const
bool bAddDialogLanguagesToLib = false;
if( nOnlyInImportLanguageCount > 0 )
{
- ::rtl::OUString aQueryBoxTitle(ResId::toString(IDEResId(RID_STR_DLGIMP_MISMATCH_TITLE)));
- ::rtl::OUString aQueryBoxText(ResId::toString(IDEResId(RID_STR_DLGIMP_MISMATCH_TEXT)));
+ ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE));
+ ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT));
LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
sal_uInt16 nRet = aQueryBox.Execute();
if( RET_YES == nRet )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 6702f93..cb18b10 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -175,7 +175,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
else
nFound = ((ModulWindow*)pCurWin)->StartSearchAndReplace( (const SvxSearchItem&)rItem );
- ::rtl::OUString aReplStr(ResId::toString(IDEResId(RID_STR_SEARCHREPLACES)));
+ ::rtl::OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES));
aReplStr = aReplStr.replaceAll("XX", rtl::OUString::valueOf(nFound));
InfoBox( pCurWin, aReplStr ).Execute();
}
@@ -203,7 +203,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
SfxViewFrame* pViewFrame = GetViewFrame();
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL;
Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL;
- QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, ResId::toString(IDEResId(RID_STR_SEARCHFROMSTART)));
+ QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART));
if ( aQuery.Execute() == RET_YES )
{
it = aIDEWindowTable.begin();
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 0e83a8e..d256b28 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -136,13 +136,13 @@ void BasicIDEShell::SetMDITitle()
aTitleBuf.append(m_aCurLibName);
}
else
- aTitleBuf.append(ResId::toString(IDEResId(RID_STR_ALL)));
+ aTitleBuf.append(IDE_RESSTR(RID_STR_ALL));
::basctl::DocumentSignature aCurSignature( m_aCurDocument );
if ( aCurSignature.getScriptingSignatureState() == SIGNATURESTATE_SIGNATURES_OK )
{
aTitleBuf.append(' ');
- aTitleBuf.append(ResId::toString(IDEResId(RID_STR_SIGNED)));
+ aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED));
aTitleBuf.append(' ');
}
::rtl::OUString aTitle(aTitleBuf.makeStringAndClear());
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index a2f9a18..3c00def 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -406,7 +406,7 @@ sal_uInt16 BasicIDEShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
if( bUI )
{
Window *pParent = &GetViewFrame()->GetWindow();
- InfoBox( pParent, ResId::toString(IDEResId(RID_STR_CANNOTCLOSE))).Execute();
+ InfoBox( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE)).Execute();
}
return sal_False;
}
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index cd9986c..1461a3e 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -179,7 +179,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
if ( rDocument.hasModule( rLibName, rNewName ) )
{
- ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
+ ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) );
aError.Execute();
return false;
}
@@ -187,7 +187,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
// #i74440
if ( rNewName.isEmpty() )
{
- ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) );
+ ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) );
aError.Execute();
return false;
}
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 338e5e0..8fa882a 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -183,7 +183,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
if ( rDocument.hasDialog( rLibName, rNewName ) )
{
- ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
+ ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) );
aError.Execute();
return false;
}
@@ -191,7 +191,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
// #i74440
if ( rNewName.isEmpty() )
{
- ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) );
+ ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) );
aError.Execute();
return false;
}
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 34a1aaf..9e78d75 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -408,10 +408,10 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt
{
::std::vector< std::pair< BasicEntryType, ::rtl::OUString > > aEntries;
- aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
- aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, ResId::toString( IDEResId( RID_STR_USERFORMS ) ) ) );
- aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, ResId::toString( IDEResId( RID_STR_NORMAL_MODULES ) ) ) );
- aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, ResId::toString( IDEResId( RID_STR_CLASS_MODULES ) ) ) );
+ aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) );
+ aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, IDE_RESSTR(RID_STR_USERFORMS) ) );
+ aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, IDE_RESSTR(RID_STR_NORMAL_MODULES) ) );
+ aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, IDE_RESSTR(RID_STR_CLASS_MODULES) ) );
::std::vector< std::pair< BasicEntryType, ::rtl::OUString > >::iterator iter;
for( iter = aEntries.begin(); iter != aEntries.end(); ++iter )
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index eb079eb..813d5bf 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent )
{
- ::rtl::OUString aQuery( ResId::toString(rId) );
+ ::rtl::OUString aQuery(rId.toString());
::rtl::OUStringBuffer aNameBuf( rName );
aNameBuf.append('\'');
aNameBuf.insert(sal_Int32(0), sal_Unicode('\''));
@@ -804,7 +804,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
// set new title
if ( bNewTitle )
{
- ::rtl::OUString aTitle(ResId::toString(IDEResId(RID_STR_ENTERPASSWORD)));
+ ::rtl::OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD));
aTitle = aTitle.replaceAll("XX", rLibName);
pDlg->SetText( aTitle );
}
@@ -826,7 +826,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
if ( !bOK )
{
- ErrorBox aErrorBox( Application::GetDefDialogParent(), WB_OK, ResId::toString( IDEResId( RID_STR_WRONGPASSWORD ) ) );
+ ErrorBox aErrorBox( Application::GetDefDialogParent(), WB_OK, IDE_RESSTR(RID_STR_WRONGPASSWORD) );
aErrorBox.Execute();
}
}
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 05e27d3..99abdbc 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -381,7 +381,7 @@ SbMethod* MacroChooser::CreateMacro()
if ( aModName.Len() )
{
// extract the module name from the string like "Sheet1 (Example1)"
- if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) )
+ if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) )
{
sal_uInt16 nIndex = 0;
aModName = aModName.GetToken( 0, ' ', nIndex );
@@ -704,7 +704,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
String aLib( aDesc.GetLibName() );
String aMod( aDesc.GetName() );
// extract the module name from the string like "Sheet1 (Example1)"
- if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) )
+ if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) )
{
sal_uInt16 nIndex = 0;
aMod = aMod.GetToken( 0, ' ', nIndex );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index d0fe408..f63a268 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -289,7 +289,7 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
::rtl::OUString aLibName = GetEntryText( pEntry, 0 );
if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_CANNOTCHANGENAMESTDLIB ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
return sal_False;
}
@@ -299,7 +299,7 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_LIBISREADONLY ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY) ).Execute();
return sal_False;
}
@@ -352,7 +352,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& r
}
catch (const container::ElementExistException& )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute();
return sal_False;
}
catch (const container::NoSuchElementException& )
@@ -365,9 +365,9 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& r
if ( !bValid )
{
if ( rNewName.getLength() > 30 )
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_LIBNAMETOLONG ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute();
else
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute();
}
return bValid;
@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
else
{
ErrorBox(this, WB_OK | WB_DEF_OK,
- ResId::toString(IDEResId(RID_STR_BADSBXNAME))).Execute();
+ IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
aEdit.GrabFocus();
}
return 0;
@@ -404,16 +404,16 @@ NewObjectDialog::NewObjectDialog(Window * pParent, NewObjectMode nMode,
switch (nMode)
{
case NEWOBJECTMODE_LIB:
- SetText( ResId::toString( IDEResId( RID_STR_NEWLIB ) ) );
+ SetText( IDE_RESSTR(RID_STR_NEWLIB) );
break;
case NEWOBJECTMODE_MOD:
- SetText( ResId::toString( IDEResId( RID_STR_NEWMOD ) ) );
+ SetText( IDE_RESSTR(RID_STR_NEWMOD) );
break;
case NEWOBJECTMODE_METH:
- SetText( ResId::toString( IDEResId( RID_STR_NEWMETH ) ) );
+ SetText( IDE_RESSTR(RID_STR_NEWMETH) );
break;
default:
- SetText( ResId::toString( IDEResId( RID_STR_NEWDLG ) ) );
+ SetText( IDE_RESSTR(RID_STR_NEWDLG) );
break;
}
@@ -442,7 +442,7 @@ GotoLineDialog::GotoLineDialog(Window * pParent )
FreeResource();
aEdit.GrabFocus();
- SetText( ResId::toString( IDEResId( RID_STR_GETLINE ) ) );
+ SetText( IDE_RESSTR(RID_STR_GETLINE) );
aOKButton.SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler));
}
@@ -828,7 +828,7 @@ void LibPage::InsertLib()
if ( !aLastFilter.isEmpty() )
xFltMgr->setCurrentFilter( aLastFilter );
else
- xFltMgr->setCurrentFilter( ResId::toString( IDEResId( RID_STR_BASIC ) ) );
+ xFltMgr->setCurrentFilter( IDE_RESSTR(RID_STR_BASIC) );
if ( xFP->execute() == RET_OK )
{
@@ -913,7 +913,7 @@ void LibPage::InsertLib()
}
if ( !pLibDlg )
- InfoBox( this, ResId::toString( IDEResId( RID_STR_NOLIBINSTORAGE ) ) ).Execute();
+ InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
else
{
sal_Bool bChanges = sal_False;
@@ -950,7 +950,7 @@ void LibPage::InsertLib()
// check, if the library is the Standard library
if ( aLibName == "Standard" )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_REPLACESTDLIB ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_REPLACESTDLIB) ).Execute();
continue;
}
@@ -958,10 +958,10 @@ void LibPage::InsertLib()
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
{
- ::rtl::OUString aErrStr( ResId::toString( IDEResId( RID_STR_REPLACELIB ) ) );
+ ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) );
aErrStr = aErrStr.replaceAll("XX", aLibName);
aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
- aErrStr += ResId::toString( IDEResId( RID_STR_LIBISREADONLY ) );
+ aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY);
ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue;
}
@@ -973,12 +973,12 @@ void LibPage::InsertLib()
{
::rtl::OUString aErrStr;
if ( bReference )
- aErrStr = ResId::toString( IDEResId( RID_STR_REFNOTPOSSIBLE ) );
+ aErrStr = IDE_RESSTR(RID_STR_REFNOTPOSSIBLE);
else
- aErrStr = ResId::toString( IDEResId( RID_STR_IMPORTNOTPOSSIBLE ) );
+ aErrStr = IDE_RESSTR(RID_STR_IMPORTNOTPOSSIBLE);
aErrStr = aErrStr.replaceAll("XX", aLibName);
aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
- aErrStr += ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED ) );
+ aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED);
ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue;
}
@@ -996,7 +996,7 @@ void LibPage::InsertLib()
if ( !bOK )
{
- ::rtl::OUString aErrStr( ResId::toString( IDEResId( RID_STR_NOIMPORT ) ) );
+ ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) );
aErrStr = aErrStr.replaceAll("XX", aLibName);
ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue;
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index c86089e..779d74c 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -94,7 +94,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStr
sal_Bool bValid = BasicIDE::IsValidSbxName( rNewText );
if ( !bValid )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute();
return sal_False;
}
@@ -651,7 +651,7 @@ void ObjectPage::CheckButtons()
// enable/disable delete button
if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
{
- if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
+ if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) )
aDelButton.Disable();
else
aDelButton.Enable();
@@ -689,7 +689,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
{
::rtl::OUString aModName( aDesc.GetName() );
// extract the module name from the string like "Sheet1 (Example1)"
- if( aDesc.GetLibSubName() == ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) )
+ if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) )
{
sal_Int32 nIndex = 0;
aModName = aModName.getToken( 0, ' ', nIndex );
@@ -816,7 +816,7 @@ void ObjectPage::NewDialog()
if ( aDocument.hasDialog( aLibName, aDlgName ) )
{
ErrorBox( this, WB_OK | WB_DEF_OK,
- ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute();
+ IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ).Execute();
}
else
{
@@ -933,7 +933,7 @@ LibDialog::LibDialog( Window* pParent )
aReferenceBox( this, IDEResId( RID_CB_REF ) ),
aReplaceBox( this, IDEResId( RID_CB_REPL ) )
{
- SetText( ResId::toString( IDEResId( RID_STR_APPENDLIBS ) ) );
+ SetText( IDE_RESSTR(RID_STR_APPENDLIBS) );
FreeResource();
}
@@ -944,7 +944,7 @@ LibDialog::~LibDialog()
void LibDialog::SetStorageName( const ::rtl::OUString& rName )
{
- ::rtl::OUString aName( ResId::toString( IDEResId( RID_STR_FILENAME ) ) );
+ ::rtl::OUString aName( IDE_RESSTR(RID_STR_FILENAME) );
aName += rName;
aStorageName.SetText( aName );
}
@@ -1011,7 +1011,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
if( pBasic && rDocument.isInVBAMode() )
{
// add the new module in the "Modules" entry
- SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, ResId::toString( IDEResId( RID_STR_NORMAL_MODULES ) ) , OBJ_TYPE_NORMAL_MODULES );
+ SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES );
if( pLibSubEntry )
{
if( !rBasicBox.IsExpanded( pLibSubEntry ) )
@@ -1040,7 +1040,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
catch (const container::ElementExistException& )
{
ErrorBox( pWin, WB_OK | WB_DEF_OK,
- ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute();
+ IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2) ).Execute();
}
catch (const container::NoSuchElementException& )
{
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index a3bde88..228b49b 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1522,9 +1522,9 @@ namespace basctl
{
switch ( _eType )
{
- case LIBRARY_TYPE_MODULE: aTitle = ResId::toString( IDEResId( RID_STR_USERMACROS ) ); break;
- case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString( IDEResId( RID_STR_USERDIALOGS ) ); break;
- case LIBRARY_TYPE_ALL: aTitle = ResId::toString( IDEResId( RID_STR_USERMACROSDIALOGS ) ); break;
+ case LIBRARY_TYPE_MODULE: aTitle = IDE_RESSTR(RID_STR_USERMACROS); break;
+ case LIBRARY_TYPE_DIALOG: aTitle = IDE_RESSTR(RID_STR_USERDIALOGS); break;
+ case LIBRARY_TYPE_ALL: aTitle = IDE_RESSTR(RID_STR_USERMACROSDIALOGS); break;
default:
break;
}
@@ -1533,9 +1533,9 @@ namespace basctl
{
switch ( _eType )
{
- case LIBRARY_TYPE_MODULE: aTitle = ResId::toString( IDEResId( RID_STR_SHAREMACROS ) ); break;
- case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString( IDEResId( RID_STR_SHAREDIALOGS ) ); break;
- case LIBRARY_TYPE_ALL: aTitle = ResId::toString( IDEResId( RID_STR_SHAREMACROSDIALOGS ) ); break;
+ case LIBRARY_TYPE_MODULE: aTitle = IDE_RESSTR(RID_STR_SHAREMACROS); break;
+ case LIBRARY_TYPE_DIALOG: aTitle = IDE_RESSTR(RID_STR_SHAREDIALOGS); break;
+ case LIBRARY_TYPE_ALL: aTitle = IDE_RESSTR(RID_STR_SHAREMACROSDIALOGS); break;
default:
break;
}
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 1941df0..a66c95b 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -797,7 +797,7 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const
if (nResId)
{
- aDefaultName = ResId::toString(IDEResId(nResId));
+ aDefaultName = IDE_RESSTR(nResId);
}
return aDefaultName;
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 856d523..ccdb32f 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -98,9 +98,9 @@ ManageLanguageDialog::ManageLanguageDialog( Window* pParent, boost::shared_ptr<L
m_aHelpBtn ( this, IDEResId( PB_HELP ) ),
m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ),
m_pLocalizationMgr ( _pLMgr ),
- m_sDefLangStr (ResId::toString(IDEResId(STR_DEF_LANG))),
- m_sDeleteStr (ResId::toString(IDEResId(STR_DELETE))),
- m_sCreateLangStr (ResId::toString(IDEResId(STR_CREATE_LANG)))
+ m_sDefLangStr (IDE_RESSTR(STR_DEF_LANG)),
+ m_sDeleteStr (IDE_RESSTR(STR_DELETE)),
+ m_sCreateLangStr (IDE_RESSTR(STR_CREATE_LANG))
{
FreeResource();
@@ -306,9 +306,9 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, boost::shar
// change to "Add Interface Language" mode
SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE );
m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) );
- SetText( ResId::toString( IDEResId( STR_ADDLANG_TITLE ) ) );
- m_aLanguageFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_LABEL ) ) );
- m_aInfoFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_INFO ) ) );
+ SetText( IDE_RESSTR(STR_ADDLANG_TITLE) );
+ m_aLanguageFT.SetText( IDE_RESSTR(STR_ADDLANG_LABEL) );
+ m_aInfoFT.SetText( IDE_RESSTR(STR_ADDLANG_INFO) );
}
FreeResource();
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 3dddfbc..0ffda09 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -324,8 +324,8 @@ void PropBrw::implSetNewObjectSequence
{
xObjectInspector->inspect( _rObjectSeq );
- ::rtl::OUString aText = ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES));
- aText += ResId::toString(IDEResId(RID_STR_BRWTITLE_MULTISELECT));
+ ::rtl::OUString aText = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
+ aText += IDE_RESSTR(RID_STR_BRWTITLE_MULTISELECT);
SetText( aText );
}
}
@@ -354,7 +354,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
if (xServiceInfo.is()) // single selection
{
sal_uInt16 nResId = 0;
- aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES));
+ aName = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ) )
{
@@ -447,12 +447,12 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
if (nResId)
{
- aName += ResId::toString(IDEResId(nResId));
+ aName += IDE_RESSTR(nResId);
}
}
else if (!_rxObject.is()) // no properties
{
- aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES));
+ aName = IDE_RESSTR(RID_STR_BRWTITLE_NO_PROPERTIES);
}
return aName;
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index c9a72af..4487c6a 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -37,6 +37,7 @@ public:
IDEResId( sal_uInt16 nId );
};
+#define IDE_RESSTR(x) IDEResId(x).toString()
#endif //_IDERID_HXX
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index cff38ee..0c38dc0 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -591,7 +591,7 @@ void DataBrowser::RenewTable()
InsertHandleColumn( static_cast< sal_uInt16 >(
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
- OUString aDefaultSeriesName( ::chart::SchResId::getResString( STR_COLUMN_LABEL ));
+ OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 7bce2ca..b4f5906 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -381,81 +381,81 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
switch (eObjectType)
{
case OBJECTTYPE_TITLE:
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER)));
- AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA)));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY)));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT)));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS)));
- AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create, NULL);
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN)));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_LEGEND:
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER)));
- AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA)));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY)));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT)));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS)));
- AddTabPage(TP_LEGEND_POS, ResId::toString(SchResId(STR_PAGE_POSITION)), SchLegendPosTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(TP_LEGEND_POS, SCH_RESSTR(STR_PAGE_POSITION), SchLegendPosTabPage::Create, NULL);
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN)));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_DATA_SERIES:
case OBJECTTYPE_DATA_POINT:
if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() )
- AddTabPage(TP_OPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),SchOptionTabPage::Create, NULL);
+ AddTabPage(TP_OPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),SchOptionTabPage::Create, NULL);
if( m_pParameter->ProvidesStartingAngle())
- AddTabPage(TP_POLAROPTIONS, ResId::toString(SchResId(STR_PAGE_OPTIONS)),PolarOptionsTabPage::Create, NULL);
+ AddTabPage(TP_POLAROPTIONS, SCH_RESSTR(STR_PAGE_OPTIONS),PolarOptionsTabPage::Create, NULL);
if( m_pParameter->HasGeometryProperties() )
- AddTabPage(TP_LAYOUT, ResId::toString(SchResId(STR_PAGE_LAYOUT)),SchLayoutTabPage::Create, NULL);
+ AddTabPage(TP_LAYOUT, SCH_RESSTR(STR_PAGE_LAYOUT),SchLayoutTabPage::Create, NULL);
if(m_pParameter->HasAreaProperties())
{
- AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA)));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY)));
+ AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
}
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE )));
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ));
break;
case OBJECTTYPE_DATA_LABEL:
case OBJECTTYPE_DATA_LABELS:
- AddTabPage(TP_DATA_DESCR, ResId::toString(SchResId(STR_OBJECT_DATALABELS)), DataLabelsTabPage::Create, NULL);
- AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT)));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS)));
+ AddTabPage(TP_DATA_DESCR, SCH_RESSTR(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN)));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
break;
case OBJECTTYPE_AXIS:
{
if( m_pParameter->HasScaleProperties() )
- AddTabPage(TP_SCALE, ResId::toString(SchResId(STR_PAGE_SCALE)), ScaleTabPage::Create, NULL);
+ AddTabPage(TP_SCALE, SCH_RESSTR(STR_PAGE_SCALE), ScaleTabPage::Create, NULL);
if( m_pParameter->HasScaleProperties() )//no positioning page for z axes so far as the tickmarks are not shown so far
- AddTabPage(TP_AXIS_POSITIONS, ResId::toString(SchResId(STR_PAGE_POSITIONING)), AxisPositionsTabPage::Create, NULL);
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE)));
- AddTabPage(TP_AXIS_LABEL, ResId::toString(SchResId(STR_OBJECT_LABEL)), SchAxisLabelTabPage::Create, NULL);
+ AddTabPage(TP_AXIS_POSITIONS, SCH_RESSTR(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
+ AddTabPage(TP_AXIS_LABEL, SCH_RESSTR(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create, NULL);
if( m_pParameter->HasNumberProperties() )
- AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS)));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT)));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS)));
+ AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage(RID_SVXPAGE_PARA_ASIAN, ResId::toString(SchResId(STR_PAGE_ASIAN)));
+ AddTabPage(RID_SVXPAGE_PARA_ASIAN, SCH_RESSTR(STR_PAGE_ASIAN));
break;
}
case OBJECTTYPE_DATA_ERRORS_X:
- AddTabPage(TP_XERRORBAR, ResId::toString(SchResId(STR_PAGE_XERROR_BARS)), ErrorBarsTabPage::Create, NULL);
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE)));
+ AddTabPage(TP_XERRORBAR, SCH_RESSTR(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_ERRORS_Y:
- AddTabPage(TP_YERRORBAR, ResId::toString(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL);
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE)));
+ AddTabPage(TP_YERRORBAR, SCH_RESSTR(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_ERRORS_Z:
@@ -465,12 +465,12 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
case OBJECTTYPE_SUBGRID:
case OBJECTTYPE_DATA_AVERAGE_LINE:
case OBJECTTYPE_DATA_STOCK_RANGE:
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE)));
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_CURVE:
- AddTabPage(TP_TRENDLINE, ResId::toString(SchResId(STR_PAGE_TRENDLINE_TYPE)), TrendlineTabPage::Create, NULL);
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_LINE)));
+ AddTabPage(TP_TRENDLINE, SCH_RESSTR(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create, NULL);
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_LINE));
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
@@ -479,9 +479,9 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
case OBJECTTYPE_DIAGRAM_FLOOR:
case OBJECTTYPE_DIAGRAM_WALL:
case OBJECTTYPE_DIAGRAM:
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER)));
- AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA)));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY)));
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
break;
case OBJECTTYPE_LEGEND_ENTRY:
@@ -490,17 +490,17 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
// nothing
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
- AddTabPage(RID_SVXPAGE_LINE, ResId::toString(SchResId(STR_PAGE_BORDER)));
- AddTabPage(RID_SVXPAGE_AREA, ResId::toString(SchResId(STR_PAGE_AREA)));
- AddTabPage(RID_SVXPAGE_TRANSPARENCE, ResId::toString(SchResId(STR_PAGE_TRANSPARENCY)));
- AddTabPage(RID_SVXPAGE_CHAR_NAME, ResId::toString(SchResId(STR_PAGE_FONT)));
- AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, ResId::toString(SchResId(STR_PAGE_FONT_EFFECTS)));
- AddTabPage(RID_SVXPAGE_NUMBERFORMAT, ResId::toString(SchResId(STR_PAGE_NUMBERS)));
+ AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER));
+ AddTabPage(RID_SVXPAGE_AREA, SCH_RESSTR(STR_PAGE_AREA));
+ AddTabPage(RID_SVXPAGE_TRANSPARENCE, SCH_RESSTR(STR_PAGE_TRANSPARENCY));
+ AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT));
+ AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS));
+ AddTabPage(RID_SVXPAGE_NUMBERFORMAT, SCH_RESSTR(STR_PAGE_NUMBERS));
if( SvtLanguageOptions().IsCTLFontEnabled() )
/* When rotation is supported for equation text boxes, use
SchAlignmentTabPage::Create here. The special
SchAlignmentTabPage::CreateWithoutRotation can be deleted. */
- AddTabPage(TP_ALIGNMENT, ResId::toString(SchResId(STR_PAGE_ALIGNMENT)), SchAlignmentTabPage::CreateWithoutRotation, NULL);
+ AddTabPage(TP_ALIGNMENT, SCH_RESSTR(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation, NULL);
break;
default:
break;
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index c9395eb..029bc92 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -83,7 +83,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
}
void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
{
- rStr = ResId::toString(SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED));
+ rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
}
bool DragMethod_PieSegment::BeginSdrDrag()
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index 2e11182..79ef5a1 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -39,10 +39,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS SchResId : public ResId
{
public:
SchResId( sal_Int16 nId );
-
- static ::rtl::OUString getResString( sal_Int16 nId );
};
+#define SCH_RESSTR(x) SchResId(x).toString()
+
} // namespace chart
// CHART2_RESID_HXX
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 7ed4efb..01f605d 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -105,8 +105,8 @@ void InternalData::createDefaultData()
m_nColumnCount = nColumnCount;
const sal_Int32 nSize = nColumnCount * nRowCount;
// @todo: localize this!
- const OUString aRowName( ::chart::SchResId::getResString( STR_ROW_LABEL ));
- const OUString aColName( ::chart::SchResId::getResString( STR_COLUMN_LABEL ));
+ const OUString aRowName(SCH_RESSTR(STR_ROW_LABEL));
+ const OUString aColName(SCH_RESSTR(STR_COLUMN_LABEL));
m_aData.resize( nSize );
for( sal_Int32 i=0; i<nSize; ++i )
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 3988da4..d445c7f 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -585,23 +585,23 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
OUString aServiceName( xServiceName->getServiceName());
if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
{
- aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN );
+ aResult = SCH_RESSTR(STR_REGRESSION_MEAN);
}
else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
- aResult = ::chart::SchResId::getResString( STR_REGRESSION_LINEAR );
+ aResult = SCH_RESSTR(STR_REGRESSION_LINEAR);
}
else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
- aResult = ::chart::SchResId::getResString( STR_REGRESSION_LOG );
+ aResult = SCH_RESSTR(STR_REGRESSION_LOG);
}
else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
- aResult = ::chart::SchResId::getResString( STR_REGRESSION_EXP );
+ aResult = SCH_RESSTR(STR_REGRESSION_EXP);
}
else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
- aResult = ::chart::SchResId::getResString( STR_REGRESSION_POWER );
+ aResult = SCH_RESSTR(STR_REGRESSION_POWER);
}
return aResult;
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 25fa256..665e87c 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -34,14 +34,10 @@
namespace chart
{
-SchResId::SchResId( sal_Int16 nId )
+ SchResId::SchResId( sal_Int16 nId )
: ResId( nId, RessourceManager::getRessourceManager() )
-{}
-
-::rtl::OUString SchResId::getResString( sal_Int16 nId )
-{
- return String( SchResId( nId ));
-}
+ {
+ }
} // namespace chart
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21473b7..1667ea1 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 279dba9..643f6d6 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 a666c1a..fb876a5 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 9737fbb..a2e33d4 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 b220125..417ab1f 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);
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 1013551..16126b1 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -254,9 +254,8 @@ namespace dbmm
::rtl::OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument )
{
::rtl::OUString sObjectName(
- ResId::toString(
MacroMigrationResId(
- _rDocument.eType == eForm ? STR_FORM : STR_REPORT)).
+ _rDocument.eType == eForm ? STR_FORM : STR_REPORT).toString().
replaceFirst("$name$", _rDocument.sHierarchicalName));
return sObjectName;
}
@@ -1028,7 +1027,7 @@ namespace dbmm
// initialize global progress
sal_Int32 nOverallRange( m_aSubDocs.size() );
rtl::OUString sProgressSkeleton(
- ResId::toString(MacroMigrationResId( STR_OVERALL_PROGRESS)).
+ MacroMigrationResId( STR_OVERALL_PROGRESS).toString().
replaceFirst("$overall$", rtl::OUString::valueOf(nOverallRange)));
m_rProgress.start( nOverallRange );
@@ -1157,7 +1156,7 @@ namespace dbmm
// -----------------
// migrate the libraries
- ProgressDelegator aDelegator(m_rProgress, sObjectName, ResId::toString(MacroMigrationResId(STR_MIGRATING_LIBS)));
+ ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS).toString());
ProgressMixer aProgressMixer( aDelegator );
aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 );
aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 );
@@ -1930,7 +1929,7 @@ namespace dbmm
{
// a human-readable description of the affected library
::rtl::OUString sLibraryDescription(
- ResId::toString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)).
+ MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME).toString().
replaceFirst("$type$",
getScriptTypeDisplayName(_eScriptType)).
replaceFirst("$library$", _rLibraryName));
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index bd30c2b..58c01e4 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2179,7 +2179,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->setOrder(::rtl::OUString()); xParser->appendOrderByColumn(xField, bSortUp),
bParserSuccess,
- ResId::toString(ModuleRes(SBA_BROWSER_SETTING_ORDER)),
+ ModuleRes(SBA_BROWSER_SETTING_ORDER).toString(),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
@@ -2251,7 +2251,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->appendHavingClauseByColumn(xField,sal_True,nOp),
bParserSuccess,
- ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
+ ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
}
@@ -2260,7 +2260,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->appendFilterByColumn(xField,sal_True,nOp),
bParserSuccess,
- ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
+ ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
}
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index bc2e08e..b8faa7f 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -50,6 +50,8 @@ public:
DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
};
+#define DPGUI_RESSTR(i) DpGuiResId(i).toString()
+
} // namespace dp_gui
#endif
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index f7dbbfb..f7dbd04 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -530,18 +530,18 @@ UpdateDialog::UpdateDialog(
m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)),
- m_error(ResId::toString(DpGuiResId(RID_DLG_UPDATE_ERROR))),
- m_none(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NONE))),
- m_noInstallable(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
- m_failure(ResId::toString(DpGuiResId(RID_DLG_UPDATE_FAILURE))),
- m_unknownError(ResId::toString(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))),
- m_noDescription(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))),
- m_noInstall(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))),
- m_noDependency(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))),
- m_noDependencyCurVer(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
- m_browserbased(ResId::toString(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
- m_version(ResId::toString(DpGuiResId(RID_DLG_UPDATE_VERSION))),
- m_ignoredUpdate(ResId::toString(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
+ m_error(DPGUI_RESSTR(RID_DLG_UPDATE_ERROR)),
+ m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)),
+ m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)),
+ m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)),
+ m_unknownError(DPGUI_RESSTR(RID_DLG_UPDATE_UNKNOWNERROR)),
+ m_noDescription(DPGUI_RESSTR(RID_DLG_UPDATE_NODESCRIPTION)),
+ m_noInstall(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALL)),
+ m_noDependency(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY)),
+ m_noDependencyCurVer(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)),
+ m_browserbased(DPGUI_RESSTR(RID_DLG_UPDATE_BROWSERBASED)),
+ m_version(DPGUI_RESSTR(RID_DLG_UPDATE_VERSION)),
+ m_ignoredUpdate(DPGUI_RESSTR(RID_DLG_UPDATE_IGNORED_UPDATE)),
m_updateData(*updateData),
m_thread(
new UpdateDialog::Thread(
@@ -619,9 +619,9 @@ short UpdateDialog::Execute() {
UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
Image const & normalStaticImage ):
SvxCheckListBox( &dialog, resource, normalStaticImage ),
- m_ignoreUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
- m_ignoreAllUpdates( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
- m_enableUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
+ m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ),
+ m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ),
+ m_enableUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_ENABLE ) ),
m_dialog(dialog)
{}
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index e7de531..2f28237 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -95,8 +95,7 @@ rtl::OUString produceErrorText(
{
return reason.replaceFirst("%VERSION",
(version.isEmpty()
- ? ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN))
+ ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString()
: version));
}
@@ -167,22 +166,19 @@ rtl::OUString getErrorText(
if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg )
{
return produceErrorText(
- ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(),
dependency->getAttribute(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
} else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg )
{
return produceErrorText(
- ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX)),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX).toString(),
dependency->getAttribute(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
} else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice )
{
return produceErrorText(
- ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN)),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN).toString(),
dependency->getAttribute(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
} else if (dependency->hasAttributeNS(
@@ -193,16 +189,14 @@ rtl::OUString getErrorText(
minimalVersionOpenOfficeOrg))))
{
return produceErrorText(
- ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(),
dependency->getAttributeNS(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(namespaceOpenOfficeOrg)),
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(minimalVersionOpenOfficeOrg))));
} else {
- return ResId::toString(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN));
+ return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString();
}
}
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index de50d7b..d4a0eb6 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -57,7 +57,7 @@ public:
#define EE_DLL() EditDLL::Get()
-#define EE_RESSTR(x) ResId::toString(EditResId(x))
+#define EE_RESSTR(x) EditResId(x).toString()
#endif //_EERDLL_HXX
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index a54be72..a5e3c66 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -57,7 +57,7 @@ EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
inline String GetBoolString( sal_Bool bVal )
{
- return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
+ return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE);
}
// -----------------------------------------------------------------------
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index d6ae16f..08072a6 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -169,7 +169,7 @@ namespace accessibility
SolarMutexGuard aGuard;
// Get the string from the resource for the specified id.
- return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
+ return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
}
::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
@@ -179,7 +179,7 @@ namespace accessibility
SolarMutexGuard aGuard;
// Get the string from the resource for the specified id.
- return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
+ return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME);
}
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6772ec9..05bc899 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2677,12 +2677,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_DELCONTENT:
case EDITUNDO_DELETE:
case EDITUNDO_CUT:
- aComment = XubString( EditResId( RID_EDITUNDO_DEL ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_DEL);
break;
case EDITUNDO_MOVEPARAGRAPHS:
case EDITUNDO_MOVEPARAS:
case EDITUNDO_DRAGANDDROP:
- aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_MOVE);
break;
case EDITUNDO_INSERTFEATURE:
case EDITUNDO_SPLITPARA:
@@ -2690,29 +2690,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_PASTE:
case EDITUNDO_INSERT:
case EDITUNDO_READ:
- aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_INSERT);
break;
case EDITUNDO_SRCHANDREPL:
case EDITUNDO_REPLACEALL:
- aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_REPLACE);
break;
case EDITUNDO_ATTRIBS:
case EDITUNDO_PARAATTRIBS:
case EDITUNDO_STRETCH:
- aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS);
break;
case EDITUNDO_RESETATTRIBS:
- aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS);
break;
case EDITUNDO_STYLESHEET:
- aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE);
break;
case EDITUNDO_TRANSLITERATE:
- aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE);
break;
case EDITUNDO_INDENTBLOCK:
case EDITUNDO_UNINDENTBLOCK:
- aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_INDENT);
break;
}
return aComment;
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ffe2285..9e0fd27 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -966,9 +966,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
aPopupMenu.InsertSeparator();
String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
- String aWordStr( EditResId( RID_STR_WORD ) );
+ String aWordStr( EE_RESSTR( RID_STR_WORD ) );
aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord );
- String aParaStr( EditResId( RID_STR_PARAGRAPH ) );
+ String aParaStr( EE_RESSTR( RID_STR_PARAGRAPH ) );
aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara );
aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr );
aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE );
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index fcfe3c8..4ea6a97 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -165,10 +165,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
rText += String::CreateFromInt32( nMinLead );
- rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) );
+ rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD );
rText += ',';
rText += String::CreateFromInt32( nMinTrail );
- rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) );
+ rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL );
return ePres;
}
default:
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index cb8db17..a552ec9 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -93,7 +93,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = String( EditResId( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ) );
+ rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue());
break;
default:
diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx
index 1318a29..f3ef1ed 100644
--- a/fpicker/source/office/fpsofficeResMgr.hxx
+++ b/fpicker/source/office/fpsofficeResMgr.hxx
@@ -55,6 +55,8 @@ namespace
};
}
+#define SVT_RESSTR(i) SvtResId(i).toString()
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ce350e0..64797c5 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -3015,7 +3015,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE );
}
- _pImp->_pPlaces = new PlacesListBox( this, ResId::toString( SvtResId( STR_PLACES_TITLE ) ), SvtResId( LB_EXPLORERFILE_PLACES_LISTBOX ) );
+ _pImp->_pPlaces = new PlacesListBox( this, SVT_RESSTR(STR_PLACES_TITLE), SvtResId(LB_EXPLORERFILE_PLACES_LISTBOX) );
initDefaultPlaces();
}
@@ -3343,7 +3343,7 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
void SvtFileDialog::initDefaultPlaces( )
{
- PlacePtr pRootPlace( new Place( ResId::toString( SvtResId( STR_DEFAULT_DIRECTORY ) ), GetStandardDir() ) );
+ PlacePtr pRootPlace( new Place( SVT_RESSTR(STR_DEFAULT_DIRECTORY), GetStandardDir() ) );
_pImp->_pPlaces->AppendPlace( pRootPlace );
// Load from user settings
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index c726ed2..31c6177 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -43,6 +43,8 @@ class FWE_DLLPUBLIC FwkResId : public ResId
static ResMgr* GetResManager();
};
+#define FWK_RESSTR(x) FwkResId(x).toString()
+
}
#endif // __FRAMEWORK_CLASSES_FWKRESID
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index fecbf6a..610eef1 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3483,8 +3483,8 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
//-----------------------------------------------
void AutoRecovery::impl_showFullDiscError()
{
- rtl::OUString sBtn(ResId::toString(FwkResId(STR_FULL_DISC_RETRY_BUTTON)));
- rtl::OUString sMsg(ResId::toString(FwkResId(STR_FULL_DISC_MSG)));
+ rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
+ rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath());
INetURLObject aConverter(sBackupURL);
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index 7cb8136..ecd059e 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -40,7 +40,7 @@ class SC_DLLPUBLIC ScResId : public ResId
ScResId( sal_uInt16 nId ); // in scdll.cxx
};
-
+#define SC_RESSTR(x) ScResId(x).toString()
#endif // SC_SCRESMGR_HXX
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index a3ae9ab..b6abe7d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1081,7 +1081,7 @@ void ScDPObject::FillPageList( std::vector<rtl::OUString>& rStrings, long nField
}
// add "-all-" entry to the top (unsorted)
- rStrings.insert(rStrings.begin(), ScResId::toString(ScResId(SCSTR_ALL)));
+ rStrings.insert(rStrings.begin(), SC_RESSTR(SCSTR_ALL));
}
void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHeaderData& rData)
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 875371f..544fb9d 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1005,7 +1005,7 @@ void ScDPOutput::Output()
if ( pPageFields[nField].aResult.getLength() == 1 )
aPageValue = pPageFields[nField].aResult[0].Caption;
else
- aPageValue = ScResId::toString(ScResId(SCSTR_ALL)); //! separate string?
+ aPageValue = SC_RESSTR(SCSTR_ALL); //! separate string?
pDoc->SetString( nFldCol, nHdrRow, nTab, aPageValue );
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 4175eff..8a02172 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -787,7 +787,7 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
- return ResId::toString(ScResId(static_cast<sal_uInt16>(_nCategoryNumber)));
+ return SC_RESSTR(static_cast<sal_uInt16>(_nCategoryNumber));
}
sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const
@@ -866,7 +866,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
}
pDesc->pFuncName = new ::rtl::OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId())));
- pDesc->pFuncDesc = new ::rtl::OUString( ResId::toString(ScResId(1)));
+ pDesc->pFuncDesc = new ::rtl::OUString( SC_RESSTR(1) );
if (nArgs)
{
@@ -874,8 +874,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
for (sal_uInt16 i = 0; i < nArgs; ++i)
{
- pDesc->ppDefArgNames[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1) )));
- pDesc->ppDefArgDescs[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1)+1)));
+ pDesc->ppDefArgNames[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1) ));
+ pDesc->ppDefArgDescs[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)+1));
}
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 94776ce..cb236c6 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -113,12 +113,12 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
- aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
- aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ),
- aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
- aStrNotEmpty ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
- aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ),
- aStrColumn ( ResId::toString(ScResId(SCSTR_COLUMN)) ),
+ aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ),
+ aStrNone ( SC_RESSTR(SCSTR_NONE) ),
+ aStrEmpty ( SC_RESSTR(SCSTR_EMPTY) ),
+ aStrNotEmpty ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+ aStrRow ( SC_RESSTR(SCSTR_ROW) ),
+ aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ),
//
pOptionsMgr ( NULL ),
nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
@@ -143,7 +143,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
OUStringBuffer aBuf;
- OUString sAccName = ResId::toString(ScResId(RID_FILTER_OPERATOR));
+ OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR);
aBuf.append(sAccName);
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
aLbConnect1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -151,7 +151,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
aLbConnect2.SetAccessibleName(aBuf.makeStringAndClear());
- sAccName = ResId::toString(ScResId(RID_FILTER_FIELDNAME));
+ sAccName = SC_RESSTR(RID_FILTER_FIELDNAME);
aBuf.append(sAccName);
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
aLbField1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -162,7 +162,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
aLbField3.SetAccessibleName(aBuf.makeStringAndClear());
- sAccName = ResId::toString(ScResId(RID_FILTER_CONDITION));
+ sAccName = SC_RESSTR(RID_FILTER_CONDITION);
aBuf.append(sAccName);
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
aLbCond1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -173,7 +173,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
aLbCond3.SetAccessibleName(aBuf.makeStringAndClear());
- sAccName = ResId::toString(ScResId(RID_FILTER_VALUE));
+ sAccName = SC_RESSTR(RID_FILTER_VALUE);
aBuf.append(sAccName);
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
aEdVal1.SetAccessibleName(aBuf.makeStringAndClear());
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 4b2198e..ef4157f 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -88,12 +88,12 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
aBtnMore ( this, ScResId( BTN_MORE ) ),
- aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
- aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ),
- aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
- aStrNotEmpty ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
- aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ),
- aStrColumn ( ResId::toString(ScResId(SCSTR_COLUMN)) ),
+ aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ),
+ aStrNone ( SC_RESSTR(SCSTR_NONE) ),
+ aStrEmpty ( SC_RESSTR(SCSTR_EMPTY) ),
+ aStrNotEmpty ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+ aStrRow ( SC_RESSTR(SCSTR_ROW) ),
+ aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ),
//
nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
theQueryData ( ((const ScQueryItem&)
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index d421765..3ff9b9c 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -129,8 +129,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
aBtnOptions ( this, ScResId( BTN_OPTIONS ) ),
aBtnMore ( this, ScResId( BTN_MORE ) ),
- aStrUndefined (ScResId::toString(ScResId(SCSTR_UNDEFINED))),
- aStrNewTable (ScResId::toString(ScResId(SCSTR_NEWTABLE))),
+ aStrUndefined (SC_RESSTR(SCSTR_UNDEFINED)),
+ aStrNewTable (SC_RESSTR(SCSTR_NEWTABLE)),
bIsDrag ( false ),
@@ -177,7 +177,7 @@ void ScDPLayoutDlg::Init(bool bNewOutput)
aFuncNameArr.reserve( PIVOT_MAXFUNC );
for ( sal_uInt16 i = 0; i < PIVOT_MAXFUNC; ++i )
- aFuncNameArr.push_back(ScResId::toString(ScResId(i+1)));
+ aFuncNameArr.push_back(SC_RESSTR(i+1));
aBtnMore.AddWindow( &aFlAreas );
aBtnMore.AddWindow( &aFtInArea );
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index ce4808b..8d4e9aa 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -86,7 +86,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
- aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
+ aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 488d1a2..9964504 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -110,22 +110,22 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
- aStrInsertCols (ResId::toString(ScResId(STR_INSERT_COLS))),
- aStrInsertRows (ResId::toString(ScResId(STR_INSERT_ROWS))),
- aStrInsertTabs (ResId::toString(ScResId(STR_INSERT_TABS))),
- aStrDeleteCols (ResId::toString(ScResId(STR_DELETE_COLS))),
- aStrDeleteRows (ResId::toString(ScResId(STR_DELETE_ROWS))),
- aStrDeleteTabs (ResId::toString(ScResId(STR_DELETE_TABS))),
- aStrMove (ResId::toString(ScResId(STR_MOVE))),
- aStrContent (ResId::toString(ScResId(STR_CONTENT))),
- aStrReject (ResId::toString(ScResId(STR_REJECT))),
- aStrAllAccepted (ResId::toString(ScResId(STR_ACCEPTED))),
- aStrAllRejected (ResId::toString(ScResId(STR_REJECTED))),
- aStrNoEntry (ResId::toString(ScResId(STR_NO_ENTRY))),
- aStrContentWithChild (ResId::toString(ScResId(STR_CONTENT_WITH_CHILD))),
- aStrChildContent (ResId::toString(ScResId(STR_CHILD_CONTENT))),
- aStrChildOrgContent (ResId::toString(ScResId(STR_CHILD_ORGCONTENT))),
- aStrEmpty (ResId::toString(ScResId(STR_EMPTY))),
+ aStrInsertCols (SC_RESSTR(STR_INSERT_COLS)),
+ aStrInsertRows (SC_RESSTR(STR_INSERT_ROWS)),
+ aStrInsertTabs (SC_RESSTR(STR_INSERT_TABS)),
+ aStrDeleteCols (SC_RESSTR(STR_DELETE_COLS)),
+ aStrDeleteRows (SC_RESSTR(STR_DELETE_ROWS)),
+ aStrDeleteTabs (SC_RESSTR(STR_DELETE_TABS)),
+ aStrMove (SC_RESSTR(STR_MOVE)),
+ aStrContent (SC_RESSTR(STR_CONTENT)),
+ aStrReject (SC_RESSTR(STR_REJECT)),
+ aStrAllAccepted (SC_RESSTR(STR_ACCEPTED)),
+ aStrAllRejected (SC_RESSTR(STR_REJECTED)),
+ aStrNoEntry (SC_RESSTR(STR_NO_ENTRY)),
+ aStrContentWithChild (SC_RESSTR(STR_CONTENT_WITH_CHILD)),
+ aStrChildContent (SC_RESSTR(STR_CHILD_CONTENT)),
+ aStrChildOrgContent (SC_RESSTR(STR_CHILD_ORGCONTENT)),
+ aStrEmpty (SC_RESSTR(STR_EMPTY)),
aUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown")),
bAcceptEnableFlag(true),
bRejectEnableFlag(true),
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index c045587..4106f69 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -95,7 +95,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aErrMsgInvalidVal( ResId::toString(ScResId(STR_VALERR)) ),
+ aErrMsgInvalidVal( SC_RESSTR(STR_VALERR) ),
rDoc ( rDocument ),
theFillDir ( eFillDir ),
theFillCmd ( eFillCmd ),
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index b3f30c4..7c91282 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -65,9 +65,9 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault)
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
- maStrTabNameUsed( ResId::toString(ScResId(STR_TABNAME_WARN_USED)) ),
- maStrTabNameEmpty( ResId::toString(ScResId(STR_TABNAME_WARN_EMPTY)) ),
- maStrTabNameInvalid( ResId::toString(ScResId(STR_TABNAME_WARN_INVALID)) ),
+ maStrTabNameUsed( SC_RESSTR(STR_TABNAME_WARN_USED) ),
+ maStrTabNameEmpty( SC_RESSTR(STR_TABNAME_WARN_EMPTY) ),
+ maStrTabNameInvalid( SC_RESSTR(STR_TABNAME_WARN_INVALID) ),
//
maDefaultName( rDefault ),
mnCurrentDocPos( 0 ),
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index fe383d7..3500d02 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -76,7 +76,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
- maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
+ maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)),
maRangeMap( aRangeMap )
{
// Initialize scope list.
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 40cf4fd..b00f546 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -97,8 +97,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
- maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
- maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))),
+ maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)),
+ maStrMultiSelect ( SC_RESSTR(STR_MULTI_SELECT)),
//
mpViewData ( ptrViewData ),
mpDoc ( ptrViewData->GetDocument() ),
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 847483f..8b243df 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -705,13 +705,13 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
// Populate the menu.
mpAutoFilterPopup->addMenuItem(
- ScResId::toString(ScResId(SCSTR_TOP10FILTER)), true, new AutoFilterAction(this, Top10));
+ SC_RESSTR(SCSTR_TOP10FILTER), true, new AutoFilterAction(this, Top10));
mpAutoFilterPopup->addMenuItem(
- ScResId::toString(ScResId(SCSTR_STDFILTER)), true, new AutoFilterAction(this, Custom));
+ SC_RESSTR(SCSTR_STDFILTER), true, new AutoFilterAction(this, Custom));
mpAutoFilterPopup->addMenuItem(
- ScResId::toString(ScResId(SCSTR_EMPTY)), true, new AutoFilterAction(this, Empty));
+ SC_RESSTR(SCSTR_EMPTY), true, new AutoFilterAction(this, Empty));
mpAutoFilterPopup->addMenuItem(
- ScResId::toString(ScResId(SCSTR_NOTEMPTY)), true, new AutoFilterAction(this, NonEmpty));
+ SC_RESSTR(SCSTR_NOTEMPTY), true, new AutoFilterAction(this, NonEmpty));
ScCheckListMenuWindow::Config aConfig;
aConfig.mbAllowEmptySet = false;
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index b764fc2..a4cc1a7 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -38,6 +38,8 @@ public:
SdResId(sal_uInt16 nId);
};
+#define SD_RESSTR(x) SdResId(x).toString()
+
#endif /* _SD_SDRESID_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 9db2394..5870e83 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -337,7 +337,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_
if (aURL.Len() && (aURL.GetChar(0) == 35))
{
XubString aHashSlide('#');
- aHashSlide += SdResId(STR_PAGE);
+ aHashSlide += SD_RESSTR(STR_PAGE);
if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL)
{
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index aa1a8b6..8511f00 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2391,22 +2391,22 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
aString += "\n\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER2);
aString += "\n\t\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER3);
aString += "\n\t\t\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER4);
aString += "\n\t\t\t\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER5);
aString += "\n\t\t\t\t\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER6);
aString += "\n\t\t\t\t\t\t\t";
- aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
+ aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER7);
}
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 8def721..b5e9f5d 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -393,26 +393,26 @@ void SAL_CALL
{
SolarMutexGuard aGuard;
- sName = ResId::toString(SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
+ sName = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_N);
}
else
{
SolarMutexGuard aGuard;
- sName = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
+ sName = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_N);
}
}
else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
- sName = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
+ sName = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_N);
}
else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list