rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 6.0.0 beta1

Browse Source
This commit is contained in:
David Tardon 2017-11-25 22:59:10 +01:00
parent 4f6763820f
commit 4d87307c04
19 changed files with 104 additions and 1325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -9,18 +9,18 @@
/cppunit-1.14.0.tar.gz
/gpgme-1.9.0.tar.bz2
/graphite2-minimal-1.3.10.tgz
/harfbuzz-1.4.8.tar.bz2
/harfbuzz-1.7.0.tar.bz2
/libassuan-2.4.3.tar.bz2
/libcmis-0.5.1.tar.gz
/libepubgen-0.0.1.tar.bz2
/libgpg-error-1.27.tar.bz2
/liborcus-0.13.1.tar.xz
/liborcus-0.13.1.tar.gz
/libqxp-0.0.0.tar.xz
/libpagemaker-0.0.3.tar.bz2
/libstaroffice-0.0.4.tar.xz
/libstaroffice-0.0.5.tar.xz
/libwps-0.4.7.tar.xz
/libzmf-0.0.2.tar.xz
/mdds-1.2.3.tar.bz2
/mdds-1.3.1.tar.bz2
/xmlsec1-1.2.25.tar.gz
/libreoffice-5.4.2.1.tar.xz
/libreoffice-help-5.4.2.1.tar.xz
@ -46,3 +46,9 @@
/libreoffice-help-6.0.0.0.alpha1.tar.xz.asc
/libreoffice-translations-6.0.0.0.alpha1.tar.xz
/libreoffice-translations-6.0.0.0.alpha1.tar.xz.asc
/libreoffice-6.0.0.0.beta1.tar.xz
/libreoffice-6.0.0.0.beta1.tar.xz.asc
/libreoffice-help-6.0.0.0.beta1.tar.xz
/libreoffice-help-6.0.0.0.beta1.tar.xz.asc
/libreoffice-translations-6.0.0.0.beta1.tar.xz
/libreoffice-translations-6.0.0.0.beta1.tar.xz.asc

92
0001-Improve-resizing-chevrons-so-the-control-point-is-a-.patch
View File

@ -1,92 +0,0 @@
From 7126bc7730242e80a04d704256d2cf7a244b3cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 25 Sep 2017 14:45:51 +0100
Subject: [PATCH] Improve resizing chevrons so the control point is a fixed
distance from end
during resizing, because...
"If I want to use LibreOffice Draw to illustrate process steps with chevrons
(which I do a lot, working on for example customer project roadmaps), I always
get stuck if the steps I want to illustrate are not equal lengths, because the
sizes/angles of the chevron "arrow heads" are proportional to the length of the
chevron, rather than being fixed, and thus don't "fit" together. Which makes
for an incredibly ugly diagram."
Change-Id: Ib8b5e0ea7db5383cae754127023f7ab12d748537
---
include/svx/svdoashp.hxx | 3 ++-
svx/source/svdraw/svdoashp.cxx | 17 ++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index ea222ed..85f5e9d 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -57,11 +57,12 @@ enum class CustomShapeHandleModes
RESIZE_ABSOLUTE_Y = 8,
MOVE_SHAPE = 16,
ORTHO4 = 32,
+ RESIZE_ABSOLUTE_NEGX = 64
};
namespace o3tl
{
- template<> struct typed_flags<CustomShapeHandleModes> : is_typed_flags<CustomShapeHandleModes, 63> {};
+ template<> struct typed_flags<CustomShapeHandleModes> : is_typed_flags<CustomShapeHandleModes, 127> {};
}
struct SdrCustomShapeInteraction
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 5323375..4f01a19 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -617,6 +617,11 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle
}
break;
+ case mso_sptChevron :
+ case mso_sptHomePlate :
+ nMode |= CustomShapeHandleModes::RESIZE_ABSOLUTE_NEGX;
+ break;
+
case mso_sptWedgeRectCallout :
case mso_sptWedgeRRectCallout :
case mso_sptCloudCallout :
@@ -1523,6 +1528,11 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
sal_Int32 nX = ( aIter->aPosition.X - aOld.Left() ) + maRect.Left();
aIter->xInteraction->setControllerPosition( css::awt::Point( nX, aIter->xInteraction->getPosition().Y ) );
}
+ else if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_NEGX )
+ {
+ sal_Int32 nX = maRect.Right() - (aOld.Right() - aIter->aPosition.X);
+ aIter->xInteraction->setControllerPosition( css::awt::Point( nX, aIter->xInteraction->getPosition().Y ) );
+ }
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_Y )
{
sal_Int32 nY = ( aIter->aPosition.Y - aOld.Top() ) + maRect.Top();
@@ -1535,6 +1545,7 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
}
InvalidateRenderGeometry();
}
+
void SdrObjCustomShape::NbcRotate( const Point& rRef, long nAngle, double sn, double cs )
{
bool bMirroredX = IsMirroredX();
@@ -1933,8 +1944,12 @@ void SdrObjCustomShape::DragResizeCustomShape( const tools::Rectangle& rNewRect
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
- if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_X )
+ if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_X ||
+ aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_NEGX )
{
+ if (aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_NEGX)
+ bOldMirroredX = !bOldMirroredX;
+
sal_Int32 nX;
if ( bOldMirroredX )
{
--
2.9.5

32
0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch
View File

@ -1,32 +0,0 @@
From c2097d5078896a71b8e1ac4074cc03766f5d7098 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 24 Oct 2017 14:56:30 +0200
Subject: [PATCH] Make testUtf8StringLiterals work when char is unsigned
...as is reportedly the case for Linux AArch64
Change-Id: I7e11c42f4437c8aad9dd734603fa7e0d458c9754
---
sal/qa/rtl/strings/test_ostring.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx
index 110831758916..3732f7488bde 100644
--- a/sal/qa/rtl/strings/test_ostring.cxx
+++ b/sal/qa/rtl/strings/test_ostring.cxx
@@ -111,9 +111,9 @@ void Test::testUtf8StringLiterals()
{
const OString sIn(u8"ßa");
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), sIn.getLength());
- CPPUNIT_ASSERT_EQUAL(-61, static_cast<int>(sIn[0]));
- CPPUNIT_ASSERT_EQUAL(-97, static_cast<int>(sIn[1]));
- CPPUNIT_ASSERT_EQUAL(97, static_cast<int>(sIn[2]));
+ CPPUNIT_ASSERT_EQUAL(195, int(static_cast<unsigned char>(sIn[0])));
+ CPPUNIT_ASSERT_EQUAL(159, int(static_cast<unsigned char>(sIn[1])));
+ CPPUNIT_ASSERT_EQUAL(97, int(static_cast<unsigned char>(sIn[2])));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
--
2.14.1

53
0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch
View File

@ -1,53 +0,0 @@
From b12be8bcddf71b969c97580bd631a6a851a2ad43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 28 Sep 2017 10:28:44 +0100
Subject: [PATCH] Resolves: tdf#42873 videos in presenter console misplaced
Change-Id: Ib7559246f6f3173acea72268db0489b79df38ae3
---
slideshow/source/engine/shapes/viewmediashape.cxx | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index dcc14b9..99bc019 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -50,15 +50,16 @@
#include <vcl/opengl/OpenGLContext.hxx>
#endif
-#include <com/sun/star/media/XManager.hpp>
-#include <com/sun/star/media/XPlayer.hpp>
-#include <com/sun/star/media/XPlayerWindow.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/media/XManager.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/media/XPlayerWindow.hpp>
+#include <com/sun/star/presentation/XSlideShowView.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
#include "viewmediashape.hxx"
#include "mediashape.hxx"
@@ -473,6 +474,13 @@ namespace slideshow
{
mpMediaWindow.disposeAndClear();
mpMediaWindow = VclPtr<SystemChildWindow>::Create( pWindow, WB_CLIPCHILDREN );
+ UnoViewSharedPtr xUnoView(std::dynamic_pointer_cast<UnoView>(mpViewLayer));
+ if (xUnoView)
+ {
+ awt::Rectangle aCanvasArea = xUnoView->getUnoView()->getCanvasArea();
+ aAWTRect.X += aCanvasArea.X;
+ aAWTRect.Y += aCanvasArea.Y;
+ }
mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
Size( aAWTRect.Width, aAWTRect.Height ) );
}
--
2.9.5

