diff -Nru libreoffice-5.2.1~rc2/canvas/source/cairo/cairo_canvashelper.cxx libreoffice-5.2.2~rc1/canvas/source/cairo/cairo_canvashelper.cxx
--- libreoffice-5.2.1~rc2/canvas/source/cairo/cairo_canvashelper.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/canvas/source/cairo/cairo_canvashelper.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -973,7 +973,27 @@
if( nPointCount > 1)
{
bool bIsBezier = aPolygon.areControlPointsUsed();
- bool bIsRectangle = ::basegfx::tools::isRectangle( aPolygon );
+ bool bIsRectangle = ::basegfx::tools::isRectangle(aPolygon);
+ if (bIsRectangle)
+ {
+ //tdf#86473, if this rectangle will end up after rounding
+ //to have no area, then nothing will be drawn, so remove
+ //such rectangles from the rounding optimization(?) effort
+ basegfx::B2DRange aRange = ::basegfx::tools::getRange(aPolygon);
+ double x1 = aRange.getMinX();
+ double x2 = aRange.getMaxX();
+ double y1 = aRange.getMinY();
+ double y2 = aRange.getMaxY();
+ cairo_matrix_transform_point(&aOrigMatrix, &x1, &y1);
+ cairo_matrix_transform_point(&aOrigMatrix, &x2, &y2);
+ basegfx::B2DRange aRoundedRange(basegfx::fround(x1),
+ basegfx::fround(y1),
+ basegfx::fround(x2),
+ basegfx::fround(y2));
+ bIsRectangle = aRoundedRange.getWidth() != 0.0 &&
+ aRoundedRange.getHeight() != 0.0;
+ }
+
::basegfx::B2DPoint aA, aB, aP;
for( sal_uInt32 j=0; j < nExtendedPointCount; j++ )
diff -Nru libreoffice-5.2.1~rc2/configure.ac libreoffice-5.2.2~rc1/configure.ac
--- libreoffice-5.2.1~rc2/configure.ac 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/configure.ac 2016-09-07 21:48:29.000000000 +0000
@@ -9,7 +9,7 @@
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[5.2.1.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.2.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
@@ -9623,7 +9623,7 @@
AC_MSG_RESULT([yes])
if test "$with_system_coinmp" = "yes"; then
SYSTEM_COINMP=TRUE
- PKG_CHECK_MODULES( COINMP, coinmp )
+ PKG_CHECK_MODULES(COINMP, coinmp coinutils)
FilterLibs "${COINMP_LIBS}"
COINMP_LIBS="${filteredlibs}"
else
diff -Nru libreoffice-5.2.1~rc2/cui/source/dialogs/hyphen.cxx libreoffice-5.2.2~rc1/cui/source/dialogs/hyphen.cxx
--- libreoffice-5.2.1~rc2/cui/source/dialogs/hyphen.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/cui/source/dialogs/hyphen.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -268,7 +268,10 @@
}
}
else
- EndDialog( RET_OK );
+ {
+ m_pCloseBtn->Disable();
+ EndDialog(RET_OK);
+ }
}
@@ -399,7 +402,6 @@
if( !m_bBusy )
{
m_bBusy = true;
- m_pHyphWrapper->SpellEnd();
EndDialog();
m_bBusy = false;
}
@@ -501,6 +503,8 @@
void SvxHyphenWordDialog::dispose()
{
+ if (m_pCloseBtn->IsEnabled())
+ m_pHyphWrapper->SpellEnd();
m_pWordEdit.clear();
m_pLeftBtn.clear();
m_pRightBtn.clear();
@@ -512,7 +516,6 @@
SfxModalDialog::dispose();
}
-
void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang )
{
SetText( m_aLabel + " (" + SvtLanguageTable::GetLanguageString( nLang ) + ")" );
diff -Nru libreoffice-5.2.1~rc2/cui/source/inc/numpages.hxx libreoffice-5.2.2~rc1/cui/source/inc/numpages.hxx
--- libreoffice-5.2.1~rc2/cui/source/inc/numpages.hxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/cui/source/inc/numpages.hxx 2016-09-07 21:48:29.000000000 +0000
@@ -318,7 +318,7 @@
DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void );
- DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool);
+ DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void );
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
DECL_LINK_TYPED( BulletHdl_Impl, Button*, void);
DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void );
diff -Nru libreoffice-5.2.1~rc2/cui/source/options/optpath.cxx libreoffice-5.2.2~rc1/cui/source/options/optpath.cxx
--- libreoffice-5.2.1~rc2/cui/source/options/optpath.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/cui/source/options/optpath.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -633,12 +633,11 @@
else
{
short nRet = xFolderPicker->execute();
- if (nRet == ExecutableDialogResults::OK)
- {
- OUString sFolder(xFolderPicker->getDirectory());
- ChangeCurrentEntry(sFolder);
- }
- xFolderPicker.clear();
+ if (ExecutableDialogResults::OK != nRet)
+ return;
+
+ OUString sFolder(xFolderPicker->getDirectory());
+ ChangeCurrentEntry(sFolder);
}
}
catch( Exception& )
@@ -724,9 +723,9 @@
IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void )
{
- assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker");
if (RET_OK == pEvt->DialogResult)
{
+ assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker");
OUString sURL = xFolderPicker->getDirectory();
ChangeCurrentEntry( sURL );
}
diff -Nru libreoffice-5.2.1~rc2/cui/source/tabpages/numpages.cxx libreoffice-5.2.2~rc1/cui/source/tabpages/numpages.cxx
--- libreoffice-5.2.1~rc2/cui/source/tabpages/numpages.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/cui/source/tabpages/numpages.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -1217,6 +1217,7 @@
m_pBulletPB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, BulletHdl_Impl));
m_pFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl));
m_pBitmapMB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, GraphicHdl_Impl));
+ m_pBitmapMB->SetActivateHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
m_pLevelLB->EnableMultiSelection(true);
m_pLevelLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, LevelHdl_Impl));
m_pCharFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, CharFmtHdl_Impl));
@@ -1235,8 +1236,6 @@
aInvalidateTimer.SetTimeout(50);
Menu *pBitmapMenu = m_pBitmapMB->GetPopupMenu();
-
- pBitmapMenu->SetHighlightHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
m_nGalleryId = pBitmapMenu->GetItemId("gallery");
assert(m_nGalleryId != MENU_ITEM_NOTFOUND);
PopupMenu* pPopup = new PopupMenu;
@@ -2116,7 +2115,7 @@
}
}
-IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool)
+IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void)
{
if(!bMenuButtonInitialized)
{
@@ -2168,7 +2167,6 @@
}
LeaveWait();
}
- return false;
}
IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)
diff -Nru libreoffice-5.2.1~rc2/cui/uiconfig/ui/textflowpage.ui libreoffice-5.2.2~rc1/cui/uiconfig/ui/textflowpage.ui
--- libreoffice-5.2.1~rc2/cui/uiconfig/ui/textflowpage.ui 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/cui/uiconfig/ui/textflowpage.ui 2016-09-07 21:48:29.000000000 +0000
@@ -116,6 +116,7 @@
start
C_haracters at line end
True
+ spinLineEnd
1
@@ -129,6 +130,7 @@
start
Cha_racters at line begin
True
+ spinLineBegin
1
@@ -142,6 +144,7 @@
start
_Maximum number of consecutive hyphens
True
+ spinMaxNum
1
@@ -209,7 +212,7 @@
True
True
False
- 25
+ 22
True
0
True
diff -Nru libreoffice-5.2.1~rc2/debian/changelog libreoffice-5.2.2~rc1/debian/changelog
--- libreoffice-5.2.1~rc2/debian/changelog 2016-09-01 05:24:14.000000000 +0000
+++ libreoffice-5.2.2~rc1/debian/changelog 2016-09-08 07:58:01.000000000 +0000
@@ -1,11 +1,17 @@
-libreoffice (1:5.2.1~rc2-0ubuntu1~xenial0) xenial; urgency=medium
+libreoffice (1:5.2.2~rc1-0ubuntu1~xenial0) xenial; urgency=medium
* Backport from yakkety
- Keep libreoffice-gtk/gtk2 as default
- -- Rico Tzschichholz Thu, 01 Sep 2016 07:24:14 +0200
+ -- Rico Tzschichholz Thu, 08 Sep 2016 09:58:01 +0200
-libreoffice (1:5.2.1~rc2-0ubuntu1~yakkety4) yakkety; urgency=medium
+libreoffice (1:5.2.2~rc1-0ubuntu1~yakkety0) yakkety; urgency=medium
+
+ * new upstream rc
+
+ -- Rico Tzschichholz Thu, 08 Sep 2016 09:50:34 +0200
+
+libreoffice (1:5.2.1~rc2-0ubuntu1) yakkety; urgency=medium
* new upstream rc
* disable cups for autopkgtests too
@@ -15,7 +21,7 @@
* kill packagekit var as did upstream and trigger on gio instead (as does upstream)
* update C/R for liblosessioninstallerlo.so move
- -- Bjoern Michaelsen Thu, 01 Sep 2016 00:07:07 +0200
+ -- Bjoern Michaelsen Fri, 02 Sep 2016 17:25:33 +0200
libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
diff -Nru libreoffice-5.2.1~rc2/debian/control libreoffice-5.2.2~rc1/debian/control
--- libreoffice-5.2.1~rc2/debian/control 2016-09-01 05:24:14.000000000 +0000
+++ libreoffice-5.2.2~rc1/debian/control 2016-09-08 07:58:01.000000000 +0000
@@ -723,11 +723,11 @@
Section: gnome
Enhances: libreoffice
Conflicts: libreoffice-core (<< 1:3.9999),
- libreoffice-gtk (<< 1:5.2.0-0ubuntu2),
- libreoffice-gtk2 (<< 1:5.2.1~rc2)
+ libreoffice-gtk (<= 1:5.2.0-0ubuntu2),
+ libreoffice-gtk2 (<= 1:5.2.0-0ubuntu2)
Replaces: libreoffice-core (<< 1:3.9999),
- libreoffice-gtk (<< 1:5.2.0-0ubuntu2),
- libreoffice-gtk2 (<< 1:5.2.1~rc2)
+ libreoffice-gtk (<= 1:5.2.0-0ubuntu2),
+ libreoffice-gtk2 (<= 1:5.2.0-0ubuntu2)
Provides: libreoffice-gtk-gnome
Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
diff -Nru libreoffice-5.2.1~rc2/debian/control.in libreoffice-5.2.2~rc1/debian/control.in
--- libreoffice-5.2.1~rc2/debian/control.in 2016-09-01 05:24:14.000000000 +0000
+++ libreoffice-5.2.2~rc1/debian/control.in 2016-09-08 07:56:53.000000000 +0000
@@ -602,8 +602,8 @@
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
-Conflicts: libreoffice-core (<< 1:3.9999), libreoffice-gtk (<< 1:5.2.0-0ubuntu2), libreoffice-gtk2 (<< 1:5.2.1~rc2)
-Replaces: libreoffice-core (<< 1:3.9999), libreoffice-gtk (<< 1:5.2.0-0ubuntu2), libreoffice-gtk2 (<< 1:5.2.1~rc2)
+Conflicts: libreoffice-core (<< 1:3.9999), libreoffice-gtk (<= 1:5.2.0-0ubuntu2), libreoffice-gtk2 (<= 1:5.2.0-0ubuntu2)
+Replaces: libreoffice-core (<< 1:3.9999), libreoffice-gtk (<= 1:5.2.0-0ubuntu2), libreoffice-gtk2 (<= 1:5.2.0-0ubuntu2)
Provides: libreoffice-gtk-gnome
Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
diff -Nru libreoffice-5.2.1~rc2/debian/rules libreoffice-5.2.2~rc1/debian/rules
--- libreoffice-5.2.1~rc2/debian/rules 2016-09-01 05:24:14.000000000 +0000
+++ libreoffice-5.2.2~rc1/debian/rules 2016-09-08 07:56:20.000000000 +0000
@@ -70,7 +70,7 @@
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# bootstraping this from the source tree is breaking get-orig-source
#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
-lo_sources_ver=5.2.1.2
+lo_sources_ver=5.2.2.1
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
diff -Nru libreoffice-5.2.1~rc2/editeng/source/misc/svxacorr.cxx libreoffice-5.2.2~rc1/editeng/source/misc/svxacorr.cxx
--- libreoffice-5.2.1~rc2/editeng/source/misc/svxacorr.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/editeng/source/misc/svxacorr.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -461,13 +461,12 @@
bool bFoundEnd = false;
bool isValidNumber = true;
sal_Int32 i = nEndPos;
-
while (i > nSttPos)
{
i--;
bool isDigit = rCC.isDigit(rTxt, i);
if (bFoundEnd)
- isValidNumber |= isDigit;
+ isValidNumber &= (isDigit || !rCC.isLetter(rTxt, i));
if (isDigit && !bFoundEnd)
{
@@ -2824,6 +2823,11 @@
nSttWdPos = rTxt.indexOf( sTmp, nFndPos);
if (nSttWdPos != -1)
{
+ sal_Int32 nTmp(nFndPos);
+ while (nTmp < nSttWdPos && !IsWordDelim(rTxt[nTmp]))
+ nTmp++;
+ if (nTmp < nSttWdPos)
+ break; // word delimiter found
buf.append(rTxt.copy(nFndPos, nSttWdPos - nFndPos)).append(pFnd->GetLong());
nFndPos = nSttWdPos + sTmp.getLength();
}
diff -Nru libreoffice-5.2.1~rc2/embeddedobj/source/general/docholder.cxx libreoffice-5.2.2~rc1/embeddedobj/source/general/docholder.cxx
--- libreoffice-5.2.1~rc2/embeddedobj/source/general/docholder.cxx 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/embeddedobj/source/general/docholder.cxx 2016-09-07 21:48:29.000000000 +0000
@@ -709,10 +709,17 @@
// this must be done after merging menus as we won't get the container menu otherwise
xContainerLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() );
+ bool bIsChart = false;
+ uno::Reference< lang::XServiceInfo> xServiceInfo(m_xComponent, uno::UNO_QUERY);
+ if (xServiceInfo.is() && xServiceInfo->supportsService("com.sun.star.chart2.ChartDocument"))
+ bIsChart = true;
// prevent further changes at this LM
// TODO: moggi: why is this necessary?
- // xContainerLM->setVisible( sal_False );
- // xContainerLM->lock();
+ if (!bIsChart)
+ {
+ xContainerLM->setVisible( false );
+ xContainerLM->lock();
+ }
bUnlock = true;
// by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now
diff -Nru libreoffice-5.2.1~rc2/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 libreoffice-5.2.2~rc1/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1
--- libreoffice-5.2.1~rc2/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-5.2.2~rc1/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 2016-09-07 21:48:29.000000000 +0000
@@ -0,0 +1,25 @@
+From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001
+From: Marti
+Date: Mon, 15 Aug 2016 23:31:39 +0200
+Subject: [PATCH] Added an extra check to MLU bounds
+
+Thanks to Ibrahim el-sayed for spotting the bug
+---
+ src/cmstypes.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmstypes.c b/src/cmstypes.c
+index cb61860..c7328b9 100644
+--- a/src/cmstypes.c
++++ b/src/cmstypes.c
+@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
+
+ // Check for overflow
+ if (Offset < (SizeOfHeader + 8)) goto Error;
++ if ((Offset + Len) > SizeOfTag + 8) goto Error;
+
+ // True begin of the string
+ BeginOfThisString = Offset - SizeOfHeader - 8;
+--
+2.7.4
+
diff -Nru libreoffice-5.2.1~rc2/external/lcms2/UnpackedTarball_lcms2.mk libreoffice-5.2.2~rc1/external/lcms2/UnpackedTarball_lcms2.mk
--- libreoffice-5.2.1~rc2/external/lcms2/UnpackedTarball_lcms2.mk 2016-08-25 00:26:36.000000000 +0000
+++ libreoffice-5.2.2~rc1/external/lcms2/UnpackedTarball_lcms2.mk 2016-09-07 21:48:29.000000000 +0000
@@ -19,6 +19,7 @@
external/lcms2/lcms2-vc2013-project.patch \
external/lcms2/lcms2-config-guess.patch.0 \
external/lcms2/ubsan.patch.0 \
+ external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff -Nru libreoffice-5.2.1~rc2/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 libreoffice-5.2.2~rc1/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
--- libreoffice-5.2.1~rc2/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-5.2.2~rc1/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 2016-09-07 21:48:29.000000000 +0000
@@ -0,0 +1,58 @@
+From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Fri, 12 Aug 2016 12:50:39 +0200
+Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic
+
+---
+ src/OdsGenerator.cxx | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx
+index 52e135e..8cb7203 100644
+--- a/src/OdsGenerator.cxx
++++ b/src/OdsGenerator.cxx
+@@ -26,6 +26,8 @@
+
+ #include
+
++#include
++#include
+ #include