[Libreoffice-commits] .: Branch 'feature/masterpages' - extras/source sfx2/inc sfx2/source

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Sun Jun 10 04:06:12 PDT 2012


 extras/source/templates/layout/BlueprintPlans.otp   |binary
 extras/source/templates/layout/BrightBlue.otp       |binary
 extras/source/templates/layout/CleanInspiration.otp |binary
 extras/source/templates/layout/Portfolio.otp        |binary
 extras/source/templates/layout/Progress.otp         |binary
 extras/source/templates/layout/ThreeNotes.otp       |binary
 sfx2/inc/sfx2/templatelocnames.hrc                  |   12 ++
 sfx2/source/doc/templatelocnames.src                |   92 ++++++++++++++++----
 8 files changed, 87 insertions(+), 17 deletions(-)

New commits:
commit a2c57539462284ac827e8b148db84e9057729724
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jun 10 12:41:50 2012 +0200

    adding more new templates
    
    Change-Id: I7245b662e10c43c7ee4c18e00899d0ca646d62a4

diff --git a/extras/source/templates/layout/BlueprintPlans.otp b/extras/source/templates/layout/BlueprintPlans.otp
new file mode 100644
index 0000000..370b0bd
Binary files /dev/null and b/extras/source/templates/layout/BlueprintPlans.otp differ
diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp
new file mode 100644
index 0000000..5eaf509
Binary files /dev/null and b/extras/source/templates/layout/BrightBlue.otp differ
diff --git a/extras/source/templates/layout/CleanInspiration.otp b/extras/source/templates/layout/CleanInspiration.otp
new file mode 100644
index 0000000..16b3bdd
Binary files /dev/null and b/extras/source/templates/layout/CleanInspiration.otp differ
diff --git a/extras/source/templates/layout/Portfolio.otp b/extras/source/templates/layout/Portfolio.otp
new file mode 100644
index 0000000..6f25ecf
Binary files /dev/null and b/extras/source/templates/layout/Portfolio.otp differ
diff --git a/extras/source/templates/layout/Progress.otp b/extras/source/templates/layout/Progress.otp
new file mode 100644
index 0000000..deae2cb
Binary files /dev/null and b/extras/source/templates/layout/Progress.otp differ
diff --git a/extras/source/templates/layout/ThreeNotes.otp b/extras/source/templates/layout/ThreeNotes.otp
new file mode 100644
index 0000000..825c71a
Binary files /dev/null and b/extras/source/templates/layout/ThreeNotes.otp differ
diff --git a/sfx2/inc/sfx2/templatelocnames.hrc b/sfx2/inc/sfx2/templatelocnames.hrc
index b70dfde..6b5a76d 100644
--- a/sfx2/inc/sfx2/templatelocnames.hrc
+++ b/sfx2/inc/sfx2/templatelocnames.hrc
@@ -25,7 +25,7 @@
  * instead of those above.
  */
 
-#define NUM_TEMPLATE_NAMES      9
+#define NUM_TEMPLATE_NAMES      15
 #define TEMPL_LOC_OFFSET        2190
 
 #define STR_TEMPLATE_NAME1_DEF      (TEMPL_LOC_OFFSET + 1)
@@ -38,6 +38,11 @@
 #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_NAME1      (TEMPL_LOC_OFFSET + 51)
 #define STR_TEMPLATE_NAME2      (TEMPL_LOC_OFFSET + 52)
@@ -49,3 +54,8 @@
 #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)
diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src
index 7eb8d61..eba33c8 100644
--- a/sfx2/source/doc/templatelocnames.src
+++ b/sfx2/source/doc/templatelocnames.src
@@ -30,46 +30,76 @@
 // Do not translate STR_TEMPLATE_NAME*_DEF names!!
 String STR_TEMPLATE_NAME1_DEF
 {
-    Text = "Cuba Libre" ;
+    Text = "Blueprint Plans" ;
 };
 
 String STR_TEMPLATE_NAME2_DEF
 {
-    Text = "DNA" ;
+    Text = "Bright Blue" ;
 };
 
 String STR_TEMPLATE_NAME3_DEF
 {
-    Text = "Green Typography" ;
+    Text = "Clean Inspiration" ;
 };
 
 String STR_TEMPLATE_NAME4_DEF
 {
-    Text = "Hexzgons" ;
+    Text = "Cuba Libre" ;
 };
 
 String STR_TEMPLATE_NAME5_DEF
 {
-    Text = "Lush Green" ;
+    Text = "DNA" ;
 };
 
 String STR_TEMPLATE_NAME6_DEF
 {
-    Text = "Metropolis" ;
+    Text = "Green Typography" ;
 };
 
 String STR_TEMPLATE_NAME7_DEF
 {
-    Text = "Red Typography" ;
+    Text = "Hexagons" ;
 };
 
 String STR_TEMPLATE_NAME8_DEF
 {
-    Text = "Vintage" ;
+    Text = "Lush Green" ;
 };
 
 String STR_TEMPLATE_NAME9_DEF
 {
+    Text = "Metropolis" ;
+};
+
+String STR_TEMPLATE_NAME10_DEF
+{
+    Text = "Portfolio" ;
+};
+
+String STR_TEMPLATE_NAME11_DEF
+{
+    Text = "Progress" ;
+};
+
+String STR_TEMPLATE_NAME12_DEF
+{
+    Text = "Red Typography" ;
+};
+
+String STR_TEMPLATE_NAME13_DEF
+{
+    Text = "Three Notes" ;
+};
+
+String STR_TEMPLATE_NAME14_DEF
+{
+    Text = "Vintage" ;
+};
+
+String STR_TEMPLATE_NAME15_DEF
+{
     Text = "Violet Typography" ;
 };
 
@@ -77,46 +107,76 @@ String STR_TEMPLATE_NAME9_DEF
 
 String STR_TEMPLATE_NAME1
 {
-    Text [ en-US ] = "Cuba Libre" ;
+    Text [ en-US ] = "Blueprint Plans" ;
 };
 
 String STR_TEMPLATE_NAME2
 {
-    Text [ en-US ] = "DNA" ;
+    Text [ en-US ] = "Bright Blue" ;
 };
 
 String STR_TEMPLATE_NAME3
 {
-    Text [ en-US ] = "Green Typography" ;
+    Text [ en-US ] = "Clean Inspiration" ;
 };
 
 String STR_TEMPLATE_NAME4
 {
-    Text [ en-US ] = "Hexagons" ;
+    Text [ en-US ] = "Cuba Libre" ;
 };
 
 String STR_TEMPLATE_NAME5
 {
-    Text [ en-US ] = "Lush Green" ;
+    Text [ en-US ] = "DNA" ;
 };
 
 String STR_TEMPLATE_NAME6
 {
-    Text [ en-US ] = "Metropolis" ;
+    Text [ en-US ] = "Green Typography" ;
 };
 
 String STR_TEMPLATE_NAME7
 {
-    Text [ en-US ] = "Red Typography" ;
+    Text [ en-US ] = "Hexagons" ;
 };
 
 String STR_TEMPLATE_NAME8
 {
-    Text [ en-US ] = "Vintage" ;
+    Text [ en-US ] = "Lush Green" ;
 };
 
 String STR_TEMPLATE_NAME9
 {
+    Text [ en-US ] = "Metropolis" ;
+};
+
+String STR_TEMPLATE_NAME10
+{
+    Text [ en-US ] = "Portfolio" ;
+};
+
+String STR_TEMPLATE_NAME11
+{
+    Text [ en-US ] = "Progress" ;
+};
+
+String STR_TEMPLATE_NAME12
+{
+    Text [ en-US ] = "Red Typography" ;
+};
+
+String STR_TEMPLATE_NAME13
+{
+    Text [ en-US ] = "Three Notes" ;
+};
+
+String STR_TEMPLATE_NAME14
+{
+    Text [ en-US ] = "Vintage" ;
+};
+
+String STR_TEMPLATE_NAME15
+{
     Text [ en-US ] = "Violet Typography" ;
 };
 


More information about the Libreoffice-commits mailing list