419
0001-Updated-liborcus-to-0.13.1.patch
View File

@ -1,419 +0,0 @@
From 38c4f46325260ffe176937fa309ef804e3bb0c31 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Wed, 15 Nov 2017 20:42:23 -0500
Subject: [PATCH] Updated liborcus to 0.13.1.
Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286
Reviewed-on: https://gerrit.libreoffice.org/44850
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
---
RepositoryExternal.mk | 4 ++--
download.lst | 4 ++--
external/liborcus/ExternalPackage_liborcus.mk | 8 ++++----
external/liborcus/ExternalProject_liborcus.mk | 4 ++--
external/liborcus/Library_orcus.mk | 15 ++++++++-------
external/liborcus/UnpackedTarball_liborcus.mk | 4 ----
external/liborcus/nullptr-in-ostringstream.patch.1 | 12 ------------
.../orcus_allow_missing_xml_header.patch.1 | 12 ------------
.../orcus_allow_underscore_in_names.patch.1 | 12 ------------
external/liborcus/visibility.patch.0 | 15 ---------------
sc/qa/unit/helper/csv_handler.hxx | 4 ++--
sc/source/filter/inc/orcusinterface.hxx | 10 +++++++---
sc/source/filter/orcus/interface.cxx | 22 +++++++++++++++-------
sc/source/ui/dataprovider/csvdataprovider.cxx | 2 +-
sc/source/ui/docshell/datastream.cxx | 2 +-
sfx2/source/control/emojiview.cxx | 6 +++---
16 files changed, 47 insertions(+), 89 deletions(-)
delete mode 100644 external/liborcus/nullptr-in-ostringstream.patch.1
delete mode 100644 external/liborcus/orcus_allow_missing_xml_header.patch.1
delete mode 100644 external/liborcus/orcus_allow_underscore_in_names.patch.1
delete mode 100644 external/liborcus/visibility.patch.0
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0e4c15b6ba5f..db70ce875e71 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3230,7 +3230,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.12 \
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.13 \
)
$(if $(SYSTEM_BOOST), \
@@ -3249,7 +3249,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.12 \
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.13 \
)
endef
diff --git a/download.lst b/download.lst
index dca14ac081be..b857dc49dfe8 100644
--- a/download.lst
+++ b/download.lst
@@ -180,6 +180,6 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
export OPENSSL_TARBALL := openssl-1.0.2k.tar.gz
-export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908
-export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
+export ORCUS_SHA256SUM := d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937
+export ORCUS_TARBALL := liborcus-0.13.1.tar.gz
export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_SHA256SUM := 3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
index 4a8b5f8bacd6..32382b7d89a1 100644
--- a/external/liborcus/ExternalPackage_liborcus.mk
+++ b/external/liborcus/ExternalPackage_liborcus.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.0.dylib,src/liborcus/.libs/liborcus-0.12.0.dylib))
-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.0.dylib,src/parser/.libs/liborcus-parser-0.12.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.0.dylib,src/liborcus/.libs/liborcus-0.13.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.0.dylib,src/parser/.libs/liborcus-parser-0.13.0.dylib))
else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.so.0,src/liborcus/.libs/liborcus-0.12.so.0.0.0))
-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.so.0,src/parser/.libs/liborcus-parser-0.12.so.0.0.0))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.so.0,src/liborcus/.libs/liborcus-0.13.so.0.0.0))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.so.0,src/parser/.libs/liborcus-parser-0.13.so.0.0.0))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 3b7ea728b216..01c7c050d04a 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -114,8 +114,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(MAKE) \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
- $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.12.0.dylib \
- $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.12.0.dylib \
+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.13.0.dylib \
+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.13.0.dylib \
) \
)
diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
index adc43cb1cc9b..9916f6fe5236 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -67,8 +67,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \
UnpackedTarball/liborcus/src/liborcus/odf_para_context \
- UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_styles \
+ UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_tokens \
UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \
UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \
@@ -86,23 +86,24 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_ods \
- UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
+ UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_xml \
UnpackedTarball/liborcus/src/liborcus/session_context \
UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
UnpackedTarball/liborcus/src/liborcus/string_helper \
- UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
- UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
- UnpackedTarball/liborcus/src/liborcus/xlsx_context \
- UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
- UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
UnpackedTarball/liborcus/src/liborcus/xls_xml_context \
UnpackedTarball/liborcus/src/liborcus/xls_xml_detection_handler \
UnpackedTarball/liborcus/src/liborcus/xls_xml_handler \
UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
UnpackedTarball/liborcus/src/liborcus/xls_xml_tokens \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_context \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_drawing_context \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
+ UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 655aa496e2f2..b3261a5fa993 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,10 +18,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
- external/liborcus/visibility.patch.0 \
- external/liborcus/nullptr-in-ostringstream.patch.1 \
- external/liborcus/orcus_allow_missing_xml_header.patch.1 \
- external/liborcus/orcus_allow_underscore_in_names.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/nullptr-in-ostringstream.patch.1 b/external/liborcus/nullptr-in-ostringstream.patch.1
deleted file mode 100644
index d8b97ee2c92a..000000000000
--- a/external/liborcus/nullptr-in-ostringstream.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/src/liborcus/xml_context_base.cpp liborcus/src/liborcus/xml_context_base.cpp
---- liborcus.org/src/liborcus/xml_context_base.cpp 2017-06-30 14:32:19.044195127 +0200
-+++ liborcus/src/liborcus/xml_context_base.cpp 2017-06-30 14:34:27.580268421 +0200
-@@ -171,7 +171,7 @@
-
- // Create a generic error message.
- ostringstream os;
-- os << "element '" << ns << ":" << m_tokens.get_token_name(name) << "' expected, but '";
-+ os << "element '" << (ns ? ns : "") << ":" << m_tokens.get_token_name(name) << "' expected, but '";
- os << elem.first << ":" << m_tokens.get_token_name(elem.second) << "' encountered.";
- throw xml_structure_error(os.str());
- }
diff --git a/external/liborcus/orcus_allow_missing_xml_header.patch.1 b/external/liborcus/orcus_allow_missing_xml_header.patch.1
deleted file mode 100644
index 2cfd498c7eae..000000000000
--- a/external/liborcus/orcus_allow_missing_xml_header.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp
---- liborcus.org/include/orcus/sax_parser.hpp 2017-08-12 09:44:21.379509116 +0200
-+++ liborcus/include/orcus/sax_parser.hpp 2017-08-12 09:46:06.884259216 +0200
-@@ -20,7 +20,7 @@
- * parsing regardless of whether or not the xml stream begins with a
- * <?xml..?> declaration.
- */
-- static const bool strict_xml_declaration = true;
-+ static const bool strict_xml_declaration = false;
- };
-
- /**
diff --git a/external/liborcus/orcus_allow_underscore_in_names.patch.1 b/external/liborcus/orcus_allow_underscore_in_names.patch.1
deleted file mode 100644
index b5acc5a0938b..000000000000
--- a/external/liborcus/orcus_allow_underscore_in_names.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/src/parser/sax_parser_base.cpp liborcus/src/parser/sax_parser_base.cpp
---- liborcus.org/src/parser/sax_parser_base.cpp 2017-08-12 10:39:49.963174114 +0200
-+++ liborcus/src/parser/sax_parser_base.cpp 2017-08-12 10:41:32.026899749 +0200
-@@ -334,7 +334,7 @@
- {
- const char* p0 = mp_char;
- char c = cur_char();
-- if (!is_alpha(c))
-+ if (!is_alpha(c) && c != '_')
- {
- ::std::ostringstream os;
- os << "name must begin with an alphabet, but got this instead '" << c << "'";
diff --git a/external/liborcus/visibility.patch.0 b/external/liborcus/visibility.patch.0
deleted file mode 100644
index a62ecf753dc8..000000000000
--- a/external/liborcus/visibility.patch.0
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstreamed as
-<https://gitlab.com/orcus/orcus/commit/05d3e608ce09a9cf34aa085de6180978a03f0f13>
-"Allow passed-in CXXFLAGS to override -fvisibility=hidden":
-
---- configure
-+++ configure
-@@ -4255,7 +4255,7 @@
-
- fi
-
--CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Wall -pthread"
-+CXXFLAGS="-fvisibility=hidden $CXXFLAGS -Wall -pthread"
-
- # ===========================
- # Find required base packages
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index c4b5fafc63b6..8f0e8a8c2be3 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -98,7 +98,7 @@ public:
mnCol = 0;
}
- void cell(const char* p, size_t n)
+ void cell(const char* p, size_t n, bool /*transient*/)
{
#if DEBUG_CSV_HANDLER
std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
@@ -194,7 +194,7 @@ public:
mnCol = 0;
}
- void cell(const char* p, size_t n)
+ void cell(const char* p, size_t n, bool /*transient*/)
{
#if DEBUG_CSV_HANDLER
std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 1d4c285200ee..9938cf10d5fd 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -182,7 +182,8 @@ public:
virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
- virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
+
+ virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
};
class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
@@ -242,6 +243,8 @@ public:
orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
const char* p, size_t n, const char* p_range, size_t n_range) override;
+ virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
+
SCTAB getIndex() const { return mnTab; }
};
@@ -417,7 +420,7 @@ public:
// border
virtual void set_border_count(size_t n) override;
- virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
+
virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
orcus::spreadsheet::color_elem_t alpha,
@@ -507,7 +510,8 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory
public:
ScOrcusFactory(ScDocument& rDoc);
- virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
+ virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
+ orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index e98df4e4e1a6..de52b861e5fc 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
maStyles(rDoc),
mnProgress(0) {}
-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
+orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
+ orcus::spreadsheet::sheet_t /*sheet_index*/, const char* sheet_name, size_t sheet_name_length)
{
OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
if (!maDoc.appendSheet(aTabName))
@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t row, bool hidden)
mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
}
-void ScOrcusSheetProperties::set_merge_cell_range(const char* /*p_range*/, size_t /*n_range*/)
+void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /*range*/)
{
}
@@ -574,6 +575,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
case orcus::spreadsheet::formula_grammar_t::gnumeric:
eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
break;
+ case orcus::spreadsheet::formula_grammar_t::xls_xml:
+ eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
+ break;
case orcus::spreadsheet::formula_grammar_t::unknown:
break;
}
@@ -689,6 +693,15 @@ void ScOrcusSheet::set_array_formula(
{
}
+orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
+{
+ orcus::spreadsheet::range_size_t ret;
+ ret.rows = MAXROWCOUNT;
+ ret.columns = MAXCOLCOUNT;
+
+ return ret;
+}
+
ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
mrFactory(rFactory) {}
@@ -1279,11 +1292,6 @@ void ScOrcusStyles::set_border_count(size_t /*n*/)
// needed at all?
}
-void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*dir*/, const char* /*s*/, size_t /*n*/)
-{
- // implement later
-}
-
void ScOrcusStyles::set_border_style(
orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style)
{
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx
index f961a4c21977..1d61996f7a6e 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -41,7 +41,7 @@ public:
mnCol = 0;
}
- void cell(const char* p, size_t n)
+ void cell(const char* p, size_t n, bool /*transient*/)
{
if (mnCol > MAXCOL)
return;
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 16a6cb09409e..f74feb7a7d06 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -71,7 +71,7 @@ public:
static void begin_row() {}
static void end_row() {}
- void cell(const char* p, size_t n)
+ void cell(const char* p, size_t n, bool /*transient*/)
{
if (mnCols >= mnColCount)
return;
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index e2820186c68d..0a572449c61d 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -104,12 +104,12 @@ void EmojiView::Populate()
}
// Populate view using the orcus json parser
- using node = orcus::json_document_tree::node;
+ using node = orcus::json::node;
// default json config
orcus::json_config config;
- orcus::json_document_tree aEmojiInfo;
+ orcus::json::document_tree aEmojiInfo;
// Load JSON string into a document tree.
aEmojiInfo.load(msJSONData, config);
@@ -122,7 +122,7 @@ void EmojiView::Populate()
orcus::pstring key = *it;
node value = root.child(key);
- if(value.type() == orcus::json_node_t::object)
+ if(value.type() == orcus::json::node_t::object)
{
// iterate each element to get the keys
std::vector<orcus::pstring> aEmojiParams = value.keys();
--
2.14.3

29
0001-We-now-require-orcus-0.13-to-build.patch
View File

@ -1,29 +0,0 @@
From 5c5fd9b86c8177403ab73c77fbb047a9ccad19f1 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Sat, 18 Nov 2017 07:46:02 -0500
Subject: [PATCH] We now require orcus-0.13 to build.
Change-Id: Ieea3eda0c3f073caf5a957e55567c84bd7261ed2
Reviewed-on: https://gerrit.libreoffice.org/44908
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7c594aa88719..1dabb24a252c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8970,7 +8970,7 @@ AC_SUBST(ENABLE_FUZZERS)
dnl ===================================================================
dnl Orcus
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.12 >= 0.12.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.0])
if test "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "TRUE"; then
# ===========================================================
--
2.14.3

