[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/libwps filter/source sfx2/source solenv/flatpak-manifest.in writerperfect/qa
Mike Kaganski
mike.kaganski at collabora.com
Tue Nov 28 07:53:25 UTC 2017
configure.ac | 2
download.lst | 4 -
external/libwps/0001-drop-unneeded-include.patch.1 | 24 ++++++++
external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 | 27 ----------
external/libwps/Library_wps.mk | 9 +++
external/libwps/UnpackedTarball_libwps.mk | 4 -
external/libwps/libwps-bundled-soname.patch.0 | 4 -
filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu | 2
sfx2/source/appl/appuno.cxx | 20 +++----
solenv/flatpak-manifest.in | 6 +-
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1
writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 |binary
12 files changed, 55 insertions(+), 48 deletions(-)
New commits:
commit cf2c667fbb41bf7d9e172d940c25abb78155efe2
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Mon Nov 27 13:26:48 2017 +0200
Don't copy the string
Change-Id: If50d952acfea0be86d36bc5b23a0f087eff520c8
Reviewed-on: https://gerrit.libreoffice.org/45325
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index ca9ca3a13794..a5bc1ea0b959 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -208,8 +208,8 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
sal_uInt16 nSubCount = pType->nAttribs;
const beans::PropertyValue& rProp = pPropsVal[0];
- OUString aName = rProp.Name;
- if ( nCount == 1 && aName == OUString( pSlot->pUnoName, strlen( pSlot->pUnoName ), RTL_TEXTENCODING_UTF8 ) )
+ const OUString& rName = rProp.Name;
+ if ( nCount == 1 && rName == OUString( pSlot->pUnoName, strlen( pSlot->pUnoName ), RTL_TEXTENCODING_UTF8 ) )
{
// there is only one parameter and its name matches the name of the property,
// so it's either a simple property or a complex property in one single UNO struct
@@ -225,7 +225,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( nSubCount == 0 )
{
// for a simple property there can be only one parameter and its name *must* match
- SAL_WARN("sfx.appl", "Property name does not match: " << aName);
+ SAL_WARN("sfx.appl", "Property name does not match: " << rName);
}
#endif
else
@@ -309,8 +309,8 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
for ( sal_Int32 n=0; n<nCount; n++ )
{
const beans::PropertyValue& rProp = pPropsVal[n];
- OUString aName = rProp.Name;
- if ( aName == OUString( rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8 ) )
+ const OUString& rName = rProp.Name;
+ if ( rName == OUString( rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8 ) )
{
#ifdef DBG_UTIL
++nFoundArgs;
@@ -333,8 +333,8 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
for ( sal_Int32 n=0; n<nCount; n++ )
{
const beans::PropertyValue& rProp = pPropsVal[n];
- OUString aName = rProp.Name;
- if ( aName == OUString(rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8) )
+ const OUString& rName = rProp.Name;
+ if ( rName == OUString(rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8) )
{
bAsWholeItem = true;
#ifdef DBG_UTIL
@@ -404,15 +404,15 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
for ( sal_Int32 n=0; n<nCount; n++ )
{
const beans::PropertyValue& rProp = pPropsVal[n];
- OUString aName = rProp.Name;
- if ( aName == sFrame )
+ const OUString& rName = rProp.Name;
+ if ( rName == sFrame )
{
Reference< XFrame > xFrame;
OSL_VERIFY( rProp.Value >>= xFrame );
rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) );
}
else
- if ( aName == sHidden )
+ if ( rName == sHidden )
{
bool bVal = false;
if (rProp.Value >>= bVal)
commit 8d0e8d5d291cbb98de6964eab2f629a405c7e813
Author: David Tardon <dtardon at redhat.com>
Date: Mon Nov 27 10:16:07 2017 +0100
upload libwps 0.4.8
Change-Id: Ib285c227cd935987311be40df3745316943a54e0
Reviewed-on: https://gerrit.libreoffice.org/45331
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index 4ff7655c0f36..3543d5874771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7696,7 +7696,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.7])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 98dd3526f783..5c15b2be12e8 100644
--- a/download.lst
+++ b/download.lst
@@ -230,8 +230,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
export WPG_VERSION_MICRO := 2
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217
-export WPS_VERSION_MICRO := 7
+export WPS_SHA256SUM := e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
+export WPS_VERSION_MICRO := 8
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 b/external/libwps/0001-drop-unneeded-include.patch.1
new file mode 100644
index 000000000000..4d7b5a494530
--- /dev/null
+++ b/external/libwps/0001-drop-unneeded-include.patch.1
@@ -0,0 +1,24 @@
+From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 27 Nov 2017 19:32:53 +0100
+Subject: [PATCH] drop unneeded include
+
+---
+ src/lib/QuattroSpreadsheet.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
+index 8d7e1c0..bc35bdf 100644
+--- a/src/lib/QuattroSpreadsheet.cpp
++++ b/src/lib/QuattroSpreadsheet.cpp
+@@ -21,7 +21,6 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include <strings.h>
+
+ #include <algorithm>
+ #include <cctype>
+--
+2.14.3
+
diff --git a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 b/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1
deleted file mode 100644
index c5aca0e7d380..000000000000
--- a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 01d2ef67b9076fd82ecc6937bdbb306b489fd29e Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 17 Jul 2017 14:34:12 +0200
-Subject: [PATCH] try to fix build with older clang
-
----
- src/lib/libwps_internal.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
-index 8e91806..8a5fccc 100644
---- a/src/lib/libwps_internal.h
-+++ b/src/lib/libwps_internal.h
-@@ -85,8 +85,8 @@ struct WPS_shared_ptr_noop_deleter
-
- /** fall through attributes */
- #define WPS_FALLTHROUGH
--#if defined(__clang__)
--# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
-+#if defined(__clang__) && defined(__has_cpp_attribute)
-+# if __has_cpp_attribute(clang::fallthrough)
- # undef WPS_FALLTHROUGH
- # define WPS_FALLTHROUGH [[clang::fallthrough]]
- # endif
---
-2.13.0
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 4089c8b244bb..d1525ecdeb11 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -34,15 +34,22 @@ $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
$(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/DosWord \
UnpackedTarball/libwps/src/lib/Lotus \
+ UnpackedTarball/libwps/src/lib/LotusChart \
UnpackedTarball/libwps/src/lib/LotusGraph \
UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Quattro \
+ UnpackedTarball/libwps/src/lib/QuattroDos \
+ UnpackedTarball/libwps/src/lib/QuattroDosChart \
+ UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+ UnpackedTarball/libwps/src/lib/QuattroGraph \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
UnpackedTarball/libwps/src/lib/WKS4 \
+ UnpackedTarball/libwps/src/lib/WKS4Chart \
UnpackedTarball/libwps/src/lib/WKS4Format \
UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \
+ UnpackedTarball/libwps/src/lib/WKSChart \
UnpackedTarball/libwps/src/lib/WKSContentListener \
UnpackedTarball/libwps/src/lib/WKSParser \
UnpackedTarball/libwps/src/lib/WKSSubDocument \
@@ -65,7 +72,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/WPSHeader \
UnpackedTarball/libwps/src/lib/WPSList \
UnpackedTarball/libwps/src/lib/WPSOLE1Parser \
+ UnpackedTarball/libwps/src/lib/WPSOLEObject \
UnpackedTarball/libwps/src/lib/WPSOLEParser \
+ UnpackedTarball/libwps/src/lib/WPSOLEStream \
UnpackedTarball/libwps/src/lib/WPSPageSpan \
UnpackedTarball/libwps/src/lib/WPSParagraph \
UnpackedTarball/libwps/src/lib/WPSParser \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 3aa0251a7bd5..58c3710d9e03 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,8 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
- external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+ external/libwps/0001-drop-unneeded-include.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libwps/libwps-bundled-soname.patch.0 b/external/libwps/libwps-bundled-soname.patch.0
index 734cdc670d18..013ba7a88b9e 100644
--- a/external/libwps/libwps-bundled-soname.patch.0
+++ b/external/libwps/libwps-bundled-soname.patch.0
@@ -7,5 +7,5 @@
-libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
+libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_SOURCES = \
- libwps_internal.cpp \
- libwps_tools_win.h \
+ libwps_internal.cpp \
+ libwps_tools_win.h \
diff --git a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
index a335004bd8cc..2c8529db0936 100644
--- a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
+++ b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
@@ -18,7 +18,7 @@
<node oor:name="calc_WPS_QPro_Document" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
<prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>wq1 wq2</value></prop>
+ <prop oor:name="Extensions"><value>wb1 wb2 wq1 wq2</value></prop>
<prop oor:name="MediaType"></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>WPS_QPro_Calc</value></prop>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2c5a3ff1df47..8119f892c189 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -280,10 +280,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libwps-0.4.7.tar.xz",
- "sha256": "2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217",
+ "url": "https://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz",
+ "sha256": "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.7.tar.xz"
+ "dest-filename": "external/tarballs/libwps-0.4.8.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz",
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 7a7dc531826c..0e5584e1ff85 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -39,6 +39,7 @@ void WpftCalcFilterTest::test()
{
{"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
{"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)},
+ {"QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8)},
};
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1
new file mode 100755
index 000000000000..95a6331c9c3d
Binary files /dev/null and b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 differ
More information about the Libreoffice-commits
mailing list