[Libreoffice-commits] core.git: sd/source

[Katarina Behrens]

 sd/source/ui/app/sdmod2.cxx  |    6 +++++-
 sd/source/ui/app/strings.src |    9 +++++++--
 sd/source/ui/inc/strings.hrc |    3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 737863ce3466391733c3f66766ab764d2fbda4ab
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue May 19 12:38:59 2015 +0200

    Related tdf#88056: Use different placeholders for Impress and Draw
    
    Change-Id: Ib087baada3660bf0d31e1295cbac322dada53d2d

diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 5025cab..a817f5e 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -269,7 +269,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                 aRepresentation = pPage->GetName();
             }
             else
-                aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_PAGETITLE).toString();
+            {
+                aRepresentation = ( ( pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
+                                    ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
+                                    : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
+            }
 
             pInfo->SetRepresentation( aRepresentation );
         }
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 2f31991..ed790cf 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1076,9 +1076,14 @@ String STR_FIELD_PLACEHOLDER_COUNT
     Text [ en-US ] = "<count>" ;
 };
 
-String STR_FIELD_PLACEHOLDER_PAGETITLE
+String STR_FIELD_PLACEHOLDER_SLIDENAME
 {
-    Text [ en-US ] = "<title>" ;
+    Text [ en-US ] = "<slide-name>" ;
+};
+
+String STR_FIELD_PLACEHOLDER_PAGENAME
+{
+    Text [ en-US ] = "<page-name>" ;
 };
 
 String STR_PLACEHOLDER_DESCRIPTION_NOTES
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index f713b83..a5da566 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -372,7 +372,8 @@
 
 #define STR_UNDO_HANGULHANJACONVERSION                  (RID_APP_START+696)
 #define STR_FIELD_PLACEHOLDER_COUNT             (RID_APP_START+697)
-#define STR_FIELD_PLACEHOLDER_PAGETITLE         (RID_APP_START+698)
+#define STR_FIELD_PLACEHOLDER_SLIDENAME         (RID_APP_START+698)
+#define STR_FIELD_PLACEHOLDER_PAGENAME          (RID_APP_START+699)
 
 #define STR_LEFT_PANE_DRAW_TITLE                        (RID_APP_START+700)
 #define STR_LEFT_PANE_IMPRESS_TITLE                     (RID_APP_START+701)