modernize the default set of Impress templates (masterpages)

Merged changes from Stefan Knorr (astron) <heinzlesspam at gmail dot com>,
Bjoern Michaelsen <bjoern dot michaelsen at canonical dot com>, and
Petr Mladek <pmladek at suse dot cz>

Change-Id: I942f747aadc897b73d97b2047e267d752580aa33
Signed-off-by:  Petr Mladek <pmladek@suse.cz>
Signed-off-by:  Bjoern Michaelsen <bjoern.michaelsen@canonical.com>

scp2/source/ooo/file_extra_ooo.scp

@@ -337,13 +337,6 @@ File gid_File_Extra_Show_Pl
     Name = "show.pl";
 End
 
-File gid_File_Extra_Tplpresntimpr_Lang
-    Dir = gid_Dir_Template_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplpresntimpr,zip);
-End
-
 File gid_File_Extra_Tpllayoutimpr
     Dir = gid_Dir_Template_Common_Layout;
     ARCHIVE_TXT_FILE_BODY;

sfx2/inc/sfx2/templatelocnames.hrc

@@ -25,7 +25,7 @@
  * instead of those above.
  */
 
-#define NUM_TEMPLATE_NAMES      25
+#define NUM_TEMPLATE_NAMES      10
 #define TEMPL_LOC_OFFSET        2190
 
 #define STR_TEMPLATE_NAME1_DEF      (TEMPL_LOC_OFFSET + 1)
@@ -38,21 +38,6 @@
 #define STR_TEMPLATE_NAME8_DEF      (TEMPL_LOC_OFFSET + 8)
 #define STR_TEMPLATE_NAME9_DEF      (TEMPL_LOC_OFFSET + 9)
 #define STR_TEMPLATE_NAME10_DEF     (TEMPL_LOC_OFFSET + 10)
-#define STR_TEMPLATE_NAME11_DEF     (TEMPL_LOC_OFFSET + 11)
-#define STR_TEMPLATE_NAME12_DEF     (TEMPL_LOC_OFFSET + 12)
-#define STR_TEMPLATE_NAME13_DEF     (TEMPL_LOC_OFFSET + 13)
-#define STR_TEMPLATE_NAME14_DEF     (TEMPL_LOC_OFFSET + 14)
-#define STR_TEMPLATE_NAME15_DEF     (TEMPL_LOC_OFFSET + 15)
-#define STR_TEMPLATE_NAME16_DEF     (TEMPL_LOC_OFFSET + 16)
-#define STR_TEMPLATE_NAME17_DEF     (TEMPL_LOC_OFFSET + 17)
-#define STR_TEMPLATE_NAME18_DEF     (TEMPL_LOC_OFFSET + 18)
-#define STR_TEMPLATE_NAME19_DEF     (TEMPL_LOC_OFFSET + 19)
-#define STR_TEMPLATE_NAME20_DEF     (TEMPL_LOC_OFFSET + 20)
-#define STR_TEMPLATE_NAME21_DEF     (TEMPL_LOC_OFFSET + 21)
-#define STR_TEMPLATE_NAME22_DEF     (TEMPL_LOC_OFFSET + 22)
-#define STR_TEMPLATE_NAME23_DEF     (TEMPL_LOC_OFFSET + 23)
-#define STR_TEMPLATE_NAME24_DEF     (TEMPL_LOC_OFFSET + 24)
-#define STR_TEMPLATE_NAME25_DEF     (TEMPL_LOC_OFFSET + 25)
 
 #define STR_TEMPLATE_NAME1      (TEMPL_LOC_OFFSET + 51)
 #define STR_TEMPLATE_NAME2      (TEMPL_LOC_OFFSET + 52)
@@ -64,18 +49,3 @@
 #define STR_TEMPLATE_NAME8      (TEMPL_LOC_OFFSET + 58)
 #define STR_TEMPLATE_NAME9      (TEMPL_LOC_OFFSET + 59)
 #define STR_TEMPLATE_NAME10     (TEMPL_LOC_OFFSET + 60)
-#define STR_TEMPLATE_NAME11     (TEMPL_LOC_OFFSET + 61)
-#define STR_TEMPLATE_NAME12     (TEMPL_LOC_OFFSET + 62)
-#define STR_TEMPLATE_NAME13     (TEMPL_LOC_OFFSET + 63)
-#define STR_TEMPLATE_NAME14     (TEMPL_LOC_OFFSET + 64)
-#define STR_TEMPLATE_NAME15     (TEMPL_LOC_OFFSET + 65)
-#define STR_TEMPLATE_NAME16     (TEMPL_LOC_OFFSET + 66)
-#define STR_TEMPLATE_NAME17     (TEMPL_LOC_OFFSET + 67)
-#define STR_TEMPLATE_NAME18     (TEMPL_LOC_OFFSET + 68)
-#define STR_TEMPLATE_NAME19     (TEMPL_LOC_OFFSET + 69)
-#define STR_TEMPLATE_NAME20     (TEMPL_LOC_OFFSET + 70)
-#define STR_TEMPLATE_NAME21     (TEMPL_LOC_OFFSET + 71)
-#define STR_TEMPLATE_NAME22     (TEMPL_LOC_OFFSET + 72)
-#define STR_TEMPLATE_NAME23     (TEMPL_LOC_OFFSET + 73)
-#define STR_TEMPLATE_NAME24     (TEMPL_LOC_OFFSET + 74)
-#define STR_TEMPLATE_NAME25     (TEMPL_LOC_OFFSET + 75)

sfx2/source/doc/templatelocnames.src

@@ -30,252 +30,103 @@
 // Do not translate STR_TEMPLATE_NAME*_DEF names!!
 String STR_TEMPLATE_NAME1_DEF
 {
-    Text = "Blue Border" ;
+    Text = "Abstract Green" ;
 };
 
 String STR_TEMPLATE_NAME2_DEF
 {
-    Text = "Black and White" ;
+    Text = "Abstract Red" ;
 };
 
 String STR_TEMPLATE_NAME3_DEF
 {
-    Text = "Blue and Grey" ;
+    Text = "Abstract Yellow" ;
 };
 
 String STR_TEMPLATE_NAME4_DEF
 {
-    Text = "Blue Lines and Gradients" ;
+    Text = "Bright Blue" ;
 };
 
 String STR_TEMPLATE_NAME5_DEF
 {
-    Text = "Blue with Bottom Title " ;
+    Text = "DNA" ;
 };
 
 String STR_TEMPLATE_NAME6_DEF
 {
-    Text = "Notebook" ;
+    Text = "Inspiration" ;
 };
 
 String STR_TEMPLATE_NAME7_DEF
 {
-    Text = "Brown" ;
+    Text = "Lush Green" ;
 };
 
 String STR_TEMPLATE_NAME8_DEF
 {
-    Text = "Characters with Glow" ;
+    Text = "Metropolis" ;
 };
 
 String STR_TEMPLATE_NAME9_DEF
 {
-    Text = "Forest" ;
+    Text = "Sunset" ;
 };
 
 String STR_TEMPLATE_NAME10_DEF
 {
-    Text = "Fresco" ;
+    Text = "Vintage" ;
 };
 
