[Libreoffice-commits] core.git: 2 commits - reportbuilder/Package_reportbuilder-templates.mk reportbuilder/template wizards/com

[Csikós Tamás]

 dev/null                                                                    |binary
 reportbuilder/Package_reportbuilder-templates.mk                            |    2 -
 reportbuilder/template/common/wizard/report/default.otr                     |binary
 wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |   14 ++++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 3a5024bc0fd4c30f06da350b5c56300368c582e8
Author: Csikós Tamás <csks.tomi at gmail.com>
Date:   Mon Jul 1 12:28:21 2013 +0200

    fdo#64155 - fix unlocalized 'default' list entry
    
    Change-Id: I3a8b706fe855e7fbff71f227b167a51d3a465be0

diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 55615af..f80da12 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -55,6 +55,7 @@ import com.sun.star.wizards.report.IReportDocument;
 import com.sun.star.wizards.report.ReportImplementationHelper;
 import com.sun.star.wizards.report.ReportLayouter;
 import com.sun.star.wizards.report.ReportWizard;
+import com.sun.star.wizards.ui.UIConsts;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -684,9 +685,22 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
                 break;
             }
         }
+        exchangeLayoutTitlesWithLocalisedOnes(LayoutFiles);
         return LayoutFiles;
     }
 
+    private void exchangeLayoutTitlesWithLocalisedOnes(String[][] LayoutFiles)
+    {
+        for(int i = 0; i < LayoutFiles[0].length; ++i)
+        {
+            if( LayoutFiles[0][i] == null) { break;}
+            if( LayoutFiles[0][i].equals("default") )
+            {
+                LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 100);
+            }
+        }
+    }
+
     public XReportDefinition getReportDefinition()
     {
         if (m_reportDocument == null)
commit a1a592140f7492cfd169787fc3d0114804afccd7
Author: Andras Timar <atimar at suse.com>
Date:   Tue Jul 2 03:00:08 2013 -0700

    default report template should be language-independent
    
    Change-Id: Ia0b18b90ffd2cb4c6958749e45d8cfec92825d02

diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_reportbuilder-templates.mk
index 54e6d7f..dec8473 100644
--- a/reportbuilder/Package_reportbuilder-templates.mk
+++ b/reportbuilder/Package_reportbuilder-templates.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder
 $(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,share/template, \
-    en-US/wizard/report/default.otr \
+    common/wizard/report/default.otr \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/reportbuilder/template/en-US/wizard/report/default.otr b/reportbuilder/template/common/wizard/report/default.otr
similarity index 100%
rename from reportbuilder/template/en-US/wizard/report/default.otr
rename to reportbuilder/template/common/wizard/report/default.otr