summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/LayerTabBar.cxx22
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx2
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx4
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx6
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx4
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/diactrl.cxx6
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx14
-rw-r--r--sd/source/ui/dlg/filedlg.cxx26
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx24
-rw-r--r--sd/source/ui/dlg/inspagob.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx8
-rw-r--r--sd/source/ui/dlg/prltempl.cxx14
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx22
-rw-r--r--sd/source/ui/dlg/tpoption.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx14
19 files changed, 91 insertions, 91 deletions
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index a62a59603403..edc4be63b315 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -170,11 +170,11 @@ bool LayerTabBar::StartRenaming()
{
bool bOK = true;
OUString aLayerName = GetPageText( GetEditPageId() );
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
if ( aLayerName == aLayoutLayer || aLayerName == aControlsLayer ||
aLayerName == aMeasureLinesLayer ||
@@ -212,18 +212,18 @@ TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming()
{
// Name already exists
ScopedVclPtrInstance<WarningBox> aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ),
- SD_RESSTR( STR_WARN_NAME_DUPLICATE ) );
+ SdResId( STR_WARN_NAME_DUPLICATE ) );
aWarningBox->Execute();
bOK = false;
}
if (bOK)
{
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
if ( aNewName == aLayoutLayer || aNewName == aControlsLayer ||
aNewName == aMeasureLinesLayer ||
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index a441b1a0a548..cd83474c0af4 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -50,7 +50,7 @@ PaneChildWindow::PaneChildWindow (
pBindings,
this,
pParentWindow,
- SD_RESSTR(nTitleBarResId)));
+ SdResId(nTitleBarResId)));
SetAlignment(SfxChildAlignment::LEFT);
static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo);
SetHideNotDelete(true);
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index c2f03a7cf7cc..ffc73486e2c3 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -109,7 +109,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
{
if (pImagesLst->GetEntryCount() == 0)
{
- ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SD_RESSTR(STR_PHOTO_ALBUM_EMPTY_WARNING));
+ ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SdResId(STR_PHOTO_ALBUM_EMPTY_WARNING));
aWarning->Execute();
}
else
@@ -610,7 +610,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
OUString sImgUrl = pData ? OUString(*pData) : "";
- if (sImgUrl != SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX))
+ if (sImgUrl != SdResId(STR_PHOTO_ALBUM_TEXTBOX))
{
GraphicFilter aCurFilter;
Graphic aGraphic;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index f0933ba5e7e9..d0583395923f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -80,7 +80,7 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
m_aScrollBar->EnableDrag();
m_aPinBox->SetUseThousandSep(false);
- m_aDeauthoriseButton->SetText( SD_RESSTR(STR_DEAUTHORISE_CLIENT) );
+ m_aDeauthoriseButton->SetText( SdResId(STR_DEAUTHORISE_CLIENT) );
m_aDeauthoriseButton->SetClickHdl( LINK( this, ClientBox, DeauthoriseHdl ) );
SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );
@@ -331,7 +331,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta
aPos.Y() += aTextHeight;
if (rEntry->m_bActive)
{
- OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+ OUString sPinText(SdResId(STR_ENTER_PIN));
DrawText(m_sPinTextRect, sPinText);
}
@@ -373,7 +373,7 @@ void ClientBox::RecalcAll()
aEntryRect.Right(),
aEntryRect.Bottom() - TOP_OFFSET);
- OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+ OUString sPinText(SdResId(STR_ENTER_PIN));
aPos = Point( aEntryRect.Left() + GetTextWidth( sPinText ),
aEntryRect.Bottom() - TOP_OFFSET - aPinBoxSize.Height() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 6588b105b646..22117cb810f2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -441,7 +441,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
}
else // delete everything
{
- ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SD_RESSTR( STR_ASK_DELETE_ALL_PICTURES ) );
+ ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SdResId( STR_ASK_DELETE_ALL_PICTURES ) );
short nReturn = aWarnBox->Execute();
if( nReturn == RET_YES )
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f8fee9961bf..e6da3e880f27 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -58,7 +58,7 @@ BreakDlg::BreakDlg(
m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
- mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE), nSumActionCount*3 );
+ mpProgress = new SfxProgress( pShell, SdResId(STR_BREAK_METAFILE), nSumActionCount*3 );
pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
// every action is edited 3 times in DoImport()
@@ -107,7 +107,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
// update status bar or show a error message?
if(nInit == reinterpret_cast<void*>(1L))
{
- ScopedVclPtrInstance< MessageDialog > aErrBox(this, SD_RESSTR(STR_BREAK_FAIL));
+ ScopedVclPtrInstance< MessageDialog > aErrBox(this, SdResId(STR_BREAK_FAIL));
aErrBox->Execute();
}
else
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8c6673011075..1666bffee6c7 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl, Button*, void)
else
{
ScopedVclPtrInstance<WarningBox>( this, WinBits( WB_OK ),
- SD_RESSTR( STR_WARN_NAME_DUPLICATE ) )->Execute();
+ SdResId( STR_WARN_NAME_DUPLICATE ) )->Execute();
m_pEdtName->GrabFocus();
}
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index e8737c19e6e9..842462414dc9 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -43,7 +43,7 @@ SdPagesField::SdPagesField( vcl::Window* pParent,
SvxMetricField ( pParent, rFrame ),
m_xFrame ( rFrame )
{
- OUString aStr( SD_RESSTR( STR_SLIDE_PLURAL ) );
+ OUString aStr( SdResId( STR_SLIDE_PLURAL ) );
SetCustomUnitText( aStr );
// set size
@@ -74,9 +74,9 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
long nValue = (long) pItem->GetValue();
SetValue( nValue );
if( nValue == 1 )
- SetCustomUnitText( SD_RESSTR( STR_SLIDE_SINGULAR ) );
+ SetCustomUnitText( SdResId( STR_SLIDE_SINGULAR ) );
else
- SetCustomUnitText( SD_RESSTR( STR_SLIDE_PLURAL ) );
+ SetCustomUnitText( SdResId( STR_SLIDE_PLURAL ) );
}
else
SetText( OUString() );
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 0ff1eddb3c82..6270815d8ff0 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -179,8 +179,8 @@ void SdModifyFieldDlg::FillFormatList()
//SVXDATEFORMAT_APPDEFAULT, // not used
//SVXDATEFORMAT_SYSTEM, // not used
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_SMALL ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_BIG ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96
@@ -205,7 +205,7 @@ void SdModifyFieldDlg::FillFormatList()
//SVXTIMEFORMAT_APPDEFAULT, // not used
//SVXTIMEFORMAT_SYSTEM, // not used
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_NORMAL ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49
@@ -231,10 +231,10 @@ void SdModifyFieldDlg::FillFormatList()
const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>( pField );
SvxExtFileField aFileField( *pFileField );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME_EXT ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_FULLPATH ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_PATH ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME ) );
m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) );
}
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 7799458da69f..c983e5f585b0 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -111,7 +111,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
mbLabelPlaying = false;
}
catch(const css::lang::IllegalArgumentException&)
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_STOP ) );
+ SdResId( STR_STOP ) );
mbLabelPlaying = true;
}
catch (const css::lang::IllegalArgumentException&)
@@ -173,7 +173,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
mbLabelPlaying = false;
}
catch (const css::lang::IllegalArgumentException&)
@@ -194,7 +194,7 @@ void SdFileDialog_Imp::CheckSelectionState()
try
{
- if( aCurrFilter.isEmpty() || ( aCurrFilter == SD_RESSTR( STR_EXPORT_HTML_NAME ) ) )
+ if( aCurrFilter.isEmpty() || ( aCurrFilter == SdResId( STR_EXPORT_HTML_NAME ) ) )
mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
else
mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, true );
@@ -227,7 +227,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
}
catch (const css::lang::IllegalArgumentException&)
{
@@ -258,25 +258,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
mpImpl( new SdFileDialog_Imp() )
{
OUString aDescr;
- aDescr = SD_RESSTR(STR_ALL_FILES);
+ aDescr = SdResId(STR_ALL_FILES);
mpImpl->AddFilter( aDescr, "*.*");
// setup filter
#if defined UNX
- aDescr = SD_RESSTR(STR_AU_FILE);
+ aDescr = SdResId(STR_AU_FILE);
mpImpl->AddFilter( aDescr, "*.au;*.snd");
- aDescr = SD_RESSTR(STR_VOC_FILE);
+ aDescr = SdResId(STR_VOC_FILE);
mpImpl->AddFilter( aDescr, "*.voc");
- aDescr = SD_RESSTR(STR_WAV_FILE);
+ aDescr = SdResId(STR_WAV_FILE);
mpImpl->AddFilter( aDescr, "*.wav");
- aDescr = SD_RESSTR(STR_AIFF_FILE);
+ aDescr = SdResId(STR_AIFF_FILE);
mpImpl->AddFilter( aDescr, "*.aiff");
- aDescr = SD_RESSTR(STR_SVX_FILE);
+ aDescr = SdResId(STR_SVX_FILE);
mpImpl->AddFilter( aDescr, "*.svx");
#else
- aDescr = SD_RESSTR(STR_WAV_FILE);
+ aDescr = SdResId(STR_WAV_FILE);
mpImpl->AddFilter( aDescr, "*.wav;*.mp3;*.ogg" );
- aDescr = SD_RESSTR(STR_MIDI_FILE);
+ aDescr = SdResId(STR_MIDI_FILE);
mpImpl->AddFilter( aDescr, "*.mid" );
#endif
}
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 2f62a2444551..f8954dc56cd4 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -92,19 +92,19 @@ void GlueEscDirLB::Select()
*/
void GlueEscDirLB::Fill()
{
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_SMART ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LEFT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RIGHT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_TOP ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_BOTTOM ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_SMART ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LEFT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RIGHT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_TOP ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_BOTTOM ) );
/*
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LO ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LU ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RO ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RU ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_ALL ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LO ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LU ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RO ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RU ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_VERT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_ALL ) );
*/
}
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 2afd2d54bca8..296349f0d887 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -49,7 +49,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
// insert text
if( !pMedium )
- SetText( SD_RESSTR( STR_INSERT_TEXT ) );
+ SetText( SdResId( STR_INSERT_TEXT ) );
Reset();
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 76fa5140872b..22157511eb53 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -81,7 +81,7 @@ SdNavigatorWin::SdNavigatorWin(vcl::Window* pParent, SfxBindings* pInBindings)
maTlbObjects->SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
- maTlbObjects->SetAccessibleName(SD_RESSTR(STR_OBJECTS_TREE));
+ maTlbObjects->SetAccessibleName(SdResId(STR_OBJECTS_TREE));
maTlbObjects->SetDoubleClickHdl(LINK(this, SdNavigatorWin, ClickObjectHdl));
maTlbObjects->SetSelectionMode(SelectionMode::Single);
@@ -271,7 +271,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
if( nRId > 0 )
{
DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!");
- pMenu->InsertItem(nID, SD_RESSTR(nRId), MenuItemBits::RADIOCHECK);
+ pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK);
pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]);
}
@@ -297,11 +297,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
pMenu->InsertItem(
nShowNamedShapesFilter,
- SD_RESSTR(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
+ SdResId(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
MenuItemBits::RADIOCHECK);
pMenu->InsertItem(
nShowAllShapesFilter,
- SD_RESSTR(STR_NAVIGATOR_SHOW_ALL_SHAPES),
+ SdResId(STR_NAVIGATOR_SHOW_ALL_SHAPES),
MenuItemBits::RADIOCHECK);
if (maTlbObjects->GetShowAllShapes())
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 71ab78a7acff..3573b27bd929 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -99,7 +99,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
// from 'Outline 1' style sheet.
if( SfxItemState::SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, false, &pItem ))
{
- OUString aStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+ OUString aStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
@@ -180,19 +180,19 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
switch( ePO )
{
case PO_TITLE:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_TITLE ));
+ aTitle = SdResId(STR_PSEUDOSHEET_TITLE);
break;
case PO_SUBTITLE:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
+ aTitle = SdResId(STR_PSEUDOSHEET_SUBTITLE);
break;
case PO_BACKGROUND:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
+ aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUND);
break;
case PO_BACKGROUNDOBJECTS:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
+ aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
break;
case PO_OUTLINE_1:
@@ -204,12 +204,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
case PO_OUTLINE_7:
case PO_OUTLINE_8:
case PO_OUTLINE_9:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " +
+ aTitle = SdResId(STR_PSEUDOSHEET_OUTLINE) + " " +
OUString::number( ePO - PO_OUTLINE_1 + 1 );
break;
case PO_NOTES:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_NOTES ));
+ aTitle = SdResId(STR_PSEUDOSHEET_NOTES);
break;
}
SetText( aTitle );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 7746eb90f0d6..b7f7d3642671 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -38,7 +38,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
"modules/simpress/ui/slidedesigndialog.ui")
, mpDocSh(pDocShell)
, mrOutAttrs(rInAttrs)
- , maStrNone(SD_RESSTR(STR_NULL))
+ , maStrNone(SdResId(STR_NULL))
{
get(m_pVS, "select");
Size aPref(LogicToPixel(Size(144 , 141), MapUnit::MapAppFont));
@@ -180,7 +180,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
{
VclPtrInstance< SfxNewFileDialog > pDlg(this, SfxNewFileDialogMode::Preview);
- pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
+ pDlg->SetText(SdResId(STR_LOAD_PRESENTATION_LAYOUT));
if(!IsReallyVisible())
return;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 614592536d9a..3bb125de459e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -404,7 +404,7 @@ OUString SdPageObjsTLB::GetObjectName(
&& aRet.isEmpty()
&& pObject!=nullptr)
{
- aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
+ aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME);
aRet = aRet.replaceFirst("%1", OUString::number(pObject->GetOrdNum() + 1));
}
@@ -988,7 +988,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
if ( !mpBookmarkDoc )
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SD_RESSTR(STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SdResId(STR_READ_DATA_ERROR));
aErrorBox->Execute();
mpMedium = nullptr; //On failure the SfxMedium is invalid
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d658d5f8b4f1..a0dec36b6c8c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -220,7 +220,7 @@ void SdTPAction::Construct()
bOLEAction = true;
aVerbVector.push_back( 0 );
- m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SD_RESSTR( STR_EDIT_OBJ ) ) );
+ m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SdResId( STR_EDIT_OBJ ) ) );
}
else if( pOleObj )
{
@@ -270,7 +270,7 @@ void SdTPAction::Construct()
for (presentation::ClickAction & rAction : maCurrentActions)
{
sal_uInt16 nRId = GetClickActionSdResId( rAction );
- m_pLbAction->InsertEntry( SD_RESSTR( nRId ) );
+ m_pLbAction->InsertEntry( SdResId( nRId ) );
}
}
@@ -452,7 +452,7 @@ void SdTPAction::OpenFileDialog()
// filter makes the (Windows system) open file dialog follow
// links on the desktop to directories.
aFileDialog.AddFilter (
- SFX2_RESSTR(STR_SFX_FILTERNAME_ALL),
+ SfxResId(STR_SFX_FILTERNAME_ALL),
"*.*");
if( aFileDialog.Execute() == ERRCODE_NONE )
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pEdtSound->Enable();
m_pBtnSearch->Show();
m_pBtnSearch->Enable();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_SOUND ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_SOUND ) );
break;
case presentation::ClickAction_PROGRAM:
@@ -594,12 +594,12 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
if( eCA == presentation::ClickAction_MACRO )
{
m_pEdtMacro->Show();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_MACRO ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_MACRO ) );
}
else
{
m_pEdtProgram->Show();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PROGRAM ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_PROGRAM ) );
}
break;
@@ -612,8 +612,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pBtnSearch->Show();
m_pBtnSearch->Enable();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_DOCUMENT ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_DOCUMENT ) );
CheckFileHdl( *m_pEdtDocument );
break;
@@ -622,7 +622,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pFtTree->Show();
m_pLbOLEAction->Show();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_ACTION ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_ACTION ) );
break;
case presentation::ClickAction_BOOKMARK:
@@ -635,8 +635,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pEdtBookmark->Show();
m_pBtnSeek->Show();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PAGE_OBJECT ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) );
break;
default:
break;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index cb7eafc02332..8f3510bf7839 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -369,7 +369,7 @@ DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
FillItemSet( pActiveSet );
return DeactivateRC::LeavePage;
}
- ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) );
+ ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SdResId( STR_WARN_SCALE_FAIL ) );
if( aWarnBox->Execute() == RET_YES )
return DeactivateRC::KeepPage;
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 7b6842539fbe..1e0b6d99a5a1 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -51,7 +51,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges());
SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc );
- OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
+ OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
OUString aName(mpStyleSheet->GetName());
// delete layout name and separator
@@ -61,27 +61,27 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if (aName == STR_LAYOUT_TITLE)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
+ aName = SdResId(STR_PSEUDOSHEET_TITLE);
}
else if (aName == STR_LAYOUT_SUBTITLE)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
+ aName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
}
else if (aName == STR_LAYOUT_BACKGROUND)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
}
else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
}
else if (aName == STR_LAYOUT_NOTES)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
+ aName = SdResId(STR_PSEUDOSHEET_NOTES);
}
else
{
- OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+ OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
nPos = aName.indexOf(aOutlineStr);
if (nPos != -1)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:14:52 +0000