Accepting request 653791 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/653791
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=168

boost_1_69.patch

@@ -0,0 +1,13 @@
+Index: libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
+===================================================================
+--- libreoffice-6.1.3.2.orig/sfx2/source/appl/shutdownicon.cxx
++++ libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
+@@ -141,7 +141,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+     }
+     assert(!boost::logic::indeterminate(loaded));
+-    return loaded;
++    return (bool)loaded;
+ }
+ 
+ }

bsc1117300.patch

@@ -0,0 +1,34 @@
+From 4846848941241f92b32bcffef3489736d1baffec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 8 Nov 2018 09:58:58 +0000
+Subject: Resolves: tdf#119790 for gtk3 save and restore typed name on changing filter
+
+Change-Id: I17c3d154144b13ce401b0e4afe84c91a2fe98d8e
+Reviewed-on: https://gerrit.libreoffice.org/63076
+Tested-by: Jenkins
+Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
+---
+ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+index 16a845eabe81..75458dae1a13 100644
+--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
++++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+@@ -807,7 +807,16 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles()
+                             }
+                         }
+                         if( bChangeFilter && bExtensionTypedIn )
++                        {
++#if GTK_CHECK_VERSION(3,0,0)
++                            gchar* pCurrentName = gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_pDialog));
++                            setCurrentFilter( aNewFilter );
++                            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_pDialog), pCurrentName);
++                            g_free(pCurrentName);
++#else
+                             setCurrentFilter( aNewFilter );
++#endif
++                        }
+                     }
+                 }
+ 

bsc882383.patch

@@ -0,0 +1,38 @@
+From 7ff2bfbf8af599bb7536721e6c221486519d7e42 Mon Sep 17 00:00:00 2001
+From: Tamas Bunth <tamas.bunth@collabora.co.uk>
+Date: Mon, 26 Nov 2018 07:19:41 +0100
+Subject: [PATCH] Put text label outside of the pie if..
+
+performLabelBestFitInnerPlacement fails.
+
+Change-Id: Ic84e8b42e02da2023b22a9406c44d462170c5305
+Reviewed-on: https://gerrit.libreoffice.org/64015
+Tested-by: Jenkins
+Reviewed-by: Tamás Bunth <btomi96@gmail.com>
+(cherry picked from commit 3339c730f8c9a6088a2e8b335185f1bf0b232216)
+---
+
+diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
+index f3f1ef3..3cc4dc3 100644
+--- a/chart2/source/view/charttypes/PieChart.cxx
++++ b/chart2/source/view/charttypes/PieChart.cxx
+@@ -1590,7 +1590,18 @@
+
+     if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) )
+     {
+-        // TODO
++        // If it does not fit inside, let's put it outside
++        PolarLabelPositionHelper aPolarPosHelper(m_pPosHelper.get(),m_nDimension,m_xLogicTarget,m_pShapeFactory);
++        auto eAlignment = LABEL_ALIGN_CENTER;
++        awt::Point aScreenPosition2D(
++        aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment, css::chart::DataLabelPlacement::OUTSIDE
++        , rShapeParam.mfUnitCircleStartAngleDegree, rShapeParam.mfUnitCircleWidthAngleDegree
++        , rShapeParam.mfUnitCircleInnerRadius, rShapeParam.mfUnitCircleOuterRadius, rShapeParam.mfLogicZ+0.5, 0 ));
++        basegfx::B2IVector aTranslationVector = rPieLabelInfo.aFirstPosition - rPieLabelInfo.aOrigin;
++        aTranslationVector.setLength(150);
++        aScreenPosition2D.X += aTranslationVector.getX();
++        aScreenPosition2D.Y += aTranslationVector.getY();
++        rPieLabelInfo.xLabelGroupShape->setPosition(aScreenPosition2D);
+     }
+ }
+

libreoffice.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com
+
+- bsc#1117300 - [DATA LOSS] Saving a new document can silently
+  overwrite an existing document
+  * bsc1117300.patch
+
+-------------------------------------------------------------------
+Thu Nov 29 10:10:00 UTC 2018 - adam.majer@suse.de
+
+- boost_1_69.patch: Fix compilation with Boost 1.69
+
+-------------------------------------------------------------------
+Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Install also C++ libreofficekit headers bsc#1117195
+
+-------------------------------------------------------------------
+Mon Nov 26 14:38:54 UTC 2018 - andras.timar@collabora.com
+
+- bsc#882383 - LO-L3: Chart in PPTX lacks color and is too large
+  * bsc882383.patch
+
 -------------------------------------------------------------------
 Mon Nov 12 08:50:57 UTC 2018 - andras.timar@collabora.com
 

libreoffice.spec

@@ -108,6 +108,11 @@ Patch6:         0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
 Patch7:         bsc1110348.patch
 # Bug 1112112 - LO-L3: [PPTX] SmartArt: Basic rendering of several list types
 Patch8:         bsc1112112.patch
+# Bug 882383 -  LO-L3: Chart in PPTX lacks color and is too large
+Patch9:         bsc882383.patch
+# Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document
+Patch10:        bsc1117300.patch
+Patch11:        boost_1_69.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -956,6 +961,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)
@@ -1300,7 +1308,7 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
 
 # Libreofficekit headers
 mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
-install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/
+install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/
 %else
 # remove files that are not supposed to be installed with disabled libreofficekit
 rm -rf %{buildroot}%{_libdir}/libreoffice/share/libreofficekit/
@@ -1429,7 +1437,7 @@ exit 0
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/LOKDocView-0.1.gir
 %dir %{_includedir}/LibreOfficeKit
-%{_includedir}/LibreOfficeKit/*.h
+%{_includedir}/LibreOfficeKit/*
 %endif
 
 %files glade