30
0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch
View File

@ -1,30 +0,0 @@
From 7e389ae76965fdbd4cdf0a8482592295489a48d7 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 24 Oct 2017 11:03:24 +0200
Subject: [PATCH] allow to override ENABLE_STRIP in the installer
... because we set ENABLE_STRIP in
instsetoo_native/CustomTarget_install.mk .
Change-Id: I4eaf66c53a0ec680688bf819b3a396865e7a3e33
---
solenv/bin/modules/installer/environment.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 8afe3c12c782..38448a8ba9fb 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -122,8 +122,8 @@ sub set_global_environment_variables
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
- if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
if (( $ENV{'ENABLE_STRIP'} ) && ( $ENV{'ENABLE_STRIP'} ne '' )) { $installer::globals::strip = 1; }
+ if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
# Special handling, if LOCALINSTALLDIR contains "~" in the path
--
2.14.1

39
0001-blind-attempt-to-fix-build-on-big-endian.patch
View File

@ -1,39 +0,0 @@
From cb0eb72ec40210ea7bade415ab3e78824e705c29 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 26 Oct 2017 22:24:55 +0200
Subject: [PATCH] blind attempt to fix build on big endian
Change-Id: I4dc2d5a5fbbded5f4c7a1417c150fe6b1a73a69d
---
drawinglayer/source/tools/emfphelperdata.cxx | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index be8f17acc02f..75f1c3c8f3f3 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -42,6 +42,21 @@
namespace emfplushelper
{
+
+#ifdef OSL_BIGENDIAN
+ // little endian <-> big endian switch
+ static float GetSwapFloat(SvStream& rStream)
+ {
+ float fTmp;
+ sal_Int8* pPtr = (sal_Int8*)&fTmp;
+ rStream.ReadSChar(pPtr[3]);
+ rStream.ReadSChar(pPtr[2]);
+ rStream.ReadSChar(pPtr[1]);
+ rStream.ReadSChar(pPtr[0]);
+ return fTmp;
+ }
+#endif
+
const char* emfTypeToName(sal_uInt16 type)
{
switch (type)
--
2.14.1

30
0001-fix-build-error.patch
View File

@ -1,30 +0,0 @@
From db6673bb32bb131b6446dc976fe09b1f8df72d49 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 24 Oct 2017 17:07:24 +0200
Subject: [PATCH] fix build error
Change-Id: I1e65f075a0519db86836b3aa09848178796a020b
---
libreofficekit/source/gtk/lokdocview.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index d2bfefcc089e..607a8624ecc3 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -177,10 +177,8 @@ struct LOKDocViewPrivateImpl
/// Cached document type, returned by getDocumentType().
LibreOfficeKitDocumentType m_eDocumentType;
- /**
- * Contains a freshly set zoom level: logic size of a tile.
- * It gets reset back to 0 when LOK was informed about this zoom change.
- */
+ /// Contains a freshly set zoom level: logic size of a tile.
+ /// It gets reset back to 0 when LOK was informed about this zoom change.
int m_nTileSizeTwips;
GdkRectangle m_aVisibleArea;
--
2.14.1

26
0001-fix-build-of-bundled-libepubgen-on-ppc64le.patch
View File

@ -1,26 +0,0 @@
From d6765e376706680156e71e985eeeb58bf469f849 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 5 Nov 2017 15:05:43 +0100
Subject: [PATCH] fix build of bundled libepubgen on ppc64le
Change-Id: I559058ffe2192764a27d278eea0e4d4676bbd64d
---
external/libepubgen/UnpackedTarball_libepubgen.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk b/external/libepubgen/UnpackedTarball_libepubgen.mk
index 28582a5cf0f3..312facb2bb11 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libepubgen))
$(eval $(call gb_UnpackedTarball_set_tarball,libepubgen,$(EPUBGEN_TARBALL)))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libepubgen))
+
$(eval $(call gb_UnpackedTarball_set_patchlevel,libepubgen,0))
$(eval $(call gb_UnpackedTarball_add_patches,libepubgen,\
--
2.14.1

26
0001-fix-build-with-older-boost.patch
View File

@ -1,26 +0,0 @@
From 4f2308bb6e5c26e304bb9372b3e5971e8ce24df1 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 4 Nov 2017 19:55:21 +0100
Subject: [PATCH] fix build with older boost
Change-Id: Ie3f7a32bf8d5c9c118d35272c8e197b9c6ffcd80
---
include/connectivity/sqlerror.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index 026d6d84bbae..b1084959a94b 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -71,7 +71,7 @@ namespace connectivity
public:
ParamValue( ) : base_type( ) { }
ParamValue( OUString const& val ) : base_type( val ) { }
- ParamValue( ParamValue const& rhs ) : base_type( rhs ) { }
+ ParamValue( ParamValue const& rhs ) : base_type( static_cast<base_type const&>( rhs ) ) { }
bool is() const { return !base_type::operator!(); }
};
--
2.14.1

70
0001-fix-includes-in-aarch64-bridge.patch Normal file
View File

@ -0,0 +1,70 @@
From 897c07bda2d116bcc2fa4a64c1eb75a52651c991 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 26 Nov 2017 16:04:25 +0100
Subject: [PATCH] fix includes in aarch64 bridge
Change-Id: Ia27f15483c27bc43a3cd3a74432f15fa928ad6da
---
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index fa6ffebfbc17..da22eb436b8f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -38,7 +38,7 @@
#include <uno/any2.h>
#include <uno/mapping.h>
-#include <abi.hxx>
+#include "abi.hxx"
#include <osl/mutex.hxx>
#include <unordered_map>
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
index 09f7696cfb4a..2f7188ea4f99 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
@@ -24,7 +24,7 @@
#include <sal/types.h>
#include <sal/alloca.h>
-#include <callvirtualfunction.hxx>
+#include "callvirtualfunction.hxx"
void callVirtualFunction(
unsigned long function, unsigned long * gpr, unsigned long * fpr,
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index 3d8eea4503e9..d867a04dd299 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -40,7 +40,7 @@
#include <types.hxx>
#include <vtablefactory.hxx>
-#include <abi.hxx>
+#include "abi.hxx"
extern "C" void vtableSlotCall_();
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
index 4e7d69b0a871..8faccbf3edaf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
@@ -42,8 +42,8 @@
#include <uno/any2.h>
#include <uno/data.h>
-#include <abi.hxx>
-#include <callvirtualfunction.hxx>
+#include "abi.hxx"
+#include "callvirtualfunction.hxx"
namespace {
--
2.14.3

40
0001-one-slash-is-enough.patch
View File

@ -1,40 +0,0 @@
From 1bacce999d7dad91b1f87baaf09b08e6b4629fad Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 5 Nov 2017 20:41:03 +0100
Subject: [PATCH] one slash is enough
Change-Id: I35fbca7592f3e17a071df567f691c62fe9232fc1
---
sc/source/ui/vba/vbafiledialogitems.hxx | 2 +-
ucbhelper/source/provider/contentinfo.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/vba/vbafiledialogitems.hxx b/sc/source/ui/vba/vbafiledialogitems.hxx
index c78d8d1ffe83..47ba90ac4440 100644
--- a/sc/source/ui/vba/vbafiledialogitems.hxx
+++ b/sc/source/ui/vba/vbafiledialogitems.hxx
@@ -9,7 +9,7 @@
#ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAFILEDIALOGSELECTEDITEMS
#define INCLUDED_SC_SOURCE_UI_VBA_VBAFILEDIALOGSELECTEDITEMS
-#include <ooo/vba//excel/XFileDialogSelectedItems.hpp>
+#include <ooo/vba/excel/XFileDialogSelectedItems.hpp>
#include <vbahelper/vbahelperinterface.hxx>
#include <vbahelper/vbacollectionimpl.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index cd8ba829d209..d2cfa62f43eb 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -23,7 +23,7 @@
*************************************************************************/
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star//ucb/UnsupportedCommandException.hpp>
+#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
#include <com/sun/star/ucb/XPropertySetRegistry.hpp>
#include "osl/mutex.hxx"
--
2.14.1

162
0001-prepare-for-build-with-ICU-60.1.patch
View File

@ -1,162 +0,0 @@
From 9206a08ada00e8762c4a634f242bd566028964bb Mon Sep 17 00:00:00 2001
Message-Id: <9206a08ada00e8762c4a634f242bd566028964bb.1511376335.git.erack@redhat.com>
From: Eike Rathke <erack@redhat.com>
Date: Fri, 17 Nov 2017 11:03:45 +0100
Subject: [PATCH] Upgrade to ICU 60.1
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
This is a multi-part message in MIME format.
--------------erAck-patch-parts
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Partially extracted and adjusted from
Change-Id: I6d90f51ee88c4e1005edbaa93d23cfb94cb2acfb
Reviewed-on: https://gerrit.libreoffice.org/44871
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
external/firebird/ExternalProject_firebird.mk | 6 +
.../source/breakiterator/breakiterator_unicode.cxx | 21 +++
i18nutil/source/utility/unicode.cxx | 11 ++
include/svx/strings.hrc | 7 +
svx/source/dialog/charmap.cxx | 23 +++
--------------erAck-patch-parts
Content-Type: text/x-patch; name="0001-Upgrade-to-ICU-60.1.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Upgrade-to-ICU-60.1.patch"
diff -ru orig.libreoffice-6.0.0.0.alpha1/external/firebird/ExternalProject_firebird.mk libreoffice-6.0.0.0.alpha1/external/firebird/ExternalProject_firebird.mk
--- a/external/firebird/ExternalProject_firebird.mk 2017-10-19 23:52:58.000000000 +0200
+++ b/external/firebird/ExternalProject_firebird.mk 2017-11-22 20:28:58.340429178 +0100
@@ -26,6 +26,10 @@
INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
endif
+ifeq ($(COM_IS_CLANG),TRUE)
+firebird_NO_CXX11_NARROWING := -Wno-c++11-narrowing
+endif
+
MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C
MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
@@ -70,6 +74,8 @@
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) \
) \
+ $(CXXFLAGS_CXX11) \
+ $(firebird_NO_CXX11_NARROWING) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_ICU),$(ICU_LIBS), \
diff -ru orig.libreoffice-6.0.0.0.alpha1/i18npool/source/breakiterator/breakiterator_unicode.cxx libreoffice-6.0.0.0.alpha1/i18npool/source/breakiterator/breakiterator_unicode.cxx
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx 2017-10-19 23:52:58.000000000 +0200
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx 2017-11-22 20:28:58.341429176 +0100
@@ -544,6 +544,27 @@
} else { //word boundary break
lbr.breakIndex = pLineBI->preceding(nStartPos);
lbr.breakType = BreakType::WORDBOUNDARY;
+
+ // Special case for Slash U+002F SOLIDUS in URI and path names.
+ // TR14 defines that as SY: Symbols Allowing Break After (A).
+ // This is unwanted in paths, see also i#17155
+ if (lbr.breakIndex > 0 && Text[lbr.breakIndex-1] == '/')
+ {
+ // Look backward and take any whitespace before as a break
+ // opportunity. This also glues something like "w/o".
+ // Avoid an overly long path and break it as was indicated.
+ // Overly long here is arbitrarily defined.
+ const sal_Int32 nOverlyLong = 66;
+ sal_Int32 nPos = lbr.breakIndex - 1;
+ while (nPos > 0 && lbr.breakIndex - nPos < nOverlyLong)
+ {
+ if (u_isWhitespace(Text.iterateCodePoints( &nPos, -1)))
+ {
+ lbr.breakIndex = nPos + 1;
+ break;
+ }
+ }
+ }
}
#define WJ 0x2060 // Word Joiner
diff -ru orig.libreoffice-6.0.0.0.alpha1/i18nutil/source/utility/unicode.cxx libreoffice-6.0.0.0.alpha1/i18nutil/source/utility/unicode.cxx
--- a/i18nutil/source/utility/unicode.cxx 2017-10-19 23:52:58.000000000 +0200
+++ b/i18nutil/source/utility/unicode.cxx 2017-11-22 20:28:58.342429173 +0100
@@ -716,6 +716,17 @@
sRet = "mis"; // Zsye - Emoji variant
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 60)
+ case USCRIPT_MASARAM_GONDI:
+ sRet = "gon-Gonm"; // macro language code, could be wsg,esg,gno
+ break;
+ case USCRIPT_SOYOMBO:
+ sRet = "mn-Soyo"; // abugida to write Mongolian, also Tibetan and Sanskrit
+ break;
+ case USCRIPT_ZANABAZAR_SQUARE:
+ sRet = "mn-Zanb"; // abugida to write Mongolian
+ break;
+#endif
}
return sRet;
}
diff -ru orig.libreoffice-6.0.0.0.alpha1/include/svx/strings.hrc libreoffice-6.0.0.0.alpha1/include/svx/strings.hrc
--- a/include/svx/strings.hrc 2017-10-19 23:52:58.000000000 +0200
+++ b/include/svx/strings.hrc 2017-11-22 20:28:58.343429171 +0100
@@ -1588,6 +1588,13 @@
#define RID_SUBSETSTR_OSAGE NC_("RID_SUBSETMAP", "Osage")
#define RID_SUBSETSTR_TANGUT NC_("RID_SUBSETMAP", "Tangut")
#define RID_SUBSETSTR_TANGUT_COMPONENTS NC_("RID_SUBSETMAP", "Tangut Components")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension F")
+#define RID_SUBSETSTR_KANA_EXTENDED_A NC_("RID_SUBSETMAP", "Kana Extended-A")
+#define RID_SUBSETSTR_MASARAM_GONDI NC_("RID_SUBSETMAP", "Masaram Gondi")
+#define RID_SUBSETSTR_NUSHU NC_("RID_SUBSETMAP", "Nushu")
+#define RID_SUBSETSTR_SOYOMBO NC_("RID_SUBSETMAP", "Soyombo")
+#define RID_SUBSETSTR_SYRIAC_SUPPLEMENT NC_("RID_SUBSETMAP", "Syriac Supplement")
+#define RID_SUBSETSTR_ZANABAZAR_SQUARE NC_("RID_SUBSETMAP", "Zanabazar Square")
#endif
diff -ru orig.libreoffice-6.0.0.0.alpha1/svx/source/dialog/charmap.cxx libreoffice-6.0.0.0.alpha1/svx/source/dialog/charmap.cxx
--- a/svx/source/dialog/charmap.cxx 2017-10-19 23:52:58.000000000 +0200
+++ b/svx/source/dialog/charmap.cxx 2017-11-22 20:28:58.343429171 +0100
@@ -1832,6 +1832,29 @@
aAllSubsets.emplace_back( 0x18800, 0x18AFF, SvxResId(RID_SUBSETSTR_TANGUT_COMPONENTS) );
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 60)
+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F:
+ aAllSubsets.emplace_back( 0x2CEB0, 0x2EBE0, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F) );
+ break;
+ case UBLOCK_KANA_EXTENDED_A:
+ aAllSubsets.emplace_back( 0x1B100, 0x1B12F, SvxResId(RID_SUBSETSTR_KANA_EXTENDED_A) );
+ break;
+ case UBLOCK_MASARAM_GONDI:
+ aAllSubsets.emplace_back( 0x11D00, 0x11D5F, SvxResId(RID_SUBSETSTR_MASARAM_GONDI) );
+ break;
+ case UBLOCK_NUSHU:
+ aAllSubsets.emplace_back( 0x1B170, 0x1B2FF, SvxResId(RID_SUBSETSTR_NUSHU) );
+ break;
+ case UBLOCK_SOYOMBO:
+ aAllSubsets.emplace_back( 0x11A50, 0x11AAF, SvxResId(RID_SUBSETSTR_SOYOMBO) );
+ break;
+ case UBLOCK_SYRIAC_SUPPLEMENT:
+ aAllSubsets.emplace_back( 0x0860, 0x086f, SvxResId(RID_SUBSETSTR_SYRIAC_SUPPLEMENT) );
+ break;
+ case UBLOCK_ZANABAZAR_SQUARE:
+ aAllSubsets.emplace_back( 0x11A00, 0x11A4F, SvxResId(RID_SUBSETSTR_ZANABAZAR_SQUARE) );
+ break;
+#endif
}
--------------erAck-patch-parts--

