Kaydet (Commit) 793246e1 authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Tamás Zolnai

tdf#107183 Set different dialog title for renaming master slide

Change-Id: I351e6db782cce8ece78083e5a79e4c2baaa414ee
Reviewed-on: https://gerrit.libreoffice.org/41310Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 81d40428
......@@ -233,6 +233,7 @@
#define STR_STATUSBAR_MASTERPAGE NC_("STR_STATUSBAR_MASTERPAGE", "Slide Master name. Right-click for list and double-click for dialog.")
#define STR_TITLE_RENAMESLIDE NC_("STR_TITLE_RENAMESLIDE", "Rename Slide")
#define STR_DESC_RENAMESLIDE NC_("STR_DESC_RENAMESLIDE", "Name")
#define STR_TITLE_RENAMEMASTER NC_("STR_TITLE_RENAMEMASTER", "Rename Master Slide")
#define STR_PLACEHOLDER_DESCRIPTION_TITLE NC_("STR_PLACEHOLDER_DESCRIPTION_TITLE", "Title Area for AutoLayouts" )
#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE NC_("STR_PLACEHOLDER_DESCRIPTION_OUTLINE", "Object Area for AutoLayouts" )
#define STR_PLACEHOLDER_DESCRIPTION_FOOTER NC_("STR_PLACEHOLDER_DESCRIPTION_FOOTER", "Footer Area" )
......
......@@ -241,7 +241,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
case SID_RENAMEPAGE:
case SID_RENAME_MASTER_PAGE:
RenameSlide ();
RenameSlide (rRequest);
rRequest.Done ();
break;
......@@ -851,7 +851,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
}
}
void SlotManager::RenameSlide()
void SlotManager::RenameSlide(SfxRequest& rRequest)
{
View* pDrView = &mrSlideSorter.GetView();
......@@ -868,7 +868,14 @@ void SlotManager::RenameSlide()
pSelectedPage = aSelectedPages.GetNextElement()->GetPage();
if (pSelectedPage != nullptr)
{
OUString aTitle( SdResId( STR_TITLE_RENAMESLIDE ) );
// tdf#107183 Set different dialog titles when renaming
// master slides or normal ones
OUString aTitle;
if( rRequest.GetSlot() == SID_RENAME_MASTER_PAGE )
aTitle = SdResId( STR_TITLE_RENAMEMASTER );
else
aTitle = SdResId( STR_TITLE_RENAMESLIDE );
OUString aDescr( SdResId( STR_DESC_RENAMESLIDE ) );
OUString aPageName = pSelectedPage->GetName();
......
......@@ -81,7 +81,7 @@ private:
/** The implementation is a copy of the code for SID_RENAMEPAGE in
drviews2.cxx.
*/
void RenameSlide();
void RenameSlide( SfxRequest& rRequest );
DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog&, bool);
bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment