summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorheiko tietze <tietze.heiko@gmail.com>2017-07-27 14:43:56 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2017-08-06 00:01:37 +0200
commit8fe86fb89b00b31c73fccbb9bf343818a0a1f537 (patch)
tree35059dfe3ee14979030b12f1d649b54a3f0b1436 /sd
parente2c14a6caabbb6413ae7b1e631a0a89f7b2ba4c7 (diff)
tdf#87592 Consistent terminology for Master Slides
All occurences of Slide Master and Master Pages are renamed to Master Slide(s). Change-Id: Idd75089f6c402b3d5e30a812b4c86aacc2f5d9bc Reviewed-on: https://gerrit.libreoffice.org/40485 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/strings.hrc4
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index e4feaa27a0ae..e3d350063c0a 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -34,10 +34,10 @@
#define STR_UNDO_BEZCLOSE NC_("STR_UNDO_BEZCLOSE", "Close Polygon")
#define STR_SLIDE_SORTER_MODE NC_("STR_SLIDE_SORTER_MODE", "Slide Sorter")
#define STR_NORMAL_MODE NC_("STR_NORMAL_MODE", "Normal")
-#define STR_SLIDE_MASTER_MODE NC_("STR_SLIDE_MASTER_MODE", "Slide Master")
+#define STR_SLIDE_MASTER_MODE NC_("STR_SLIDE_MASTER_MODE", "Master Slide")
#define STR_OUTLINE_MODE NC_("STR_OUTLINE_MODE", "Outline")
#define STR_NOTES_MODE NC_("STR_NOTES_MODE", "Notes")
-#define STR_NOTES_MASTER_MODE NC_("STR_NOTES_MASTER_MODE", "Notes Master")
+#define STR_NOTES_MASTER_MODE NC_("STR_NOTES_MASTER_MODE", "Master Notes")
#define STR_HANDOUT_MASTER_MODE NC_("STR_HANDOUT_MASTER_MODE", "Handout")
#define STR_AUTOLAYOUT_NONE NC_("STR_AUTOLAYOUT_NONE", "Blank Slide")
#define STR_AUTOLAYOUT_ONLY_TITLE NC_("STR_AUTOLAYOUT_ONLY_TITLE", "Title Only")
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 392be76b07ed..d32fc57375ce 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1011,7 +1011,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind)
if(eObjKind == PRESOBJ_HEADER )
{
- OSL_FAIL( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a slide master" );
+ OSL_FAIL( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a master slide" );
return nullptr;
}
else
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 338da53bb7a1..43e0056eb5ac 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1703,7 +1703,7 @@ void PowerPointExport::AddLayoutIdAndRelation( const FSHelperPtr& pFS, sal_Int32
void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > const & aXBackgroundPropSet )
{
- SAL_INFO("sd.eppt", "write slide master: " << nPageNum << "\n--------------");
+ SAL_INFO("sd.eppt", "write master slide: " << nPageNum << "\n--------------");
// slides list
if( nPageNum == 0 )