155
0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch
View File

@ -1,155 +0,0 @@
From a3cb93b3917608f5b329321caea8d699b80b1ddf Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 27 Oct 2017 11:51:28 +0200
Subject: [PATCH] remove GetSwapFloat nonsense from all 3 EMF readers
SvStream::ReadFloat already does that, and SvStream is initialised
to SvStreamEndian::LITTLE by default.
Change-Id: I5859e43014533bcebef9d4b8f0678c516193b92e
---
cppcanvas/source/inc/implrenderer.hxx | 23 -----------------------
drawinglayer/source/tools/emfphelperdata.cxx | 23 -----------------------
emfio/source/reader/emfreader.cxx | 14 --------------
emfio/source/reader/mtftools.cxx | 9 ---------
4 files changed, 69 deletions(-)
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 15b610306304..e61f3407169a 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -133,20 +133,6 @@ namespace cppcanvas
eDy = eDx*f.eM12 + eDy*f.eM22 + f.eDy;
}
-#ifdef OSL_BIGENDIAN
-// little endian <-> big endian switch
-static float GetSwapFloat( SvStream& rSt )
-{
- float fTmp;
- sal_Int8* pPtr = (sal_Int8*)&fTmp;
- rSt.ReadSChar( pPtr[3] );
- rSt.ReadSChar( pPtr[2] );
- rSt.ReadSChar( pPtr[1] );
- rSt.ReadSChar( pPtr[0] );
- return fTmp;
-}
-#endif
-
friend SvStream& ReadXForm( SvStream& rIn, XForm& rXForm )
{
if ( sizeof( float ) != 4 )
@@ -156,17 +142,8 @@ static float GetSwapFloat( SvStream& rSt )
}
else
{
-#ifdef OSL_BIGENDIAN
- rXForm.eM11 = GetSwapFloat( rIn );
- rXForm.eM12 = GetSwapFloat( rIn );
- rXForm.eM21 = GetSwapFloat( rIn );
- rXForm.eM22 = GetSwapFloat( rIn );
- rXForm.eDx = GetSwapFloat( rIn );
- rXForm.eDy = GetSwapFloat( rIn );
-#else
rIn.ReadFloat( rXForm.eM11 ).ReadFloat( rXForm.eM12 ).ReadFloat( rXForm.eM21 ).ReadFloat( rXForm.eM22 )
.ReadFloat( rXForm.eDx ).ReadFloat( rXForm.eDy );
-#endif
}
return rIn;
}
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 75f1c3c8f3f3..79ce930a5358 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -43,20 +43,6 @@
namespace emfplushelper
{
-#ifdef OSL_BIGENDIAN
- // little endian <-> big endian switch
- static float GetSwapFloat(SvStream& rStream)
- {
- float fTmp;
- sal_Int8* pPtr = (sal_Int8*)&fTmp;
- rStream.ReadSChar(pPtr[3]);
- rStream.ReadSChar(pPtr[2]);
- rStream.ReadSChar(pPtr[1]);
- rStream.ReadSChar(pPtr[0]);
- return fTmp;
- }
-#endif
-
const char* emfTypeToName(sal_uInt16 type)
{
switch (type)
@@ -265,16 +251,7 @@ namespace emfplushelper
float eM22(0.0);
float eDx(0.0);
float eDy(0.0);
-#ifdef OSL_BIGENDIAN
- eM11 = GetSwapFloat(rIn);
- eM12 = GetSwapFloat(rIn);
- eM21 = GetSwapFloat(rIn);
- eM22 = GetSwapFloat(rIn);
- eDx = GetSwapFloat(rIn);
- eDy = GetSwapFloat(rIn);
-#else
rIn.ReadFloat(eM11).ReadFloat(eM12).ReadFloat(eM21).ReadFloat(eM22).ReadFloat(eDx).ReadFloat(eDy);
-#endif
rTarget = basegfx::B2DHomMatrix(
eM11, eM21, eDx,
eM12, eM22, eDy);
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index 8ff413b79033..f865487e00d1 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -305,20 +305,6 @@ record_type_name(sal_uInt32 nRecType)
#endif
}
-#ifdef OSL_BIGENDIAN
-// little endian <-> big endian switch
-static float GetSwapFloat(SvStream& rStream)
-{
- float fTmp;
- sal_Int8* pPtr = (sal_Int8*)&fTmp;
- rStream.ReadSChar(pPtr[3]);
- rStream.ReadSChar(pPtr[2]);
- rStream.ReadSChar(pPtr[1]);
- rStream.ReadSChar(pPtr[0]);
- return fTmp;
-}
-#endif
-
struct BLENDFUNCTION
{
unsigned char aBlendOperation;
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index b6de61d1f6bc..038000e9a185 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -56,21 +56,12 @@ namespace emfio
}
else
{
-#ifdef OSL_BIGENDIAN
- rXForm.eM11 = GetSwapFloat(rInStream);
- rXForm.eM12 = GetSwapFloat(rInStream);
- rXForm.eM21 = GetSwapFloat(rInStream);
- rXForm.eM22 = GetSwapFloat(rInStream);
- rXForm.eDx = GetSwapFloat(rInStream);
- rXForm.eDy = GetSwapFloat(rInStream);
-#else
rInStream.ReadFloat(rXForm.eM11);
rInStream.ReadFloat(rXForm.eM12);
rInStream.ReadFloat(rXForm.eM21);
rInStream.ReadFloat(rXForm.eM22);
rInStream.ReadFloat(rXForm.eDx);
rInStream.ReadFloat(rXForm.eDy);
-#endif
}
return rInStream;
}
--
2.14.1

