[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - reportbuilder/java reportdesign/source vcl/AllLangResTarget_vcl.mk vcl/inc vcl/source
Michael Stahl
mstahl at redhat.com
Fri Feb 5 15:34:23 UTC 2016
reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 1
reportdesign/source/filter/xml/xmlExport.cxx | 7 +
vcl/AllLangResTarget_vcl.mk | 1
vcl/inc/svids.hrc | 6 +
vcl/source/app/svapp.cxx | 10 +-
vcl/source/src/app.src | 37 ++++++++++
7 files changed, 58 insertions(+), 5 deletions(-)
New commits:
commit 216738ffa610848eebfd6bbbad6bc74db96ef051
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 3 22:39:46 2016 +0100
reportbuilder: tdf#92720: add loext namespace
... to allow export of paragraphs in shapes.
(regression from 6acc6c011d3afd6834efeee1b2efe43652a86f2e)
Change-Id: I2c23e686a2cfcd997d3393b0f9fb4cdcab7252b7
(cherry picked from commit 969a760e2bad7f65c28eba425af1751946b09d76)
Reviewed-on: https://gerrit.libreoffice.org/22089
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
index 2774359..6a7d144 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
@@ -51,6 +51,7 @@ public class OfficeNamespaces
public static final String OOREPORT_NS = "http://openoffice.org/2005/report";
public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#";
public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0";
+ public static final String LOEXT_NS = "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0";
private OfficeNamespaces()
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 2889a8f..e629d43 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -383,6 +383,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
+ rootAttributes.addNamespaceDeclaration("loext", OfficeNamespaces.LOEXT_NS);
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
ODF_VERSION);
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 4dd2bf4..24b964f 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -246,6 +246,13 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin
if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
{
_GetNamespaceMap().Add( GetXMLToken(XML_NP_XHTML),GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
+ // loext, needed for paragraphs inside shapes
+ if (getDefaultVersion() > SvtSaveOptions::ODFVER_012)
+ {
+ _GetNamespaceMap().Add(
+ GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT),
+ XML_NAMESPACE_LO_EXT);
+ }
}
// GRDDL: to convert RDFa and meta.xml to RDF
if( getExportFlags() & (SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
commit 1b6e2453c3ac4298f6b2b557e5e6510ec6619518
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Feb 2 22:38:58 2016 +0100
tdf#97512 make strings localizable
Reviewed-on: https://gerrit.libreoffice.org/22063
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit e4b98408f60fdbe8248540da58bde8a9bf00c461)
Change-Id: I518918689e81475e9aaf0023cf91f4860531ad1e
Reviewed-on: https://gerrit.libreoffice.org/22070
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 7c286bf..822b3a2 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
))
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
+ vcl/source/src/app.src \
vcl/source/src/btntext.src \
vcl/source/src/helptext.src \
vcl/source/src/menu.src \
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 62e3203..04ecc94 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -177,6 +177,12 @@
#define SV_FUNIT_STRINGS 10700
+#define SV_APP_CPUTHREADS 10800
+#define SV_APP_OSVERSION 10801
+#define SV_APP_UIRENDER 10802
+#define SV_APP_GL 10803
+#define SV_APP_DEFAULT 10804
+
#define SV_ICON_SIZE48_START 20000
#define SV_ICON_SIZE32_START 21000
#define SV_ICON_SIZE16_START 23000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0f57808..ef0847d 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1189,7 +1189,7 @@ OUString Application::GetHWOSConfInfo()
ImplSVData* pSVData = ImplGetSVData();
OUStringBuffer aDetails;
- aDetails.append( "CPU Threads: " );
+ aDetails.append( VclResId(SV_APP_CPUTHREADS).toString() );
aDetails.append( (sal_Int32)
std::thread::hardware_concurrency() );
aDetails.append( "; " );
@@ -1200,15 +1200,15 @@ OUString Application::GetHWOSConfInfo()
else
aVersion = "-";
- aDetails.append( "OS Version: " );
+ aDetails.append( VclResId(SV_APP_OSVERSION).toString() );
aDetails.append( aVersion );
aDetails.append( "; " );
- aDetails.append( "UI Render: " );
+ aDetails.append( VclResId(SV_APP_UIRENDER).toString() );
if ( OpenGLWrapper::isVCLOpenGLEnabled() )
- aDetails.append( "GL" );
+ aDetails.append( VclResId(SV_APP_GL).toString() );
else
- aDetails.append( "default" );
+ aDetails.append( VclResId(SV_APP_DEFAULT).toString() );
aDetails.append( "; " );
return aDetails.makeStringAndClear();
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
new file mode 100644
index 0000000..91d9df1
--- /dev/null
+++ b/vcl/source/src/app.src
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "svids.hrc"
+
+String SV_APP_CPUTHREADS
+{
+ Text [en-US] = "CPU Threads: ";
+};
+
+String SV_APP_OSVERSION
+{
+ Text [en-US] = "OS Version: ";
+};
+
+String SV_APP_UIRENDER
+{
+ Text [en-US] = "UI Render: ";
+};
+
+String SV_APP_GL
+{
+ Text [en-US] = "GL";
+};
+
+String SV_APP_DEFAULT
+{
+ Text [ en-US ] = "default";
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list