[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 5 commits - configure.ac cui/source sc/qa sc/res svl/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 30 07:22:02 UTC 2020
configure.ac | 2 +-
cui/source/inc/QrCodeGenDialog.hxx | 2 ++
sc/qa/extras/scstylefamilyobj.cxx | 6 +++++-
sc/res/xml/styles.xml | 4 ++++
svl/source/items/slstitm.cxx | 5 ++---
sw/source/core/txtnode/thints.cxx | 2 ++
sw/source/core/undo/unattr.cxx | 5 +++--
7 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit cb031281ba027110e708b0354f3809e9e6a664de
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 28 14:05:00 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 09:21:25 2020 +0200
tdf#133358 fix crash in redoing indent
since...
commit b070202b420129b5edd368420e0e50ec45261d01
Date: Tue Nov 20 18:26:18 2018 +0100
sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin()
Change-Id: Ie28207747560153020341305015f1693f6ca9f50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103552
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
(cherry picked from commit dc6e005c79b6c23b805dea44cd89fa83ea945f03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103578
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 038302aa187c..e0130d9390f3 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -919,14 +919,15 @@ void SwUndoMoveLeftMargin::RedoImpl(::sw::UndoRedoContext & rContext)
SwPaM & rPam = AddUndoRedoPaM(rContext);
rDoc.MoveLeftMargin( rPam,
- GetId() == SwUndoId::INC_LEFTMARGIN, m_bModulus );
+ GetId() == SwUndoId::INC_LEFTMARGIN, m_bModulus,
+ rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
}
void SwUndoMoveLeftMargin::RepeatImpl(::sw::RepeatContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
rDoc.MoveLeftMargin(rContext.GetRepeatPaM(), GetId() == SwUndoId::INC_LEFTMARGIN,
- m_bModulus );
+ m_bModulus, rDoc.getIDocumentLayoutAccess().GetCurrentLayout());
}
SwUndoChangeFootNote::SwUndoChangeFootNote(
commit a41bae08efeae9a68d310ce703bf709fab9285d1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 3 14:40:32 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 09:21:19 2020 +0200
tdf#132688 diacritics broken in lines with punctuation
regression from
commit 4b2d4f3c4a68361a6bc03c9ab110ce9376b14b20
tdf#119227 fix freeze when copying a large bulleted list
Change-Id: I7d54b19c7a02c717426edce7896caaadf909154e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102000
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Jenkins
(cherry picked from commit 18e4367c33f327cf09985105bde583cdcc7b2a46)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101972
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103581
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index b46c3ea7ae05..5b363f2d9119 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2821,6 +2821,8 @@ bool SwpHints::MergePortions( SwTextNode& rNode )
eMerge = DIFFER;
break;
}
+ if (iter1.IsAtEnd() && iter2.IsAtEnd())
+ break;
if (iter1.IsAtEnd() || iter2.IsAtEnd())
{
eMerge = DIFFER;
commit 074bd08e949dd451691e9800e26b7faa87b4d4da
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 25 15:08:51 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 09:21:11 2020 +0200
Related: tdf#136985 SfxStringListItem::GetString() crash in empty case
probably since...
commit a573b8b21688d9681f4fa129ec37cf89954e9d1c
Date: Sat May 21 16:14:56 2011 -0430
Replace List for std::vector in SfxStringListItem.
Change-Id: I7060b5693ba08fa5f70cc5cb3ae1b7a4722a31a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103340
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
(cherry picked from commit 7c8f997321e136208e8983ab6ad78cc33891125f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103572
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 225c43f08cfe..a18497a06b39 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -127,13 +127,12 @@ OUString SfxStringListItem::GetString()
OUStringBuffer aStr;
if ( mpList )
{
- std::vector<OUString>::const_iterator iter = mpList->begin();
- for (;;)
+ for (auto iter = mpList->begin(), end = mpList->end(); iter != end;)
{
aStr.append(*iter);
++iter;
- if (iter == mpList->end())
+ if (iter == end)
break;
aStr.append("\r");
commit 23e36c85d7618b588dcb59a818b5c26977686fc9
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Sun Sep 27 20:37:34 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 09:20:42 2020 +0200
Resolves: tdf#133812 Add the 'Result' style again used by the Subtotal tool
Necessary to also adapt the test case that checks for a defined
number of styles.
Regression from
commit 7b0aed617f1e57335837cf56ef2d222a96f8270d
CommitDate: Wed Sep 28 11:42:56 2016 +0000
Remove old cell styles from calc
and
commit 06f319937187f76ee402d53b3baa78c391c2af19
CommitDate: Sun Oct 2 13:51:26 2016 +0000
tdf#90937 Add a set of cell styles to calc
Change-Id: I3e47d8e24d375a64d9056e7a85197b89173c8e41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103520
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 930d82550863430c9bef96ac307c3ff2cfefe4d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103433
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index fe5d8fb2ec19..6f8965c20bd9 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -83,10 +83,14 @@ private:
uno::Reference<lang::XComponent> m_xComponent;
};
+/* TODO: this c/should be derived/defined from the real style count, default
+ * implemented plus sc/res/xml/styles.xml */
+constexpr sal_Int32 kScStyleFamilyObjCount = 20;
+
ScStyleFamilyObj::ScStyleFamilyObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<style::XStyle>::get())
- , XIndexAccess(19)
+ , XIndexAccess(kScStyleFamilyObjCount)
, XNameAccess("ScStyleFamilyObj")
, XNameContainer("ScStyleFamilyObj")
, XNameReplace("ScStyleFamilyObj")
diff --git a/sc/res/xml/styles.xml b/sc/res/xml/styles.xml
index 9bfda940c3d9..d1d1a750e241 100644
--- a/sc/res/xml/styles.xml
+++ b/sc/res/xml/styles.xml
@@ -57,4 +57,8 @@
<style:style style:name="Accent 3" style:family="table-cell" style:parent-style-name="Accent">
<style:table-cell-properties fo:background-color="#dddddd"/>
</style:style>
+
+ <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default">
+ <style:text-properties fo:font-weight="bold" fo:font-style="italic" style:text-underline-style="solid"/>
+ </style:style>
</office:styles>
commit f658812ff1c178fe1dafbcce868f4cb40f66b311
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 23 19:32:33 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 09:20:35 2020 +0200
fix disable qrcodegen option
Change-Id: Ic554f01125653022987c70d03c8c9d86fe3f547a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103272
Tested-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
diff --git a/configure.ac b/configure.ac
index 7b6e16d28512..de0a779ab52d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10110,7 +10110,7 @@ dnl ===================================================================
dnl Check for system qrcodegen
dnl ===================================================================
AC_MSG_CHECKING([whether to use libqrcodegen])
-if test "$enable_libqrcodegen" = "no"; then
+if test "$enable_qrcodegen" = "no"; then
AC_MSG_RESULT([no])
ENABLE_QRCODEGEN=
SYSTEM_QRCODEGEN=
diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx
index a3ca38d48d4a..741253f7687d 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -9,6 +9,8 @@
#ifndef INCLUDED_CUI_INC_QRCODEGENDIALOG_HXX
#define INCLUDED_CUI_INC_QRCODEGENDIALOG_HXX
+#include <config_qrcodegen.h>
+
#include <vcl/weld.hxx>
#include <com/sun/star/frame/XModel.hpp>
More information about the Libreoffice-commits
mailing list