89
0001-rename-IsAutoCapitalizeWordDelim-to-NonFieldWordDeli.patch
View File

@ -1,89 +0,0 @@
From 0a9e57785e3a391cea1aa74b87afc6e2c2c0a398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 19 Jun 2017 14:07:46 +0100
Subject: [PATCH 1/2] rename IsAutoCapitalizeWordDelim to NonFieldWordDelim
Change-Id: If8fb8f5e51bba8e631a6fc5db54487b418c19e05
---
editeng/source/misc/svxacorr.cxx | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index e0472dd..c7ec14c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -105,18 +105,18 @@ static const sal_Char
OUString EncryptBlockName_Imp(const OUString& rName);
-static inline bool IsWordDelim( const sal_Unicode c )
+static inline bool NonFieldWordDelim( const sal_Unicode c )
{
return ' ' == c || '\t' == c || 0x0a == c ||
- cNonBreakingSpace == c || 0x2011 == c || 0x1 == c;
+ cNonBreakingSpace == c || 0x2011 == c;
}
-static inline bool IsAutoCapitalizeWordDelim( const sal_Unicode c )
+static inline bool IsWordDelim( const sal_Unicode c )
{
- return ' ' == c || '\t' == c || 0x0a == c ||
- cNonBreakingSpace == c || 0x2011 == c;
+ return c == 0x1 || NonFieldWordDelim(c);
}
+
static inline bool IsLowerLetter( sal_Int32 nCharType )
{
return CharClass::isLetterType( nCharType ) &&
@@ -882,9 +882,9 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
if( !bAtStart ) // Still no beginning of a paragraph?
{
- if (IsAutoCapitalizeWordDelim(*pStr))
+ if (NonFieldWordDelim(*pStr))
{
- while (!(bAtStart = (pStart == pStr--)) && IsAutoCapitalizeWordDelim(*pStr))
+ while (!(bAtStart = (pStart == pStr--)) && NonFieldWordDelim(*pStr))
;
}
// Asian full stop, full width full stop, full width exclamation mark
@@ -915,7 +915,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
do { // overwrite all blanks
--pStr;
- if (!IsAutoCapitalizeWordDelim(*pStr))
+ if (!NonFieldWordDelim(*pStr))
break;
bAtStart = (pStart == pStr);
} while( !bAtStart );
@@ -1011,7 +1011,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
else
bAlphaFnd = true;
}
- else if (bAlphaFnd || IsAutoCapitalizeWordDelim(*pTmpStr))
+ else if (bAlphaFnd || NonFieldWordDelim(*pTmpStr))
break;
if( pTmpStr == pStart )
@@ -1027,7 +1027,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
// Search for the beginning of the word
- while (!IsAutoCapitalizeWordDelim(*pStr))
+ while (!NonFieldWordDelim(*pStr))
{
if( bNumericOnly && rCC.isLetter( aText, pStr - pStart ) )
bNumericOnly = false;
@@ -1041,7 +1041,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
if( bNumericOnly ) // consists of only numbers, then not
return false;
- if (IsAutoCapitalizeWordDelim(*pStr))
+ if (NonFieldWordDelim(*pStr))
++pStr;
OUString sWord;
--
2.9.3

63
0002-consider-field-marks-as-text-for-auto-quotes.patch
View File

@ -1,63 +0,0 @@
From 1f44a635681af51a213f69d0fc60ec91a4458f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 19 Jun 2017 15:02:17 +0100
Subject: [PATCH 2/2] consider field marks as text for auto quotes
Change-Id: I511a13f7785a0de6efaa8439d3f0bff20a1644ed
---
editeng/qa/unit/core-test.cxx | 17 +++++++++++++++++
editeng/source/misc/svxacorr.cxx | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index f620a72..b71c90c 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -375,6 +375,7 @@ void Test::testAutocorrect()
CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult());
}
+ // don't autocapitalize after a field mark
{
OUString sInput("Test. \x01 test");
sal_Unicode cNextChar(' ');
@@ -385,6 +386,23 @@ void Test::testAutocorrect()
CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult());
}
+
+ // consider field contents as text for auto quotes
+ {
+ OUString sInput("T\x01");
+ sal_Unicode cNextChar('"');
+ const sal_Unicode EXPECTED[] = { 'T', 0x01, 0x0201d };
+ OUString sExpected(EXPECTED, SAL_N_ELEMENTS(EXPECTED));
+ bool bNbspRunNext = false;
+
+ TestAutoCorrDoc aFoo(sInput, LANGUAGE_ENGLISH_US);
+ aAutoCorrect.SetAutoCorrFlag(ChgQuotes, true);
+ aAutoCorrect.DoAutoCorrect(aFoo, sInput, sInput.getLength(), cNextChar, true, bNbspRunNext);
+ fprintf(stderr, "text is %x\n", aFoo.getResult()[aFoo.getResult().getLength() - 1]);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult());
+ }
+
}
void Test::testHyperlinkCopyPaste()
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c7ec14c..d8804dc 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1258,7 +1258,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
{
sal_Unicode cPrev;
bool bSttQuote = !nInsPos ||
- IsWordDelim( ( cPrev = rTxt[ nInsPos-1 ])) ||
+ NonFieldWordDelim( ( cPrev = rTxt[ nInsPos-1 ])) ||
lcl_IsInAsciiArr( "([{", cPrev ) ||
( cEmDash && cEmDash == cPrev ) ||
( cEnDash && cEnDash == cPrev );
--
2.9.3

47
libreoffice.spec
View File

@ -3,7 +3,7 @@
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
%global libo_prerelease .alpha1
%global libo_prerelease .beta1
# Should contain any suffix of release tarball name, e.g., -buildfix1.
%global libo_buildfix %{nil}
# rhbz#715152 state vendor
@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
Release: 4%{?libo_prerelease}%{?dist}
Release: 5%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@ -85,10 +85,6 @@ Provides: bundled(rhino) = 1.5
Provides: bundled(xmlsec1) = 1.2.25
Provides: bundled(xsltml) = 2.1.2
%if 0%{?fedora}
Source40: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
%endif
# symbolic icons
Source42: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-base-symbolic.svg
Source43: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-calc-symbolic.svg
@ -101,13 +97,13 @@ Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
%if 0%{?rhel}
Source100: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Source101: %{external_url}/liborcus-0.13.1.tar.xz
Source102: %{external_url}/mdds-1.2.3.tar.bz2
Source102: %{external_url}/mdds-1.3.1.tar.bz2
Source103: %{external_url}/libcmis-0.5.1.tar.gz
Source104: %{external_url}/libwps-0.4.7.tar.xz
Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2
Source106: %{external_url}/libzmf-0.0.2.tar.xz
Source107: %{external_url}/libstaroffice-0.0.4.tar.xz
Source108: %{external_url}/harfbuzz-1.4.8.tar.bz2
Source107: %{external_url}/libstaroffice-0.0.5.tar.xz
Source108: %{external_url}/harfbuzz-1.7.0.tar.bz2
Source109: %{external_url}/graphite2-minimal-1.3.10.tgz
Source110: %{external_url}/gpgme-1.9.0.tar.bz2
Source111: %{external_url}/libgpg-error-1.27.tar.bz2
@ -119,7 +115,7 @@ Source115: %{external_url}/libepubgen-0.0.1.tar.bz2
Provides: bundled(gpgme) = 1.9.0
Provides: bundled(graphite2) = 1.3.10
Provides: bundled(harfbuzz) = 1.4.8
Provides: bundled(harfbuzz) = 1.7.0
Provides: bundled(libassuan) = 2.4.3
Provides: bundled(libcmis) = 0.5.1
Provides: bundled(libepubgen) = 0.0.1
@ -127,10 +123,10 @@ Provides: bundled(libgpg-error) = 1.27
Provides: bundled(liborcus) = 0.13.1
Provides: bundled(libpagemaker) = 0.0.3
Provides: bundled(libqxp) = 0.0.0
Provides: bundled(libstaroffice) = 0.0.4
Provides: bundled(libstaroffice) = 0.0.5
Provides: bundled(libwps) = 0.4.7
Provides: bundled(libzmf) = 0.0.2
Provides: bundled(mdds) = 1.2.3
Provides: bundled(mdds) = 1.3.1
Provides: bundled(ucpp) = 1.3.2
%endif
@ -232,7 +228,6 @@ BuildRequires: pkgconfig(libcmis-0.5)
BuildRequires: pkgconfig(libe-book-0.1)
BuildRequires: pkgconfig(libeot)
BuildRequires: pkgconfig(libepubgen-0.0)
BuildRequires: pkgconfig(libgltf-0.1)
BuildRequires: pkgconfig(liborcus-0.13)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libqxp-0.0)
@ -273,21 +268,11 @@ Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# not upstreamed
Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch
Patch5: 0001-fix-build-error.patch
Patch6: 0001-blind-attempt-to-fix-build-on-big-endian.patch
Patch7: 0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch
Patch8: 0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch
Patch9: 0001-Updated-liborcus-to-0.13.1.patch
Patch10: 0001-We-now-require-orcus-0.13-to-build.patch
Patch11: 0001-prepare-for-build-with-ICU-60.1.patch
Patch4: 0001-fix-includes-in-aarch64-bridge.patch
%if 0%{?rhel}
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
Patch501: 0001-fix-build-with-older-boost.patch
Patch502: 0001-fix-build-of-bundled-libepubgen-on-ppc64le.patch
Patch503: 0001-one-slash-is-enough.patch
%endif
%global instdir %{_libdir}
@ -1035,6 +1020,7 @@ sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # i686
sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # i686
sed -i -e /CppunitTest_services/d postprocess/Module_postprocess.mk # i686
sed -i -e /CppunitTest_sd_export_ooxml2/d sd/Module_sd.mk # i686
sed -i -e /CppunitTest_sw_ooxmlexport4/d sw/Module_sw.mk
%if 0%{?rhel}
sed -i -e /CppunitTest_desktop_lib/d desktop/Module_desktop.mk
sed -i -e /CppunitTest_writerperfect_draw/d writerperfect/Module_writerperfect.mk
@ -1073,11 +1059,9 @@ export CFLAGS=$ARCH_FLAGS
export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel}
%define distrooptions --disable-eot --disable-gltf --enable-python=system
%define distrooptions --disable-eot --enable-python=system
%else # fedora
%define distrooptions --enable-eot --enable-kde4 --with-system-opencollada --with-system-ucpp
export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'
%define distrooptions --enable-eot --enable-kde4 --with-system-ucpp
%endif
%if %{with langpacks}
@ -1743,6 +1727,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%dir %{baseinstdir}/share/config
%{baseinstdir}/share/config/images_breeze.zip
%{baseinstdir}/share/config/images_breeze_dark.zip
%{baseinstdir}/share/config/images_elementary.zip
%{baseinstdir}/share/config/images_galaxy.zip
%{baseinstdir}/share/config/images_helpimg.zip
%{baseinstdir}/share/config/images_hicontrast.zip
@ -1831,7 +1816,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/bootstraprc
%{baseinstdir}/program/fundamentalrc
%{baseinstdir}/program/setuprc
%{baseinstdir}/program/intro.*
%{baseinstdir}/program/intro.png
%{baseinstdir}/program/intro-highres.png
%{baseinstdir}/program/soffice
%{baseinstdir}/program/soffice.bin
%{baseinstdir}/program/sofficerc
@ -2266,6 +2252,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Sat Nov 25 2017 David Tardon <dtardon@redhat.com> - 1:6.0.0.0-5.beta1
- update to 6.0.0 beta1
* Wed Nov 22 2017 Eike Rathke <erack@redhat.com> - 1:6.0.0.0-4.alpha1
- prepare for build with ICU 60.1