-String STR_TEMPLATE_NAME11_DEF
-{
-    Text = "Glacier" ;
-};
-
-String STR_TEMPLATE_NAME12_DEF
-{
-    Text = "Green with White Lines" ;
-};
-
-String STR_TEMPLATE_NAME13_DEF
-{
-    Text = "Keyboard" ;
-};
-
-String STR_TEMPLATE_NAME14_DEF
-{
-    Text = "Light Blue Shapes" ;
-};
-
-String STR_TEMPLATE_NAME15_DEF
-{
-    Text = "Numbers on Dark Background" ;
-};
-
-String STR_TEMPLATE_NAME16_DEF
-{
-    Text = "Blue Step Gradients" ;
-};
-
-String STR_TEMPLATE_NAME17_DEF
-{
-    Text = "White Blue and Lightnings" ;
-};
-
-String STR_TEMPLATE_NAME18_DEF
-{
-    Text = "Noise Paper" ;
-};
-
-String STR_TEMPLATE_NAME19_DEF
-{
-    Text = "Red Noise Shapes" ;
-};
-
-String STR_TEMPLATE_NAME20_DEF
-{
-    Text = "Rounded Rectangles" ;
-};
-
-String STR_TEMPLATE_NAME21_DEF
-{
-    Text = "Blue and Red Gradient" ;
-};
-
-String STR_TEMPLATE_NAME22_DEF
-{
-    Text = "Technical Polygon" ;
-};
-
-String STR_TEMPLATE_NAME23_DEF
-{
-    Text = "Tunnel" ;
-};
-
-String STR_TEMPLATE_NAME24_DEF
-{
-    Text = "Water" ;
-};
-
-String STR_TEMPLATE_NAME25_DEF
-{
-    Text = "Wine" ;
-};
 
 /////////////////////////////////////////////////
 
 String STR_TEMPLATE_NAME1
 {
-    Text [ en-US ] = "Blue Border" ;
+    Text [ en-US ] = "Abstract Green" ;
 };
 
 String STR_TEMPLATE_NAME2
 {
-    Text [ en-US ] = "Black and White" ;
+    Text [ en-US ] = "Abstract Red" ;
 };
 
 String STR_TEMPLATE_NAME3
 {
-    Text [ en-US ] = "Blue and Grey" ;
+    Text [ en-US ] = "Abstract Yellow" ;
 };
 
 String STR_TEMPLATE_NAME4
 {
-    Text [ en-US ] = "Blue Lines and Gradients" ;
+    Text [ en-US ] = "Bright Blue" ;
 };
 
 String STR_TEMPLATE_NAME5
 {
-    Text [ en-US ] = "Blue with Bottom Title" ;
+    Text [ en-US ] = "DNA" ;
 };
 
 String STR_TEMPLATE_NAME6
 {
-    Text [ en-US ] = "Notebook" ;
+    Text [ en-US ] = "Inspiration" ;
 };
 
 String STR_TEMPLATE_NAME7
 {
-    Text [ en-US ] = "Brown" ;
+    Text [ en-US ] = "Lush Green" ;
 };
 
 String STR_TEMPLATE_NAME8
 {
-    Text [ en-US ] = "Characters with Glow" ;
+    Text [ en-US ] = "Metropolis" ;
 };
 
 String STR_TEMPLATE_NAME9
 {
-    Text [ en-US ] = "Forest" ;
+    Text [ en-US ] = "Sunset" ;
 };
 
 String STR_TEMPLATE_NAME10
 {
-    Text [ en-US ] = "Fresco" ;
-};
-
-String STR_TEMPLATE_NAME11
-{
-    Text [ en-US ] = "Glacier" ;
-};
-
-String STR_TEMPLATE_NAME12
-{
-    Text [ en-US ] = "Green with White Lines" ;
-};
-
-String STR_TEMPLATE_NAME13
-{
-    Text [ en-US ] = "Keyboard" ;
-};
-
-String STR_TEMPLATE_NAME14
-{
-    Text [ en-US ] = "Light Blue Shapes" ;
-};
-
-String STR_TEMPLATE_NAME15
-{
-    Text [ en-US ] = "Numbers on Dark Background" ;
-};
-
-String STR_TEMPLATE_NAME16
-{
-    Text [ en-US ] = "Blue Step Gradients" ;
-};
-
-String STR_TEMPLATE_NAME17
-{
-    Text [ en-US ] = "White Blue and Lightnings" ;
-};
-
-String STR_TEMPLATE_NAME18
-{
-    Text [ en-US ] = "Noise Paper" ;
-};
-
-String STR_TEMPLATE_NAME19
-{
-    Text [ en-US ] = "Red Noise Shapes" ;
-};
-
-String STR_TEMPLATE_NAME20
-{
-    Text [ en-US ] = "Rounded Rectangles" ;
-};
-
-String STR_TEMPLATE_NAME21
-{
-    Text [ en-US ] = "Blue and Red Gradient" ;
-};
-
-String STR_TEMPLATE_NAME22
-{
-    Text [ en-US ] = "Technical Polygon" ;
-};
-
-String STR_TEMPLATE_NAME23
-{
-    Text [ en-US ] = "Tunnel" ;
-};
-
-String STR_TEMPLATE_NAME24
-{
-    Text [ en-US ] = "Water" ;
-};
-
-String STR_TEMPLATE_NAME25
-{
-    Text [ en-US ] = "Wine" ;
+    Text [ en-US ] = "Vintage" ;
 };