[Libreoffice-commits] core.git: avmedia/source basctl/source chart2/source extensions/source filter/source formula/source fpicker/source framework/source include/tools sfx2/source svx/source
Caolán McNamara
caolanm at redhat.com
Sun Jul 28 08:47:24 PDT 2013
avmedia/source/inc/mediamisc.hxx | 1
avmedia/source/viewer/mediawindow.cxx | 6
basctl/source/basicide/baside2.cxx | 6
basctl/source/basicide/baside2b.cxx | 20 -
basctl/source/basicide/basides1.cxx | 4
basctl/source/basicide/basobj2.cxx | 2
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/macrodlg.cxx | 14 -
basctl/source/basicide/moduldl2.cxx | 16 -
basctl/source/basicide/objdlg.cxx | 6
chart2/source/controller/accessibility/AccessibleChartView.cxx | 2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 90 +++----
chart2/source/controller/dialogs/DataBrowser.cxx | 10
chart2/source/controller/dialogs/DialogModel.cxx | 34 +-
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 124 +++++-----
chart2/source/controller/dialogs/RangeSelectionButton.cxx | 2
chart2/source/controller/dialogs/TextDirectionListBox.cxx | 6
chart2/source/controller/dialogs/dlg_ChartType.cxx | 2
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 6
chart2/source/controller/dialogs/dlg_DataSource.cxx | 4
chart2/source/controller/dialogs/dlg_View3D.cxx | 6
chart2/source/controller/dialogs/res_BarGeometry.cxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 2
chart2/source/controller/dialogs/res_ErrorBar.cxx | 10
chart2/source/controller/dialogs/res_TextSeparator.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 6
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6
chart2/source/controller/dialogs/tp_ChartType.cxx | 18 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 17 -
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 6
chart2/source/controller/dialogs/tp_Scale.cxx | 2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 2
chart2/source/controller/main/ChartController.cxx | 6
chart2/source/controller/main/ChartController_EditData.cxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 62 ++---
chart2/source/controller/main/ChartController_Properties.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 28 +-
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/controller/main/UndoCommandDispatch.cxx | 4
extensions/source/abpilot/abspilot.cxx | 4
extensions/source/abpilot/admininvokationimpl.cxx | 4
extensions/source/abpilot/datasourcehandling.cxx | 4
extensions/source/abpilot/fieldmappingimpl.cxx | 2
extensions/source/abpilot/fieldmappingpage.cxx | 4
extensions/source/bibliography/bibload.cxx | 2
extensions/source/bibliography/bibresid.hxx | 2
extensions/source/bibliography/bibview.cxx | 2
extensions/source/bibliography/datman.cxx | 68 ++---
extensions/source/bibliography/general.cxx | 108 ++++----
extensions/source/dbpilots/controlwizard.cxx | 4
extensions/source/dbpilots/gridwizard.cxx | 4
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 8
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/formbrowsertools.cxx | 42 +--
extensions/source/propctrlr/formcomponenthandler.cxx | 10
extensions/source/propctrlr/formlinkdialog.cxx | 4
extensions/source/propctrlr/formmetadata.cxx | 4
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 2
extensions/source/propctrlr/usercontrol.cxx | 4
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 2
extensions/source/resource/ResourceIndexAccess.cxx | 2
extensions/source/scanner/grid.cxx | 8
extensions/source/scanner/sanedlg.cxx | 8
filter/source/graphicfilter/eps/eps.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 2
fpicker/source/office/iodlg.cxx | 10
fpicker/source/office/iodlgimp.cxx | 2
framework/source/accelerators/presethandler.cxx | 6
framework/source/classes/menumanager.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4
framework/source/services/desktop.cxx | 2
framework/source/uielement/generictoolbarcontroller.cxx | 9
framework/source/uielement/langselectionstatusbarcontroller.cxx | 18 -
framework/source/uielement/menubarmanager.cxx | 11
framework/source/uielement/recentfilesmenucontroller.cxx | 6
include/tools/StringListResource.hxx | 3
sfx2/source/doc/templatedlg.cxx | 2
sfx2/source/sidebar/DeckTitleBar.cxx | 2
sfx2/source/sidebar/PanelTitleBar.cxx | 4
sfx2/source/sidebar/SidebarController.cxx | 8
svx/source/dialog/_bmpmask.cxx | 4
svx/source/dialog/_contdlg.cxx | 8
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/dlgctl3d.cxx | 2
svx/source/dialog/dlgctrl.cxx | 10
svx/source/dialog/docrecovery.cxx | 12
svx/source/dialog/imapdlg.cxx | 6
svx/source/dialog/passwd.cxx | 4
svx/source/dialog/pfiledlg.cxx | 2
svx/source/dialog/prtqry.cxx | 8
svx/source/dialog/svxruler.cxx | 2
svx/source/dialog/swframeposstrings.cxx | 2
svx/source/engine3d/float3d.cxx | 8
svx/source/fmcomp/fmgridcl.cxx | 10
svx/source/fmcomp/gridctrl.cxx | 6
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/datanavi.cxx | 44 +--
svx/source/form/filtnav.cxx | 8
svx/source/form/fmPropBrw.cxx | 16 -
svx/source/form/fmpgeimp.cxx | 14 -
svx/source/form/fmvwimp.cxx | 4
svx/source/form/formcontrolfactory.cxx | 4
svx/source/form/formcontroller.cxx | 8
svx/source/form/navigatortree.cxx | 2
svx/source/form/navigatortreemodel.cxx | 2
svx/source/form/stringlistresource.cxx | 3
svx/source/form/tabwin.cxx | 2
svx/source/form/tbxform.cxx | 4
svx/source/inc/stringlistresource.hxx | 2
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 4
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 8
svx/source/sidebar/line/LinePropertyPanel.cxx | 10
svx/source/sidebar/line/LineWidthControl.cxx | 20 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 22 -
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 30 +-
svx/source/sidebar/text/TextUnderlineControl.cxx | 22 -
svx/source/sidebar/tools/ColorControl.cxx | 4
svx/source/tbxctrls/colrctrl.cxx | 2
svx/source/tbxctrls/extrusioncontrols.cxx | 26 +-
svx/source/tbxctrls/fontworkgallery.cxx | 38 +--
svx/source/toolbars/extrusionbar.cxx | 4
svx/source/toolbars/fontworkbar.cxx | 6
svx/source/unodraw/unoprov.cxx | 6
svx/source/xoutdev/xattr.cxx | 6
svx/source/xoutdev/xtabbtmp.cxx | 2
svx/source/xoutdev/xtabdash.cxx | 6
svx/source/xoutdev/xtabgrdt.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
137 files changed, 683 insertions(+), 695 deletions(-)
New commits:
commit 5efc15f0006866ac4c422c1b2bde173ded47893f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 27 17:01:36 2013 +0100
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index b87fe43..f460161 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -20,6 +20,7 @@
class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+#define AVMEDIA_RESSTR( nId ) AVMEDIA_RESID( nId ).toString()
#define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
#ifdef WNT
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 310d564..835e362 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -255,7 +255,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
const OUString aSeparator( ";" );
OUString aAllTypes;
- aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
+ aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink)
? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
getMediaFilters( aFilters );
@@ -273,7 +273,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all media types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+ aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
for( i = 0; i < aFilters.size(); ++i )
{
@@ -292,7 +292,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) );
+ aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) );
uno::Reference<ui::dialogs::XFilePicker> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 962658f..0593c12 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -455,7 +455,7 @@ bool ModulWindow::LoadBasic()
AssertValidEditEngine();
sal_uLong nLines = CalcLineCount( *pStream );
// nLines*4: ReadText/Formatting/Highlighting/Formatting
- GetEditorWindow().CreateProgress( String( IDEResId( RID_STR_GENERATESOURCE ) ), nLines*4 );
+ GetEditorWindow().CreateProgress( IDEResId(RID_STR_GENERATESOURCE).toString(), nLines*4 );
GetEditEngine()->SetUpdateMode( false );
GetEditView()->Read( *pStream );
GetEditEngine()->SetUpdateMode( true );
@@ -516,7 +516,7 @@ bool ModulWindow::SaveBasicSource()
bDone = true;
}
else
- ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId( RID_STR_COULDNTWRITE) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_COULDNTWRITE).toString() ).Execute();
}
return bDone;
@@ -1468,7 +1468,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped)
void ModulWindowLayout::Paint (Rectangle const&)
{
- DrawText(Point(), String(IDEResId(RID_STR_NOMODULE)));
+ DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString());
}
// virtual
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index cde1f42..2347616 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -466,7 +466,7 @@ bool EditorWindow::ImpCanModify()
{
// If in Trace-mode, abort the trace or refuse input
// Remove markers in the modules in Notify at Basic::Stoped
- if ( QueryBox( 0, WB_OK_CANCEL, String( IDEResId( RID_STR_WILLSTOPPRG ) ) ).Execute() == RET_OK )
+ if ( QueryBox( 0, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString() ).Execute() == RET_OK )
{
rModulWindow.GetBasicStatus().bIsRunning = false;
StopBasic();
@@ -624,7 +624,7 @@ void EditorWindow::CreateEditEngine()
// for the text then if the source code is long...
pProgress.reset(new ProgressInfo(
GetShell()->GetViewFrame()->GetObjectShell(),
- String(IDEResId(RID_STR_GENERATESOURCE)),
+ IDEResId(RID_STR_GENERATESOURCE).toString(),
nLines*4
));
setTextEngineText(*pEditEngine, aOUSource);
@@ -1220,8 +1220,8 @@ WatchWindow::WatchWindow (Layout* pParent) :
| WB_HASLINESATROOT | WB_HASBUTTONSATROOT ),
aHeaderBar( this, WB_BUTTONSTYLE | WB_BORDER )
{
- aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
- aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
+ aXEdit.SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
+ aTreeListBox.SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
@@ -1260,9 +1260,9 @@ WatchWindow::WatchWindow (Layout* pParent) :
long nVarTabWidth = 220;
long nValueTabWidth = 100;
long nTypeTabWidth = 1250;
- aHeaderBar.InsertItem( ITEM_ID_VARIABLE, String( IDEResId( RID_STR_WATCHVARIABLE ) ), nVarTabWidth );
- aHeaderBar.InsertItem( ITEM_ID_VALUE, String( IDEResId( RID_STR_WATCHVALUE ) ), nValueTabWidth );
- aHeaderBar.InsertItem( ITEM_ID_TYPE, String( IDEResId( RID_STR_WATCHTYPE ) ), nTypeTabWidth );
+ aHeaderBar.InsertItem( ITEM_ID_VARIABLE, IDEResId(RID_STR_WATCHVARIABLE).toString(), nVarTabWidth );
+ aHeaderBar.InsertItem( ITEM_ID_VALUE, IDEResId(RID_STR_WATCHVALUE).toString(), nValueTabWidth );
+ aHeaderBar.InsertItem( ITEM_ID_TYPE, IDEResId(RID_STR_WATCHTYPE).toString(), nTypeTabWidth );
long tabs[ 4 ];
tabs[ 0 ] = 3; // two tabs
@@ -1278,7 +1278,7 @@ WatchWindow::WatchWindow (Layout* pParent) :
aTreeListBox.Show();
- SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
+ SetText(IDEResId(RID_STR_WATCHNAME).toString());
SetHelpId( HID_BASICIDE_WATCHWINDOW );
@@ -1510,14 +1510,14 @@ StackWindow::StackWindow (Layout* pParent) :
aStackStr( IDEResId( RID_STR_STACK ) )
{
aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
- aTreeListBox.SetAccessibleName(String( IDEResId(RID_STR_STACKNAME)));
+ aTreeListBox.SetAccessibleName(IDEResId(RID_STR_STACKNAME).toString());
aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) );
aTreeListBox.SetHighlightRange();
aTreeListBox.SetSelectionMode( NO_SELECTION );
aTreeListBox.InsertEntry( String(), 0, false, LIST_APPEND );
aTreeListBox.Show();
- SetText( String( IDEResId( RID_STR_STACKNAME ) ) );
+ SetText(IDEResId(RID_STR_STACKNAME).toString());
SetHelpId( HID_BASICIDE_STACKWINDOW );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 474e792..1ccc4ad 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -101,7 +101,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
nActModWindows++;
}
- if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && QueryBox( pCurWin, WB_YES_NO|WB_DEF_YES, String(IDEResId(RID_STR_SEARCHALLMODULES)) ).Execute() == RET_YES ) )
+ if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && QueryBox( pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES).toString() ).Execute() == RET_YES ) )
{
for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
@@ -180,7 +180,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
SetCurWindow( pWin, true );
}
if ( !nFound && !bCanceled )
- InfoBox( pCurWin, String(IDEResId(RID_STR_SEARCHNOTFOUND)) ).Execute();
+ InfoBox( pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND).toString() ).Execute();
}
rReq.Done();
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index d5e4b91..321f282 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -359,7 +359,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
{
// error
bError = true;
- ErrorBox( NULL, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_ERRORCHOOSEMACRO ) ) ).Execute();
+ ErrorBox( NULL, WB_OK | WB_DEF_OK, IDEResId(RID_STR_ERRORCHOOSEMACRO).toString() ).Execute();
}
}
}
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 83cf3ba..41c2491 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -562,7 +562,7 @@ long TabBar::AllowRenaming()
bool const bValid = IsValidSbxName(GetEditText());
if ( !bValid )
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
return bValid ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO;
}
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index f172160..36dae43 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -440,7 +440,7 @@ void MacroChooser::CheckButtons()
bNewDelIsDel = pMethod ? true : false;
if (bPrev != bNewDelIsDel && nMode == All)
{
- String aBtnText( bNewDelIsDel ? IDEResId( RID_STR_BTNDEL) : IDEResId( RID_STR_BTNNEW ) );
+ OUString aBtnText( bNewDelIsDel ? IDEResId(RID_STR_BTNDEL).toString() : IDEResId(RID_STR_BTNNEW).toString() );
m_pDelButton->SetText( aBtnText );
}
@@ -622,7 +622,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
if ( aDocument.isDocument() && !aDocument.allowMacros() )
{
- WarningBox( this, WB_OK, String( IDEResId( RID_STR_CANNOTRUNMACRO ) ) ).Execute();
+ WarningBox( this, WB_OK, IDEResId(RID_STR_CANNOTRUNMACRO).toString() ).Execute();
return 0;
}
}
@@ -631,7 +631,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
{
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return 0;
@@ -699,7 +699,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
{
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return 1;
@@ -804,7 +804,7 @@ void MacroChooser::SetMode (Mode nM)
{
case All:
{
- m_pRunButton->SetText( String( IDEResId( RID_STR_RUN ) ) );
+ m_pRunButton->SetText(IDEResId(RID_STR_RUN).toString());
EnableButton(*m_pDelButton, true);
EnableButton(*m_pOrganizeButton, true);
break;
@@ -812,7 +812,7 @@ void MacroChooser::SetMode (Mode nM)
case ChooseOnly:
{
- m_pRunButton->SetText( String( IDEResId( RID_STR_CHOOSE ) ) );
+ m_pRunButton->SetText(IDEResId(RID_STR_CHOOSE).toString());
EnableButton(*m_pDelButton, false);
EnableButton(*m_pOrganizeButton, false);
break;
@@ -820,7 +820,7 @@ void MacroChooser::SetMode (Mode nM)
case Recording:
{
- m_pRunButton->SetText( String( IDEResId( RID_STR_RECORD ) ) );
+ m_pRunButton->SetText(IDEResId(RID_STR_RECORD).toString());
EnableButton(*m_pDelButton, false);
EnableButton(*m_pOrganizeButton, false);
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index ae513291..8952742 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -785,10 +785,10 @@ void LibPage::InsertLib()
Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
// file open dialog
Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILEOPEN_SIMPLE);
- xFP->setTitle( String( IDEResId( RID_STR_APPENDLIBS ) ) );
+ xFP->setTitle(IDEResId(RID_STR_APPENDLIBS).toString());
// filter
- OUString aTitle = String( IDEResId( RID_STR_BASIC ) );
+ OUString aTitle(IDEResId(RID_STR_BASIC).toString());
OUString aFilter;
aFilter = "*.sbl;*.xlc;*.xlb" ; // library files
aFilter += ";*.sdw;*.sxw;*.odt" ; // text
@@ -1245,10 +1245,10 @@ void LibPage::ExportAsPackage( const String& aLibName )
Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILESAVE_SIMPLE);
- xFP->setTitle( String( IDEResId( RID_STR_EXPORTPACKAGE ) ) );
+ xFP->setTitle(IDEResId(RID_STR_EXPORTPACKAGE).toString());
// filter
- OUString aTitle = String( IDEResId( RID_STR_PACKAGE_BUNDLE ) );
+ OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE).toString());
OUString aFilter;
aFilter = "*.oxt" ; // library files
xFP->appendFilter( aTitle, aFilter );
@@ -1365,7 +1365,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) );
- xFolderPicker->setTitle( String( IDEResId( RID_STR_EXPORTBASIC ) ) );
+ xFolderPicker->setTitle(IDEResId(RID_STR_EXPORTBASIC).toString());
// set display directory and filter
String aPath =GetExtraData()->GetAddLibPath();
@@ -1569,17 +1569,17 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
if ( aLibName.getLength() > 30 )
{
- ErrorBox( pWin, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_LIBNAMETOLONG ) ) ).Execute();
+ ErrorBox( pWin, WB_OK | WB_DEF_OK, IDEResId(RID_STR_LIBNAMETOLONG).toString() ).Execute();
}
else if ( !IsValidSbxName( aLibName ) )
{
ErrorBox( pWin, WB_OK | WB_DEF_OK,
- String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
+ IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
}
else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) )
{
ErrorBox( pWin, WB_OK | WB_DEF_OK,
- String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute();
+ IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString() ).Execute();
}
else
{
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index cb707e9..3244507 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -43,10 +43,10 @@ ObjectCatalog::ObjectCatalog (Window* pParent) :
aTree(this, IDEResId(RID_TLB_MACROS))
{
SetHelpId("basctl:FloatingWindow:RID_BASICIDE_OBJCAT");
- SetText(String(IDEResId(RID_BASICIDE_OBJCAT)));
+ SetText(IDEResId(RID_BASICIDE_OBJCAT).toString());
// title
- aTitle.SetText(String(IDEResId(RID_BASICIDE_OBJCAT)));
+ aTitle.SetText(IDEResId(RID_BASICIDE_OBJCAT).toString());
aTitle.SetStyle(WB_CENTER);
// tree list
@@ -56,7 +56,7 @@ ObjectCatalog::ObjectCatalog (Window* pParent) :
WB_HASLINES | WB_HASLINESATROOT |
WB_HASBUTTONS | WB_HASBUTTONSATROOT
);
- aTree.SetAccessibleName(String(IDEResId(RID_STR_TLB_MACROS)));
+ aTree.SetAccessibleName(IDEResId(RID_STR_TLB_MACROS).toString());
aTree.SetHelpId(HID_BASICIDE_OBJECTCAT);
aTree.ScanAllEntries();
aTree.GrabFocus();
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 3b1be85..ecf9290 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -110,7 +110,7 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const
OUString SAL_CALL AccessibleChartView::getAccessibleName()
throw (uno::RuntimeException)
{
- return OUString( String( SchResId( STR_OBJECT_DIAGRAM )));
+ return SCH_RESSTR(STR_OBJECT_DIAGRAM);
}
OUString SAL_CALL AccessibleChartView::getAccessibleDescription()
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 12a01eb..78e3e14 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -430,7 +430,7 @@ ColumnChartDialogController::~ColumnChartDialogController()
}
String ColumnChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_COLUMN ));
+ return SCH_RESSTR( STR_TYPE_COLUMN );
}
Image ColumnChartDialogController::getImage()
{
@@ -491,10 +491,10 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) );
}
//--------------------------------------------------------------------------
@@ -507,7 +507,7 @@ BarChartDialogController::~BarChartDialogController()
}
String BarChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_BAR ));
+ return SCH_RESSTR( STR_TYPE_BAR );
}
Image BarChartDialogController::getImage()
{
@@ -567,10 +567,10 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 )));
rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) );
}
//--------------------------------------------------------------------------
@@ -583,7 +583,7 @@ PieChartDialogController::~PieChartDialogController()
}
String PieChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_PIE ));
+ return SCH_RESSTR( STR_TYPE_PIE );
}
Image PieChartDialogController::getImage()
{
@@ -622,10 +622,10 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D )));
rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_PIE_EXPLODED ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_DONUT ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DONUT_EXPLODED ) );
}
bool PieChartDialogController::shouldShow_3DLookControl() const
@@ -646,7 +646,7 @@ LineChartDialogController::~LineChartDialogController()
}
String LineChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_LINE ));
+ return SCH_RESSTR( STR_TYPE_LINE );
}
Image LineChartDialogController::getImage()
{
@@ -734,10 +734,10 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C
}
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) );
}
bool LineChartDialogController::shouldShow_StackingControl() const
{
@@ -798,7 +798,7 @@ XYChartDialogController::~XYChartDialogController()
}
String XYChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_XY ));
+ return SCH_RESSTR( STR_TYPE_XY );
}
Image XYChartDialogController::getImage()
{
@@ -849,10 +849,10 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha
rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) );
}
bool XYChartDialogController::shouldShow_SplineControl() const
{
@@ -898,7 +898,7 @@ AreaChartDialogController::~AreaChartDialogController()
}
String AreaChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_AREA ));
+ return SCH_RESSTR(STR_TYPE_AREA);
}
Image AreaChartDialogController::getImage()
{
@@ -938,9 +938,9 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C
rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) );
}
void AreaChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
@@ -981,7 +981,7 @@ NetChartDialogController::~NetChartDialogController()
}
String NetChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_NET ));
+ return SCH_RESSTR(STR_TYPE_NET);
}
Image NetChartDialogController::getImage()
{
@@ -1033,10 +1033,10 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch
rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK )));
}
- rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_FILLED )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_FILLED ) );
}
void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
@@ -1076,7 +1076,7 @@ StockChartDialogController::~StockChartDialogController()
String StockChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_STOCK ));
+ return SCH_RESSTR(STR_TYPE_STOCK);
}
Image StockChartDialogController::getImage()
{
@@ -1102,10 +1102,10 @@ void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 )));
rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 )));
- rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) );
- rSubTypeList.SetItemText( 3, String( SchResId( STR_STOCK_3 )) );
- rSubTypeList.SetItemText( 4, String( SchResId( STR_STOCK_4 )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_STOCK_1) );
+ rSubTypeList.SetItemText( 2, SCH_RESSTR(STR_STOCK_2) );
+ rSubTypeList.SetItemText( 3, SCH_RESSTR(STR_STOCK_3) );
+ rSubTypeList.SetItemText( 4, SCH_RESSTR(STR_STOCK_4) );
}
void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
@@ -1130,7 +1130,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
String CombiColumnLineChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
+ return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE);
}
Image CombiColumnLineChartDialogController::getImage( )
@@ -1153,15 +1153,15 @@ void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeLi
rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE )));
rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED )));
- rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) );
- rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) );
+ rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN));
+ rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN));
}
void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize )
{
if(!m_pFT_NumberOfLines)
{
m_pFT_NumberOfLines = new FixedText(pParent,pParent->GetStyle());
- m_pFT_NumberOfLines->SetText( String( SchResId( STR_NUMBER_OF_LINES )) );
+ m_pFT_NumberOfLines->SetText(SCH_RESSTR(STR_NUMBER_OF_LINES));
}
if(!m_pMF_NumberOfLines)
{
@@ -1276,7 +1276,7 @@ BubbleChartDialogController::~BubbleChartDialogController()
}
String BubbleChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_BUBBLE ));
+ return SCH_RESSTR(STR_TYPE_BUBBLE);
}
Image BubbleChartDialogController::getImage()
{
@@ -1294,7 +1294,7 @@ void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
rSubTypeList.Clear();
rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 )));
- rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) );
+ rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_BUBBLE_1) );
}
void BubbleChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
{
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6f9ced4..9f10757 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -146,8 +146,8 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt )
Edit::MouseButtonDown( rMEvt );
if( m_bShowWarningBox )
- WarningBox( this, WinBits( WB_OK ),
- String( SchResId( STR_INVALID_NUMBER ))).Execute();
+ WarningBox(this, WinBits( WB_OK ),
+ SCH_RESSTR(STR_INVALID_NUMBER)).Execute();
}
class SeriesHeader
@@ -779,13 +779,13 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt )
void DataBrowser::ShowWarningBox()
{
- WarningBox( this, WinBits( WB_OK ),
- String( SchResId( STR_INVALID_NUMBER ))).Execute();
+ WarningBox(this, WinBits( WB_OK ),
+ SCH_RESSTR(STR_INVALID_NUMBER)).Execute();
}
bool DataBrowser::ShowQueryBox()
{
- QueryBox* pQueryBox = new QueryBox( this, WB_YES_NO, String( SchResId( STR_DATA_EDITOR_INCORRECT_INPUT )));
+ QueryBox* pQueryBox = new QueryBox(this, WB_YES_NO, SCH_RESSTR(STR_DATA_EDITOR_INCORRECT_INPUT));
return ( pQueryBox->Execute() == RET_YES );
}
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 161e344..57b6f42 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -82,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
if( aTranslationMap.empty() )
{
- aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES )));
- aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR )));
- aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE )));
- aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE )));
- aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR )));
- aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE )));
- aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE )));
- aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL )));
- aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST )));
- aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST )));
- aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX )));
- aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN )));
- aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X )));
- aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y )));
- aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE )));
+ aTranslationMap[ "categories" ] = ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ).toString();
+ aTranslationMap[ "error-bars-x" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR ).toString();
+ aTranslationMap[ "error-bars-x-positive" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ).toString();
+ aTranslationMap[ "error-bars-x-negative" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ).toString();
+ aTranslationMap[ "error-bars-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ).toString();
+ aTranslationMap[ "error-bars-y-positive" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ).toString();
+ aTranslationMap[ "error-bars-y-negative" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ).toString();
+ aTranslationMap[ "label" ] = ::chart::SchResId( STR_DATA_ROLE_LABEL ).toString();
+ aTranslationMap[ "values-first" ] = ::chart::SchResId( STR_DATA_ROLE_FIRST ).toString();
+ aTranslationMap[ "values-last" ] = ::chart::SchResId( STR_DATA_ROLE_LAST ).toString();
+ aTranslationMap[ "values-max" ] = ::chart::SchResId( STR_DATA_ROLE_MAX ).toString();
+ aTranslationMap[ "values-min" ] = ::chart::SchResId( STR_DATA_ROLE_MIN ).toString();
+ aTranslationMap[ "values-x" ] = ::chart::SchResId( STR_DATA_ROLE_X ).toString();
+ aTranslationMap[ "values-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y ).toString();
+ aTranslationMap[ "values-size" ] = ::chart::SchResId( STR_DATA_ROLE_SIZE ).toString();
}
if( bFromInternalToUI )
@@ -308,7 +308,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
{
::std::vector< Reference< data::XLabeledDataSequence > > aNewSequences;
const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel();
- const OUString aLabel( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES )));
+ const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString());
const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles());
const Sequence< OUString > aOptRoles( xChartType->getSupportedOptionalRoles());
sal_Int32 nI = 0;
@@ -721,7 +721,7 @@ OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString
OUString DialogModel::GetRoleDataLabel()
{
- return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS )));
+ return ::chart::SchResId(STR_OBJECT_DATALABELS).toString();
}
sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString )
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 29a3f38..b630f3a 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -72,7 +72,7 @@ OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< fra
OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
{
- OUString aRet = String(SchResId(STR_TIP_DATASERIES));
+ OUString aRet(SCH_RESSTR(STR_TIP_DATASERIES));
OUString aWildcard( "%SERIESNAME" );
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
@@ -206,103 +206,103 @@ OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural )
switch( eObjectType )
{
case OBJECTTYPE_PAGE:
- aRet=String(SchResId(STR_OBJECT_PAGE));
+ aRet=SCH_RESSTR(STR_OBJECT_PAGE);
break;
case OBJECTTYPE_TITLE:
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_TITLES));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLES);
else
- aRet=String(SchResId(STR_OBJECT_TITLE));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE);
}
break;
case OBJECTTYPE_LEGEND:
- aRet=String(SchResId(STR_OBJECT_LEGEND));
+ aRet=SCH_RESSTR(STR_OBJECT_LEGEND);
break;
case OBJECTTYPE_LEGEND_ENTRY:
- aRet=String(SchResId(STR_OBJECT_LEGEND_SYMBOL));//@todo change string if we do differenciate symbol and legend entry in future
+ aRet=SCH_RESSTR(STR_OBJECT_LEGEND_SYMBOL);//@todo change string if we do differenciate symbol and legend entry in future
break;
case OBJECTTYPE_DIAGRAM:
- aRet=String(SchResId(STR_OBJECT_DIAGRAM));
+ aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM);
break;
case OBJECTTYPE_DIAGRAM_WALL:
- aRet=String(SchResId(STR_OBJECT_DIAGRAM_WALL));
+ aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_WALL);
break;
case OBJECTTYPE_DIAGRAM_FLOOR:
- aRet=String(SchResId(STR_OBJECT_DIAGRAM_FLOOR));
+ aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_FLOOR);
break;
case OBJECTTYPE_AXIS:
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_AXES));
+ aRet=SCH_RESSTR(STR_OBJECT_AXES);
else
- aRet=String(SchResId(STR_OBJECT_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_AXIS);
}
break;
case OBJECTTYPE_AXIS_UNITLABEL:
- aRet=String(SchResId(STR_OBJECT_LABEL));//@todo maybe a more concrete name
+ aRet=SCH_RESSTR(STR_OBJECT_LABEL);//@todo maybe a more concrete name
break;
case OBJECTTYPE_GRID:
case OBJECTTYPE_SUBGRID: //maybe todo: different names for subgrids
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_GRIDS));
+ aRet=SCH_RESSTR(STR_OBJECT_GRIDS);
else
- aRet=String(SchResId(STR_OBJECT_GRID));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID);
}
break;
case OBJECTTYPE_DATA_SERIES:
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_DATASERIES_PLURAL));
+ aRet=SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL);
else
- aRet=String(SchResId(STR_OBJECT_DATASERIES));
+ aRet=SCH_RESSTR(STR_OBJECT_DATASERIES);
}
break;
case OBJECTTYPE_DATA_POINT:
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_DATAPOINTS));
+ aRet=SCH_RESSTR(STR_OBJECT_DATAPOINTS);
else
- aRet=String(SchResId(STR_OBJECT_DATAPOINT));
+ aRet=SCH_RESSTR(STR_OBJECT_DATAPOINT);
}
break;
case OBJECTTYPE_DATA_LABELS:
- aRet=String(SchResId(STR_OBJECT_DATALABELS));
+ aRet=SCH_RESSTR(STR_OBJECT_DATALABELS);
break;
case OBJECTTYPE_DATA_LABEL:
- aRet=String(SchResId(STR_OBJECT_LABEL));
+ aRet=SCH_RESSTR(STR_OBJECT_LABEL);
break;
case OBJECTTYPE_DATA_ERRORS_X:
- aRet=String(SchResId(STR_OBJECT_ERROR_BARS_X));
+ aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_X);
break;
case OBJECTTYPE_DATA_ERRORS_Y:
- aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y));
+ aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Y);
break;
case OBJECTTYPE_DATA_ERRORS_Z:
- aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Z));
+ aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Z);
break;
case OBJECTTYPE_DATA_AVERAGE_LINE:
- aRet=String(SchResId(STR_OBJECT_AVERAGE_LINE));
+ aRet=SCH_RESSTR(STR_OBJECT_AVERAGE_LINE);
break;
case OBJECTTYPE_DATA_CURVE:
{
if(bPlural)
- aRet=String(SchResId(STR_OBJECT_CURVES));
+ aRet=SCH_RESSTR(STR_OBJECT_CURVES);
else
- aRet=String(SchResId(STR_OBJECT_CURVE));
+ aRet=SCH_RESSTR(STR_OBJECT_CURVE);
}
break;
case OBJECTTYPE_DATA_STOCK_RANGE:
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
- aRet=String(SchResId(STR_OBJECT_STOCK_LOSS));
+ aRet=SCH_RESSTR(STR_OBJECT_STOCK_LOSS);
break;
case OBJECTTYPE_DATA_STOCK_GAIN:
- aRet=String(SchResId(STR_OBJECT_STOCK_GAIN));
+ aRet=SCH_RESSTR(STR_OBJECT_STOCK_GAIN);
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
- aRet=String(SchResId(STR_OBJECT_CURVE_EQUATION));
+ aRet=SCH_RESSTR(STR_OBJECT_CURVE_EQUATION);
break;
default: //OBJECTTYPE_UNKNOWN
;
@@ -329,21 +329,21 @@ OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID
{
case 0://x-axis
if( nAxisIndex == 0 )
- aRet=String(SchResId(STR_OBJECT_AXIS_X));
+ aRet=SCH_RESSTR(STR_OBJECT_AXIS_X);
else
- aRet=String(SchResId(STR_OBJECT_SECONDARY_X_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_X_AXIS);
break;
case 1://y-axis
if( nAxisIndex == 0 )
- aRet=String(SchResId(STR_OBJECT_AXIS_Y));
+ aRet=SCH_RESSTR(STR_OBJECT_AXIS_Y);
else
- aRet=String(SchResId(STR_OBJECT_SECONDARY_Y_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_Y_AXIS);
break;
case 2://z-axis
- aRet=String(SchResId(STR_OBJECT_AXIS_Z));
+ aRet=SCH_RESSTR(STR_OBJECT_AXIS_Z);
break;
default://axis
- aRet=String(SchResId(STR_OBJECT_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_AXIS);
break;
}
@@ -357,25 +357,25 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
switch(eType)
{
case TitleHelper::MAIN_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_MAIN));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_MAIN);
break;
case TitleHelper::SUB_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_SUB));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_SUB);
break;
case TitleHelper::X_AXIS_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_X_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_X_AXIS);
break;
case TitleHelper::Y_AXIS_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_Y_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_Y_AXIS);
break;
case TitleHelper::Z_AXIS_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_Z_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_Z_AXIS);
break;
case TitleHelper::SECONDARY_X_AXIS_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_X_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_X_AXIS);
break;
case TitleHelper::SECONDARY_Y_AXIS_TITLE:
- aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_Y_AXIS));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_Y_AXIS);
break;
default:
OSL_FAIL("unknown title type");
@@ -383,7 +383,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
}
if( aRet.isEmpty() )
- aRet=String(SchResId(STR_OBJECT_TITLE));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE);
return aRet;
}
@@ -402,7 +402,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
aRet = ObjectNameProvider::getTitleNameByType( eType );
}
if( aRet.isEmpty() )
- aRet=String(SchResId(STR_OBJECT_TITLE));
+ aRet=SCH_RESSTR(STR_OBJECT_TITLE);
return aRet;
}
@@ -427,16 +427,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
switch(nDimensionIndex)
{
case 0://x-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_X));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_X);
break;
case 1://y-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Y));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Y);
break;
case 2://z-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Z));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Z);
break;
default://axis
- aRet=String(SchResId(STR_OBJECT_GRID));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID);
break;
}
}
@@ -445,16 +445,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
switch(nDimensionIndex)
{
case 0://x-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MINOR_X));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_X);
break;
case 1://y-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Y));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Y);
break;
case 2://z-axis
- aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Z));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Z);
break;
default://axis
- aRet=String(SchResId(STR_OBJECT_GRID));
+ aRet=SCH_RESSTR(STR_OBJECT_GRID);
break;
}
}
@@ -493,14 +493,14 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
OUString aNewLine( "\n" );
- aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX));
+ aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX);
aRet+=aNewLine;
- aRet+=String(SchResId(STR_TIP_DATASERIES));
+ aRet+=SCH_RESSTR(STR_TIP_DATASERIES);
aRet+=aNewLine;
- aRet+=String(SchResId(STR_TIP_DATAPOINT_VALUES));
+ aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
}
else
- aRet=String(SchResId(STR_TIP_DATAPOINT));
+ aRet=SCH_RESSTR(STR_TIP_DATAPOINT);
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY );
@@ -554,7 +554,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
if( bVerbose )
{
- aRet = String( SchResId( STR_OBJECT_CURVE_WITH_PARAMETERS ));
+ aRet = SCH_RESSTR( STR_OBJECT_CURVE_WITH_PARAMETERS );
Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ));
Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
if( xCurveCnt.is())
@@ -603,7 +603,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
if( bVerbose )
{
- aRet = String( SchResId( STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS ));
+ aRet = SCH_RESSTR(STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS);
Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ));
Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
if( xCurveCnt.is())
@@ -670,7 +670,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
if( OBJECTTYPE_DATA_POINT == eObjectType )
{
- aRet = String( SchResId( STR_STATUS_DATAPOINT_MARKED ));
+ aRet = SCH_RESSTR( STR_STATUS_DATAPOINT_MARKED );
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY );
@@ -706,7 +706,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose ));
if( !aHelpText.isEmpty())
{
- aRet = String( SchResId( STR_STATUS_OBJECT_MARKED ));
+ aRet = SCH_RESSTR( STR_STATUS_OBJECT_MARKED );
replaceParamterInString( aRet, "%OBJECTNAME", aHelpText );
}
}
@@ -778,7 +778,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries(
Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ), uno::UNO_QUERY );
if( xSeries.is() )
{
- OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES));
+ OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_SERIES);
replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) );
replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) );
return aRet;
@@ -789,7 +789,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries(
OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
{
- OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES));
+ OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_ALL_SERIES);
replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) );
return aRet;
}
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 2105aef..04a970c 100644
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -32,7 +32,7 @@ RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId
ImageButton( pParent, rResId )
{
SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) );
- this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE));
+ this->SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE));
}
RangeSelectionButton::~RangeSelectionButton()
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 99667e4..91863c8 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -30,9 +30,9 @@ namespace chart
TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId, Window* pWindow1, Window* pWindow2 ) :
svx::FrameDirectionListBox( pParent, rResId )
{
- InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_LTR ) ), FRMDIR_HORI_LEFT_TOP );
- InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_RTL ) ), FRMDIR_HORI_RIGHT_TOP );
- InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_SUPER ) ), FRMDIR_ENVIRONMENT );
+ InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
+ InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP );
+ InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT );
if( !SvtLanguageOptions().IsCTLFontEnabled() )
{
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 9d04659..b40d3db 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -50,7 +50,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent
{
FreeResource();
- this->SetText(String(SchResId(STR_PAGE_CHARTTYPE)));
+ this->SetText(SCH_RESSTR(STR_PAGE_CHARTTYPE));
//don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly
m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index fd7feb19..a89d323 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -78,10 +78,10 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
{
m_nOnePageOnlyIndex = -1;
- this->setTitleBase(String(SchResId(STR_DLG_CHART_WIZARD)));
+ this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD));
}
else
- this->setTitleBase(String());
+ this->setTitleBase(OUString());
declarePath( PATH_FULL
, STATE_CHARTTYPE
@@ -219,7 +219,7 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const
default:
break;
}
- return String(SchResId(nResId));
+ return SCH_RESSTR(nResId);
}
//.............................................................................
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 80bc723..e601d84 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -167,8 +167,8 @@ DataSourceDialog::DataSourceDialog(
m_pDataSourceTabPage = new DataSourceTabPage( m_pTabControl, *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true /* bHideDescription */ );
- m_pTabControl->InsertPage( TP_RANGECHOOSER, String( SchResId( STR_PAGE_DATA_RANGE )));
- m_pTabControl->InsertPage( TP_DATA_SOURCE, String( SchResId( STR_OBJECT_DATASERIES_PLURAL )));
+ m_pTabControl->InsertPage( TP_RANGECHOOSER, SCH_RESSTR(STR_PAGE_DATA_RANGE) );
+ m_pTabControl->InsertPage( TP_DATA_SOURCE, SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL) );
m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabePage );
m_pTabControl->SetTabPage( TP_DATA_SOURCE, m_pDataSourceTabPage );
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 081b39f..eb5bfaf 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -67,9 +67,9 @@ View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel
m_pAppearance = new ThreeD_SceneAppearance_TabPage(&m_aTabControl,xChartModel,m_aControllerLocker);
m_pIllumination = new ThreeD_SceneIllumination_TabPage(&m_aTabControl,xSceneProperties,xChartModel,pColorTable);
- m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, String(SchResId(STR_PAGE_PERSPECTIVE)) );
- m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, String(SchResId(STR_PAGE_APPEARANCE)) );
- m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, String(SchResId(STR_PAGE_ILLUMINATION)) );
+ m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) );
+ m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) );
+ m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) );
m_aTabControl.SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry );
m_aTabControl.SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance );
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 791b9c8..9550871 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -34,7 +34,7 @@ BarGeometryResources::BarGeometryResources( Window* pWindow )
: m_aFT_Geometry( pWindow, pWindow->GetStyle() )
, m_aLB_Geometry( pWindow, SchResId( LB_BAR_GEOMETRY ) )
{
- m_aFT_Geometry.SetText( String( SchResId( STR_BAR_GEOMETRY )) );
+ m_aFT_Geometry.SetText( SCH_RESSTR( STR_BAR_GEOMETRY ) );
m_aFT_Geometry.SetSizePixel( m_aFT_Geometry.CalcMinimumSize() );
m_aLB_Geometry.SetAccessibleName(m_aFT_Geometry.GetText());
m_aLB_Geometry.SetAccessibleRelationLabeledBy(&m_aFT_Geometry);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 3bd3a13..3b24755 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -250,7 +250,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
NumberFormatDialog aDlg(m_pWindow, aNumberSet);
if( bPercent )
- aDlg.SetText( String( SchResId( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) ) );
+ aDlg.SetText( SCH_RESSTR( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) );
if( RET_OK == aDlg.Execute() )
{
const SfxItemSet* pResult = aDlg.GetOutputItemSet();
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1a8c2fe..713fed2 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -153,8 +153,8 @@ ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog,
m_aIbRangePositive.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange ));
m_aIbRangeNegative.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange ));
- m_aIbRangePositive.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE )));
- m_aIbRangeNegative.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE )));
+ m_aIbRangePositive.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE));
+ m_aIbRangeNegative.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE));
FillValueSets();
Reset( rInAttrs );
@@ -198,7 +198,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( m_bHasInternalDataProvider )
{
- m_aRbRange.SetText( String( SchResId( STR_CONTROLTEXT_ERROR_BARS_FROM_DATA )));
+ m_aRbRange.SetText(SCH_RESSTR(STR_CONTROLTEXT_ERROR_BARS_FROM_DATA));
}
if( m_aRbRange.IsChecked())
@@ -451,12 +451,12 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
if( pButton == &m_aIbRangePositive )
{
m_pCurrentRangeChoosingField = &m_aEdRangePositive;
- aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ));
+ aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS );
}
else
{
m_pCurrentRangeChoosingField = &m_aEdRangeNegative;
- aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ));
+ aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS );
}
assert( m_pParentDialog );
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 9b7fc8c..6180477 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -37,7 +37,7 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow )
, m_aEntryMap()
, m_nDefaultPos(0)
{
- m_aFT_Separator.SetText( String( SchResId( STR_TEXT_SEPARATOR )) );
+ m_aFT_Separator.SetText( SCH_RESSTR( STR_TEXT_SEPARATOR ) );
m_aFT_Separator.SetSizePixel( m_aFT_Separator.CalcMinimumSize() );
m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount());
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 8f7b0cd..7c16bd2 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -108,8 +108,8 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
, m_rControllerLockHelper( rControllerLockHelper )
{
FreeResource();
- m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE)),POS_3DSCHEME_SIMPLE);
- m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC)),POS_3DSCHEME_REALISTIC);
+ m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE),POS_3DSCHEME_SIMPLE);
+ m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC),POS_3DSCHEME_REALISTIC);
m_aLB_Scheme.SetDropDownLineCount(2);
m_aLB_Scheme.SetSelectHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectSchemeHdl ) );
@@ -281,7 +281,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
break;
case ThreeDLookScheme_Unknown:
{
- m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_CUSTOM)),POS_3DSCHEME_CUSTOM);
+ m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_CUSTOM),POS_3DSCHEME_CUSTOM);
m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_CUSTOM );
m_aLB_Scheme.SetDropDownLineCount(3);
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index f838433..ec691e5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -54,7 +54,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
{
SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
- String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) );
+ String aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) );
OUString aTipHelp( aTipHelpStr );
const OUString aReplacementStr( "%LIGHTNUMBER" );
sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr );
@@ -96,7 +96,7 @@ ColorButton::ColorButton( Window* pParent, const ResId& rResId )
: ImageButton( pParent, rResId )
{
SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) );
- this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) );
+ this->SetQuickHelpText( SCH_RESSTR(STR_TIP_CHOOSECOLOR) );
}
ColorButton::~ColorButton()
@@ -345,7 +345,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
m_aBtn_Light6.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
m_aBtn_Light7.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
m_aBtn_Light8.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
- m_aCtl_Preview.SetAccessibleName(String(SchResId( STR_LIGHT_PREVIEW )));
+ m_aCtl_Preview.SetAccessibleName(SCH_RESSTR( STR_LIGHT_PREVIEW ));
}
ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 34446a9..3e4ff3c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -162,8 +162,8 @@ Dim3DLookResourceGroup::Dim3DLookResourceGroup( Window* pWindow )
{
m_aCB_3DLook.SetToggleHdl( LINK( this, Dim3DLookResourceGroup, Dim3DLookCheckHdl ) );
- m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE)));
- m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC)));
+ m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE));
+ m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC));
m_aLB_Scheme.SetDropDownLineCount(2);
m_aLB_Scheme.SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) );
@@ -459,7 +459,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
get(m_pFT_SplineOrder, "PolynomialsLabel");
get(m_pMF_SplineOrder, "PolynomialsSpinButton");
- this->SetText( String( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ) );
+ this->SetText( SCH_RESSTR( STR_DLG_SMOOTH_LINE_PROPERTIES ) );
m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) );
}
@@ -627,9 +627,9 @@ SplineResourceGroup::SplineResourceGroup( Window* pWindow )
, m_aPB_DetailsDialog( pWindow, SchResId( PB_SPLINE_DIALOG ) )
, m_pSplinePropertiesDialog()
{
- m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STRAIGHT)));
- m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_SMOOTH)));
- m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STEPPED)));
+ m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STRAIGHT));
+ m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_SMOOTH));
+ m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STEPPED));
m_aLB_LineType.SetDropDownLineCount(3);
m_aLB_LineType.SetSelectHdl( LINK( this, SplineResourceGroup, LineTypeChangeHdl ) );
m_aLB_LineType.SetAccessibleName(m_aFT_LineType.GetText());
@@ -716,7 +716,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
m_aLB_LineType.SelectEntryPos(POS_LINETYPE_SMOOTH);
m_aPB_DetailsDialog.Enable(true);
m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) );
- m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES) ) );
+ m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_SMOOTH_LINE_PROPERTIES) );
getSplinePropertiesDialog().fillControls( rParameter );
break;
case CurveStyle_STEP_START:
@@ -726,7 +726,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
m_aLB_LineType.SelectEntryPos(POS_LINETYPE_STEPPED);
m_aPB_DetailsDialog.Enable(true);
m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) );
- m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_STEPPED_LINE_PROPERTIES) ) );
+ m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) );
getSteppedPropertiesDialog().fillControls( rParameter );
break;
default:
@@ -915,7 +915,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
m_aFT_ChooseType.SetStyle( m_aFT_ChooseType.GetStyle() | WB_NOLABEL );
}
- this->SetText( String(SchResId(STR_PAGE_CHARTTYPE)) );
+ this->SetText( SCH_RESSTR(STR_PAGE_CHARTTYPE) );
m_aMainTypeList.SetStyle(m_aMainTypeList.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK );
m_aMainTypeList.SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 13a2fe4..43d7d19 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -294,7 +294,7 @@ DataSourceTabPage::DataSourceTabPage(
}
m_aFixedTextRange = OUString( m_aFT_RANGE.GetText() );
- this->SetText( String( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ) );
+ this->SetText( SCH_RESSTR( STR_OBJECT_DATASERIES_PLURAL ) );
// set handlers
m_apLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl ));
@@ -347,8 +347,8 @@ DataSourceTabPage::DataSourceTabPage(
if( m_apLB_SERIES->First())
m_apLB_SERIES->Select( m_apLB_SERIES->First());
m_apLB_SERIES->GrabFocus();
- m_aBTN_UP.SetAccessibleName(String(SchResId(STR_BUTTON_UP)));
- m_aBTN_DOWN.SetAccessibleName(String(SchResId(STR_BUTTON_DOWN)));
+ m_aBTN_UP.SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP));
+ m_aBTN_DOWN.SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN));
}
DataSourceTabPage::~DataSourceTabPage()
@@ -472,7 +472,7 @@ void DataSourceTabPage::fillSeriesListBox()
{
if( nUnnamedSeriesIndex > 1 )
{
- OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX )));
+ OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ).toString());
// replace index of unnamed series
const OUString aReplacementStr( "%NUMBER" );
@@ -483,7 +483,7 @@ void DataSourceTabPage::fillSeriesListBox()
OUString::valueOf(nUnnamedSeriesIndex)));
}
if( aLabel.isEmpty() )
- aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ));
+ aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString();
++nUnnamedSeriesIndex;
}
@@ -637,8 +637,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
if( bHasSelectedEntry && (m_aLB_ROLE.FirstSelected() != 0))
{
- String aStr( SchResId( STR_DATA_SELECT_RANGE_FOR_SERIES ));
- OUString aUIStr( aStr );
+ OUString aUIStr(SCH_RESSTR(STR_DATA_SELECT_RANGE_FOR_SERIES));
// replace role
OUString aReplacement( "%VALUETYPE" );
@@ -674,10 +673,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl)
! updateModelFromControl( m_pCurrentRangeChoosingField ))
return 0;
- String aStr( SchResId( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS ));
+ OUString aStr( SCH_RESSTR( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS ));
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange(
- m_rDialogModel.getCategoriesRange(), OUString( aStr ), *this );
+ m_rDialogModel.getCategoriesRange(), aStr, *this );
return 0;
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 1ce4107..c3cfe03 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -133,8 +133,8 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
m_aFT_Caption.SetStyle( m_aFT_Caption.GetStyle() | WB_NOLABEL );
}
- this->SetText( String(SchResId(STR_PAGE_DATA_RANGE)) );
- m_aIB_Range.SetQuickHelpText( String(SchResId(STR_TIP_SELECT_RANGE)) );
+ this->SetText( SCH_RESSTR(STR_PAGE_DATA_RANGE) );
+ m_aIB_Range.SetQuickHelpText( SCH_RESSTR(STR_TIP_SELECT_RANGE) );
// set defaults as long as DetectArguments does not work
m_aRB_Columns.Check();
@@ -354,7 +354,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
{
OUString aRange = m_aED_Range.GetText();
// using assignment for broken gcc 3.3
- OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
+ OUString aTitle = SCH_RESSTR( STR_PAGE_DATA_RANGE );
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 0acab30..e1e062a 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -752,7 +752,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* =
if( nResIdMessage == 0 )
return false;
- WarningBox( this, WinBits( WB_OK ), String( SchResId( nResIdMessage ))).Execute();
+ WarningBox( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) ).Execute();
if( pControl )
{
pControl->GrabFocus();
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index fced71d..72c0b6a 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -59,7 +59,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent
{
FreeResource();
- this->SetText( String( SchResId( STR_PAGE_CHART_ELEMENTS ) ) );
+ this->SetText( SCH_RESSTR( STR_PAGE_CHART_ELEMENTS ) );
Font aFont( m_aFT_TitleDescription.GetControlFont() );
aFont.SetWeight( WEIGHT_BOLD );
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e10133c..4f7a4a1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1289,7 +1289,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
{
// using assignment for broken gcc 3.3
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
- String( SchResId( STR_ACTION_EDIT_CHARTTYPE )), m_xUndoManager );
+ SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager );
SolarMutexGuard aSolarGuard;
//prepare and open dialog
@@ -1310,7 +1310,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
return;
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
- String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager );
+ SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager );
if( xChartDoc.is())
{
SolarMutexGuard aSolarGuard;
@@ -1335,7 +1335,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
UndoGuardWithSelection aUndoGuard(
ActionDescriptionProvider::createDescription(
(bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM),
- String( SchResId( STR_OBJECT_DATASERIES ))),
+ SCH_RESSTR(STR_OBJECT_DATASERIES)),
m_xUndoManager );
bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( getModel() ), xGivenDataSeries, bForward );
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 8d9dd5d6..ec72c7c 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -55,7 +55,7 @@ void ChartController::executeDispatch_EditData()
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
- String( SchResId( STR_ACTION_EDIT_CHART_DATA )),
+ SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
m_xUndoManager );
DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC );
// the dialog has no OK/Cancel
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 08c4610..d7bc61d 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -109,7 +109,7 @@ void ChartController::executeDispatch_InsertAxes()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXES ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXES )),
m_xUndoManager );
try
@@ -147,7 +147,7 @@ void ChartController::executeDispatch_InsertGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRIDS ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRIDS )),
m_xUndoManager );
try
@@ -184,7 +184,7 @@ void ChartController::executeDispatch_InsertTitles()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLES ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLES )),
m_xUndoManager );
try
@@ -215,7 +215,7 @@ void ChartController::executeDispatch_DeleteLegend()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )),
m_xUndoManager );
LegendHelper::hideLegend( getModel() );
@@ -226,7 +226,7 @@ void ChartController::executeDispatch_InsertLegend()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )),
m_xUndoManager );
Reference< chart2::XLegend > xLegend = LegendHelper::showLegend( getModel(), m_xCC );
@@ -237,7 +237,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )),
m_xUndoManager );
try
@@ -268,7 +268,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_DATALABELS ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_DATALABELS )),
m_xUndoManager );
//if a series is selected insert labels for that series only:
@@ -330,7 +330,7 @@ void ChartController::executeDispatch_InsertMeanValue()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
lcl_InsertMeanValueLine( m_xCC ).operator()(
ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ));
@@ -341,7 +341,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries(
@@ -383,7 +383,7 @@ void ChartController::executeDispatch_InsertTrendline()
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE )),
m_xUndoManager );
uno::Reference< chart2::XRegressionCurve > xCurve =
@@ -442,7 +442,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT,
- String( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X ))),
+ SCH_RESSTR( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )),
m_xUndoManager );
// add error bars with standard deviation
@@ -549,7 +549,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true ));
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 ));
@@ -566,7 +566,7 @@ void ChartController::executeDispatch_InsertR2Value()
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true ));
aUndoGuard.commit();
@@ -581,7 +581,7 @@ void ChartController::executeDispatch_DeleteR2Value()
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
aUndoGuard.commit();
@@ -596,7 +596,7 @@ void ChartController::executeDispatch_DeleteMeanValue()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -611,7 +611,7 @@ void ChartController::executeDispatch_DeleteTrendline()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )),
m_xUndoManager );
RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -626,7 +626,7 @@ void ChartController::executeDispatch_DeleteTrendlineEquation()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
RegressionCurveHelper::removeEquations( xRegCurveCnt );
aUndoGuard.commit();
@@ -641,7 +641,7 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError )
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )),
m_xUndoManager );
StatisticsHelper::removeErrorBars( xDataSeries, bYError );
aUndoGuard.commit();
@@ -655,7 +655,7 @@ void ChartController::executeDispatch_InsertDataLabels()
if( xSeries.is() )
{
UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT,
- String( SchResId( STR_OBJECT_DATALABELS ))),
+ SCH_RESSTR( STR_OBJECT_DATALABELS )),
m_xUndoManager );
DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -665,7 +665,7 @@ void ChartController::executeDispatch_InsertDataLabels()
void ChartController::executeDispatch_InsertDataLabel()
{
UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT,
- String( SchResId( STR_OBJECT_LABEL ))),
+ SCH_RESSTR( STR_OBJECT_LABEL )),
m_xUndoManager );
DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -678,7 +678,7 @@ void ChartController::executeDispatch_DeleteDataLabels()
if( xSeries.is() )
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE,
- String( SchResId( STR_OBJECT_DATALABELS ))),
+ SCH_RESSTR( STR_OBJECT_DATALABELS )),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -688,7 +688,7 @@ void ChartController::executeDispatch_DeleteDataLabels()
void ChartController::executeDispatch_DeleteDataLabel()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE,
- String( SchResId( STR_OBJECT_LABEL ))),
+ SCH_RESSTR( STR_OBJECT_LABEL )),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -697,7 +697,7 @@ void ChartController::executeDispatch_DeleteDataLabel()
void ChartController::executeDispatch_ResetAllDataPoints()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT,
- String( SchResId( STR_OBJECT_DATAPOINTS ))),
+ SCH_RESSTR( STR_OBJECT_DATAPOINTS )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -707,7 +707,7 @@ void ChartController::executeDispatch_ResetAllDataPoints()
void ChartController::executeDispatch_ResetDataPoint()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT,
- String( SchResId( STR_OBJECT_DATAPOINT ))),
+ SCH_RESSTR( STR_OBJECT_DATAPOINT )),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -726,7 +726,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLE ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLE )),
m_xUndoManager );
Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() );
@@ -758,7 +758,7 @@ void ChartController::executeDispatch_InsertAxis()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXIS ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXIS )),
m_xUndoManager );
try
@@ -780,7 +780,7 @@ void ChartController::executeDispatch_DeleteAxis()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AXIS ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AXIS )),
m_xUndoManager );
try
@@ -802,7 +802,7 @@ void ChartController::executeDispatch_InsertMajorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -824,7 +824,7 @@ void ChartController::executeDispatch_DeleteMajorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -846,7 +846,7 @@ void ChartController::executeDispatch_InsertMinorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )),
m_xUndoManager );
try
@@ -870,7 +870,7 @@ void ChartController::executeDispatch_DeleteMinorGrid()
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR(STR_OBJECT_GRID)),
m_xUndoManager );
try
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index f06c271..09c24ea 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -825,7 +825,7 @@ void SAL_CALL ChartController::executeDispatch_View3D()
{
// using assignment for broken gcc 3.3
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
- String( SchResId( STR_ACTION_EDIT_3D_VIEW )),
+ SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ),
m_xUndoManager );
//open dialog
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 8fd50b0..1db54eb 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -73,7 +73,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" );
m_pTextActionUndoGuard.reset( new UndoGuard(
- String( SchResId( STR_ACTION_EDIT_TEXT ) ), m_xUndoManager ) );
+ SCH_RESSTR( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) );
SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
//#i77362 change notification for changes on additional shapes are missing
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 18359d33..cd25717 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -107,7 +107,7 @@ bool lcl_deleteDataSeries(
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_DATASERIES ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_DATASERIES )),
xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) );
@@ -146,7 +146,7 @@ bool lcl_deleteDataCurve(
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )),
xUndoManager );
xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve );
@@ -194,7 +194,7 @@ void ChartController::executeDispatch_NewArrangement()
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_REARRANGE_CHART )),
+ SCH_RESSTR( STR_ACTION_REARRANGE_CHART ),
m_xUndoManager );
ControllerLockGuard aCtlLockGuard( xModel );
@@ -248,7 +248,7 @@ void ChartController::executeDispatch_ScaleText()
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_SCALE_TEXT )),
+ SCH_RESSTR( STR_ACTION_SCALE_TEXT ),
m_xUndoManager );
ControllerLockGuard aCtlLockGuard( getModel() );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -630,7 +630,7 @@ bool ChartController::executeDispatch_Delete()
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_TITLE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )),
m_xUndoManager );
TitleHelper::removeTitle(
ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() );
@@ -649,7 +649,7 @@ bool ChartController::executeDispatch_Delete()
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )),
m_xUndoManager );
xLegendProp->setPropertyValue( "Show", uno::makeAny( false ));
bReturn = true;
@@ -696,7 +696,7 @@ bool ChartController::executeDispatch_Delete()
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
bReturn = true;
@@ -722,7 +722,7 @@ bool ChartController::executeDispatch_Delete()
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
m_xUndoManager );
{
ControllerLockGuard aCtlLockGuard( xModel );
@@ -756,7 +756,7 @@ bool ChartController::executeDispatch_Delete()
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( nId ))),
+ ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )),
m_xUndoManager );
{
ControllerLockGuard aCtlLockGuard( xModel );
@@ -779,8 +779,8 @@ bool ChartController::executeDispatch_Delete()
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, OUString( String(
- SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))),
+ ActionDescriptionProvider::DELETE,
+ SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )),
m_xUndoManager );
chart2::DataPointLabel aLabel;
xObjectProperties->getPropertyValue( "Label" ) >>= aLabel;
@@ -845,7 +845,7 @@ void ChartController::executeDispatch_ToggleLegend()
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager );
+ SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager );
Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend( xModel ), uno::UNO_QUERY );
bool bChanged = false;
if( xLegendProp.is())
@@ -879,7 +879,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal()
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager );
+ SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() ));
if( xDiagram.is())
{
@@ -913,7 +913,7 @@ void ChartController::executeDispatch_ToggleGridVertical()
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_TOGGLE_GRID_VERTICAL )), m_xUndoManager );
+ SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() ));
if( xDiagram.is())
{
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 208bf0a..0dd17f6 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1556,7 +1556,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
if( ! bReturn )
{
SolarMutexGuard aGuard;
- InfoBox( m_pChartWindow, String(SchResId( STR_ACTION_NOTPOSSIBLE ))).Execute();
+ InfoBox( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE )).Execute();
}
}
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index ffe3ccb..c03404f 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -111,7 +111,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
XLineEndListRef pLineEndList = rModel.GetLineEndList();
if ( pLineEndList.is() )
{
- String aName( SVX_RES( nResId ) );
+ String aName( SVX_RESSTR( nResId ) );
long nCount = pLineEndList->Count();
for ( long nIndex = 0; nIndex < nCount; ++nIndex )
{
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 2711702..601cf82 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list