13
sources
View File

@ -5,11 +5,10 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6f
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
SHA512 (libreoffice-6.0.0.0.alpha1.tar.xz) = 77e1e6b50b9e23831a9c08959e63ee4612003afe908d927f33f64f87907012acc4e7ee17651ad49f84c25f74b8f0b9270a69c522be577685590389c630d422cb
SHA512 (libreoffice-6.0.0.0.alpha1.tar.xz.asc) = e14f4ff5567cf931c05c4782792cc3cf8520bddf762696ab47c28a3e04d79de18b8fe724fda620ec1cb9c7ddf13c0ef9d3335ee5e61a302ddeaa90be6907b43f
SHA512 (libreoffice-help-6.0.0.0.alpha1.tar.xz) = 8f1c876e2cd54172f515daebb99325e6ee227c55b518a63ba9a04d0e8f306e2f2055e00a984b3c6c64948eab80766bee8e74c8c41f282bae8c09cb922323a935
SHA512 (libreoffice-help-6.0.0.0.alpha1.tar.xz.asc) = ec252706ad3d5c4533fb102cb9a928c1e5ba55e0fd5ee94ecbab9da5b9d31b735b4025893ed66f0fa43404b9583236cfc957aabb5a4bb58fca2ed5225ecf4c18
SHA512 (libreoffice-translations-6.0.0.0.alpha1.tar.xz) = 380f966cd67654be6d604683df0a5f6dcb9f41f9e1d309cf5dbffae7e1621d1974fbaa66e630616a0038f249ca187db273aa5e730edb31623ae369018e7bf382
SHA512 (libreoffice-translations-6.0.0.0.alpha1.tar.xz.asc) = 032ead42ecd3dc66790d34359e7ac3d7a7185c76ee21be5851d939828072f619565693f5ba68daa79ac24715a8b099429773e00fd3901c818a032c4c69cba576
SHA512 (libreoffice-6.0.0.0.beta1.tar.xz) = 7b8b99e1d79789422f5c6e89a87c91a3d7052b310d770dff4228bd8e2ab4d083e7b8a7de22b9d185ad7b58ab2bd731c8129fc138b7c187ab86f532dc9450f2e9
SHA512 (libreoffice-6.0.0.0.beta1.tar.xz.asc) = 50d1dfefb1308a160406b83d93853ea95fe01847fcdc6557833a0b7a8293989885247d8cb56b46837de11593ebf52a6e2be8970223c159d0030491d5c17bd190
SHA512 (libreoffice-help-6.0.0.0.beta1.tar.xz) = b01ac4e2b181b793d9dbb6183e6a1c76e37c8154295bd0c001d181d7d75977153bcefd10ac5c9b3d82e1008c9906493046098fa64e2353cc4412cfd5c498680d
SHA512 (libreoffice-help-6.0.0.0.beta1.tar.xz.asc) = dc178afd614a5774b6ab8b8b1c7dd71165278aa87d0438d76ddc6afd1b9f2949100226fae29f729a15e5fafe4ac919bb7f4e47245c6a32db811800467d6990e5
SHA512 (libreoffice-translations-6.0.0.0.beta1.tar.xz) = 50f33269ba46b8dd9c8179a3745b0f31c482f26b3c5a1e84f5373d8070e6ff1704e75458348dbe8ad001f797e1f0d9e6571dcda745332f10805344d5d123b3b8
SHA512 (libreoffice-translations-6.0.0.0.beta1.tar.xz.asc) = f91f31f360c1659174799d68bca82e765a69f3e068a4881175270998f2bfc0646de333120312803ad1d8e9ab841fbf849bd09f65857cec69db58a52e48b0fda1