date:20210120

[Libreoffice-commits] core.git: sw/qa

2021-01-20 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/uiwriter/data3/tdf123285.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   25 +
 2 files changed, 25 insertions(+)

New commits:
commit 35a564864e6ce08abfa4924e1ea9314982e7957c
Author: Xisco Fauli 
AuthorDate: Tue Jan 19 19:26:24 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Jan 20 09:02:02 2021 +0100

tdf#123285: sw_uiwriter3: Add unittest

Change-Id: I32c20543f648e42b603ae5b5ace5fbfd6463a9d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109654
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data3/tdf123285.odt 
b/sw/qa/extras/uiwriter/data3/tdf123285.odt
new file mode 100644
index ..1f92e1511a8b
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf123285.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 8250b01ef5dc..95503190218d 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1082,6 +1082,31 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134021)
 CPPUNIT_ASSERT_EQUAL(12, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf123285)
+{
+load(DATA_DIRECTORY, "tdf123285.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(true,
+ getParagraph(1)->getString().endsWith(
+ ".  Here is a short sentence demonstrating this 
very peculiar bug"
+ ".  Here is a short sentence demonstrating this 
very peculiar bug."));
+
+dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
+Scheduler::ProcessEventsToIdle();
+
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, the last "sentence" would have been changed 
to " entence"
+CPPUNIT_ASSERT_EQUAL(true,
+ getParagraph(1)->getString().endsWith(
+ ". Here is a short sentence demonstrating this 
very peculiar bug"
+ ".  Here is a short sentence demonstrating this 
very peculiar bug."));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130746)
 {
 load(DATA_DIRECTORY, "tdf130746.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: animations/source basctl/source basic/source canvas/source chart2/source comphelper/source UnoControls/source

2021-01-20 Thread Noel (via logerrit)

 UnoControls/source/controls/framecontrol.cxx   |2 
 animations/source/animcore/animcore.cxx|   12 ++---
 basctl/source/basicide/basicrenderable.cxx |4 -
 basic/source/basmgr/basmgr.cxx |4 -
 basic/source/classes/propacc.cxx   |2 
 basic/source/uno/namecont.cxx  |   21 
+-
 basic/source/uno/scriptcont.cxx|4 -
 canvas/source/cairo/cairo_textlayout.cxx   |2 
 chart2/source/model/main/BaseCoordinateSystem.cxx  |2 
 chart2/source/model/main/DataSeries.cxx|2 
 chart2/source/model/main/Diagram.cxx   |2 
 chart2/source/model/template/ChartType.cxx |2 
 chart2/source/tools/RegressionCurveCalculator.cxx  |2 
 comphelper/source/container/IndexedPropertyValuesContainer.cxx |4 -
 comphelper/source/container/NamedPropertyValuesContainer.cxx   |4 -
 comphelper/source/container/enumerablemap.cxx  |2 
 comphelper/source/container/namecontainer.cxx  |4 -
 comphelper/source/eventattachermgr/eventattachermgr.cxx|8 +--
 comphelper/source/misc/anycompare.cxx  |6 +-
 comphelper/source/misc/types.cxx   |3 -
 comphelper/source/property/ChainablePropertySet.cxx|2 
 comphelper/source/property/opropertybag.cxx|4 -
 comphelper/source/property/propertysethelper.cxx   |2 
 comphelper/source/streaming/seqstream.cxx  |2 
 24 files changed, 52 insertions(+), 50 deletions(-)

New commits:
commit bca1b74c0753f2305a5e234293df88aa3e1d9af0
Author: Noel 
AuthorDate: Mon Jan 18 15:05:18 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Jan 20 09:03:45 2021 +0100

improve some IllegalArgumentException messages

Change-Id: Id88f2a82bf2651e8b5895aa330f32b71ff5b0e48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109546
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index 8ecc73cf2d1a..ddfa693a654b 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -275,7 +275,7 @@ sal_Bool FrameControl::convertFastPropertyValue(
Any&rConvertedVa
 
 if ( !bReturn )
 {
-throw IllegalArgumentException();
+throw IllegalArgumentException("unknown handle " + 
OUString::number(nHandle), static_cast(this), 1);
 }
 
 return bReturn;
diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 2347dc08a231..ba1f6f7d4231 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1875,7 +1875,7 @@ Reference< XAnimationNode > SAL_CALL 
AnimationNode::insertBefore( const Referenc
 Guard< Mutex > aGuard( maMutex );
 
 if( !newChild.is() || !refChild.is() )
-throw IllegalArgumentException();
+throw IllegalArgumentException("no child", 
static_cast(this), -1);
 
 if( std::find(maChildren.begin(), maChildren.end(), newChild) != 
maChildren.end() )
 throw ElementExistException();
@@ -1899,7 +1899,7 @@ Reference< XAnimationNode > SAL_CALL 
AnimationNode::insertAfter( const Reference
 Guard< Mutex > aGuard( maMutex );
 
 if( !newChild.is() || !refChild.is() )
-throw IllegalArgumentException();
+throw IllegalArgumentException("no child", 
static_cast(this), -1);
 
 if( std::find(maChildren.begin(), maChildren.end(), newChild) != 
maChildren.end() )
 throw ElementExistException();
@@ -1927,7 +1927,7 @@ Reference< XAnimationNode > SAL_CALL 
AnimationNode::replaceChild( const Referenc
 Guard< Mutex > aGuard( maMutex );
 
 if( !newChild.is() || !oldChild.is() )
-throw IllegalArgumentException();
+throw IllegalArgumentException("no child", 
static_cast(this), -1);
 
 if( std::find(maChildren.begin(), maChildren.end(), newChild) != 
maChildren.end() )
 throw ElementExistException();
@@ -1953,7 +1953,7 @@ Reference< XAnimationNode > SAL_CALL 
AnimationNode::removeChild( const Reference
 Guard< Mutex > aGuard( maMutex );
 
 if( !oldChild.is() )
-throw IllegalArgumentException();
+throw IllegalArgumentException("no child", 
static_cast(this), 1);
 
 auto old = std::find(maChildren.begin(), maChildren.end(), oldChild);
 if( old == maChildren.end() )
@@ -1973,7 +1973,7 @@ Reference< XAnimationNode > SAL_CALL 
AnimationNode::appendChild( const Reference
 Guard< Mutex > aGuard( maMutex );
 
 if( !newChild.is() )
-throw IllegalArgumentException();
+throw IllegalArgumentExc

[Libreoffice-commits] core.git: vcl/inc vcl/source

2021-01-20 Thread Tomaž Vajngerl (via logerrit)

 vcl/inc/graphic/Manager.hxx|5 ++-
 vcl/source/gdi/impgraph.cxx|   18 +++-
 vcl/source/graphic/Manager.cxx |   58 +++--
 3 files changed, 58 insertions(+), 23 deletions(-)

New commits:
commit c36cef138a840af013cf85d33ea3d3d27aeb001a
Author: Tomaž Vajngerl 
AuthorDate: Wed Dec 30 17:13:35 2020 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Jan 20 09:06:23 2021 +0100

vcl: Improve graphic manager swapping allocation

This improves the counting of the used space by graphics and
makes the manager loop faster.

Change-Id: Ifebe5fe52722d0f22dae0d1bdef02f65afb036ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109595
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index bff72780cbd7..098c8644ac61 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -41,6 +41,7 @@ private:
 Manager();
 
 void registerGraphic(const std::shared_ptr& rImpGraphic);
+void loopGraphicsAndSwapOut();
 
 DECL_LINK(SwapOutTimerHandler, Timer*, void);
 
@@ -49,8 +50,8 @@ private:
 public:
 static Manager& get();
 
-void swappedIn(const ImpGraphic* pImpGraphic);
-void swappedOut(const ImpGraphic* pImpGraphic);
+void swappedIn(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
+void swappedOut(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
 
 void reduceGraphicMemory();
 void changeExisting(const ImpGraphic* pImpGraphic, sal_Int64 nOldSize);
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 1e56e57a8226..30db3e932bb9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1276,6 +1276,8 @@ bool ImpGraphic::swapOut()
 
 bool bResult = false;
 
+sal_Int64 nByteSize = getSizeBytes();
+
 // We have GfxLink so we have the source available
 if (mpGfxLink && mpGfxLink->IsNative())
 {
@@ -1289,9 +1291,6 @@ bool ImpGraphic::swapOut()
 // mark as swapped out
 mbSwapOut = true;
 
-// Signal to manager that we have swapped out
-vcl::graphic::Manager::get().swappedOut(this);
-
 bResult = true;
 }
 else
@@ -1331,12 +1330,15 @@ bool ImpGraphic::swapOut()
 
 mpSwapFile = std::move(pSwapFile);
 mbSwapOut = true;
-
-// Signal to manager that we have swapped out
-vcl::graphic::Manager::get().swappedOut(this);
 }
 }
 
+if (bResult)
+{
+// Signal to manager that we have swapped out
+vcl::graphic::Manager::get().swappedOut(this, nByteSize);
+}
+
 return bResult;
 }
 
@@ -1480,7 +1482,9 @@ bool ImpGraphic::swapIn()
 }
 
 if (bReturn)
-vcl::graphic::Manager::get().swappedIn(this);
+{
+vcl::graphic::Manager::get().swappedIn(this, getSizeBytes());
+}
 
 return bReturn;
 }
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 5d535e446955..fafca90b5ad8 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -75,25 +75,24 @@ Manager::Manager()
 }
 }
 
-void Manager::reduceGraphicMemory()
+void Manager::loopGraphicsAndSwapOut()
 {
-if (!mbSwapEnabled)
-return;
-
-std::scoped_lock aGuard(maMutex);
-
 // make a copy of m_pImpGraphicList because if we swap out a svg, the svg
 // filter may create more temp Graphics which are auto-added to
 // m_pImpGraphicList invalidating a loop over m_pImpGraphicList, e.g.
 // reexport of tdf118346-1.odg
 o3tl::sorted_vector aImpGraphicList = m_pImpGraphicList;
+
 for (ImpGraphic* pEachImpGraphic : aImpGraphicList)
 {
-if (mnUsedSize < mnMemoryLimit * 0.7)
+if (mnUsedSize < sal_Int64(mnMemoryLimit * 0.7))
 return;
 
+if (pEachImpGraphic->isSwappedOut())
+continue;
+
 sal_Int64 nCurrentGraphicSize = getGraphicSizeBytes(pEachImpGraphic);
-if (!pEachImpGraphic->isSwappedOut() && nCurrentGraphicSize > 100)
+if (nCurrentGraphicSize > 10)
 {
 if (!pEachImpGraphic->mpContext)
 {
@@ -108,6 +107,33 @@ void Manager::reduceGraphicMemory()
 }
 }
 
+void Manager::reduceGraphicMemory()
+{
+if (!mbSwapEnabled)
+return;
+
+if (mnUsedSize < mnMemoryLimit)
+return;
+
+std::scoped_lock aGuard(maMutex);
+
+loopGraphicsAndSwapOut();
+
+sal_Int64 calculatedSize = 0;
+for (ImpGraphic* pEachImpGraphic : m_pImpGraphicList)
+{
+if (!pEachImpGraphic->isSwappedOut())
+{
+calculatedSize += getGraphicSizeBytes(pEachImpGraphic);
+}
+}
+
+if (calculatedSize != mnUsedSize)
+{
+mnUsedSize = calculatedSize;
+}
+}
+
 sal_Int64 Manager::getGraphicSizeBytes(const ImpGraphic* pImpGraphic)
 {
 if (!pImpGraphic->isAvailable())
@@ -213,18 +239,22 @@ std::s

[Libreoffice-commits] core.git: include/vcl offapi/com offapi/UnoApi_offapi.mk vcl/inc vcl/Library_vcl.mk vcl/source

2021-01-20 Thread Tomaž Vajngerl (via logerrit)

 include/vcl/BinaryDataContainerTools.hxx  |   23 +
 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/util/XBinaryDataContainer.idl |   34 ++
 vcl/Library_vcl.mk|2 
 vcl/inc/graphic/UnoBinaryDataContainer.hxx|   52 ++
 vcl/source/graphic/BinaryDataContainerTools.cxx   |   28 +++
 vcl/source/graphic/UnoBinaryDataContainer.cxx |   34 ++
 7 files changed, 174 insertions(+)

New commits:
commit eda153002f619697394066de127bed42ff3eeb50
Author: Tomaž Vajngerl 
AuthorDate: Fri Dec 25 20:10:44 2020 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Jan 20 09:06:41 2021 +0100

vcl: add an UNO interface and impl. for BinaryDataContainer

Change-Id: Icbc384892bee8c31eb7f3a39ff9a64f1199b23b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109596
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/BinaryDataContainerTools.hxx 
b/include/vcl/BinaryDataContainerTools.hxx
new file mode 100644
index ..3d50379a82d3
--- /dev/null
+++ b/include/vcl/BinaryDataContainerTools.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+namespace vcl
+{
+VCL_DLLPUBLIC BinaryDataContainer convertUnoBinaryDataContainer(
+css::uno::Reference const& 
rxBinaryDataContainer);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index eabb1272588a..5e2384552b5b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4143,6 +4143,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/util,\
VetoException \
XAccounting \
XAtomServer \
+   XBinaryDataContainer \
XBroadcaster \
XCancellable \
XChainable \
diff --git a/offapi/com/sun/star/util/XBinaryDataContainer.idl 
b/offapi/com/sun/star/util/XBinaryDataContainer.idl
new file mode 100644
index ..b58bca00d0e0
--- /dev/null
+++ b/offapi/com/sun/star/util/XBinaryDataContainer.idl
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef com_sun_star_util_XBinaryDataContainer_idl
+#define com_sun_star_util_XBinaryDataContainer_idl
+
+module com { module sun { module star { module util
+{
+
+/** Container for binary data, typically an in-memory content of files.
+
+The binary data in the container is regarded as read-only so no
+access that would allow changing the data is allowed in this
+interface.
+
+@since LibreOffice 7.2
+ */
+interface XBinaryDataContainer
+{
+/** Get a copy of the contained data */
+sequence getCopyAsByteSequence();
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9bb7906eb39f..e58e6b8b3d17 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -321,6 +321,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/pdf/PDFiumLibrary \
 vcl/source/pdf/ExternalPDFStreams \
 vcl/source/graphic/BinaryDataContainer \
+vcl/source/graphic/BinaryDataContainerTools \
 vcl/source/graphic/GraphicID \
 vcl/source/graphic/GraphicLoader \
 vcl/source/graphic/GraphicObject \
@@ -328,6 +329,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/graphic/GraphicReader \
 vcl/source/graphic/grfattr \
 vcl/source/graphic/Manager \
+vcl/source/graphic/UnoBinaryDataContainer \
 vcl/source/graphic/UnoGraphic \
 vcl/source/graphic/UnoGraphicMapper \
 vcl/source/graphic/UnoGraphicDescriptor \
diff --git a/vcl/inc/graphic/UnoBinaryDataContainer.hxx 
b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
new file mode 100644
index ..115cbc46d46c
--- /dev/null
+++ b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ */
+
+#pragma o

Re: Calc memory consumption

2021-01-20 Thread Noel Grandin





On 2021/01/20 1:56 am, Daniel A. Rodriguez wrote:
Hi, exists some kind of formula to estimate how much RAM a spreadsheet could use? For instance 468K rows and columns 
from A to AG.




Calc uses a kind of compression for columns (when there is repeating data), and it depends heavily on what kind of data 
it is, so no, not really.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/source

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/salvtables.hxx|   28 +
 vcl/source/app/salvtables.cxx |   88 ++
 2 files changed, 66 insertions(+), 50 deletions(-)

New commits:
commit 8d2fc607a3d03adbc92d8b44172b9039cd457754
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 09:40:33 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 09:13:06 2021 +0100

Move SalInstanceRadioButton decl to header file

Change-Id: Ic99187477459d424e9c731a29b41a8f06d598864
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109633
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 562621251215..b8a71e08f917 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1763,4 +1763,32 @@ public:
 virtual ~SalInstanceIconView() override;
 };
 
+class SalInstanceRadioButton : public SalInstanceButton, public virtual 
weld::RadioButton
+{
+private:
+VclPtr<::RadioButton> m_xRadioButton;
+
+DECL_LINK(ToggleHdl, ::RadioButton&, void);
+
+public:
+SalInstanceRadioButton(::RadioButton* pButton, SalInstanceBuilder* 
pBuilder,
+   bool bTakeOwnership);
+
+virtual void set_active(bool active) override;
+
+virtual bool get_active() const override;
+
+virtual void set_image(VirtualDevice* pDevice) override;
+
+virtual void set_image(const css::uno::Reference& 
rImage) override;
+
+virtual void set_from_icon_name(const OUString& rIconName) override;
+
+virtual void set_inconsistent(bool /*inconsistent*/) override;
+
+virtual bool get_inconsistent() const override;
+
+virtual ~SalInstanceRadioButton() override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7470800b28d8..06d8c8f89533 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2759,65 +2759,53 @@ IMPL_LINK(SalInstanceLinkButton, ClickHdl, 
FixedHyperlink&, rButton, void)
 m_aOrigClickHdl.Call(rButton);
 }
 
-namespace
-{
-class SalInstanceRadioButton : public SalInstanceButton, public virtual 
weld::RadioButton
+SalInstanceRadioButton::SalInstanceRadioButton(::RadioButton* pButton, 
SalInstanceBuilder* pBuilder,
+   bool bTakeOwnership)
+: SalInstanceButton(pButton, pBuilder, bTakeOwnership)
+, m_xRadioButton(pButton)
 {
-private:
-VclPtr<::RadioButton> m_xRadioButton;
-
-DECL_LINK(ToggleHdl, ::RadioButton&, void);
-
-public:
-SalInstanceRadioButton(::RadioButton* pButton, SalInstanceBuilder* 
pBuilder,
-   bool bTakeOwnership)
-: SalInstanceButton(pButton, pBuilder, bTakeOwnership)
-, m_xRadioButton(pButton)
-{
-m_xRadioButton->SetToggleHdl(LINK(this, SalInstanceRadioButton, 
ToggleHdl));
-}
+m_xRadioButton->SetToggleHdl(LINK(this, SalInstanceRadioButton, 
ToggleHdl));
+}
 
-virtual void set_active(bool active) override
-{
-disable_notify_events();
-m_xRadioButton->Check(active);
-enable_notify_events();
-}
+void SalInstanceRadioButton::set_active(bool active)
+{
+disable_notify_events();
+m_xRadioButton->Check(active);
+enable_notify_events();
+}
 
-virtual bool get_active() const override { return 
m_xRadioButton->IsChecked(); }
+bool SalInstanceRadioButton::get_active() const { return 
m_xRadioButton->IsChecked(); }
 
-virtual void set_image(VirtualDevice* pDevice) override
-{
-m_xRadioButton->SetImageAlign(ImageAlign::Center);
-if (pDevice)
-m_xRadioButton->SetModeImage(createImage(*pDevice));
-else
-m_xRadioButton->SetModeImage(Image());
-}
+void SalInstanceRadioButton::set_image(VirtualDevice* pDevice)
+{
+m_xRadioButton->SetImageAlign(ImageAlign::Center);
+if (pDevice)
+m_xRadioButton->SetModeImage(createImage(*pDevice));
+else
+m_xRadioButton->SetModeImage(Image());
+}
 
-virtual void set_image(const css::uno::Reference& 
rImage) override
-{
-m_xRadioButton->SetImageAlign(ImageAlign::Center);
-m_xRadioButton->SetModeImage(Image(rImage));
-}
+void SalInstanceRadioButton::set_image(const 
css::uno::Reference& rImage)
+{
+m_xRadioButton->SetImageAlign(ImageAlign::Center);
+m_xRadioButton->SetModeImage(Image(rImage));
+}
 
-virtual void set_from_icon_name(const OUString& rIconName) override
-{
-m_xRadioButton->SetModeRadioImage(Image(StockImage::Yes, rIconName));
-}
+void SalInstanceRadioButton::set_from_icon_name(const OUString& rIconName)
+{
+m_xRadioButton->SetModeRadioImage(Image(StockImage::Yes, rIconName));
+}
 
-virtual void set_inconsistent(bool /*inconsistent*/) override
-{
-//not available
-}
+void SalInstanceRadioButton::set_inconsistent(bool /*inconsistent*/)
+{
+//n

[Libreoffice-commits] dictionaries.git: it_IT/it_IT.dic

2021-01-20 Thread Rene Engelhard (via logerrit)

 it_IT/it_IT.dic | 4886 
 1 file changed, 2443 insertions(+), 2443 deletions(-)

New commits:
commit 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f
Author: Rene Engelhard 
AuthorDate: Fri Jan 15 09:44:21 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 09:47:03 2021 +0100

deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109321
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: René Engelhard 

diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic
index 394734e..c5ed82b 100644
--- a/it_IT/it_IT.dic
+++ b/it_IT/it_IT.dic
@@ -38,7 +38,7 @@ ab
 abaco/OTqr
 Abacuc
 abadessa/QTUqrs
-abaliet�/TU
+abalietà/TU
 abanese/STUqrs
 Abano/Tqr
 abarica/QTU
@@ -157,7 +157,7 @@ abbicare/ALKhlTXI
 abbicata/QTU
 abbicato/EyT
 abbicatura/QTUqs
-abbicc�/Tq
+abbiccì/Tq
 abbiente/STUqrs
 abbietta/QTU
 abbietto/OTYW
@@ -399,7 +399,7 @@ abilitata/QTU
 abilitativa/QTU
 abilitativo/OT
 abilitato/EyT
-abilit�/TUqs
+abilità/TUqs
 abilitazione/STUqs
 abiogenesi/Tq
 abiogenetica/QTU
@@ -413,7 +413,7 @@ Abissinia/TUqrs
 abissino/OTqr
 abisso/OTqr
 abitabile/STU
-abitabilit�/TUqs
+abitabilità/TUqs
 abitacolo/OTq
 abitando/D
 abitante/STUqrs
@@ -428,13 +428,13 @@ abitazione/STUqs
 abitino/OTq
 abito/OTq
 abituale/SYTU
-abitualit�/TUqs
+abitualità/TUqs
 abituando/D
 abituare/ALKhlTXI
 abituata/QTU
 abituato/EyT
 abitudinaria/QTUqrs
-abitudinariet�/TUqs
+abitudinarietà/TUqs
 abitudinario/OTYqr
 abitudine/STUqs
 abituro/OTq
@@ -507,7 +507,7 @@ Abramo/T^
 abrasero
 abrasione/STUqrs
 abrasiva/QTUqrs
-abrasivit�/TUqs
+abrasività/TUqs
 abrasivo/OTqr
 abraso/oT
 abreazione/STUqs
@@ -545,11 +545,11 @@ abusata/QTU
 abusato/EyT
 abusiva/QTUqrs
 abusivismo/OTq
-abusivit�/Tqs
+abusività/Tqs
 abusivo/OTYWqr
 abuso/OTq
 acacia/QTUqs
-acagi�/T
+acagiù/T
 acantacea/QTUqrs
 acantocefalo/OTq
 acanto/OTqr
@@ -591,7 +591,7 @@ accadimento/OTq
 accado/OTq
 accadrai
 accadranno/X
-accadr�/X
+accadrà/X
 accadrebbero
 accadrebbe/X
 accadrei
@@ -600,7 +600,7 @@ accadremo
 accadreste
 accadresti
 accadrete
-accadr�
+accadrò
 accaduta/QTU
 accaduto/EyT
 accagliamento/OTq
@@ -840,7 +840,7 @@ accerchiata/QTU
 accerchiato/EyT
 accerchiatura/QTUqs
 accertabile/STU
-accertabilit�/TUqs
+accertabilità/TUqs
 accertamento/OTq
 accertando/DJ
 accertare/ALKhlJTXI
@@ -853,7 +853,7 @@ accesissima/QTU
 accesissimo/OT
 acceso/OYT
 accessibile/STU
-accessibilit�/TUqs
+accessibilità/TUqs
 accessione/STUqrs
 accesso/OTqr
 accessoriabile/STU
@@ -862,7 +862,7 @@ accessoria/QTU
 accessoriare/ALKhlTXI
 accessoriata/QTU
 accessoriato/EyT
-accessoriet�/TUqs
+accessorietà/TUqs
 accessorio/OTqY
 accessorista/QRTUqrs
 accessuale/SYTU
@@ -874,7 +874,7 @@ accestito/OT
 accettabile/SYTU
 accettabilissima/QTU
 accettabilissimo/OT
-accettabilit�/TUqs
+accettabilità/TUqs
 accettando/DJ
 accettante/STUqrs
 accetta/QTUqs
@@ -945,7 +945,7 @@ acciarpata/QTU
 acciarpato/EyT
 accidempoli/Tqr
 accidentale/STUYq
-accidentalit�/TUqs
+accidentalità/TUqs
 accidentata/QTU
 accidentato/OT
 accidente/STUqrs
@@ -968,7 +968,7 @@ accinsero/T
 accinse/STUqrs
 accinta/QTU
 accinto/OT
-acciocch�/Tqr
+acciocché/Tqr
 acciottolando/D
 acciottolare/ALKhlTXI
 acciottolata/QTU
@@ -1016,7 +1016,7 @@ acclimatrice/STUqrs
 acclimazione/STUqs
 accline/STUqrs
 acclive/STUqrs
-acclivit�/TUqs
+acclività/TUqs
 accludendo/D
 accludere/BTXI
 acclusa/QTU
@@ -1301,7 +1301,7 @@ accuratezza/QTUqrs
 accurato/OTWYqr
 Accursio/T^
 accusabile/STU
-accusabilit�/TUqs
+accusabilità/TUqs
 accusando/D
 accusa/QTUqs
 accusare/ALKhlTXI
@@ -1323,7 +1323,7 @@ acerba/QTUqrs
 acerbezza/QTUqs
 acerbissima/QTU
 acerbissimo/OT
-acerbit�/TUqs
+acerbità/TUqs
 acerbo/OTY
 Acerenza
 acereta/QTUqs
@@ -1385,7 +1385,7 @@ acetonuria/QTUqs
 aceto/OTq
 acetosa/QTUqs
 acetosella/QTUqs
-acetosit�/TUqs
+acetosità/TUqs
 acetoso/OT
 ace/TUq
 achea/QTUqrs
@@ -1408,7 +1408,7 @@ achiria/QTUqs
 Aci
 aciatici/Tqr
 aciclica/QTU
-aciclicit�/TU
+aciclicità/TU
 aciclico/nT
 acicolare/STU
 acicula/QTUqs
@@ -1423,7 +1423,7 @@ acidificata/QTU
 acidificato/EyT
 acidificazione/STUqs
 acidimetria/QTUqrs
-acidit�/TUqs
+acidità/TUqs
 acidofila/QTU
 acidofilo/OT
 acidolisi/TUqs
@@ -1471,12 +1471,12 @@ acneico/nT
 acne/STUq
 acolia/QTUqs
 aconcettuale/STUqrs
-aconcettualit�/TUqs
+aconcettualità/TUqs
 acondroplasia/QTUqs
 acondroplasica/QTUqrs
 acondroplasico/nTqr
 aconfessionale/STUqrs
-aconfessionalit�/TUqs
+aconfessionalità/TUqs
 aconitina/QTUq
 aconito/OTq
 aconzio/OTqs
@@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs
 Acquasparta
 acquata/QTUqrs
 acquatica/QTU
-acquaticit�/TUqs
+acquaticità/TUqs
 acquatico/nTq
 acquatile/STU
 acquatinta/TUqs
@@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs
 acquitrinoso/OTqr
 acquolina/QTUqrs
 acquosa/QTUqrs
-acquosit�/TUqs
+acquosità/TUqs

[Libreoffice-commits] core.git: dictionaries

2021-01-20 Thread Rene Engelhard (via logerrit)

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9527955dd78618f14e12018e4f0ff533d2823d1
Author: Rene Engelhard 
AuthorDate: Wed Jan 20 09:47:03 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 20 09:47:03 2021 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f
  - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109321
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: René Engelhard 

diff --git a/dictionaries b/dictionaries
index a706f520e612..87ca82e1a22b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a706f520e612d1148c6d259b595ba4815be99f50
+Subproject commit 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-1' - it_IT/it_IT.dic

2021-01-20 Thread Rene Engelhard (via logerrit)

 it_IT/it_IT.dic | 4886 
 1 file changed, 2443 insertions(+), 2443 deletions(-)

New commits:
commit 28be227a705917bd78ee47f7c50a4adaf31740a7
Author: Rene Engelhard 
AuthorDate: Fri Jan 15 09:44:21 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 09:47:44 2021 +0100

deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109291
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: René Engelhard 

diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic
index 394734e..c5ed82b 100644
--- a/it_IT/it_IT.dic
+++ b/it_IT/it_IT.dic
@@ -38,7 +38,7 @@ ab
 abaco/OTqr
 Abacuc
 abadessa/QTUqrs
-abaliet�/TU
+abalietà/TU
 abanese/STUqrs
 Abano/Tqr
 abarica/QTU
@@ -157,7 +157,7 @@ abbicare/ALKhlTXI
 abbicata/QTU
 abbicato/EyT
 abbicatura/QTUqs
-abbicc�/Tq
+abbiccì/Tq
 abbiente/STUqrs
 abbietta/QTU
 abbietto/OTYW
@@ -399,7 +399,7 @@ abilitata/QTU
 abilitativa/QTU
 abilitativo/OT
 abilitato/EyT
-abilit�/TUqs
+abilità/TUqs
 abilitazione/STUqs
 abiogenesi/Tq
 abiogenetica/QTU
@@ -413,7 +413,7 @@ Abissinia/TUqrs
 abissino/OTqr
 abisso/OTqr
 abitabile/STU
-abitabilit�/TUqs
+abitabilità/TUqs
 abitacolo/OTq
 abitando/D
 abitante/STUqrs
@@ -428,13 +428,13 @@ abitazione/STUqs
 abitino/OTq
 abito/OTq
 abituale/SYTU
-abitualit�/TUqs
+abitualità/TUqs
 abituando/D
 abituare/ALKhlTXI
 abituata/QTU
 abituato/EyT
 abitudinaria/QTUqrs
-abitudinariet�/TUqs
+abitudinarietà/TUqs
 abitudinario/OTYqr
 abitudine/STUqs
 abituro/OTq
@@ -507,7 +507,7 @@ Abramo/T^
 abrasero
 abrasione/STUqrs
 abrasiva/QTUqrs
-abrasivit�/TUqs
+abrasività/TUqs
 abrasivo/OTqr
 abraso/oT
 abreazione/STUqs
@@ -545,11 +545,11 @@ abusata/QTU
 abusato/EyT
 abusiva/QTUqrs
 abusivismo/OTq
-abusivit�/Tqs
+abusività/Tqs
 abusivo/OTYWqr
 abuso/OTq
 acacia/QTUqs
-acagi�/T
+acagiù/T
 acantacea/QTUqrs
 acantocefalo/OTq
 acanto/OTqr
@@ -591,7 +591,7 @@ accadimento/OTq
 accado/OTq
 accadrai
 accadranno/X
-accadr�/X
+accadrà/X
 accadrebbero
 accadrebbe/X
 accadrei
@@ -600,7 +600,7 @@ accadremo
 accadreste
 accadresti
 accadrete
-accadr�
+accadrò
 accaduta/QTU
 accaduto/EyT
 accagliamento/OTq
@@ -840,7 +840,7 @@ accerchiata/QTU
 accerchiato/EyT
 accerchiatura/QTUqs
 accertabile/STU
-accertabilit�/TUqs
+accertabilità/TUqs
 accertamento/OTq
 accertando/DJ
 accertare/ALKhlJTXI
@@ -853,7 +853,7 @@ accesissima/QTU
 accesissimo/OT
 acceso/OYT
 accessibile/STU
-accessibilit�/TUqs
+accessibilità/TUqs
 accessione/STUqrs
 accesso/OTqr
 accessoriabile/STU
@@ -862,7 +862,7 @@ accessoria/QTU
 accessoriare/ALKhlTXI
 accessoriata/QTU
 accessoriato/EyT
-accessoriet�/TUqs
+accessorietà/TUqs
 accessorio/OTqY
 accessorista/QRTUqrs
 accessuale/SYTU
@@ -874,7 +874,7 @@ accestito/OT
 accettabile/SYTU
 accettabilissima/QTU
 accettabilissimo/OT
-accettabilit�/TUqs
+accettabilità/TUqs
 accettando/DJ
 accettante/STUqrs
 accetta/QTUqs
@@ -945,7 +945,7 @@ acciarpata/QTU
 acciarpato/EyT
 accidempoli/Tqr
 accidentale/STUYq
-accidentalit�/TUqs
+accidentalità/TUqs
 accidentata/QTU
 accidentato/OT
 accidente/STUqrs
@@ -968,7 +968,7 @@ accinsero/T
 accinse/STUqrs
 accinta/QTU
 accinto/OT
-acciocch�/Tqr
+acciocché/Tqr
 acciottolando/D
 acciottolare/ALKhlTXI
 acciottolata/QTU
@@ -1016,7 +1016,7 @@ acclimatrice/STUqrs
 acclimazione/STUqs
 accline/STUqrs
 acclive/STUqrs
-acclivit�/TUqs
+acclività/TUqs
 accludendo/D
 accludere/BTXI
 acclusa/QTU
@@ -1301,7 +1301,7 @@ accuratezza/QTUqrs
 accurato/OTWYqr
 Accursio/T^
 accusabile/STU
-accusabilit�/TUqs
+accusabilità/TUqs
 accusando/D
 accusa/QTUqs
 accusare/ALKhlTXI
@@ -1323,7 +1323,7 @@ acerba/QTUqrs
 acerbezza/QTUqs
 acerbissima/QTU
 acerbissimo/OT
-acerbit�/TUqs
+acerbità/TUqs
 acerbo/OTY
 Acerenza
 acereta/QTUqs
@@ -1385,7 +1385,7 @@ acetonuria/QTUqs
 aceto/OTq
 acetosa/QTUqs
 acetosella/QTUqs
-acetosit�/TUqs
+acetosità/TUqs
 acetoso/OT
 ace/TUq
 achea/QTUqrs
@@ -1408,7 +1408,7 @@ achiria/QTUqs
 Aci
 aciatici/Tqr
 aciclica/QTU
-aciclicit�/TU
+aciclicità/TU
 aciclico/nT
 acicolare/STU
 acicula/QTUqs
@@ -1423,7 +1423,7 @@ acidificata/QTU
 acidificato/EyT
 acidificazione/STUqs
 acidimetria/QTUqrs
-acidit�/TUqs
+acidità/TUqs
 acidofila/QTU
 acidofilo/OT
 acidolisi/TUqs
@@ -1471,12 +1471,12 @@ acneico/nT
 acne/STUq
 acolia/QTUqs
 aconcettuale/STUqrs
-aconcettualit�/TUqs
+aconcettualità/TUqs
 acondroplasia/QTUqs
 acondroplasica/QTUqrs
 acondroplasico/nTqr
 aconfessionale/STUqrs
-aconfessionalit�/TUqs
+aconfessionalità/TUqs
 aconitina/QTUq
 aconito/OTq
 aconzio/OTqs
@@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs
 Acquasparta
 acquata/QTUqrs
 acquatica/QTU
-acquaticit�/TUqs
+acquaticità/TUqs
 acquatico/nTq
 acquatile/STU
 acquatinta/TUqs
@@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs
 acquitrinoso/OTqr
 acquolina/QTUqrs
 acquosa/QTUqrs
-acquosit�/TUqs
+acquosità/TUqs

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dictionaries

2021-01-20 Thread Rene Engelhard (via logerrit)

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e38db1bdcf8ffef8491bfd8b375acab48210325c
Author: Rene Engelhard 
AuthorDate: Wed Jan 20 09:47:44 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 20 09:47:44 2021 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-7-1'
  to 28be227a705917bd78ee47f7c50a4adaf31740a7
  - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109291
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: René Engelhard 

diff --git a/dictionaries b/dictionaries
index 0f14b9278300..28be227a7059 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0f14b92783008b49eedd6d3dbf40b7becd71746d
+Subproject commit 28be227a705917bd78ee47f7c50a4adaf31740a7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/flatpak-manifest.in

2021-01-20 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 3360f84050c46ff3ed862c2415e71469f479ce2f
Author: Stephan Bergmann 
AuthorDate: Mon Jan 18 17:42:22 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 09:53:05 2021 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109565
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 2197f69f1b91ff13d0dcd078685ab23466241197)
Merge conflicts:
solenv/flatpak-manifest.in

Change-Id: I8e81fd375bd819a62a543960a2368e3bf965c8c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109632
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b4e31e620a03..9b58b5536f28 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -255,10 +255,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";,
-"sha256": 
"cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2";,
+"sha256": 
"62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2020-09-29.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2020-12-18.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
@@ -381,10 +381,10 @@
 "dest-filename": 
"external/tarballs/liborcus-0.16.1.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";,
-"sha256": 
"234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz";,
+"sha256": 
"016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.82.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-21.01.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";,
@@ -579,10 +579,10 @@
 "dest-filename": 
"external/tarballs/libatomic_ops-7.6.8.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/skia-m86-e1e24080421116cf5d63b55cd5042176bebc0a43.tar.xz";,
-"sha256": 
"d6fe401003854f0487473f5692a4d37998c5eb82b501b2e4de72ad263467a0e6",
+"url": 
"https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";,
+"sha256": 
"f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301",
 "type": "file",
-"dest-filename": 
"external/tarballs/skia-m86-e1e24080421116cf5d63b55cd5042176bebc0a43.tar.xz"
+"dest-filename": 
"external/tarballs/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

2021-01-20 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/cmd/32/chainframes.png  |binary
 icon-themes/elementary/cmd/32/choosecontrols.png   |binary
 icon-themes/elementary/cmd/32/dbaddrelation.png|binary
 icon-themes/elementary/cmd/32/dbrelationdesign.png |binary
 icon-themes/elementary/cmd/32/insertframeinteract.png  |binary
 icon-themes/elementary/cmd/32/modifyframe.png  |binary
 icon-themes/elementary/cmd/32/navigationbar.png|binary
 icon-themes/elementary/cmd/32/pushbutton.png   |binary
 icon-themes/elementary/cmd/32/tabdialog.png|binary
 icon-themes/elementary/cmd/32/unhainframes.png |binary
 icon-themes/elementary/cmd/32/wraptext.png |binary
 icon-themes/elementary/cmd/lc_chainframes.png  |binary
 icon-themes/elementary/cmd/lc_dbaddrelation.png|binary
 icon-themes/elementary/cmd/lc_imagebutton.png  |binary
 icon-themes/elementary/cmd/lc_insertframeinteract.png  |binary
 icon-themes/elementary/cmd/lc_modifyframe.png  |binary
 icon-themes/elementary/cmd/lc_navigationbar.png|binary
 icon-themes/elementary/cmd/lc_pushbutton.png   |binary
 icon-themes/elementary/cmd/lc_tabdialog.png|binary
 icon-themes/elementary/cmd/lc_unhainframes.png |binary
 icon-themes/elementary/cmd/lc_wraptext.png |binary
 icon-themes/elementary/cmd/sc_chainframes.png  |binary
 icon-themes/elementary/cmd/sc_dataform.png |binary
 icon-themes/elementary/cmd/sc_dbaddrelation.png|binary
 icon-themes/elementary/cmd/sc_dbrelationdesign.png |binary
 icon-themes/elementary/cmd/sc_imagebutton.png  |binary
 icon-themes/elementary/cmd/sc_insertframeinteract.png  |binary
 icon-themes/elementary/cmd/sc_inserttreecontrol.png|binary
 icon-themes/elementary/cmd/sc_modifyframe.png  |binary
 icon-themes/elementary/cmd/sc_navigationbar.png|binary
 icon-themes/elementary/cmd/sc_pushbutton.png   |binary
 icon-themes/elementary/cmd/sc_tabdialog.png|binary
 icon-themes/elementary/cmd/sc_unhainframes.png |binary
 icon-themes/elementary/cmd/sc_wraptext.png |binary
 icon-themes/elementary/links.txt   |9 +++--
 icon-themes/elementary/res/grafikde.png|binary
 icon-themes/elementary/res/hldocntp.png|binary
 icon-themes/elementary/res/im30823.png |binary
 icon-themes/elementary/res/javacomponent_16.png|binary
 icon-themes/elementary/res/javalibrary_16.png  |binary
 icon-themes/elementary/res/lx03125.png |binary
 icon-themes/elementary/res/lx03126.png |binary
 icon-themes/elementary/res/lx03127.png |binary
 icon-themes/elementary/res/lx03129.png |binary
 icon-themes/elementary/res/lx03132.png |binary
 icon-themes/elementary/res/lx03162.png |binary
 icon-themes/elementary/res/lx03163.png |binary
 icon-themes/elementary/res/savemodified_extralarge.png |binary
 icon-themes/elementary/res/savemodified_large.png  |binary
 icon-themes/elementary/res/savemodified_small.png  |binary
 icon-themes/elementary/res/script.png  |binary
 icon-themes/elementary/res/sx03125.png |binary
 icon-themes/elementary/res/sx03126.png |binary
 icon-themes/elementary/res/sx03127.png |binary
 icon-themes/elementary/res/sx03132.png |binary
 icon-themes/elementary/res/sx03162.png |binary
 icon-themes/elementary/res/sx03163.png |binary
 icon-themes/elementary/res/sx03201.png |binary
 icon-themes/elementary/sc/res/dropurl.png  |binary
 icon-themes/elementary/sc/res/lc26049.png  |binary
 icon-themes/elementary/sc/res/sf02.png |binary
 icon-themes/elementary_svg/cmd/32/chainframes.svg  |2 +-
 icon-themes/elementary_svg/cmd/32/choosecontrols.svg   |2 +-
 icon-themes/elementary_svg/cmd/32/dbaddrelation.svg|2 +-
 icon-themes/elementary_svg/cmd/32/dbrelationdesign.svg |2 +-
 icon-themes/elementary_svg/cmd/32/insertframeinteract.svg  |1 +
 icon-themes/elementary_svg/cmd/32/modifyframe.svg  |2 +-
 icon-themes/elementary_svg/cmd/32/navigationbar.svg|2 +-
 icon-themes/elementary_svg/cmd/32/pushbutton.svg   |2 +-
 icon-themes/elementary_svg/cmd/32/tabdialog.svg|2 +-
 icon-themes/elementary_svg/cmd/32/unhainframes.svg |2 +-
 icon-themes/elementary_svg/cmd/32/wraptext.svg |2 +-
 icon-themes/elementary_svg/cmd/lc_chainframes.svg  |2 +-
 ic

[Libreoffice-commits] core.git: cui/source sw/source

2021-01-20 Thread Caolán McNamara (via logerrit)

 cui/source/tabpages/grfpage.cxx |1 +
 sw/source/ui/envelp/label1.cxx  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 61f5add790fad40b1e3f7a3a45b96d52f784f69c
Author: Caolán McNamara 
AuthorDate: Mon Jan 18 20:12:45 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 10:08:31 2021 +0100

weld the dialog parent for best cleanup

Change-Id: I4e43a7e891077ab257419d57093383c07311bd5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 707c954703e2..ddc47de404c2 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -632,6 +632,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
 OUString sTemp;
 {
 std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/spinbox.ui"));
+std::unique_ptr 
xTopLevel(xBuilder->weld_dialog("SpinDialog"));
 std::unique_ptr 
xFld(xBuilder->weld_metric_spin_button("spin", FieldUnit::CM));
 SetFieldUnit( *xFld, eMetric );
 xFld->set_digits(m_xWidthMF->get_digits());
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 6dd5c5b1d4b7..54cc0ff0a61f 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -390,6 +390,7 @@ IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
 void SwLabPage::DisplayFormat()
 {
 std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/spinbox.ui"));
+std::unique_ptr 
xTopLevel(xBuilder->weld_dialog("SpinDialog"));
 std::unique_ptr 
xField(xBuilder->weld_metric_spin_button("spin", FieldUnit::CM));
 SetFieldUnit(*xField, ::GetDfltMetric(false));
 xField->set_digits(2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - filter/source

2021-01-20 Thread Marco Cecchetti (via logerrit)

 filter/source/svg/presentation_engine.js |   68 ---
 filter/source/svg/svgexport.cxx  |7 +++
 filter/source/svg/svgwriter.cxx  |3 -
 3 files changed, 55 insertions(+), 23 deletions(-)

New commits:
commit 8a8773f7216678142d41ca0f39ffcd5155b63086
Author: Marco Cecchetti 
AuthorDate: Sun Jan 17 23:38:57 2021 +0100
Commit: Marco Cecchetti 
CommitDate: Wed Jan 20 11:04:51 2021 +0100

filter: svg: js engine: further improving text fields handling

Added support for slide name text field on master page

Change-Id: I969bd3b2d030cf117f4c7022716b55152538f846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109497
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Marco Cecchetti 

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index c1a6a4ef988e..1ab4e5eac01b 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -4434,6 +4434,7 @@ var aOOOAttrUsePositionedChars = 'use-positioned-chars';
 
 var aOOOAttrSlide = 'slide';
 var aOOOAttrMaster = 'master';
+var aOOOAttrDisplayName = 'display-name';
 var aOOOAttrSlideDuration = 'slide-duration';
 var aOOOAttrHasTransition = 'has-transition';
 var aOOOAttrHasCustomBackground = 'has-custom-background';
@@ -4460,6 +4461,7 @@ var aFooterClassName = 'Footer';
 var aHeaderClassName = 'Header';
 var aDateClassName = 'Date';
 var aTimeClassName = 'Time';
+var aSlideNameClassName='SlideName';
 
 // Creating a namespace dictionary.
 var NSS = {};
@@ -5030,6 +5032,8 @@ function MetaSlide( sMetaSlideId, aMetaDoc )
 else
 this.nSlideNumber= -1;
 
+this.slideName = this.element.getAttributeNS( NSS['ooo'], 
aOOOAttrDisplayName );
+
 // Each slide element is double wrapped by  elements.
 // The outer  element is responsible for
 // the slide element visibility. In fact the visibility attribute has
@@ -5099,6 +5103,7 @@ function MetaSlide( sMetaSlideId, aMetaDoc )
 this.aTextFieldContentProviderSet[aHeaderClassName]= 
this.initFixedTextFieldContentProvider( aOOOAttrHeaderField );
 this.aTextFieldContentProviderSet[aDateClassName]  = 
this.theMetaDoc.aCurrentDateProvider;
 this.aTextFieldContentProviderSet[aTimeClassName]  = 
this.theMetaDoc.aCurrentTimeProvider;
+this.aTextFieldContentProviderSet[aSlideNameClassName] = new 
FixedTextProvider( this.slideName );
 
 // We init the slide duration when automatic slide transition is enabled
 this.fDuration = this.initSlideDuration();
@@ -5254,7 +5259,7 @@ initDateTimeFieldContentProvider : function( 
aOOOAttrDateTimeField )
 var sClassName = getClassAttribute( aTextFieldElem );
 if( sClassName == 'FixedDateTimeField' )
 {
-aTextField = new FixedTextProvider( aTextFieldElem );
+aTextField = new FixedTextByElementProvider( aTextFieldElem );
 this.bIsDateTimeVariable = false;
 }
 else if( sClassName == 'VariableDateTimeField' )
@@ -5284,7 +5289,7 @@ initFixedTextFieldContentProvider : function( 
aOOOAttribute )
 {
 var aTextFieldElem = document.getElementById( sTextFieldId );
 this.theMetaDoc.aTextFieldContentProviderSet[ nIndex ]
-= new FixedTextProvider( aTextFieldElem );
+= new FixedTextByElementProvider( aTextFieldElem );
 }
 return this.theMetaDoc.aTextFieldContentProviderSet[ nIndex ];
 },
@@ -5378,6 +5383,8 @@ function getTextFieldType ( elem )
 sFieldType = aDateClassName;
 else if (sContent === '')
 sFieldType = aTimeClassName;
+else if (sContent === '')
+sFieldType = aSlideNameClassName;
 }
 }
 return sFieldType;
@@ -5387,7 +5394,8 @@ function isTextFieldByClassName ( sClassName )
 {
 return sClassName === aDateTimeClassName || sClassName === aFooterClassName
 || sClassName === aHeaderClassName || sClassName.startsWith( 
aSlideNumberClassName )
-|| sClassName.startsWith( aDateClassName ) || sClassName.startsWith( 
aTimeClassName );
+|| sClassName.startsWith( aDateClassName ) || sClassName.startsWith( 
aTimeClassName )
+|| sClassName.startsWith( aSlideNameClassName );
 }
 
 /** Class MasterPage
@@ -5834,13 +5842,9 @@ MasterPageView.prototype.createElement = function()
aTextFieldHandlerSet, 
sMasterSlideId );
 }
 }
-else if( sId.startsWith( aDateClassName ) )
-{
-this.initTextFieldHandler( sId, aPlaceholderShapeSet,
-   aTextFieldContentProviderSet, 
aDefsElement,
-   aTextFieldHandlerSet, 
sMasterSlideId );
-}
-else if( sId.startsWith( aTimeClassName ) )
+else if( sId.startsWith( aDateClass

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/qa

2021-01-20 Thread Marco Cecchetti (via logerrit)

 sd/qa/unit/SVGExportTests.cxx   |   32 ++--
 sd/qa/unit/data/odp/text-fields.odp |binary
 2 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit abfc973318a7432e0b95c232cf6c9326408f51d0
Author: Marco Cecchetti 
AuthorDate: Mon Jan 18 12:36:42 2021 +0100
Commit: Marco Cecchetti 
CommitDate: Wed Jan 20 11:05:20 2021 +0100

filter: svg: js engine: text fields support: unit test

Change-Id: I80a7e7906fb2a82d955562a137b208497d4c0d9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109543
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Marco Cecchetti 

diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 3ed2ab2de02d..ab9b55658f23 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -125,7 +125,7 @@ public:
 1);
 }
 
-void testSVGExporSlidetCustomBackground()
+void testSVGExportSlideCustomBackground()
 {
 executeExport("slide-custom-background.odp");
 
@@ -135,10 +135,38 @@ public:
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_DEFS ), "class", 
"SlideBackground");
 }
 
+void testSVGExportTextFieldsInMasterPage()
+{
+executeExport("text-fields.odp");
+
+xmlDocPtr svgDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(svgDoc);
+
+assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_DEFS[9]/SVG_G[2] ), 
"class", "Master_Slide");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2] ), "class", "BackgroundObjects");
+// Current Date Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4] ), "class", 
"com.sun.star.drawing.TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+// Current Time Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5] ), "class", 
"com.sun.star.drawing.TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+// Slide Name Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6] ), "class", 
"com.sun.star.drawing.TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+// Slide Number Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7] ), "class", 
"com.sun.star.drawing.TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+}
+
 CPPUNIT_TEST_SUITE(SdSVGFilterTest);
 CPPUNIT_TEST(testSVGExportTextDecorations);
 CPPUNIT_TEST(testSVGExportJavascriptURL);
-CPPUNIT_TEST(testSVGExporSlidetCustomBackground);
+CPPUNIT_TEST(testSVGExportSlideCustomBackground);
+CPPUNIT_TEST(testSVGExportTextFieldsInMasterPage);
 CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/sd/qa/unit/data/odp/text-fields.odp 
b/sd/qa/unit/data/odp/text-fields.odp
new file mode 100644
index ..3c5d057ba2f0
Binary files /dev/null and b/sd/qa/unit/data/odp/text-fields.odp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

2021-01-20 Thread Szymon Kłos (via logerrit)

 svx/source/tbxctrls/fontworkgallery.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 29c15be71f8c12e1116ef80d515fe3f734cd183f
Author: Szymon Kłos 
AuthorDate: Wed Jan 20 10:02:53 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 11:23:15 2021 +0100

Don't insert fontwork outside view

Change-Id: Ib518cc6c70e2595cc191cd353b628729fd220de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109665
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index edd3748400fb..e04978139236 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -200,10 +200,19 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
 // pNewObject->SetPage(nullptr);
 
 tools::Rectangle aObjRect( pNewObject->GetLogicRect() );
-tools::Rectangle aVisArea = 
pOutDev->PixelToLogic(tools::Rectangle(Point(0,0), 
pOutDev->GetOutputSizePixel()));
+Size aSize = pOutDev->GetOutputSizePixel();
+tools::Rectangle aVisArea = 
pOutDev->PixelToLogic(tools::Rectangle(Point(0,0), aSize));
+
 Point aPagePos = aVisArea.Center();
-aPagePos.AdjustX( -(aObjRect.GetWidth() / 2) );
-aPagePos.AdjustY( -(aObjRect.GetHeight() / 2) );
+bool bIsInsertedObjectSmallerThanVisibleArea =
+aVisArea.GetSize().getHeight() > 
aObjRect.GetSize().getHeight()
+&& aVisArea.GetSize().getWidth() > 
aObjRect.GetSize().getWidth();
+if (bIsInsertedObjectSmallerThanVisibleArea)
+{
+aPagePos.AdjustX( -(aObjRect.GetWidth() / 2) );
+aPagePos.AdjustY( -(aObjRect.GetHeight() / 2) );
+}
+
 tools::Rectangle aNewObjectRectangle(aPagePos, 
aObjRect.GetSize());
 pNewObject->SetLogicRect(aNewObjectRectangle);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/source/control/button.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 04e2aa34303424456b9db46ab1300eb103f40a03
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 09:16:06 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 11:23:38 2021 +0100

jsdialog: dump radio groups

Change-Id: I64bb8c7c87a2d4f054c3f2c8e5ac28812230cf70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109613
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f7bc3ba80f7f..5fd00612a1a5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2879,6 +2879,14 @@ void RadioButton::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
 {
 Button::DumpAsPropertyTree(rJsonWriter);
 rJsonWriter.put("checked", IsChecked());
+
+OUString sGroupId;
+std::vector> aGroup = GetRadioButtonGroup();
+for(auto& pButton : aGroup)
+sGroupId += pButton->get_id();
+
+if (!sGroupId.isEmpty())
+rJsonWriter.put("group", sGroupId);
 }
 
 FactoryFunction RadioButton::GetUITestFactory() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang UnoControls/source

2021-01-20 Thread Stephan Bergmann (via logerrit)

 UnoControls/source/inc/progressbar.hxx   |4 ++--
 compilerplugins/clang/compat.hxx |   14 ++
 compilerplugins/clang/doubleconvert.cxx  |   20 
 compilerplugins/clang/test/doubleconvert.cxx |3 +++
 4 files changed, 27 insertions(+), 14 deletions(-)

New commits:
commit 4b55847b81fa18d5bf2445c294b9260e98f365bc
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 08:02:19 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 20 11:27:33 2021 +0100

Improve loplugin:doubleconvert

(The use of isa_and_nonnull<> instead of isa<> is necessary for cases like

  return (i_styleSettings.*i_getDefaultColor)();

in lcl_getEffectiveColor, svtools/source/table/gridtablerenderer.cxx.)

Change-Id: Iffc59b1146dd4ce13bbd3c8a6f46bd3c78a39344
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109663
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/UnoControls/source/inc/progressbar.hxx 
b/UnoControls/source/inc/progressbar.hxx
index f327b453b19b..ef5eabe34781 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -30,8 +30,8 @@ namespace unocontrols {
 #define PROGRESSBAR_FREESPACE   4
 #define PROGRESSBAR_DEFAULT_HORIZONTAL  true
 #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION  Size(1,1)
-#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR sal_Int32(Color( 0xC0, 0xC0, 0xC0 
)) // lightgray
-#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR sal_Int32(Color( 0x00, 0x00, 0x80 
)) // blue
+#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR Color( 0xC0, 0xC0, 0xC0 ) // 
lightgray
+#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR Color( 0x00, 0x00, 0x80 ) // blue
 #define PROGRESSBAR_DEFAULT_MINRANGEINT_MIN
 #define PROGRESSBAR_DEFAULT_MAXRANGEINT_MAX
 #define PROGRESSBAR_DEFAULT_BLOCKVALUE  1
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index bf3abf60c941..ae7557b71956 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -20,12 +20,26 @@
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Lex/Lexer.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/Compiler.h"
 
 #include "config_clang.h"
 
 // Compatibility wrapper to abstract over (trivial) changes in the Clang API:
 namespace compat {
 
+// Copies code from LLVM's include/llvm/Support/Casting.h:
+template LLVM_NODISCARD inline bool 
isa_and_nonnull(Y const & Val) {
+#if CLANG_VERSION >= 9
+return llvm::isa_and_nonnull(Val);
+#else
+if (!Val) {
+return false;
+}
+return llvm::isa(Val);
+#endif
+}
+
 inline clang::SourceLocation getBeginLoc(clang::Decl const * decl) {
 #if CLANG_VERSION >= 8
 return decl->getBeginLoc();
diff --git a/compilerplugins/clang/doubleconvert.cxx 
b/compilerplugins/clang/doubleconvert.cxx
index 2dbff56ca30b..6a08ae376a95 100644
--- a/compilerplugins/clang/doubleconvert.cxx
+++ b/compilerplugins/clang/doubleconvert.cxx
@@ -28,7 +28,7 @@ public:
 }
 void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
-bool VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr const*);
+bool VisitCXXConstructExpr(CXXConstructExpr const*);
 };
 
 /**
@@ -48,13 +48,9 @@ public:
   `-ImplicitCastExpr 0x8e5b6e0 'const class Color' lvalue 
 `-DeclRefExpr 0x8e5b6b0 'class Color' lvalue Var 0x8e5b518 
'col1' 'class Color'
 */
-bool DoubleConvert::VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr 
const* materializetemp)
+bool DoubleConvert::VisitCXXConstructExpr(CXXConstructExpr const* cxxConstruct)
 {
-if (ignoreLocation(materializetemp))
-return true;
-auto cxxConstruct
-= 
dyn_cast(compat::getSubExpr(materializetemp)->IgnoreParenCasts());
-if (!cxxConstruct)
+if (ignoreLocation(cxxConstruct))
 return true;
 if (cxxConstruct->getNumArgs() == 0)
 return true;
@@ -62,21 +58,21 @@ bool 
DoubleConvert::VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr const
 = 
dyn_cast(cxxConstruct->getArg(0)->IgnoreParenCasts());
 if (!cxxMemberCallExpr)
 return true;
-if (!isa(cxxMemberCallExpr->getMethodDecl()))
+if 
(!compat::isa_and_nonnull(cxxMemberCallExpr->getMethodDecl()))
 return true;
-if (materializetemp->getType().getCanonicalType().getTypePtr()
+if (cxxConstruct->getType().getCanonicalType().getTypePtr()
 != cxxMemberCallExpr->getImplicitObjectArgument()
->getType()
.getCanonicalType()
.getTypePtr())
 return true;
-if (!loplugin::TypeCheck(materializetemp->getType().getCanonicalType())
+if (!loplugin::TypeCheck(cxxConstruct->getType().getCanonicalType())
  .Class("Color")
  .GlobalNamespace())
 return true;
 
-report(DiagnosticsEngine::Warning, "redun

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source

2021-01-20 Thread Pranam Lashkari (via logerrit)

 desktop/source/lib/init.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f7b31b02f2fe28f75d2a70c0261897aba4a7b72d
Author: Pranam Lashkari 
AuthorDate: Wed Jan 20 14:30:14 2021 +0530
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 11:29:56 2021 +0100

Do not skip cusor invalidation if hyperlink in payload

Change-Id: Iba08f9a52a282bdab890eeb4194222d0b576d64b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109664
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cad798a9be44..2f730cd3b930 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1424,7 +1424,9 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 
 // Suppress invalid payloads.
 if (type == LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
-payload.find(", 0, 0, ") != std::string::npos)
+payload.find(", 0, 0, ") != std::string::npos &&
+payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+payload.find("\"hyperlink\": {}") == std::string::npos)
 {
 // The cursor position is often the relative coordinates of the widget
 // issuing it, instead of the absolute one that we expect.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/postgresql RepositoryExternal.mk solenv/flatpak-manifest.in

2021-01-20 Thread Michael Stahl (via logerrit)

 RepositoryExternal.mk  |   22 ++-
 download.lst   |4 
 external/postgresql/ExternalPackage_postgresql.mk  |   16 ++
 external/postgresql/ExternalProject_postgresql.mk  |   16 +-
 external/postgresql/Module_postgresql.mk   |6 
 external/postgresql/UnpackedTarball_postgresql.mk  |   11 -
 external/postgresql/config.pl  |1 
 external/postgresql/internal-zlib.patch.1  |   29 
 external/postgresql/postgres-msvc-build.patch.1|  110 +
 external/postgresql/postgresql-9.2.1-libreoffice.patch |   74 ---
 external/postgresql/postgresql-libs-leak.patch |   40 --
 external/postgresql/postgresql.exit.patch.0|8 -
 solenv/flatpak-manifest.in |6 
 13 files changed, 168 insertions(+), 175 deletions(-)

New commits:
commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5
Author: Michael Stahl 
AuthorDate: Tue Jan 19 15:38:05 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 20 11:31:18 2021 +0100

postgresql: upgrade to release 13.1

Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant.

* --with-krb5 no longer exists, neither does --disable-shared
* remove internal-zlib.patch.1:
  zlib is only used by pg_* tools / contrib/pgcrypto
* remove postgresql-libs-leak.patch:
  some relic from pre-gbuild times, not clear what the point is for
  static libs
* remove postgresql-9.2.1-libreoffice.patch:
  another dmake .mk file relic, and the win32 nmake build system was
  removed
* add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl
* on WNT, libpq.dll is now built, no longer static lib

Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b525fb5b40be..3d9ca8da5551 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3052,7 +3052,7 @@ else # !SYSTEM_POSTGRESQL
 
 define gb_LinkTarget__use_postgresql
 
-$(call gb_LinkTarget_use_external_project,$(1),postgresql)
+$(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
 
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \
@@ -3060,19 +3060,25 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   postgresql \
+))
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
 )
 
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_use_external,$(1),openssl)
+else # WNT
 
-$(call gb_LinkTarget_use_system_win32_libs,$(1),\
-   secur32 \
-   ws2_32 \
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
-endif
+endif # WNT
 
 endef
 
diff --git a/download.lst b/download.lst
index c2e11b17c695..f41dc56f77df 100644
--- a/download.lst
+++ b/download.lst
@@ -220,8 +220,8 @@ export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201f
 export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
 export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
-export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
-export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
+export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
+export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
 export PYTHON_SHA256SUM := 
5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37
 export PYTHON_TARBALL := Python-3.8.4.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
diff --git a/external/postgresql/ExternalPackage_postgresql.mk 
b/external/postgresql/ExternalPackage_postgresql.mk
new file mode 100644
index ..ada8c4f38eba
--- /dev/null
+++ b/external/postgresql/ExternalPackage_postgresql.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You c

[Libreoffice-commits] core.git: connectivity/README

2021-01-20 Thread Michael Stahl (via logerrit)

 connectivity/README |   20 
 1 file changed, 20 insertions(+)

New commits:
commit cc67a25886594e9009fa49418e106ea4ec40dd18
Author: Michael Stahl 
AuthorDate: Wed Jan 20 11:29:36 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 20 11:32:34 2021 +0100

connectivity: document how to test postgresql manually

Change-Id: I16f091b35a8246cb43842a6b864ba6061013ea7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109695
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/connectivity/README b/connectivity/README
index ebae354523ca..40525a57 100644
--- a/connectivity/README
+++ b/connectivity/README
@@ -2,6 +2,26 @@ Contains database pieces, drivers, etc.
 
 [[dbaccess]] builds UI on top of this.
 
+=== PostgreSQL ===
+
+For testing, use:
+
+podman pull postgres:latest
+podman run --name=postgres -e POSTGRES_PASSWORD=foobarbaz -p 
127.0.0.1:5432:5432 postgres:latest
+
+In Base, Connect to an existing database, select PostgreSQL:
+
+URL: host=127.0.0.1 port=5432 dbname=postgres
+User: postgres
+Password: foobarbaz
+
+podman stop postgres
+podman rm postgres
+
+In order to test SCRAM authentication, create the container like this:
+
+podman run --name=postgres -e POSTGRES_PASSWORD=foobarbaz -e 
POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 -e 
POSTGRES_HOST_AUTH_METHOD=scram-sha-256 -p 127.0.0.1:5432:5432 postgres:latest
+
 === mysql_test ===
 
 - The CppunitTest_mysql_test unit test can be used to test the mysqlc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa sw/source

2021-01-20 Thread László Németh (via logerrit)

 sw/qa/extras/uiwriter/uiwriter2.cxx   |   41 +++--
 sw/source/core/doc/DocumentRedlineManager.cxx |   42 ++
 sw/source/core/inc/DocumentRedlineManager.hxx |3 +
 sw/source/core/view/viewsh.cxx|8 
 4 files changed, 91 insertions(+), 3 deletions(-)

New commits:
commit 644f9abce55878e27292451b9b2c8d3b6e11104e
Author: László Németh 
AuthorDate: Mon Jan 18 10:10:24 2021 +0100
Commit: László Németh 
CommitDate: Wed Jan 20 11:54:24 2021 +0100

tdf#138666 sw: fix enable/disable of ChangesInMargin mode

by hiding/showing the existing deletions inline.

Change-Id: I643c23b3008c3d58bd4631aa40bec375d811bd5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109555
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 83b119fe0fed..7d24e652d694 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2150,12 +2150,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137771)
 xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
 CPPUNIT_ASSERT(pXmlDoc);
 
-// This was 12 (missing vertical redline mark)
-assertXPath(pXmlDoc, "/metafile/push/push/push/line", 13);
+// This would be 5 without the new vertical redline mark
+assertXPath(pXmlDoc, "/metafile/push/push/push/line", 6);
 
 // This was the content of the next  (missing deletion on margin)
 // or only the first character of the deleted character sequence
-assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[16]/text", 
" saved.");
+assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[9]/text", 
" saved.");
 
 // this would crash due to bad redline range
 for (int i = 0; i < 6; ++i)
@@ -2362,6 +2362,41 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138479)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138666)
+{
+SwDoc* pDoc = createDoc("tdf39721.fodt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+//turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// show deletions inline
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum"), 
getParagraph(1)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("dolor sit"), getParagraph(2)->getString());
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+// show deletions in margin
+CPPUNIT_ASSERT_EQUAL(OUString("Loremm"), getParagraph(1)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("dolsit"), getParagraph(2)->getString());
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+// show deletions inline again
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum"), 
getParagraph(1)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("dolor sit"), getParagraph(2)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf126206)
 {
 load(DATA_DIRECTORY, "tdf126206.docx");
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index af078b52e985..b6b06e157b42 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -3289,6 +3289,48 @@ void 
DocumentRedlineManager::SetAutoFormatRedlineComment( const OUString* pText,
 mnAutoFormatRedlnCommentNo = nSeqNo;
 }
 
+void DocumentRedlineManager::HideAll( bool bDeletion )
+{
+const SwRedlineTable& rTable = GetRedlineTable();
+for (SwRedlineTable::size_type i = rTable.size(); i > 0; --i)
+{
+SwRangeRedline* pRedline = rTable[i-1];
+if ( pRedline->GetType() == RedlineType::Delete &&
+ pRedline->IsVisible() )
+{
+pRedline->Hide(0, rTable.GetPos(pRedline), false);
+pRedline->Hide(1, rTable.GetPos(pRedline), false);
+}
+else if ( pRedline->GetType() == RedlineType::Insert )
+{
+if ( !bDeletion && pRedline->IsVisible() )
+{
+pRedline->ShowOriginal(0, rTable.GetPos(pRedline), false);
+pRedline->ShowOriginal(1, rTable.GetPos(pRedline), false);
+}
+else if ( bDeletion && !pRedline->IsVisible() )
+{
+pRedline->Sh

[Libreoffice-commits] core.git: download.lst external/skia vcl/skia

2021-01-20 Thread Luboš Luňák (via logerrit)

 download.lst  |4 +-
 external/skia/Library_skia.mk |   22 +--
 external/skia/UnpackedTarball_skia.mk |2 -
 external/skia/fix-pch.patch.1 |   20 +-
 external/skia/fix-warnings.patch.1|   28 ++
 external/skia/fontconfig-get-typeface.patch.0 |   50 +++---
 external/skia/inc/pch/precompiled_skia.hxx|   43 +++---
 external/skia/lerp.patch  |   12 --
 vcl/skia/SkiaHelper.cxx   |3 +
 vcl/skia/gdiimpl.cxx  |3 +
 vcl/skia/salbmp.cxx   |4 +-
 11 files changed, 124 insertions(+), 67 deletions(-)

New commits:
commit 2cf9b8e265e9694803f55e30f2f392abfa512a5a
Author: Luboš Luňák 
AuthorDate: Mon Jan 18 19:38:03 2021 +0100
Commit: Luboš Luňák 
CommitDate: Wed Jan 20 11:55:23 2021 +0100

update Skia to chrome/m89

Change-Id: I82517728139a4b270d98e2694f2a21b248c80d4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109568
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/download.lst b/download.lst
index f41dc56f77df..36856cd70c6a 100644
--- a/download.lst
+++ b/download.lst
@@ -241,8 +241,8 @@ export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 
f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
-export SKIA_TARBALL := skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+export SKIA_SHA256SUM := 
da6d48be42db008bcbc6f086b88b423e9864601ad30adb1b7a66a927d7568680
+export SKIA_TARBALL := skia-m89-15595ea39c4442ded546ba36ef63a521240bc0f4.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
 export STAROFFICE_VERSION_MICRO := 7
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 87ae0c64552f..8c805fd787dd 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -137,7 +137,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkBBHFactory \
 UnpackedTarball/skia/src/core/SkBigPicture \
 UnpackedTarball/skia/src/core/SkBitmapCache \
-UnpackedTarball/skia/src/core/SkBitmapController \
 UnpackedTarball/skia/src/core/SkBitmap \
 UnpackedTarball/skia/src/core/SkBitmapDevice \
 UnpackedTarball/skia/src/core/SkBitmapProcState \
@@ -230,8 +229,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkMD5 \
 UnpackedTarball/skia/src/core/SkMiniRecorder \
 UnpackedTarball/skia/src/core/SkMipmap \
+UnpackedTarball/skia/src/core/SkMipmapAccessor \
 UnpackedTarball/skia/src/core/SkModeColorFilter \
 UnpackedTarball/skia/src/core/SkOpts \
+UnpackedTarball/skia/src/core/SkOpts_erms \
 UnpackedTarball/skia/src/core/SkOverdrawCanvas \
 UnpackedTarball/skia/src/core/SkPaint \
 UnpackedTarball/skia/src/core/SkPaintPriv \
@@ -273,7 +274,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkRRect \
 UnpackedTarball/skia/src/core/SkRTree \
 UnpackedTarball/skia/src/core/SkRuntimeEffect \
-UnpackedTarball/skia/src/core/SkRWBuffer \
 UnpackedTarball/skia/src/core/SkScalar \
 UnpackedTarball/skia/src/core/SkScalerCache \
 UnpackedTarball/skia/src/core/SkScalerContext \
@@ -323,7 +323,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkXfermodeInterpretation \
 UnpackedTarball/skia/src/core/SkYUVAInfo \
 UnpackedTarball/skia/src/core/SkYUVAPixmaps \
-UnpackedTarball/skia/src/core/SkYUVASizeInfo \
 UnpackedTarball/skia/src/core/SkYUVMath \
 UnpackedTarball/skia/src/core/SkYUVPlanesCache \
 UnpackedTarball/skia/src/c/sk_effects \
@@ -429,6 +428,11 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/shaders/SkPerlinNoiseShader \
 UnpackedTarball/skia/src/shaders/SkPictureShader \
 UnpackedTarball/skia/src/shaders/SkShader \
+UnpackedTarball/skia/src/sksl/dsl/DSLCore \
+UnpackedTarball/skia/src/sksl/dsl/DSLExpression \
+UnpackedTarball/skia/src/sksl/dsl/DSLType \
+UnpackedTarball/skia/src/sksl/dsl/DSLVar \
+UnpackedTarball/skia/src/sksl/dsl/priv/DSLWriter \
 UnpackedTarball/skia/src/sksl/ir/SkSLConstructor \
 UnpackedTarball/skia/src/sksl/ir/SkSLPrefixExpression \
 UnpackedTarball/skia/src/sksl/ir/SkSLSetting \
@@ -441,6 +445,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\

[Libreoffice-commits] core.git: canvas/source

2021-01-20 Thread Tarun Sharma (via logerrit)

 canvas/source/directx/dx_surfacebitmap.cxx   |   10 +-
 canvas/source/directx/dx_surfacegraphics.cxx |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3ff95c8df6be9aa01aef5c663ee2ffa9881193d4
Author: Tarun Sharma 
AuthorDate: Thu Jan 14 10:16:35 2021 +0530
Commit: Michael Stahl 
CommitDate: Wed Jan 20 12:02:53 2021 +0100

tdf#42982: Improve UNO API error reporting

Change-Id: Ida34f9428d342cbe7f89f7bf40688c71cdba30c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109299
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/canvas/source/directx/dx_surfacebitmap.cxx 
b/canvas/source/directx/dx_surfacebitmap.cxx
index 0d23674ca91b..a118b31db2d8 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -526,7 +526,7 @@ namespace dxcanvas
   // 
getMemoryLayout
 &aBmpData ) )
 {
-throw uno::RuntimeException();
+throw uno::RuntimeException("GDIPlus method call was 
unsuccessful, problem with locking bitmap aRect object");
 }
 
 // commit data to bitmap
@@ -540,7 +540,7 @@ namespace dxcanvas
 // lock the directx surface to receive the pointer to the surface 
memory.
 D3DLOCKED_RECT aLockedRect;
 
if(FAILED(mpSurface->LockRect(&aLockedRect,nullptr,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
-throw uno::RuntimeException();
+throw uno::RuntimeException("failed to lock direcrx surface to 
surface memory");
 
 sal_uInt8 const *pSrc = reinterpret_cast(data.getConstArray());
 sal_uInt8 *pDst = (static_cast(aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1;
@@ -580,7 +580,7 @@ namespace dxcanvas
 if( Gdiplus::Ok != mpGDIPlusBitmap->SetPixel( pos.X, pos.Y,
 Gdiplus::Color( 
tools::sequenceToArgb( color 
 {
-throw uno::RuntimeException();
+throw uno::RuntimeException("Problem with setting the color of 
bitmap object");
 }
 }
 else
@@ -597,7 +597,7 @@ namespace dxcanvas
 // lock the directx surface to receive the pointer to the surface 
memory.
 D3DLOCKED_RECT aLockedRect;
 
if(FAILED(mpSurface->LockRect(&aLockedRect,nullptr,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
-throw uno::RuntimeException();
+throw uno::RuntimeException("cannot lock the directx surface 
to surface memory");
 
 sal_uInt32 *pDst = reinterpret_cast((static_cast(aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X);
 *pDst = aColor.GetValue();
@@ -640,7 +640,7 @@ namespace dxcanvas
 // lock the directx surface to receive the pointer to the surface 
memory.
 D3DLOCKED_RECT aLockedRect;
 
if(FAILED(mpSurface->LockRect(&aLockedRect,nullptr,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
-throw uno::RuntimeException();
+throw uno::RuntimeException("failed to lock directX surface to 
surface memory");
 
 sal_uInt32 *pDst = reinterpret_cast((static_cast(aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X);
 Gdiplus::Color aColor(*pDst);
diff --git a/canvas/source/directx/dx_surfacegraphics.cxx 
b/canvas/source/directx/dx_surfacegraphics.cxx
index c4f03e9db6ec..a496b41017dd 100644
--- a/canvas/source/directx/dx_surfacegraphics.cxx
+++ b/canvas/source/directx/dx_surfacegraphics.cxx
@@ -70,7 +70,7 @@ namespace dxcanvas
 rSurface->ReleaseDC( aHDC );
 }
 
-throw uno::RuntimeException();
+throw uno::RuntimeException("could not get the DC to rSurface");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sd/qa

2021-01-20 Thread Mark Hung (via logerrit)

 oox/source/ppt/timenode.cxx |   57 ++--
 sd/qa/unit/data/pptx/tdf128550.pptx |binary
 sd/qa/unit/export-tests.cxx |   14 
 3 files changed, 63 insertions(+), 8 deletions(-)

New commits:
commit 9b19bf0283b569a5c134de6b5cce1d72d8f37879
Author: Mark Hung 
AuthorDate: Sat Jan 16 23:48:56 2021 +0800
Commit: Mark Hung 
CommitDate: Wed Jan 20 12:14:21 2021 +0100

tdf#128550 set sub item on the ancestor node.

The target of a animation node may resolved to
a subitem. However it only has effect on a
iterate container or animate node, not on any
other containers. Subitem setting like background
and paragraph got ignored, so everything were shown
together.  The patch find the ancestor node
that is iterate container or animate, and set
the subitem on it.

Change-Id: Iaaa52aed3a34eb2d70b3b318b8336246e17e1e98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109444
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 3e08a6716d74..132c54b79f4a 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -51,8 +51,37 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::presentation;
 
-namespace oox::ppt {
+namespace {
+
+void lcl_setAncestorSubItem( const Reference& xParent, 
sal_Int16 nSubItem )
+{
+
+Reference xNode = xParent;
+
+while ( xNode.is() )
+{
+if ( xNode->getType() == AnimationNodeType::ANIMATE )
+{
+Reference xAnimate( xNode, UNO_QUERY );
+if ( xAnimate.is() )
+xAnimate->setSubItem( nSubItem );
+break;
+}
+else if ( xNode->getType() == AnimationNodeType::ITERATE )
+{
+Reference xIterateContainer( xNode, UNO_QUERY );
+if ( xIterateContainer.is() )
+xIterateContainer->setSubItem( nSubItem );
+break;
+}
+
+xNode.set( xNode->getParent(), UNO_QUERY );
+}
+}
+
+}
 
+namespace oox::ppt {
 OUString TimeNode::getServiceName( sal_Int16 nNodeType )
 {
 OUString sServiceName;
@@ -225,11 +254,17 @@ namespace oox::ppt {
 
 if( mpTarget )
 {
-sal_Int16 nSubType(0);
-maNodeProperties[ NP_TARGET ] = mpTarget->convert( pSlide, 
nSubType );
+sal_Int16 nSubItem(0);
+maNodeProperties[ NP_TARGET ] = mpTarget->convert( pSlide, 
nSubItem );
 if( mpTarget->mnType == XML_spTgt )
 {
-maNodeProperties[ NP_SUBITEM ] <<= nSubType;
+if ( xNode->getType() == AnimationNodeType::ANIMATE ||
+xNode->getType() == AnimationNodeType::ITERATE )
+{
+maNodeProperties[ NP_SUBITEM ] <<= nSubItem;
+}
+else
+lcl_setAncestorSubItem( xParent, nSubItem );
 }
 }
 
@@ -320,15 +355,21 @@ namespace oox::ppt {
 }
 break;
 case NP_SUBITEM:
-if( xAnimate.is() )
+if( aValue >>= nInt16 )
 {
-if( aValue >>= nInt16 )
+if( xAnimate.is() )
+{
 xAnimate->setSubItem( nInt16 );
-else
+}
+else if ( xIterateContainer.is() )
 {
-SAL_INFO("oox.ppt","any >>= failed " << 
__LINE__ );
+xIterateContainer->setSubItem( nInt16 );
 }
 }
+else
+{
+SAL_INFO("oox.ppt","any >>= failed " << __LINE__ );
+}
 break;
 case NP_ATTRIBUTENAME:
 if( xAnimate.is() )
diff --git a/sd/qa/unit/data/pptx/tdf128550.pptx 
b/sd/qa/unit/data/pptx/tdf128550.pptx
new file mode 100755
index ..e2be342b2e51
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf128550.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 56227498f2e5..e101731d0238 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -80,6 +80,7 @@ public:
 void testSoftEdges();
 void testShadowBlur();
 void testRhbz1870501();
+void testTdf128550();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
 
@@ -118,6 +119,7 @@ public:
 CPPUNIT_TEST(testSoftEdges);
 CPPUNIT_TEST(testShadowBlur);
 CPPUNIT_TEST(testRhbz1870501);

Re: Calc memory consumption

2021-01-20 Thread Daniel A. Rodriguez

 Well, trying to do something with such file using an i3 based PC with 4Gb
freezes the software completely. However, an i7 with 16Gb handles it well.
The idea is to find a common ground in between to prevent with hardware.

El mié., 20 de enero de 2021 02:56, Tor Lillqvist  escribió:

>
>> Hi, exists some kind of formula to estimate how much RAM a spreadsheet
>> could use? For instance 468K rows and columns from A to AG.
>>
>
> Why do you need to know? And why is the amount of RAM interesting and not
> the amount of virtual memory required?
>
> --tml
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-1-0' - it_IT/it_IT.dic

2021-01-20 Thread Rene Engelhard (via logerrit)

 it_IT/it_IT.dic | 4886 
 1 file changed, 2443 insertions(+), 2443 deletions(-)

New commits:
commit 625cc9846854ed05246a007a24095b580eebf8cf
Author: Rene Engelhard 
AuthorDate: Fri Jan 15 09:44:21 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 20 12:17:12 2021 +0100

deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109332
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Michael Stahl 
Tested-by: René Engelhard 

diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic
index 394734e..c5ed82b 100644
--- a/it_IT/it_IT.dic
+++ b/it_IT/it_IT.dic
@@ -38,7 +38,7 @@ ab
 abaco/OTqr
 Abacuc
 abadessa/QTUqrs
-abaliet�/TU
+abalietà/TU
 abanese/STUqrs
 Abano/Tqr
 abarica/QTU
@@ -157,7 +157,7 @@ abbicare/ALKhlTXI
 abbicata/QTU
 abbicato/EyT
 abbicatura/QTUqs
-abbicc�/Tq
+abbiccì/Tq
 abbiente/STUqrs
 abbietta/QTU
 abbietto/OTYW
@@ -399,7 +399,7 @@ abilitata/QTU
 abilitativa/QTU
 abilitativo/OT
 abilitato/EyT
-abilit�/TUqs
+abilità/TUqs
 abilitazione/STUqs
 abiogenesi/Tq
 abiogenetica/QTU
@@ -413,7 +413,7 @@ Abissinia/TUqrs
 abissino/OTqr
 abisso/OTqr
 abitabile/STU
-abitabilit�/TUqs
+abitabilità/TUqs
 abitacolo/OTq
 abitando/D
 abitante/STUqrs
@@ -428,13 +428,13 @@ abitazione/STUqs
 abitino/OTq
 abito/OTq
 abituale/SYTU
-abitualit�/TUqs
+abitualità/TUqs
 abituando/D
 abituare/ALKhlTXI
 abituata/QTU
 abituato/EyT
 abitudinaria/QTUqrs
-abitudinariet�/TUqs
+abitudinarietà/TUqs
 abitudinario/OTYqr
 abitudine/STUqs
 abituro/OTq
@@ -507,7 +507,7 @@ Abramo/T^
 abrasero
 abrasione/STUqrs
 abrasiva/QTUqrs
-abrasivit�/TUqs
+abrasività/TUqs
 abrasivo/OTqr
 abraso/oT
 abreazione/STUqs
@@ -545,11 +545,11 @@ abusata/QTU
 abusato/EyT
 abusiva/QTUqrs
 abusivismo/OTq
-abusivit�/Tqs
+abusività/Tqs
 abusivo/OTYWqr
 abuso/OTq
 acacia/QTUqs
-acagi�/T
+acagiù/T
 acantacea/QTUqrs
 acantocefalo/OTq
 acanto/OTqr
@@ -591,7 +591,7 @@ accadimento/OTq
 accado/OTq
 accadrai
 accadranno/X
-accadr�/X
+accadrà/X
 accadrebbero
 accadrebbe/X
 accadrei
@@ -600,7 +600,7 @@ accadremo
 accadreste
 accadresti
 accadrete
-accadr�
+accadrò
 accaduta/QTU
 accaduto/EyT
 accagliamento/OTq
@@ -840,7 +840,7 @@ accerchiata/QTU
 accerchiato/EyT
 accerchiatura/QTUqs
 accertabile/STU
-accertabilit�/TUqs
+accertabilità/TUqs
 accertamento/OTq
 accertando/DJ
 accertare/ALKhlJTXI
@@ -853,7 +853,7 @@ accesissima/QTU
 accesissimo/OT
 acceso/OYT
 accessibile/STU
-accessibilit�/TUqs
+accessibilità/TUqs
 accessione/STUqrs
 accesso/OTqr
 accessoriabile/STU
@@ -862,7 +862,7 @@ accessoria/QTU
 accessoriare/ALKhlTXI
 accessoriata/QTU
 accessoriato/EyT
-accessoriet�/TUqs
+accessorietà/TUqs
 accessorio/OTqY
 accessorista/QRTUqrs
 accessuale/SYTU
@@ -874,7 +874,7 @@ accestito/OT
 accettabile/SYTU
 accettabilissima/QTU
 accettabilissimo/OT
-accettabilit�/TUqs
+accettabilità/TUqs
 accettando/DJ
 accettante/STUqrs
 accetta/QTUqs
@@ -945,7 +945,7 @@ acciarpata/QTU
 acciarpato/EyT
 accidempoli/Tqr
 accidentale/STUYq
-accidentalit�/TUqs
+accidentalità/TUqs
 accidentata/QTU
 accidentato/OT
 accidente/STUqrs
@@ -968,7 +968,7 @@ accinsero/T
 accinse/STUqrs
 accinta/QTU
 accinto/OT
-acciocch�/Tqr
+acciocché/Tqr
 acciottolando/D
 acciottolare/ALKhlTXI
 acciottolata/QTU
@@ -1016,7 +1016,7 @@ acclimatrice/STUqrs
 acclimazione/STUqs
 accline/STUqrs
 acclive/STUqrs
-acclivit�/TUqs
+acclività/TUqs
 accludendo/D
 accludere/BTXI
 acclusa/QTU
@@ -1301,7 +1301,7 @@ accuratezza/QTUqrs
 accurato/OTWYqr
 Accursio/T^
 accusabile/STU
-accusabilit�/TUqs
+accusabilità/TUqs
 accusando/D
 accusa/QTUqs
 accusare/ALKhlTXI
@@ -1323,7 +1323,7 @@ acerba/QTUqrs
 acerbezza/QTUqs
 acerbissima/QTU
 acerbissimo/OT
-acerbit�/TUqs
+acerbità/TUqs
 acerbo/OTY
 Acerenza
 acereta/QTUqs
@@ -1385,7 +1385,7 @@ acetonuria/QTUqs
 aceto/OTq
 acetosa/QTUqs
 acetosella/QTUqs
-acetosit�/TUqs
+acetosità/TUqs
 acetoso/OT
 ace/TUq
 achea/QTUqrs
@@ -1408,7 +1408,7 @@ achiria/QTUqs
 Aci
 aciatici/Tqr
 aciclica/QTU
-aciclicit�/TU
+aciclicità/TU
 aciclico/nT
 acicolare/STU
 acicula/QTUqs
@@ -1423,7 +1423,7 @@ acidificata/QTU
 acidificato/EyT
 acidificazione/STUqs
 acidimetria/QTUqrs
-acidit�/TUqs
+acidità/TUqs
 acidofila/QTU
 acidofilo/OT
 acidolisi/TUqs
@@ -1471,12 +1471,12 @@ acneico/nT
 acne/STUq
 acolia/QTUqs
 aconcettuale/STUqrs
-aconcettualit�/TUqs
+aconcettualità/TUqs
 acondroplasia/QTUqs
 acondroplasica/QTUqrs
 acondroplasico/nTqr
 aconfessionale/STUqrs
-aconfessionalit�/TUqs
+aconfessionalità/TUqs
 aconitina/QTUq
 aconito/OTq
 aconzio/OTqs
@@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs
 Acquasparta
 acquata/QTUqrs
 acquatica/QTU
-acquaticit�/TUqs
+acquaticità/TUqs
 acquatico/nTq
 acquatile/STU
 acquatinta/TUqs
@@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs
 acquitrinoso/OTqr
 acquolina/QTUqrs
 acquosa/QTUqrs
-acquosit�/

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-0' - dictionaries

2021-01-20 Thread Rene Engelhard (via logerrit)

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf4942e06c39ec21cbe18f42bb51c6459a1bd2f5
Author: Rene Engelhard 
AuthorDate: Wed Jan 20 12:17:12 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 20 12:17:12 2021 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-7-1-0'
  to 625cc9846854ed05246a007a24095b580eebf8cf
  - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8

since that is what .aff is anyway/.aff specifies.
Otherwise it doesn't work.

Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109332
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Michael Stahl 
Tested-by: René Engelhard 

diff --git a/dictionaries b/dictionaries
index 50086014570f..625cc9846854 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 50086014570f7f1bc612a8c5eb5aa08227878a4f
+Subproject commit 625cc9846854ed05246a007a24095b580eebf8cf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

2021-01-20 Thread Justin Luth (via logerrit)

 sw/source/uibase/dbui/dbtree.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ebdf896c9d3260b544ebe67ffa09d21be603d170
Author: Justin Luth 
AuthorDate: Wed Jan 13 21:27:56 2021 +0300
Commit: Michael Stahl 
CommitDate: Wed Jan 20 12:17:28 2021 +0100

tdf#119610 tdf#112634: Don't show broken connections - RevB

This changes LO 6.0 commit 75a881829f19439245cdb859fc16d59461992f79
to use a light-weight check to see if a database exists.

The previous way made a connection, which is extremely
expensive if there is a password, or if network traffic
needs to timeout, etc. And if there are multiple
registered databases like that...

Change-Id: I980cb6979cfc7cae8f1251f3459718192459aaee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109242
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 647c9de0338350c1b5eff4b9adf08bd06930e36b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109402
Reviewed-by: Xisco Fauli 
(cherry picked from commit 6c580008d397f5f5f4a0bfd879308018b5d2a54f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109582
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index cf31941c31db..f9ffad0f26ab 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -157,8 +157,10 @@ void SwDBTreeList::InitTreeList()
 OUString aImg(RID_BMP_DB);
 for (const OUString& rDBName : std::as_const(aDBNames))
 {
-Reference xConnection = pImpl->GetConnection(rDBName);
-if (xConnection.is())
+// If this database has a password or a (missing) remote connection,
+// then it might take a long time or spam for unnecessary credentials.
+// Just check that it basically exists to weed out any broken/obsolete 
registrations.
+if (SwDBManager::getDataSourceAsParent(Reference(), 
rDBName).is())
 {
 m_xTreeView->insert(nullptr, -1, &rDBName, nullptr, nullptr, 
nullptr, &aImg, true, nullptr);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa sw/source

2021-01-20 Thread Attila Bakos (NISZ) (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf131540.odt  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |9 +
 sw/source/filter/ww8/docxattributeoutput.cxx |8 +++-
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit eedf45f6b18e3466caf72f7ee56856e4aae11cf6
Author: Attila Bakos (NISZ) 
AuthorDate: Thu Jan 7 13:46:43 2021 +0100
Commit: László Németh 
CommitDate: Wed Jan 20 12:18:36 2021 +0100

tdf#131540 DOCX export: fix OLE position in v:shape

If the OLE icon was anchored to page, it moved a bit,
because exporting mso-position-horizontal-relative:text
instead of mso-position-horizontal-relative:page in v:shape.

Change-Id: I4eb7bdd648a9b9b6aee48782a0086e82cfc55107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108938
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf131540.odt 
b/sw/qa/extras/ooxmlexport/data/tdf131540.odt
new file mode 100755
index ..541ab2093156
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf131540.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index b363d261fbf7..997bf888e403 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -46,6 +46,15 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf123621, 
"tdf123621.docx")
 "/wp:positionV/wp:posOffset", "1080135");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf131540, "tdf131540.odt")
+{
+// There are 2 OLEs test if one of them moved on save:
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The shape1 moved on saving!", 
text::RelOrientation::PAGE_FRAME,
+ getProperty(getShape(1), 
"HoriOrientRelation"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The shape2 moved on saving!", 
text::RelOrientation::PAGE_FRAME,
+ getProperty(getShape(2), 
"HoriOrientRelation"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf131801, "tdf131801.docx")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 991f6335539b..1808db7a3369 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5848,8 +5848,14 @@ OString DocxAttributeOutput::GetOLEStyle(const 
SwFlyFrameFormat& rFormat, const
 //Get the vertical alignment of the OLE via the frame format to aVAlign
 OString aVAlign = 
convertToOOXMLVertOrient(rFormat.GetVertOrient().GetVertOrient());
 
+// Check if the OLE anchored to page:
+const bool bIsPageAnchor = rFormat.GetAnchor().GetAnchorId() == 
RndStdIds::FLY_AT_PAGE;
+
 //Get the relative horizontal positions for the anchors
-OString aHAnch = 
convertToOOXMLHoriOrientRel(rFormat.GetHoriOrient().GetRelationOrient());
+OString aHAnch
+= bIsPageAnchor
+  ? OString("page")
+  : 
convertToOOXMLHoriOrientRel(rFormat.GetHoriOrient().GetRelationOrient());
 //Get the relative vertical positions for the anchors
 OString aVAnch = 
convertToOOXMLVertOrientRel(rFormat.GetVertOrient().GetRelationOrient());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Package_gallbullets.mk extras/source

2021-01-20 Thread Andreas Kainz (via logerrit)

 extras/Package_gallbullets.mk |  117 +++---
 extras/source/gallery/bullets/Bullet01-Circle-DarkRed.svg |1 
 extras/source/gallery/bullets/Bullet02-Circle-Blue.svg|1 
 extras/source/gallery/bullets/Bullet03-Circle-Green.svg   |1 
 extras/source/gallery/bullets/Bullet04-Square-Black.svg   |1 
 extras/source/gallery/bullets/Bullet05-Square-Orange.svg  |1 
 extras/source/gallery/bullets/Bullet06-Square-Purple.svg  |1 
 extras/source/gallery/bullets/Bullet07-Diamond-Blue.svg   |1 
 extras/source/gallery/bullets/Bullet08-Diamond-LightBlue.svg  |1 
 extras/source/gallery/bullets/Bullet09-Diamond-Red.svg|1 
 extras/source/gallery/bullets/Bullet10-Star-Yellow.svg|1 
 extras/source/gallery/bullets/Bullet11-Star-Blue.svg  |1 
 extras/source/gallery/bullets/Bullet12-Triangle-Blue.svg  |1 
 extras/source/gallery/bullets/Bullet13-Triangle-DarkGreen.svg |1 
 extras/source/gallery/bullets/Bullet14-Arrow-Red.svg  |1 
 extras/source/gallery/bullets/Bullet15-Arrow-Blue.svg |1 
 extras/source/gallery/bullets/Bullet16-Box-Blue.svg   |1 
 extras/source/gallery/bullets/Bullet17-Box-Red.svg|1 
 extras/source/gallery/bullets/Bullet18-Asterisk-LightBlue.svg |1 
 extras/source/gallery/bullets/Bullet19-Leaves-Red.svg |1 
 extras/source/gallery/bullets/Bullet20-Target-Blue.svg|1 
 extras/source/gallery/bullets/Bullet21-Arrow-Blue.svg |1 
 extras/source/gallery/bullets/Bullet22-Arrow-DarkBlue.svg |1 
 extras/source/gallery/bullets/Bullet23-Arrow-Brown.svg|1 
 extras/source/gallery/bullets/Bullet24-Flag-Red.svg   |1 
 extras/source/gallery/bullets/Bullet25-Flag-Green.svg |1 
 extras/source/gallery/bullets/Bullet26-X-Red.svg  |1 
 extras/source/gallery/bullets/Bullet27-X-Black.svg|1 
 extras/source/gallery/bullets/Bullet28-Checkmark-Green.svg|1 
 extras/source/gallery/bullets/Bullet29-Checkmark-Blue.svg |1 
 extras/source/gallery/bullets/Bullet30-Square-DarkRed.svg |1 
 extras/source/gallery/bullets/blkpearl.gif|binary
 extras/source/gallery/bullets/bluarrow.gif|binary
 extras/source/gallery/bullets/bluball.gif |binary
 extras/source/gallery/bullets/bludiamd.gif|binary
 extras/source/gallery/bullets/bluered.gif |binary
 extras/source/gallery/bullets/blusqare.gif|binary
 extras/source/gallery/bullets/blustar.gif |binary
 extras/source/gallery/bullets/check.svg   |1 
 extras/source/gallery/bullets/circle-blue.svg |1 
 extras/source/gallery/bullets/circle-green.svg|1 
 extras/source/gallery/bullets/circle-yellow.svg   |1 
 extras/source/gallery/bullets/circle.svg  |1 
 extras/source/gallery/bullets/coffee_1.gif|binary
 extras/source/gallery/bullets/coffee_2.gif|binary
 extras/source/gallery/bullets/coffee_3.gif|binary
 extras/source/gallery/bullets/coffee_4.gif|binary
 extras/source/gallery/bullets/coffee_5.gif|binary
 extras/source/gallery/bullets/con-blue.gif|binary
 extras/source/gallery/bullets/con-cyan.gif|binary
 extras/source/gallery/bullets/con-green.gif   |binary
 extras/source/gallery/bullets/con-lilac.gif   |binary
 extras/source/gallery/bullets/con-oran.gif|binary
 extras/source/gallery/bullets/con-pink.gif|binary
 extras/source/gallery/bullets/con-red.gif |binary
 extras/source/gallery/bullets/con-yellow.gif  |binary
 extras/source/gallery/bullets/corner_1.gif|binary
 extras/source/gallery/bullets/corner_2.gif|binary
 extras/source/gallery/bullets/corner_3.gif|binary
 extras/source/gallery/bullets/corner_4.gif|binary
 extras/source/gallery/bullets/cross-red.svg   |   77 --
 extras/source/gallery/bullets/cross.svg   |1 
 extras/source/gallery/bullets/darkball.gif|binary
 extras/source/gallery/bullets/darkblue.gif|binary
 extras/source/gallery/bullets/flag-blue.svg   |1 
 extras/source/gallery/bullets/flag-green.svg  |1 
 extras/source/gallery/bullets/flag-yellow.svg |1 
 extras/source/gallery/bullets/flag.svg|1 
 extras/source/gallery/bullets/gldpearl.gif|binary
 extras/source/gallery/bullets/golfball.gif|binary
 extras/sourc

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source

2021-01-20 Thread Caolán McNamara (via logerrit)

 sfx2/source/dialog/backingwindow.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 38d6d477791dd9c443a719227fdee9432dc39b85
Author: Caolán McNamara 
AuthorDate: Tue Jan 19 10:47:34 2021 +
Commit: Michael Stahl 
CommitDate: Wed Jan 20 12:36:50 2021 +0100

silence "gsignal.c:2731: instance X has no handler with id Y" warning

Change-Id: Iafc0aa085338fb41758fa845252f584c2a8aea76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109584
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index f7f98a86b11f..39183c2a748c 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -170,6 +170,7 @@ void BackingWindow::dispose()
 mxDrawAllButton.reset();
 mxDBAllButton.reset();
 mxMathAllButton.reset();
+mxBrandImage.reset();
 mxHelpButton.reset();
 mxExtensionsButton.reset();
 mxAllButtonsBox.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-0' - sw/source

2021-01-20 Thread Heiko Tietze (via logerrit)

 sw/source/ui/config/optpage.cxx  |2 ++
 sw/source/uibase/inc/optpage.hxx |1 +
 2 files changed, 3 insertions(+)

New commits:
commit 24081bf72b20c08563df40e33fd5e549c9d91074
Author: Heiko Tietze 
AuthorDate: Mon Jan 18 12:13:26 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 20 12:40:14 2021 +0100

Resolves tdf#139521 - Hide image anchor option in Writer Web mode

Change-Id: Ic5298069fcabbd2c72eb43fdf270b69c53570298
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109524
Reviewed-by: Heiko Tietze 
Reviewed-by: Xisco Fauli 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5820f260886e..26ae3fb628bd 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1214,6 +1214,7 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 , m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff"))
 , 
m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
 , m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
+, m_xImageFrame(m_xBuilder->weld_frame("frmImage"))
 , m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
 , m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
 , m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
@@ -1246,6 +1247,7 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 m_xDirectCursorFillMode->hide();
 m_xCursorProtFrame->hide();
 m_xCursorInProtCB->hide();
+m_xImageFrame->hide();
 }
 
 SwShdwCursorOptionsTabPage::~SwShdwCursorOptionsTabPage()
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 93a84bbb2758..31be1cc611e9 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -238,6 +238,7 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
 
 std::unique_ptr m_xDirectCursorFillMode;
 std::unique_ptr m_xCursorProtFrame;
+std::unique_ptr m_xImageFrame;
 std::unique_ptr m_xCursorInProtCB;
 
 std::unique_ptr m_xDefaultAnchorType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa sw/qa

2021-01-20 Thread Andrea Gelmini (via logerrit)

 0 files changed

New commits:
commit fdc10ceabccba463c0aca9dfba8c10d22f197025
Author: Andrea Gelmini 
AuthorDate: Wed Jan 20 12:59:51 2021 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 20 13:36:21 2021 +0100

Removed executable permission on files

Change-Id: I37c058030dddfa5d5d1688ec4e3fea6718a77d75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109707
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sd/qa/unit/data/pptx/tdf128550.pptx 
b/sd/qa/unit/data/pptx/tdf128550.pptx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/tdf131540.odt 
b/sw/qa/extras/ooxmlexport/data/tdf131540.odt
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/mathml svx/source vcl/ios vcl/osx

2021-01-20 Thread Andrea Gelmini (via logerrit)

 starmath/mathml/inc/xparsmlbase.hxx  |2 +-
 svx/source/devtools/DocumentModelTreeHandler.cxx |2 +-
 vcl/ios/salios.cxx   |2 +-
 vcl/osx/salinst.cxx  |2 +-
 vcl/osx/salmacos.cxx |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d90e9c19ffef5a645f5ad3080c25cb4eb98674c0
Author: Andrea Gelmini 
AuthorDate: Mon Jan 18 17:01:20 2021 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 20 13:39:33 2021 +0100

Fix typos

Change-Id: I8bab3efcd63c0f950bc3176e0d26cc896d601083
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109559
Tested-by: Jenkins
Reviewed-by: Dante DM 
Reviewed-by: Julien Nabet 

diff --git a/starmath/mathml/inc/xparsmlbase.hxx 
b/starmath/mathml/inc/xparsmlbase.hxx
index 83650382e31b..4494d547712f 100644
--- a/starmath/mathml/inc/xparsmlbase.hxx
+++ b/starmath/mathml/inc/xparsmlbase.hxx
@@ -29,7 +29,7 @@ namespace starmathdatabase
   * See: https://www.w3.org/2003/entities/2007/htmlmathml-f.ent
   * Copyright 1998 - 2011 W3C.
   * We allow the import of HTML5 entities because are compatible with mathml
-  * and ill formated are expected.
+  * and ill formatted are expected.
   * On export only mathml entities are allowed.
   * Some documentation: https://www.w3.org/TR/MathML3/chapter7.html
   */
diff --git a/svx/source/devtools/DocumentModelTreeHandler.cxx 
b/svx/source/devtools/DocumentModelTreeHandler.cxx
index 2c721dcbea8e..af446f923d0d 100644
--- a/svx/source/devtools/DocumentModelTreeHandler.cxx
+++ b/svx/source/devtools/DocumentModelTreeHandler.cxx
@@ -87,7 +87,7 @@ public:
 /// The main UNO object for this entry
 virtual css::uno::Reference getMainObject() { return 
mxObject; }
 
-/// Create and fill the childrent to the parent tree view node.
+/// Create and fill the children to the parent tree view node.
 virtual void fill(std::unique_ptr& /*pDocumentModelTree*/,
   weld::TreeIter const& /*rParent*/)
 {
diff --git a/vcl/ios/salios.cxx b/vcl/ios/salios.cxx
index 59474c7443eb..fc925b61cdf3 100644
--- a/vcl/ios/salios.cxx
+++ b/vcl/ios/salios.cxx
@@ -18,7 +18,7 @@
  */
 
 // This file contains the iOS-specific versions of the functions which were 
touched in the commit to
-// fix tdf#138122. The funtions are here (for now) as they were before that 
commit. The
+// fix tdf#138122. The functions are here (for now) as they were before that 
commit. The
 // macOS-specific versions of these functions are in vcl/osx/salmacos.cxx.
 
 #include 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 1ab962284918..f44bf282a9cd 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -304,7 +304,7 @@ VCLPLUG_OSX_PUBLIC SalInstance* create_SalInstance()
 
 // Dark mode is disabled as long as it is not implemented completely. For 
development purposes, it may be controlled by
 // environment variables: VCL_MACOS_FORCE_DARK_MODE enable dark mode 
independent of system settings,
-// VCL_MACOS_USE_SYSTEM_APPEARANCE to use system settings (light mode oder 
dark mode as configured within system preferences).
+// VCL_MACOS_USE_SYSTEM_APPEARANCE to use system settings (light mode or 
the dark mode as configured within system preferences).
 
 // TODO: After implementation of dark mode, this code has to be removed.
 
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx
index bc91c2885339..0f41dd9e8c4a 100644
--- a/vcl/osx/salmacos.cxx
+++ b/vcl/osx/salmacos.cxx
@@ -193,7 +193,7 @@ void AquaSalGraphics::copyScaledArea(tools::Long nDstX, 
tools::Long nDstY,tools:
 CGContextSetBlendMode(xSourceContext, kCGBlendModeCopy);
 CGContextDrawLayerAtPoint(xSourceContext, aSrcPoint, pSrc->maLayer.get());
 
-// Copy source area from additional layer to traget area
+// Copy source area from additional layer to target area
 
 const CGRect aTargetRect = CGRectMake(nScaledTargetX, nScaledTargetY, 
nScaledSourceWidth, nScaledSourceHeight);
 CGContextSetBlendMode(xCopyContext, kCGBlendModeCopy);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2021-01-20 Thread Roman Kuznetsov (via logerrit)

 source/text/sdraw/guide/align_arrange.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1564e769638b68222683ba6b4351b378c9d5585
Author: Roman Kuznetsov 
AuthorDate: Wed Jan 20 11:35:09 2021 +0100
Commit: Olivier Hallot 
CommitDate: Wed Jan 20 13:58:17 2021 +0100

tdf#126555 Change Distribution menu label to Distribute selection

in Help

Change-Id: I059873458581565dad34d43dfcf0e2fa98f416ce
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109678
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdraw/guide/align_arrange.xhp 
b/source/text/sdraw/guide/align_arrange.xhp
index 137335396..0c0f5ebe9 100644
--- a/source/text/sdraw/guide/align_arrange.xhp
+++ b/source/text/sdraw/guide/align_arrange.xhp
@@ -88,7 +88,7 @@
 
 
 Distributing Objects
-If you select 
three or more objects in Draw, you can also use the Distribution command to distribute the 
vertical and horizontal spacing evenly between the objects.
+If you select 
three or more objects in Draw, you can also use the Distribute 
selection command to distribute the vertical and horizontal 
spacing evenly between the objects.
 
 
 Select three or 
more objects to be distributed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2021-01-20 Thread Roman Kuznetsov (via logerrit)

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5657142d9840c8a0fdc0419922289f741aed2bf6
Author: Roman Kuznetsov 
AuthorDate: Wed Jan 20 13:58:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 20 13:58:17 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d1564e769638b68222683ba6b4351b378c9d5585
  - tdf#126555 Change Distribution menu label to Distribute selection

in Help

Change-Id: I059873458581565dad34d43dfcf0e2fa98f416ce
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109678
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 2bf658142b7e..d1564e769638 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2bf658142b7e3c859d353e0d964aa1404fb0087e
+Subproject commit d1564e769638b68222683ba6b4351b378c9d5585
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sot/source

2021-01-20 Thread Tor Lillqvist (via logerrit)

 sot/source/base/exchange.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1a7d3dff5ee7383a71fe1c9e73d85514ea60d7d7
Author: Tor Lillqvist 
AuthorDate: Thu Jan 14 02:57:35 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 14:05:30 2021 +0100

Make SotExchange::GetFormat() accept a MIME type with additional parameters

For instance, if SotExchange::GetFormat() is passed a flavor with MIME
type
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star
Object Descriptor (XML)\";typename=\"LibreOffice 7.2 Spreadsheet\"" we
do want to recognize it as SotClipboardFormatId::OBJECTDESCRIPTOR,
even if the MIME type in the entry for it in the array in
ImplFormatArray_Impl only has the windows_formatname parameter.

This is part of fixing
https://github.com/CollaboraOnline/online/issues/849, but it will help
for corresponding problems with LibreOffice on macOS, too.

Note that on Linux, SotExchange::GetFormat() gets called with a flavor
with a MIME type that does *not* have all the extra parameters
(classname, typename, displayname, viewaspect, width, height, posx,
posy) (See the GitHub issue mentioned above.) This change does not
remove any checks for classname, typename, etc. There are/were no such
checks in SotExchange::GetFormat().

But, in the (much different) code path for macOS (and iOS), with my
work in process in vcl, SotExchange::GetFormat() gets called with a
flavor with a MIME type that *does* contain those extra parameters. I
don't see the point in introducing checks of the "sanity" of those
into SotExchange::GetFormat().

(In this branch, already contains the add-on fix to use the existing
OUString::matchAsciiL() instead of requiring a new
OUString::startsWithAsciiL().)

Change-Id: Ie65ed1ab922cdaa6557eb65d980b9e886d3c6971
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109254
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109356
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 4888a366ec71..cca47c4bcad4 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -447,10 +447,16 @@ SotClipboardFormatId SotExchange::GetFormat( const 
DataFlavor& rFlavor )
 // only into 5.1 chart documents - in 5.0 and 5.2 it was 42 ("StarChart 
5.0")
 // The registry only contains the entry for the 42 format id.
 for( SotClipboardFormatId i = SotClipboardFormatId::RTF; i <= 
SotClipboardFormatId::USER_END;  ++i )
-if( rMimeType.equalsAscii( pFormatArray_Impl[ static_cast(i) 
].pMimeType ) )
+{
+const char* const pFormatMimeType = pFormatArray_Impl[ 
static_cast(i) ].pMimeType;
+const sal_Int32 nFormatMimeTypeLen = rtl_str_getLength( 
pFormatMimeType );
+if( rMimeType.matchAsciiL( pFormatMimeType, nFormatMimeTypeLen ) &&
+( rMimeType.getLength() == nFormatMimeTypeLen ||
+  rMimeType[ nFormatMimeTypeLen ] == ';' ) )
 return ( (i == SotClipboardFormatId::STARCHARTDOCUMENT_50)
  ? SotClipboardFormatId::STARCHART_50
  : i );
+}
 
 // then in the dynamic list
 tDataFlavorList& rL = InitFormats_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/sal vcl/osx

2021-01-20 Thread Tor Lillqvist (via logerrit)

 include/sal/log-areas.dox |1 
 vcl/osx/DataFlavorMapping.cxx |   79 +++---
 2 files changed, 46 insertions(+), 34 deletions(-)

New commits:
commit 716af8206af673fee53d4315aa6ca6494e8d610c
Author: Tor Lillqvist 
AuthorDate: Thu Jan 14 16:03:33 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 14:05:49 2021 +0100

Fix handling of the OBJECTDESCRIPTOR clipboard (pasteboard) type on macOS

This fixes a demonstrable problem, and affects only macOS.

This is also on the path towards fixing
https://github.com/CollaboraOnline/online/issues/849 , even if the
code touched here is for macOS only. The iOS pasteboard handling code
is based on the macOS one.

We need the pasteboard to have the OBJECTDESCRIPTOR type as a MIME
type that includes the typename attribute, because the code in sc
checks for that when it decides whether it is a proper
OBJECTDESCRIPTOR.

Simplify the data in the flavorMap array. No need to duplicate the
same MIME type string as both the pasteboard type and MIME type, for
those cases where the MIME type is used diretly as pasteboard type. We
also know that for those types, the MIME type might have additional
parameters, so be more lenient in checking.

With this change, and my recent change to sot, this now works:

Start LibreOffice. Open a spreadsheet. Select a cell range. (It can
include formulas.) Edit > Copy. Quit LibreOffice.

Start LibreOffice again. Open a spreadsheet. Edit > Paste. You get the
very same cells that you pasted as such (with relative cell addresses
in formulas properly adjusted, as expected).

Previously, it would paste an image of the copied cell range, which is
fairly pointless.

There is still lots of opportunity for cleanup in the clipboard code
for macOS and iOS. It is presumably rather pointless to put images on
the pasteboard in Windows bitmap format, for instance. Just PNG should
be enough. No idea why the code provides the TIFF pasteboard type for
images. Ditto for Windows metafiles (WMF and EMF). It is also unclear
how useful the EMBED_SOURCE or LINK_SOURCE types are on macOS, for
instance.

Change-Id: I573648480b03972b506203b4f470d513bcb81212
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109297
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109357
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0e514d2896cf..94733ff414ad 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -487,6 +487,7 @@ certain functionality.
 @li @c vcl.opengl
 @li @c vcl.opengl.qt5 - QT5 OpenGL
 @li @c vcl.osx
+@li @c vcl.osx.clipboard
 @li @c vcl.osx.print
 @li @c vcl.pdfwriter
 @li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 07534d0c893b..1c6eaac98a4d 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -73,19 +73,6 @@ namespace
 return [NSString stringWithCString: utf8Str.getStr() encoding: 
NSUTF8StringEncoding];
   }
 
-  NSString* PBTYPE_SODX = 
@"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star 
Object Descriptor (XML)\"";
-  NSString* PBTYPE_SESX = 
@"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed 
Source (XML)\"";
-  NSString* PBTYPE_SLSDX = 
@"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link 
Source Descriptor (XML)\"";
-  NSString* PBTYPE_ESX = 
@"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed 
Source (XML)\"";
-  NSString* PBTYPE_LSX = 
@"application/x-openoffice-link-source-xml;windows_formatname=\"Star Link 
Source (XML)\"";
-  NSString* PBTYPE_EOX = 
@"application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded 
Object (XML)\"";
-  NSString* PBTYPE_SVXB = 
@"application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView 
Bitmap/Animation)\"";
-  NSString* PBTYPE_GDIMF = 
@"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
-  NSString* PBTYPE_WMF = 
@"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
-  NSString* PBTYPE_EMF = 
@"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
-  NSString* PBTYPE_DUMMY_INTERNAL = @"application/x-openoffice-internal";
-
   const char* FLAVOR_SODX = 
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object 
Descriptor (XML)\"";
   const char* FLAVOR_SESX = 
"application/x-openoffi

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/osx

2021-01-20 Thread Tor Lillqvist (via logerrit)

 vcl/osx/DataFlavorMapping.cxx |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 7a23ae2785ccf565530a01721c968cff1610a4b0
Author: Tor Lillqvist 
AuthorDate: Fri Jan 15 18:19:11 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 14:06:44 2021 +0100

Enable pasting of LINK data from the system pasteboard on macOS

Also add more documentation on how the flavorMap array works. The
interesting thing is that the code stores anything you throw at it on
the system pasteboard. But in another LibreOffice process, it won't
accept types not mentioned in the array even if it as such is a type
that other parts of the code would look for.

Thus, adding the
"application/x-openoffice-link;windows_formatname=\"Link\"" type to
the array means that if there is such data on the system pasteboard
(from an earlier or simultaneous run of LibreOffice), it will be
pasteable also in a different LibreOffice process from the one that
put it there.

(While at it, order the FLAVOR_FOO variable definitions to be in the
same order as their use in the array entries.)

Change-Id: I913cc732e4dfb32d4b098505aa10806976db6326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109384
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109472
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 1c6eaac98a4d..41ef196e40a5 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -73,7 +73,6 @@ namespace
 return [NSString stringWithCString: utf8Str.getStr() encoding: 
NSUTF8StringEncoding];
   }
 
-  const char* FLAVOR_SODX = 
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object 
Descriptor (XML)\"";
   const char* FLAVOR_SESX = 
"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed 
Source (XML)\"";
   const char* FLAVOR_SLSDX = 
"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link 
Source Descriptor (XML)\"";
   const char* FLAVOR_ESX = 
"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed 
Source (XML)\"";
@@ -83,7 +82,8 @@ namespace
   const char* FLAVOR_GDIMF = 
"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
   const char* FLAVOR_WMF = 
"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
   const char* FLAVOR_EMF = 
"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
+  const char* FLAVOR_SODX = 
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object 
Descriptor (XML)\"";
+  const char* FLAVOR_LINK = 
"application/x-openoffice-link;windows_formatname=\"Link\"";
   const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
 
   struct FlavorMap
@@ -94,6 +94,16 @@ namespace
 bool DataTypeOUString; // sequence otherwise
   };
 
+  // This is a list of the bidirectional mapping between (internal) MIME types 
and (system)
+  // pasteboard types.
+
+  // Only pasteboard types mentioned here will be recognized, mapped, and 
available for pasting in a
+  // fresh LibreOffice process. When copy-pasting in-process, the situation is 
different.
+
+  // Also MIME types not mentioned here will be stored on the pasteboard 
(using the same type name),
+  // though. But that is IMHO a bit pointless as they in general won't then be 
pasteable anyway in a
+  // new LibreOffice process. See the use of the maOfficeOnlyTypes array.
+
   // The SystemFlavor member is nil for the cases where there is no predefined 
pasteboard type UTI
   // and we use the internal MIME type (media type) also on the pasteboard. 
That is OK in macOS,
   // there is no requirement that the types are well-formed UTIs. It is 
different on iOS, I think,
@@ -127,6 +137,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
   { nil, FLAVOR_WMF, "Windows MetaFile", false },
   { nil, FLAVOR_EMF, "Windows Enhanced MetaFile", false },
   { nil, FLAVOR_SODX, "Star Object Descriptor (XML)", false },
+  { nil, FLAVOR_LINK, "Dynamic Data Exchange (DDE link)", false },
   { nil, FLAVOR_DUMMY_INTERNAL, "internal data",false }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2021-01-20 Thread Olivier Hallot (via logerrit)

 source/text/swriter/00/0405.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a3932cc1047b133170c08c45add70b8197fe9dd2
Author: Olivier Hallot 
AuthorDate: Wed Jan 20 09:50:12 2021 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 20 14:08:32 2021 +0100

Some corrections in English

* an icon/button is to click not to select
* Use "long click"
* remove excessive usage of 
* "Right click" should not be a 

Change-Id: I604125be12e1ba1bf2504501eca6b757477fc265
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109711
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/00/0405.xhp 
b/source/text/swriter/00/0405.xhp
index 8c8f5f0e8..e90235ef6 100644
--- a/source/text/swriter/00/0405.xhp
+++ b/source/text/swriter/00/0405.xhp
@@ -41,7 +41,7 @@
  
   
 Choose Styles - Load Styles from 
Template
-In the Styles window. Click the 
Styles action icon on the top right of the Styles 
window and keep the mouse button pressed. Choose Load Styles from 
Template from the submenu.
+In the Styles window, do a long click on the 
Styles action icon on the top right. Choose Load Styles 
from Template from the submenu.
 Different ways to open Styles window:
   
 Press  Command+TF11
@@ -84,10 +84,10 @@
   Choose View - Styles or Styles - 
Manage Styles (Command+TF11)
 to open Styles deck.
 
 
-  Select 
Character Style icon at top of deck, then select a character style.
+  Click on the 
Character Style icon at top of the deck, then select a character 
style.
 
 
-  Right-click to open context menu and choose 
Modify/New.
+  Right-click to 
open context menu and choose Modify/New.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2021-01-20 Thread Olivier Hallot (via logerrit)

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14eda8305008f7e3f0425430527a1d4ce8698dbc
Author: Olivier Hallot 
AuthorDate: Wed Jan 20 10:08:32 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jan 20 14:08:32 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a3932cc1047b133170c08c45add70b8197fe9dd2
  - Some corrections in English

* an icon/button is to click not to select
* Use "long click"
* remove excessive usage of 
* "Right click" should not be a 

Change-Id: I604125be12e1ba1bf2504501eca6b757477fc265
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109711
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index d1564e769638..a3932cc1047b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d1564e769638b68222683ba6b4351b378c9d5585
+Subproject commit a3932cc1047b133170c08c45add70b8197fe9dd2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/qa

2021-01-20 Thread Henry Castro (via logerrit)

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   39 +++-
 1 file changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 08d45119cfb875fa8a5c03d6e946a47f0f680932
Author: Henry Castro 
AuthorDate: Fri Jan 15 16:13:29 2021 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Jan 20 14:55:25 2021 +0100

lok: unit test incorrect cursor position

Test to not send client side cursor position (0,0)
due to:

mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) 
) );

Change-Id: Ib5cd7f1c0c45073c5d2039e8b889d3a6fd7ef70c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109417
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 6fc8affd77eb..4f708dfe76c5 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -226,6 +226,7 @@ public:
 void testControlState();
 void testMetricField();
 void testMultiDocuments();
+void testJumpCursor();
 void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -289,6 +290,7 @@ public:
 CPPUNIT_TEST(testControlState);
 CPPUNIT_TEST(testMetricField);
 CPPUNIT_TEST(testMultiDocuments);
+CPPUNIT_TEST(testJumpCursor);
 CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
@@ -1947,13 +1949,15 @@ class ViewCallback
 public:
 OString m_aCellFormula;
 bool m_bTilesInvalidated;
+bool m_bZeroCursor;
 tools::Rectangle m_aOwnCursor;
 boost::property_tree::ptree m_aCommentCallbackResult;
 boost::property_tree::ptree m_aCallbackWindowResult;
 
 ViewCallback(LibLODocument_Impl* pDocument)
 : mpDocument(pDocument),
-  m_bTilesInvalidated(false)
+  m_bTilesInvalidated(false),
+  m_bZeroCursor(false)
 {
 mnView = SfxLokHelper::getView();
 mpDocument->m_pDocumentClass->registerCallback(pDocument, 
&ViewCallback::callback, this);
@@ -1990,6 +1994,9 @@ public:
 m_aOwnCursor.setY(aSeq[1].toInt32());
 m_aOwnCursor.setWidth(aSeq[2].toInt32());
 m_aOwnCursor.setHeight(aSeq[3].toInt32());
+
+if (m_aOwnCursor.getX() == 0 && m_aOwnCursor.getY() == 0)
+m_bZeroCursor = true;
 }
 break;
 case LOK_CALLBACK_COMMENT:
@@ -3088,6 +3095,36 @@ void DesktopLOKTest::testMultiDocuments()
 }
 }
 
+void DesktopLOKTest::testJumpCursor()
+{
+comphelper::LibreOfficeKit::setTiledAnnotations(false);
+
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
+
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'B', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'o', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'l', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'i', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'v', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'i', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, 
com::sun::star::awt::Key::ESCAPE);
+Scheduler::ProcessEventsToIdle();
+
+// There is a cursor jump to (0, 0) due to
+// mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) 
) );
+// when creating a comment
+ViewCallback aView1(pDocument);
+
+pDocument->pClass->postUnoCommand(pDocument, ".uno:InsertAnnotation", 
nullptr, true);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT(!aView1.m_bZeroCursor);
+
+comphelper::LibreOfficeKit::setTiledAnnotations(true);
+}
+
 namespace {
 
 constexpr size_t classOffset(int i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - oox/source

2021-01-20 Thread Noel Grandin (via logerrit)

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |  106 ++--
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |   10 +
 2 files changed, 66 insertions(+), 50 deletions(-)

New commits:
commit 6845a140ad6fb6640f9209e34cf7aa0865b8aea6
Author: Noel Grandin 
AuthorDate: Mon Aug 10 20:47:32 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jan 20 14:57:07 2021 +0100

loplugin:flatten

(cherry picked from commit 2d582244680e7f6dec6e4a466e276f93ccb01dc9)

Change-Id: I6560756eb63856a22b43e3e65a7b7843cd2d5376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109702
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 58f6da680f97..6e9626c2f9fe 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -836,26 +836,26 @@ void ApplyConstraintToLayout(const Constraint& 
rConstraint, LayoutPropertyMap& r
 }
 
 const LayoutPropertyMap::const_iterator aRef = 
rProperties.find(rConstraint.msRefForName);
-if (aRef != rProperties.end())
+if (aRef == rProperties.end())
+return;
+
+const LayoutProperty::const_iterator aRefType = 
aRef->second.find(rConstraint.mnRefType);
+if (aRefType != aRef->second.end())
+rProperties[rConstraint.msForName][rConstraint.mnType]
+= aRefType->second * rConstraint.mfFactor;
+else
 {
-const LayoutProperty::const_iterator aRefType = 
aRef->second.find(rConstraint.mnRefType);
-if (aRefType != aRef->second.end())
-rProperties[rConstraint.msForName][rConstraint.mnType]
-= aRefType->second * rConstraint.mfFactor;
+// Values are never in EMU, while oox::drawingml::Shape position and 
size are always in
+// EMU.
+double fUnitFactor = 0;
+if (isFontUnit(rConstraint.mnRefType))
+// Points -> EMU.
+fUnitFactor = EMU_PER_PT;
 else
-{
-// Values are never in EMU, while oox::drawingml::Shape position 
and size are always in
-// EMU.
-double fUnitFactor = 0;
-if (isFontUnit(rConstraint.mnRefType))
-// Points -> EMU.
-fUnitFactor = EMU_PER_PT;
-else
-// Millimeters -> EMU.
-fUnitFactor = EMU_PER_HMM * 100;
-rProperties[rConstraint.msForName][rConstraint.mnType]
-= rConstraint.mfValue * fUnitFactor;
-}
+// Millimeters -> EMU.
+fUnitFactor = EMU_PER_HMM * 100;
+rProperties[rConstraint.msForName][rConstraint.mnType]
+= rConstraint.mfValue * fUnitFactor;
 }
 }
 
commit 26fc0fb9b2c66c94078c27ac07ded465cdc50325
Author: Miklos Vajna 
AuthorDate: Wed Jan 13 15:10:48 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 20 14:56:51 2021 +0100

oox smartart: extract pyra algo from AlgAtom::layoutShape()

AlgAtom::layoutShape() is more or less the single function where all
layouting happens for all algoritms. Extract the pyra algorithm part
from it to a separate PyraAlg::layoutShapeChildren() before that
function grows too large.

(cherry picked from commit 318438a680e6bf5c2c592d5e997f6f45a4ae8e5f)

Change-Id: I097ac9ed6110536bbeb8a26ab35a8ee8a79d5b33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109701
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 6a33148a7993..58f6da680f97 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -440,6 +440,43 @@ void SnakeAlg::layoutShapeChildren(const 
AlgAtom::ParamMap& rMap, const ShapePtr
 }
 }
 
+void PyraAlg::layoutShapeChildren(const ShapePtr& rShape)
+{
+if (rShape->getChildren().empty() || rShape->getSize().Width == 0
+|| rShape->getSize().Height == 0)
+return;
+
+// const sal_Int32 nDir = maMap.count(XML_linDir) ? 
maMap.find(XML_linDir)->second : XML_fromT;
+// const sal_Int32 npyraAcctPos = maMap.count(XML_pyraAcctPos) ? 
maMap.find(XML_pyraAcctPos)->second : XML_bef;
+// const sal_Int32 ntxDir = maMap.count(XML_txDir) ? 
maMap.find(XML_txDir)->second : XML_fromT;
+// const sal_Int32 npyraLvlNode = maMap.count(XML_pyraLvlNode) ? 
maMap.find(XML_pyraLvlNode)->second : XML_level;
+// uncomment when use in code.
+
+sal_Int32 nCount = rShape->getChildren().size();
+double fAspectRatio = 0.32;
+
+awt::Size aChildSize = rShape->getSize();
+aChildSize.Width /= nCount;
+aChildSize.Height /= nCount;
+
+awt::Point aCurrPos(0, 0);
+aCurrPos.X = fAspectRatio * aChildSize.Width * (nCount - 1);
+a

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/source sd/qa

2021-01-20 Thread Miklos Vajna (via logerrit)

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx  |   42 +++
 sd/qa/unit/data/pptx/smartart-composite-infer-right.pptx |binary
 sd/qa/unit/import-tests-smartart.cxx |   26 +
 3 files changed, 68 insertions(+)

New commits:
commit 51b0a654b2c75c7b4e42763603a4e23c25317dc5
Author: Miklos Vajna 
AuthorDate: Tue Jan 19 16:59:38 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 20 14:57:24 2021 +0100

oox smartart: composite algo: handle right constraint when left+width is 
given

The bugdoc had this constraint:



While img has no "r", it has:




Which is enough to fix the x position of the text to not overlap with
img.

(cherry picked from commit 1359e8c566970fcef860f7ba7f54a07d8e6e0513)

Change-Id: I80db290bd1695884ffb7b1eabaffa09462e8883d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109703
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 6e9626c2f9fe..410b2c9e677e 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -820,6 +820,37 @@ sal_Int32 AlgAtom::getVerticalShapesCount(const ShapePtr& 
rShape)
 
 namespace
 {
+/**
+ * Decides if a certain reference type (e.g. "right") can be inferred from the 
available properties
+ * in rMap (e.g. left and width). Returns true if rValue is written to.
+ */
+bool InferFromLayoutProperty(const LayoutProperty& rMap, sal_Int32 nRefType, 
sal_Int32& rValue)
+{
+switch (nRefType)
+{
+case XML_r:
+{
+auto it = rMap.find(XML_l);
+if (it == rMap.end())
+{
+return false;
+}
+sal_Int32 nLeft = it->second;
+it = rMap.find(XML_w);
+if (it == rMap.end())
+{
+return false;
+}
+rValue = nLeft + it->second;
+return true;
+}
+default:
+break;
+}
+
+return false;
+}
+
 /**
  * Apply rConstraint to the rProperties shared layout state.
  *
@@ -840,11 +871,22 @@ void ApplyConstraintToLayout(const Constraint& 
rConstraint, LayoutPropertyMap& r
 return;
 
 const LayoutProperty::const_iterator aRefType = 
aRef->second.find(rConstraint.mnRefType);
+sal_Int32 nInferredValue = 0;
 if (aRefType != aRef->second.end())
+{
+// Reference is found directly.
 rProperties[rConstraint.msForName][rConstraint.mnType]
 = aRefType->second * rConstraint.mfFactor;
+}
+else if (InferFromLayoutProperty(aRef->second, rConstraint.mnRefType, 
nInferredValue))
+{
+// Reference can be inferred.
+rProperties[rConstraint.msForName][rConstraint.mnType]
+= nInferredValue * rConstraint.mfFactor;
+}
 else
 {
+// Reference not found, assume a fixed value.
 // Values are never in EMU, while oox::drawingml::Shape position and 
size are always in
 // EMU.
 double fUnitFactor = 0;
diff --git a/sd/qa/unit/data/pptx/smartart-composite-infer-right.pptx 
b/sd/qa/unit/data/pptx/smartart-composite-infer-right.pptx
new file mode 100644
index ..ca417499fa16
Binary files /dev/null and 
b/sd/qa/unit/data/pptx/smartart-composite-infer-right.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index edb8edaed9f2..35920ae76ac0 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -111,6 +111,7 @@ public:
 void testLinearRuleVert();
 void testAutofitSync();
 void testSnakeRows();
+void testCompositeInferRight();
 
 CPPUNIT_TEST_SUITE(SdImportTestSmartArt);
 
@@ -161,6 +162,7 @@ public:
 CPPUNIT_TEST(testLinearRuleVert);
 CPPUNIT_TEST(testAutofitSync);
 CPPUNIT_TEST(testSnakeRows);
+CPPUNIT_TEST(testCompositeInferRight);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -1637,6 +1639,30 @@ void SdImportTestSmartArt::testSnakeRows()
 xDocShRef->DoClose();
 }
 
+void SdImportTestSmartArt::testCompositeInferRight()
+{
+// Load a smartart which contains a composite algorithm.
+// One contraint says that the left of the text should be the right of the 
image.
+sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-composite-infer-right.pptx"),
+PPTX);
+
+uno::Reference xDiagram(getShapeFromPage(0, 0, 
xDocShRef), uno::UNO_QUERY);
+uno::Reference xMiddle = getChildShape(xDiagram, 1);
+uno::Reference xImage = getChildShape(xMiddle, 1);
+uno::Reference xText = getChildShape(xMiddle, 2);
+sal_Int32 nRightOfImage = xImage->getPosition().X + 
xImage->getSize().Width;
+sal_Int32 nLeftOfText = xText->getPosition().X;

[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/jsdialog/jsdialogbuilder.hxx |   10 ++
 vcl/jsdialog/executor.cxx|   15 +++
 vcl/jsdialog/jsdialogbuilder.cxx |   25 +
 3 files changed, 50 insertions(+)

New commits:
commit 38d01e5af250fb18aa41db8eeafaa644004a0ed4
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 09:19:03 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 15:05:47 2021 +0100

jsdialog: implemented RadioButton

Change-Id: Iad182d96cb4ff86b1a3fc8bfcca37ea62763fe67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109615
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index a1c320c16159..cefa5776c79b 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -190,6 +190,7 @@ public:
 virtual std::unique_ptr weld_tree_view(const OString& id) 
override;
 virtual std::unique_ptr weld_expander(const OString& id) 
override;
 virtual std::unique_ptr weld_icon_view(const OString& id) 
override;
+virtual std::unique_ptr weld_radio_button(const 
OString& id) override;
 
 static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
 VclMessageType 
eMessageType,
@@ -476,4 +477,13 @@ public:
 virtual void unselect(int pos) override;
 };
 
+class JSRadioButton : public JSWidget
+{
+public:
+JSRadioButton(JSDialogSender* pSender, ::RadioButton* pRadioButton,
+  SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+
+virtual void set_active(bool active) override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index f2d4d61ecf61..655104633410 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -316,6 +316,21 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 }
 }
 }
+else if (sControlType == "radiobutton")
+{
+auto pRadioButton = dynamic_cast(pWidget);
+if (pRadioButton)
+{
+if (sAction == "change")
+{
+bool bChecked = rData["data"] == "true";
+pRadioButton->set_state(bChecked ? TRISTATE_TRUE : 
TRISTATE_FALSE);
+
LOKTrigger::trigger_clicked(*static_cast(pRadioButton));
+
LOKTrigger::trigger_toggled(*static_cast(pRadioButton));
+return true;
+}
+}
+}
 }
 
 return false;
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 140e3fa2b755..38ef2a44e354 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -681,6 +681,18 @@ std::unique_ptr 
JSInstanceBuilder::weld_icon_view(const OString&
 return pWeldWidget;
 }
 
+std::unique_ptr JSInstanceBuilder::weld_radio_button(const 
OString& id)
+{
+::RadioButton* pRadioButton = m_xBuilder->get<::RadioButton>(id);
+auto pWeldWidget
+= pRadioButton ? std::make_unique(this, pRadioButton, 
this, false) : nullptr;
+
+if (pWeldWidget)
+RememberWidget(id, pWeldWidget.get());
+
+return pWeldWidget;
+}
+
 weld::MessageDialog* JSInstanceBuilder::CreateMessageDialog(weld::Widget* 
pParent,
 VclMessageType 
eMessageType,
 VclButtonsType 
eButtonType,
@@ -1108,4 +1120,17 @@ void JSIconView::unselect(int pos)
 notifyDialogState();
 }
 
+JSRadioButton::JSRadioButton(JSDialogSender* pSender, ::RadioButton* 
pRadioButton,
+ SalInstanceBuilder* pBuilder, bool bTakeOwnership)
+: JSWidget(pSender, pRadioButton, 
pBuilder,
+  bTakeOwnership)
+{
+}
+
+void JSRadioButton::set_active(bool active)
+{
+SalInstanceRadioButton::set_active(active);
+notifyDialogState();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/jsdialog/jsdialogbuilder.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit ab85732e1c6a1b52cf95fd9fb50b9ccb7cac2137
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 14:08:35 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 15:38:58 2021 +0100

jsdialog: enqueue update on dialog weld

Change-Id: Id1fa7e69f2381df6c30598e28514132a20fac391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109636
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 38ef2a44e354..ecd0f3d1b36d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -472,16 +472,8 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 RememberWidget("__DIALOG__", pRet.get());
 
-const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
-if (pNotifier)
-{
-tools::JsonWriter aJsonWriter;
-m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
-aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
-}
-
 initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
+sendFullUpdate();
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] ESC meeting minutes: 2021-01-14

2021-01-20 Thread Caolán McNamara

On Thu, 2021-01-14 at 18:46 +0200, Noel Grandin wrote:
> On Thu, 14 Jan 2021 at 17:45, Miklos Vajna 
> wrote:
> > * Crash Testing (Caolan)
> >     + 16 ossfuzz issues, 12 Timeouts
> >       + lots of new issues → exception when reading the past the
> > end of the stream
> >       + not sure if this is improving things in practice
>
> I'm not deeply attached to SvStreamEOFException, I
> think, with extensive therapy and several glasses of decent Merlot, I
> can probably get over its removal.
> 
> TBH, I expected that we'd just need some catch blocks scattered at a
> handful of top level places, I did not expect that so much stuff
> embarks on "hopeful parsing".

Yeah, I didn't expect to see so much churn, especially out of the
fuzzers, but especially the msoffice binary filters tend to do a lot of
reads before an eventual check of the stream to see if eof was hit, or
otherwise expect to be able to keep going. ppt/escher filters seems to
be particularly full of it, so in the end I think reverting is safer
than not.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: emfio/source filter/qa filter/source include/sal include/tools sc/qa sc/source sd/qa sd/source sfx2/source sot/source starmath/source sw/qa sw/source tools/qa tools/sou

2021-01-20 Thread Caolán McNamara (via logerrit)

 emfio/source/emfuno/xemfparser.cxx  |2 
 filter/source/graphicfilter/ieps/ieps.cxx   |  350 ++--
 filter/source/graphicfilter/ios2met/ios2met.cxx |3 
 filter/source/graphicfilter/ipcx/ipcx.cxx   |   12 
 filter/source/graphicfilter/ipsd/ipsd.cxx   |   13 
 filter/source/graphicfilter/itga/itga.cxx   |   15 
 filter/source/msfilter/msdffimp.cxx |   20 
 filter/source/msfilter/svdfppt.cxx  |  751 -
 include/sal/log-areas.dox   |1 
 include/tools/stream.hxx|7 
 sc/source/filter/excel/read.cxx | 1985 +++-
 sc/source/filter/excel/xistream.cxx |   60 
 sc/source/filter/excel/xltoolbar.cxx|9 
 sc/source/filter/lotus/lotread.cxx  |   17 
 sc/source/filter/qpro/qpro.cxx  |   21 
 sd/source/filter/ppt/pptin.cxx  |   11 
 sfx2/source/doc/oleprops.cxx|   74 
 sot/source/sdstor/stg.cxx   |   13 
 sot/source/sdstor/stgelem.cxx   |4 
 sot/source/sdstor/stgio.cxx |   12 
 starmath/source/mathtype.cxx|   50 
 sw/source/filter/html/htmlreqifreader.cxx   |   89 -
 tools/qa/cppunit/test_stream.cxx|   12 
 tools/source/stream/stream.cxx  |   34 
 vcl/source/bitmap/dibtools.cxx  |   17 
 vcl/source/filter/graphicfilter.cxx |9 
 vcl/source/filter/graphicfilter2.cxx| 1229 ++
 vcl/source/filter/itiff/itiff.cxx   |4 
 vcl/source/filter/png/pngread.cxx   |  132 -
 vcl/source/gdi/impgraph.cxx |   37 
 30 files changed, 2336 insertions(+), 2657 deletions(-)

New commits:
commit 4e639c37b4dcdc27d46111d0d0cbca966544c2cb
Author: Caolán McNamara 
AuthorDate: Mon Jan 18 16:19:10 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 16:20:25 2021 +0100

ofz#29691 revert throw SvStreamEOFException

reasonably sane code like
s.ReadUInt32(a).ReadUInt32(b).ReadUInt32(c).ReadUInt32(d);
if (s.good())
// use a, b, c d;
stopped working.

FWIW on a short read we retain whatever was in the variable before the
read, rather than overwrite it with new random data, so
sal_uInt32 a(0xdead); s.ReadUInt32(a); assert(s.good() || a == 0xdead);

the msoffice ppt/escher/xls/doc filters especially speculatively parse
and rely on a variables preinit value in the case of a short read.

commit b345a2bab0d6f981049951a86b172ce49ce7d4c2
cid#1470786 Uncaught exception

commit 71aec4726a94dcde1169fd293dbecfeb0e840e6d
ofz#29528 uncaught exception

commit bed03603f6cae264abb9e5b58aa2ab00448d92ff
ofz#29414 uncaught exception

commit 684885a99a1eb7ad943e9736166d4bb1468663be
ofz#29443 uncaught exception

commit 93574ac7768d247ed754ecda322e54e4bd447e43
ofz#29251 Abrt

commit 413db68d95bd39d34e6a6b81a7c5c9478ced0514
ofz#29152 short read

commit f400e883044143f999c460375a293647b4a57244
ofz#29151 short read

commit 96ea80a725dfe4ef38993f78917c243f13e3beb5
ofz#29129 Abrt on uncaught exception

commit 646a635efe6eecbc3d1dd3a7cbb02a278c6f3be5
ofz#28931 Indirect-leak

commit b0e573f18629d28fe3179c12d0d434653f92fc93
ofz#29030 Abrt in xlsfuzzer

commit 95407c39168d186ee44e67b1a6a4bcf592c58b84
ofz#28902 uncaught exception

commit 45175d655ad3773df1c006182108cf25e87b1091
oss-fuzz: tgafuzzer doesn't pass sanity check

commit b82fc702bae9d6190bda1b4818a47cfa197df6d8
oss-fuzz: psdfuzzer doesn't pass sanity check

commit e7c76d604a4694e6568bf10c2a06a786f1096319
oss-fuzz: epsfuzzer doesn't pass sanity check

commit 901e5e7c9170184e286ea3e46fce406136aa9572
oss-fuzz: xlsfuzzer doesn't pass sanity check

commit 127bfab61c297df06fd8e71e709bc4362cb89d21
oss-fuzz: pngfuzzer doesn't pass sanity check

commit 77387ae00ae27e3f8bcdf7bccf97fb2db8f196b7
oss-fuzz: mtpfuzzer doesn't pass sanity check

commit 974ffa79b0fef4ca76558bb8b16bce84af3aaf6c
oss-fuzz: xlsxfuzzer doesn't pass sanity check

commit 6d6d104cbb382d0045e1f04b12d268992fa5c624
oss-fuzz: bmpfuzzer doesn't pass sanity check

commit a7d1d107ec58d3b00b4019c89edddcff71ca6ff3
oss-fuzz: qpwfuzzer doesn't pass sanity check

commit 898993aa62276f59480df8af1da4bad530829b56
oss-fuzz: pcxfuzzer doesn't pass sanity check

throw/catch parts of
commit 8c9a4ff511a3b1d84a7a6d08a1b153c07f164abb
throw exception in SvStream when reading past end of file

Change-Id: Ic49c249768b17b64d8e868655dbc05b31906c2e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109621

[Libreoffice-commits] core.git: vcl/jsdialog

2021-01-20 Thread Stephan Bergmann (via logerrit)

 vcl/jsdialog/jsdialogbuilder.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5f6b7aac3b9561ec5f31b6294f43dcd24e8da1c9
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 16:42:21 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 20 16:44:42 2021 +0100

Revert "jsdialog: enqueue update on dialog weld"

This reverts commit ab85732e1c6a1b52cf95fd9fb50b9ccb7cac2137.
 had built green on 
Jenkins
against parent Gerrit commit  "jsdialog: send updates 
also for
source treeview on drag", which introduced JSDialogSender::sendFullUpdate, 
but
which has apparently never been submitted to master.  Thus, this commit on
master now started to fail with

> 
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/vcl/jsdialog/jsdialogbuilder.cxx:
 In member function ‘virtual std::unique_ptr 
JSInstanceBuilder::weld_dialog(const rtl::OString&)’:
> 
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/vcl/jsdialog/jsdialogbuilder.cxx:476:9:
 error: ‘sendFullUpdate’ was not declared in this scope
>  sendFullUpdate();
>  ^~

().

Change-Id: I98e58ea50fb7524123e25fccb3da571a2ec9783c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109685
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index ecd0f3d1b36d..38ef2a44e354 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -472,8 +472,16 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 RememberWidget("__DIALOG__", pRet.get());
 
+const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
+if (pNotifier)
+{
+tools::JsonWriter aJsonWriter;
+m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
+aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
+}
+
 initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
-sendFullUpdate();
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/qa

2021-01-20 Thread Michael Stahl (via logerrit)

 vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit bd015917e8967b4e3c5325f01484fb53e00f9340
Author: Michael Stahl 
AuthorDate: Wed Jan 20 10:31:57 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 20 16:51:46 2021 +0100

vcl: check DISABLE_CVE_TESTS in TiffFilterTest::testCVEs()

Change-Id: Ieec599efd6d715d9cb308f15fdff796b673e903f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109694
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
index ab3a9a343dec..165d92562bff 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
@@ -64,7 +64,12 @@ bool TiffFilterTest::load(const OUString&, const OUString& 
rURL, const OUString&
 return ImportTiffGraphicImport(aFileStream, aGraphic);
 }
 
-void TiffFilterTest::testCVEs() { testDir(OUString(), getUrl()); }
+void TiffFilterTest::testCVEs()
+{
+#ifndef DISABLE_CVE_TESTS
+testDir(OUString(), getUrl());
+#endif
+}
 
 void TiffFilterTest::testTdf126460()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl sc/source vcl/inc vcl/source vcl/unx

2021-01-20 Thread Attila Szűcs (via logerrit)

 include/vcl/toolkit/treelistbox.hxx  |6 ++
 include/vcl/weld.hxx |2 ++
 sc/source/ui/cctrl/checklistmenu.cxx |3 +++
 vcl/inc/salvtables.hxx   |2 ++
 vcl/inc/svimpbox.hxx |1 +
 vcl/source/app/salvtables.cxx|5 +
 vcl/source/treelist/treelistbox.cxx  |6 --
 vcl/unx/gtk3/gtk3gtkinst.cxx |4 
 8 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 3d2a431da1126f4924f6cd7e5abac6488cd480e7
Author: Attila Szűcs 
AuthorDate: Thu Jan 7 19:07:23 2021 +0100
Commit: László Németh 
CommitDate: Wed Jan 20 17:23:24 2021 +0100

tdf#139115 vcl tree list: add new toggle behaviors

at clicking on list items with checkboxes to clean-up
generic VCL plugin commit 2471d6f44c7e8ecbe86a90eeb593b899a08a7408
(tdf#116675 vcl tree list: toggle by label click (e.g. in AutoFilter)).

This limits the new toggle-always to ScCheckListMenuControl
(e.g. AutoFilter).

set_clicks_to_toggle() options to set the effect of the
click on a treeview list item:

0 == clicking never toggles the checkbox (default setting)

1 == clicking always toggles the checkbox

2 == clicking only toggles the checkbox of a selected list item,
 i.e. the first click selects a not selected list item, and
 only the second click toggles its checkbox.

It would be better if we could set this information in the
.ui files, but I did not find a good way for that.

A good place in the code to call this function can be
found by searching for the .ui filename.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I5c72d710508fc397f2b6f959d7680b23f8dc6f67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108947
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/include/vcl/toolkit/treelistbox.hxx 
b/include/vcl/toolkit/treelistbox.hxx
index 199f37c093e8..895c6c15d860 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -221,6 +221,9 @@ class VCL_DLLPUBLIC SvTreeListBox
 bool mbQuickSearch; // Enables type-ahead search in the check list box.
 bool mbActivateOnSingleClick; // Make single click "activate" a row like a 
double-click normally does
 bool mbHoverSelection; // Make mouse over a row "select" a row like a 
single-click normally does
+sal_Int8mnClicksToToggle; // 0 == Click on a row not toggle its 
checkbox.
+  // 1 == Every click on row toggle its 
checkbox.
+  // 2 == First click select, second click 
toggle.
 
 SvTreeListEntry*pHdlEntry;
 
@@ -680,6 +683,9 @@ public:
 voidSetHoverSelection(bool bEnable) { mbHoverSelection = 
bEnable; }
 boolGetHoverSelection() const { return mbHoverSelection; }
 
+// Set when clicks toggle the checkbox of the row.
+voidSetClicksToToggle(sal_Int8 nCount) { mnClicksToToggle = 
nCount; }
+
 voidSetForceMakeVisible(bool bEnable);
 
 virtual FactoryFunction GetUITestFactory() const override;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fcf0749f96c7..b788a1313b74 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -958,6 +958,8 @@ public:
 // inserted after this call which can be accessed with col index -1
 virtual void enable_toggle_buttons(ColumnToggleType eType) = 0;
 
+virtual void set_clicks_to_toggle(int nToggleBehavior) = 0;
+
 //by index
 virtual int get_selected_index() const = 0;
 //Don't select when frozen, select after thaw. Note selection doesn't 
survive a freeze.
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index b9f51cb84471..00d8a882d80c 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -463,6 +463,9 @@ 
ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v
 , maOpenTimer(this)
 , maCloseTimer(this)
 {
+mxTreeChecks->set_clicks_to_toggle(1);
+mxListChecks->set_clicks_to_toggle(1);
+
 /*
tdf#136559 If we have no dates we don't need a tree
structure, just a list. GtkListStore can be then
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index b8a71e08f917..8d8138690bf1 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1496,6 +1496,8 @@ public:
 
 virtual void set_toggle(const weld::TreeIter& rIter, TriState eState, int 
col = -1) override;
 
+virtual void set_clicks_to_toggle(int nToggleBehavior) override;
+
 virtual void set_extra_row_indent(const weld::TreeIter& rIter, int 
nIndentLevel) override;
 
 void set_text_emphasis(SvTreeListEntry* pEntry, bool bOn, int col = -1);
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index ae171cca8e65..54382ea6e5d7 100644
--- a/vcl/inc/svimpbox

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - 2 commits - sw/source

2021-01-20 Thread Michael Stahl (via logerrit)

 sw/source/core/crsr/bookmrk.cxx   |6 +++---
 sw/source/core/layout/frmtool.cxx |5 +
 sw/source/core/text/redlnitr.cxx  |2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 8ba16d77881fe199a3c2ea40fb9c18741e17af5f
Author: Michael Stahl 
AuthorDate: Wed Jan 13 14:35:24 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:24:42 2021 +0100

tdf#135014 sw_fieldmarkhide: allow section overlap with fieldmark

In this bugdoc it happens that the field with instruction
"\aINDEX \\c \"2\"\\h \"A\" \\e \"\t\"\003\063  "
result end is on a node following the start of a section,
so sw::mark::FindFieldSep() asserts.

In this case it looks like the section was wrongly set by the import,
but experimenting with Word reveals that it will respect sectPr on a
paragraph inside a field, so i guess we need to cope with that.

Also adapt InsertCnt_() to skip the section end node.

Change-Id: I5517d463de43b04bf773528a28de12123e534069
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109305
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 359deaee45fd4a2bfe7aae255e6da38a9e1931ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109344
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 89352072ac70..d76b43cebf2a 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -104,15 +104,15 @@ namespace sw::mark
 }
 }
 }
-else if (pNode->IsEndNode())
+else if (pNode->IsEndNode() && 
!pNode->StartOfSectionNode()->IsSectionNode())
 {
 assert(nStartNode <= pNode->StartOfSectionIndex());
-// fieldmark cannot overlap node section
+// fieldmark cannot overlap node section, unless it's a section
 n = pNode->StartOfSectionIndex();
 }
 else
 {
-assert(pNode->IsNoTextNode());
+assert(pNode->IsNoTextNode() || pNode->IsSectionNode());
 }
 }
 assert(ret); // must have found it
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 8590af6aa2a4..9228b4a8b68e 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1811,6 +1811,11 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
 assert(pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden);
 continue; // skip it
 }
+if (pLayout->HasMergedParas() && 
!pNd->StartOfSectionNode()->IsCreateFrameWhenHidingRedlines())
+{   // tdf#135014 section break in fieldmark (start inside, end 
outside)
+assert(pNd->StartOfSectionNode()->GetRedlineMergeFlag() == 
SwNode::Merge::Hidden);
+continue; // skip it
+}
 assert(pActualSection && "Section end without section start?");
 assert(pActualSection->GetSectionNode() == 
pNd->StartOfSectionNode());
 
commit 00d5eb31363cc4abd5b3d0f828256ff4e2f48303
Author: Michael Stahl 
AuthorDate: Wed Jan 13 11:58:36 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:24:34 2021 +0100

tdf#135014 sw_fieldmarkhide: fix bogus assert on loading the bugdoc

The == case was omitted, iirc because of changing the first compare at
the last minute.

(regression from aacaa2aa91f705d64b929b5cff2872f160021b9f)

Change-Id: I03602917def8248150139d788c880d93cab18bf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109304
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0771b84e4c5002338275da0d061f966e2fc47505)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109343
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 2e3d1f55a06e..a56142dff8f1 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -182,7 +182,7 @@ public:
 }
 else if (m_oNextFieldmarkHide)
 {
-assert(!pNextRedlineHide || *m_oNextFieldmarkHide < 
*pNextRedlineHide);
+assert(!pNextRedlineHide || *m_oNextFieldmarkHide <= 
*pNextRedlineHide);
 m_pStartPos = &*m_oNextFieldmarkHide;
 m_pEndPos = m_Fieldmark.second.get();
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - 2 commits - sw/source

2021-01-20 Thread Michael Stahl (via logerrit)

 sw/source/core/doc/DocumentRedlineManager.cxx |   15 +++
 sw/source/core/text/txtfrm.cxx|2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 2ec6b5055dc09ab3884dc2542dd93e75fe2c50d4
Author: Michael Stahl 
AuthorDate: Thu Jan 14 20:10:24 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:25:06 2021 +0100

tdf#135014 sw_redlinehide: fix missing frames when removing fieldmark

A fieldmark was deleted. UpdateFramesForRemoveDeleteRedline() deleted
the MergedPara but its start node was before the start node of the
fieldmark, and then MakeFrames() didn't find a frame on the preceding
node and did nothing.

Similar problem likely possible with redline.

Change-Id: I532f9a67c0268f3287736a61da4cc9fefec7b8e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109307
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 32e104c1d6be0ffe6ed6c4e08af868c87b3c258c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109346
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 337c0429107d..25d26f6a7743 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -316,6 +316,8 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM 
const& rPam)
 pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
 *pFrame, rFirstNode, eMode));
 eMode = sw::FrameMode::New; // Existing is not idempotent!
+// update pNode so MakeFrames starts on 2nd node
+pNode = &rFirstNode;
 }
 }
 if (pLast != pNode)
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 4e2d8af0bcb9..13f48b3ba321 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1278,6 +1278,8 @@ void 
SwTextFrame::SetMergedPara(std::unique_ptr p)
 pFirst->Add(this); // must register at node again
 }
 }
+// postcondition: frame must be listening somewhere
+assert(m_pMergedPara || GetDep());
 }
 
 const OUString& SwTextFrame::GetText() const
commit 60eb993b5558c7999a23b4e3c241b2a60419a3d4
Author: Michael Stahl 
AuthorDate: Thu Jan 14 19:33:34 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:24:49 2021 +0100

tdf#135014 sw_fieldmarkhide: fix crash deleting field in fly

SwUndoDelete calls DelContentIndex(), which calls
SwUndoFlyBase::DelFly().

This calls DelFrames() first and then SwUndoSaveSection::SaveSection(),
so by the time UpdateFramesForRemoveDeleteRedline() runs for the
fieldmark in fly it's expected that there are no more frames.

Also, don't try to recreate fly frames in this situation; it will crash
when resetting the RES_ANCHOR.

Change-Id: I11f6fb011d84e96f77b93ffbd1b5904594cbc591
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109306
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit eef10be20a4c5108c68b19ccdda263c5ca852386)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109345
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 4a63d5e443ac..337c0429107d 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -286,10 +286,15 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, 
SwPaM const& rPam)
 }
 if (frames.empty())
 {
-auto const& layouts(rDoc.GetAllLayouts());
-assert(std::none_of(layouts.begin(), layouts.end(),
-[](SwRootFrame const*const pLayout) { return 
pLayout->IsHideRedlines(); }));
-(void) layouts;
+// in SwUndoSaveSection::SaveSection(), DelFrames() preceded 
this call
+if (!pNode->FindTableBoxStartNode() && 
!pNode->FindFlyStartNode())
+{
+auto const& layouts(rDoc.GetAllLayouts());
+assert(std::none_of(layouts.begin(), layouts.end(),
+[](SwRootFrame const*const pLayout) { return 
pLayout->IsHideRedlines(); }));
+(void) layouts;
+}
+isAppendObjsCalled = true; // skip that!
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

2021-01-20 Thread Michael Stahl (via logerrit)

 sw/source/core/crsr/pam.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fe2e79391957e684719adb21561242af197845b3
Author: Michael Stahl 
AuthorDate: Fri Jan 15 16:24:45 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:25:17 2021 +0100

sw_fieldmarkhide: allow editing all fieldmarks if ...

ForceImportWWFieldsAsGenericFields is set. Not sure what restrictions it
needs.

Change-Id: I8b8e61fb320d5c2b66d5ff332517759b53e68817
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109378
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit f8da730bd66d5d6d3e49935573b3223c06baffbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109518
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 55775a358826..684b6e5eae72 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -23,6 +23,8 @@
 
 #include 
 #include 
+#include 
+
 #include 
 #include 
 #include 
@@ -728,7 +730,9 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
 const bool bAtStartA = (pA != nullptr) && (pA->GetMarkStart() == 
*GetPoint());
 const bool bAtStartB = (pB != nullptr) && (pB->GetMarkStart() == 
*GetMark());
 
-if (!bRet)
+if (!bRet &&
+// allow editing all fields in generic mode
+
!officecfg::Office::Common::Filter::Microsoft::Import::ForceImportWWFieldsAsGenericFields::get(comphelper::getProcessComponentContext()))
 {
 bool bUnhandledMark = pA && pA->GetFieldname( ) == ODF_UNHANDLED;
 // Unhandled fieldmarks case shouldn't be edited manually to avoid 
breaking anything
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/nss

2021-01-20 Thread Michael Stahl (via logerrit)

 external/nss/ExternalProject_nss.mk |8 ++--
 external/nss/nsinstall.py   |   12 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit b998e3c8da56e544b829cc6461af7f9db12e9d80
Author: Michael Stahl 
AuthorDate: Tue Jan 19 11:28:41 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:25:37 2021 +0100

nss: fix parallel build race in nsinstall.py

  File 
"/home/tdf/lode/jenkins/workspace/android_aarch64/external/nss/nsinstall.py", 
line 112, in nsinstall
os.makedirs(args[0])
  File "/opt/rh/rh-python38/root/usr/lib64/python3.8/os.py", line 223, in 
makedirs
mkdir(name, mode)
FileExistsError: [Errno 17] File exists: '../../../../dist/public/dbm'
../../../coreconf/rules.mk:119: recipe for target 
'../../../../dist/public/dbm/d' failed

Change-Id: I4273e6d3d5fa520353fff8738823ef281fe237ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109619
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 6f5186a94dcd1989cdd819e35163af0542912559)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109586
Reviewed-by: Thorsten Behrens 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b9f56d24de0c..b97ae11a515a 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 ))
 
 ifeq ($(OS),WNT)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
@@ -43,7 +45,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
 else # OS!=WNT
 # make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so 
nss can append it's own defaults
 # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so 
they will overrule nss makefile values
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py
index 80e9c1679373..d90a85e6c540 100644
--- a/external/nss/nsinstall.py
+++ b/external/nss/nsinstall.py
@@ -99,17 +99,17 @@ def nsinstall(argv):
   if options.D:
 if len(args) != 1:
   return 1
-if os.path.exists(args[0]):
+try:
+  if options.m:
+os.makedirs(args[0], options.m)
+  else:
+os.makedirs(args[0])
+except FileExistsError:
   if not os.path.isdir(args[0]):
 sys.stderr.write('nsinstall: ' + args[0] + ' is not a directory\n')
 sys.exit(1)
   if options.m:
 os.chmod(args[0], options.m)
-  sys.exit()
-if options.m:
-  os.makedirs(args[0], options.m)
-else:
-  os.makedirs(args[0])
 return 0
 
   # nsinstall arg1 [...] directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/nss

2021-01-20 Thread Michael Stahl (via logerrit)

 external/nss/ExternalProject_nss.mk |8 ++--
 external/nss/nsinstall.py   |   12 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 01fffa977e28b2a671f195daa3a1aaa4cbe3b258
Author: Michael Stahl 
AuthorDate: Tue Jan 19 11:28:41 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 20 17:27:17 2021 +0100

nss: fix parallel build race in nsinstall.py

  File 
"/home/tdf/lode/jenkins/workspace/android_aarch64/external/nss/nsinstall.py", 
line 112, in nsinstall
os.makedirs(args[0])
  File "/opt/rh/rh-python38/root/usr/lib64/python3.8/os.py", line 223, in 
makedirs
mkdir(name, mode)
FileExistsError: [Errno 17] File exists: '../../../../dist/public/dbm'
../../../coreconf/rules.mk:119: recipe for target 
'../../../../dist/public/dbm/d' failed

Change-Id: I4273e6d3d5fa520353fff8738823ef281fe237ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109619
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 6f5186a94dcd1989cdd819e35163af0542912559)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109587
Reviewed-by: Thorsten Behrens 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 5de54f467ecd..2570d007473f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 ))
 
 ifeq ($(OS),WNT)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
@@ -37,7 +39,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
 else # OS!=WNT
 # make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so 
nss can append it's own defaults
 # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so 
they will overrule nss makefile values
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py
index 80e9c1679373..d90a85e6c540 100644
--- a/external/nss/nsinstall.py
+++ b/external/nss/nsinstall.py
@@ -99,17 +99,17 @@ def nsinstall(argv):
   if options.D:
 if len(args) != 1:
   return 1
-if os.path.exists(args[0]):
+try:
+  if options.m:
+os.makedirs(args[0], options.m)
+  else:
+os.makedirs(args[0])
+except FileExistsError:
   if not os.path.isdir(args[0]):
 sys.stderr.write('nsinstall: ' + args[0] + ' is not a directory\n')
 sys.exit(1)
   if options.m:
 os.chmod(args[0], options.m)
-  sys.exit()
-if options.m:
-  os.makedirs(args[0], options.m)
-else:
-  os.makedirs(args[0])
 return 0
 
   # nsinstall arg1 [...] directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-01-20 Thread Tor Lillqvist (via logerrit)

 solenv/bin/macosx-codesign-app-bundle |   51 ++
 1 file changed, 9 insertions(+), 42 deletions(-)

New commits:
commit e2fcbac50549ca96b092d64bd14a37cee6b12e0a
Author: Tor Lillqvist 
AuthorDate: Wed Jan 20 12:16:09 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 20 17:28:32 2021 +0100

Simplify error handling

There were a couple of weird things in this script. Firstly, the
script redirected stdout and stderr from each invocation of codesign
separately into a log file. (Several differently named log files.) But
those log files were never displayed.

Secondly, the script did "set -e" at the start. Thus, if a codesign
invocation returned non-zero (error) exit status, any code to check
the exit status and possibly display the log file would not be
executed anyway.

Simplify thusly:

Don't pass --verbose to codesign. Then if nothing goes wrong, it is
silent. That is The Unix Philosophy, right?

Don't redirect codesign stdout and stderr to a log file (that would be
removed if codesign didn't fail). Just let any error message of
warning from codesign go to the script's stderr or stdout.

If codesign fails, just exit. Error messages will have been written to
stderr already. No log files to display or remove.

Don't use set -e. Instead if a codesign invocation fails, just exit.

The intent is that in the normal case, this script will be totally
silent.

Change-Id: Ic6081c418e4c564be768e30bf52b8196ee59f061
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109696
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 8aa725745327..f4df4d4e6639 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Exit on errors
-set -e
 # Use of unset variable is an error
 set -u
 # If any part of a pipeline of commands fails, the whole pipeline fails
@@ -47,11 +45,7 @@ fi
 find -d "$APP_BUNDLE" \( -name '*.jnilib' \) ! -type l |
 while read file; do
 id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --verbose --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" "$file" > "/tmp/codesign_$(basename 
"$file").log" 2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_$(basename "$file").log"
+codesign --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
 done
 
 # Sign dylibs
@@ -66,11 +60,7 @@ find "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.dylib.*' 
-or -name '*.so' \
 $other_files \) ! -type l |
 while read file; do
 id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --verbose --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" "$file" > "/tmp/codesign_$(basename 
"$file").log" 2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_$(basename "$file").log"
+codesign --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
 done
 
 # Sign included bundles. First .app ones (i.e. the Python.app inside
@@ -78,23 +68,15 @@ done
 
 find "$APP_BUNDLE"/Contents -name '*.app' -type d |
 while read app; do
-fn=`basename "$app"`
-fn=${fn%.*}
 # Assume the app has a XML (and not binary) Info.plist
 id=`grep -A 1 'CFBundleIdentifier' $app/Contents/Info.plist | 
tail -1 | sed -e 's,.*,,' -e 's,.*,,'`
-codesign --verbose --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$app" > "/tmp/codesign_${fn}.log" 
2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_${fn}.log"
+codesign --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$app" || exit 1
 done
 
 # Then .framework ones. Again, be generic just for kicks.
 
 find "$APP_BUNDLE" -name '*.framework' -type d |
 while read framework; do
-fn=`basename "$framework"`
-fn=${fn%.*}
 for version in "$framework"/Versions/*; do
 if test ! -L "$version" -a -d "$version"; then
# Assume the framework has a XML (and not binary) Info.plist
@@ -102,14 +84,10 @@ while read framework; do
if test -d $version/bin; then
# files in bin are not covered by signing the framework...
for scriptorexecutable in $(find $version/bin/ -type f); do
-   codesign --verbose --options=runtime --force 
--identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable" >> 
"/tmp/codesign_${fn}.log" 2>&1
+   codesign --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable"

[Libreoffice-commits] core.git: oox/source

2021-01-20 Thread Miklos Vajna (via logerrit)

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |  513 +---
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |   31 +
 2 files changed, 285 insertions(+), 259 deletions(-)

New commits:
commit 9e8cb640ed16a392d628c0ec513f6b4f5b947bfd
Author: Miklos Vajna 
AuthorDate: Wed Jan 20 10:49:30 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 20 18:17:29 2021 +0100

oox smartart: extract composite algo from AlgAtom::layoutShape()

AlgAtom::layoutShape() is more or less the single function where all
layouting happens for all algoritms. Extract the composite algorithm
part from it to a separate CompositeAlg::layoutShapeChildren() before
that function grows too large. This also allows making it clear that
some local functions are only meant to be used with the composite
algorithm.

Change-Id: Iccfd5ea0dcca2f531dae14cbed3e900d4ffd9cc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109668
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 562c20d05e7f..66df25d9ef4a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -108,7 +108,7 @@ bool containsDataNodeType(const oox::drawingml::ShapePtr& 
pShape, sal_Int32 nTyp
 }
 
 namespace oox::drawingml {
-void SnakeAlg::layoutShapeChildren(const AlgAtom::ParamMap& rMap, const 
ShapePtr& rShape,
+void SnakeAlg::layoutShapeChildren(const AlgAtom& rAlg, const ShapePtr& rShape,
const std::vector& rConstraints)
 {
 if (rShape->getChildren().empty() || rShape->getSize().Width == 0
@@ -199,6 +199,7 @@ void SnakeAlg::layoutShapeChildren(const AlgAtom::ParamMap& 
rMap, const ShapePtr
 
 bool bSpaceFromConstraints = fSpaceFromConstraint != 1.0;
 
+const AlgAtom::ParamMap& rMap = rAlg.getMap();
 const sal_Int32 nDir = rMap.count(XML_grDir) ? 
rMap.find(XML_grDir)->second : XML_tL;
 sal_Int32 nIncX = 1;
 sal_Int32 nIncY = 1;
@@ -477,6 +478,257 @@ void PyraAlg::layoutShapeChildren(const ShapePtr& rShape)
 }
 }
 
+bool CompositeAlg::inferFromLayoutProperty(const LayoutProperty& rMap, 
sal_Int32 nRefType,
+   sal_Int32& rValue)
+{
+switch (nRefType)
+{
+case XML_r:
+{
+auto it = rMap.find(XML_l);
+if (it == rMap.end())
+{
+return false;
+}
+sal_Int32 nLeft = it->second;
+it = rMap.find(XML_w);
+if (it == rMap.end())
+{
+return false;
+}
+rValue = nLeft + it->second;
+return true;
+}
+default:
+break;
+}
+
+return false;
+}
+
+void CompositeAlg::applyConstraintToLayout(const Constraint& rConstraint,
+   LayoutPropertyMap& rProperties)
+{
+// TODO handle the case when we have ptType="...", not forName="...".
+if (rConstraint.msForName.isEmpty())
+{
+return;
+}
+
+const LayoutPropertyMap::const_iterator aRef = 
rProperties.find(rConstraint.msRefForName);
+if (aRef == rProperties.end())
+return;
+
+const LayoutProperty::const_iterator aRefType = 
aRef->second.find(rConstraint.mnRefType);
+sal_Int32 nInferredValue = 0;
+if (aRefType != aRef->second.end())
+{
+// Reference is found directly.
+rProperties[rConstraint.msForName][rConstraint.mnType]
+= aRefType->second * rConstraint.mfFactor;
+}
+else if (inferFromLayoutProperty(aRef->second, rConstraint.mnRefType, 
nInferredValue))
+{
+// Reference can be inferred.
+rProperties[rConstraint.msForName][rConstraint.mnType]
+= nInferredValue * rConstraint.mfFactor;
+}
+else
+{
+// Reference not found, assume a fixed value.
+// Values are never in EMU, while oox::drawingml::Shape position and 
size are always in
+// EMU.
+double fUnitFactor = 0;
+if (isFontUnit(rConstraint.mnRefType))
+// Points -> EMU.
+fUnitFactor = EMU_PER_PT;
+else
+// Millimeters -> EMU.
+fUnitFactor = EMU_PER_HMM * 100;
+rProperties[rConstraint.msForName][rConstraint.mnType] = 
rConstraint.mfValue * fUnitFactor;
+}
+}
+
+void CompositeAlg::layoutShapeChildren(AlgAtom& rAlg, const ShapePtr& rShape,
+   const std::vector& 
rConstraints)
+{
+LayoutPropertyMap aProperties;
+LayoutProperty& rParent = aProperties[""];
+
+sal_Int32 nParentXOffset = 0;
+
+// Track min/max vertical positions, so we can center everything at the 
end, if needed.
+sal_Int32 nVertMin = std::numeric_limits::max();
+sal_Int32 nVertMax = 0;
+
+if (rAlg.getAspectRatio

Re: Calc memory consumption

2021-01-20 Thread Daniel A. Rodriguez


20 ene. 2021 02:56:24 Tor Lillqvist :

>>
>> Hi, exists some kind of formula to estimate how much RAM a spreadsheet could 
>> use? For instance 468K rows and columns from A to AG.
>
> Why do you need to know? And why is the amount of RAM interesting and not the 
> amount of virtual memory required?
>
> --tml
>

Well, trying to do something with such file using an i3 based PC with 4Gb 
freezes the software completely. However, an i7 with 16Gb handles it well. The 
idea is to find a common ground in between to prevent with hardware.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: desktop/source include/desktop

2021-01-20 Thread Luboš Luňák (via logerrit)

 desktop/source/app/crashreport.cxx |  177 +
 include/desktop/crashreport.hxx|1 
 2 files changed, 178 insertions(+)

New commits:
commit ea610df36842305ef7e26d964ad0a1677be5f553
Author: Luboš Luňák 
AuthorDate: Thu Jan 14 18:12:43 2021 +0100
Commit: Luboš Luňák 
CommitDate: Wed Jan 20 18:56:40 2021 +0100

make crashreports include info about the system (CPU,memory)

This may be useful when we again will be deciding on how well something
is or isn't supported (such as when we were making SSE2 required
on Windows).
Breakpad already kind of provides this information (as CPU family, model
and stepping), but that appears to be next to useless in practice
(on X86_64 it doesn't even say the CPU vendor).
So send as metadata CPU name, flags (SSE etc.) and system RAM, as these
may be possibly useful information.

Change-Id: I77ed935d78501d49f70e8b9769fab6be79f1db77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109358
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 2b6a1a57003e..a9f74b87e259 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -15,11 +15,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 
 #include 
+#include 
 
 
 #if HAVE_FEATURE_BREAKPAD
@@ -121,6 +123,8 @@ void CrashReporter::addKeyValue(const OUString& rKey, const 
OUString& rValue, tA
 
 void CrashReporter::writeCommonInfo()
 {
+writeSystemInfo();
+
 ucbhelper::InternetProxyDecider 
proxy_decider(::comphelper::getProcessComponentContext());
 
 const OUString protocol = "https";
@@ -256,6 +260,179 @@ std::string CrashReporter::getIniFileName()
 return aRet;
 }
 
+// Write system-specific information such as the CPU name and features.
+// This may allow us to get some statistics for decisions (such as when
+// deciding whether SSE2 can be made a hard-requirement for Windows).
+// Breakpad provides this information poorly or not at all.
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
+void CrashReporter::writeSystemInfo()
+{
+// Get 'model name' and 'flags' from /proc/cpuinfo.
+if( std::ifstream cpuinfo( "/proc/cpuinfo" ); cpuinfo )
+{
+bool haveModel = false;
+bool haveFlags = false;
+std::regex modelRegex( "^model name[ \t]*:[ \t]*(.*)$" );
+std::regex flagsRegex( "^flags[ \t]*:[ \t]*(.*)$" );
+for( std::string line; std::getline( cpuinfo, line ); )
+{
+std::smatch match;
+if( !haveModel && std::regex_match( line, match, modelRegex ) && 
match.size() == 2)
+{
+addKeyValue("CPUModelName", OUString::fromUtf8( match[ 1 
].str()), AddItem);
+haveModel = true;
+}
+if( !haveFlags && std::regex_match( line, match, flagsRegex ) && 
match.size() == 2)
+{
+addKeyValue("CPUFlags", OUString::fromUtf8( match[ 1 ].str()), 
AddItem);
+haveFlags = true;
+}
+if( haveModel && haveFlags )
+break;
+}
+}
+// Get 'MemTotal' from /proc/meminfo.
+if( std::ifstream meminfo( "/proc/meminfo" ); meminfo )
+{
+std::regex memTotalRegex( "^MemTotal[ \t]*:[ \t]*(.*)$" );
+for( std::string line; std::getline( meminfo, line ); )
+{
+std::smatch match;
+if( std::regex_match( line, match, memTotalRegex ) && match.size() 
== 2)
+{
+addKeyValue("MemoryTotal", OUString::fromUtf8( match[ 1 
].str()), AddItem);
+break;
+}
+}
+}
+}
+#elif defined _WIN32
+void CrashReporter::writeSystemInfo()
+{
+// Get CPU model name and flags.
+// See https://docs.microsoft.com/en-us/cpp/intrinsics/cpuid-cpuidex
+// and https://en.wikipedia.org/wiki/CPUID .
+int cpui[ 4 ];
+__cpuid( cpui, 0x8000 ); // Get the highest extended ID.
+int exIds = cpui[ 0 ];
+if( exIds >= 0x8004 )
+{
+int brand[ 16 ];
+__cpuidex( brand, 0x8002, 0 );
+__cpuidex( brand + 4, 0x8003, 0 );
+__cpuidex( brand + 8, 0x8004, 0 );
+brand[ 12 ] = 0;;
+addKeyValue( "CPUModelName", OUString::fromUtf8( reinterpret_cast< 
const char* >( brand )),
+AddItem );
+}
+__cpuid( cpui, 0 ); // Get the highest ID.
+int ids = cpui[ 0 ];
+unsigned int ecx1 = 0, edx1 = 0, ebx7 = 0, ecx7 = 0, ecx81 = 0, edx81 = 0;
+if( ids >= 0x1 )
+{
+__cpuidex( cpui, 0x1, 0 );
+ecx1 = cpui[ 2 ];
+edx1 = cpui[ 3 ];
+}
+if( ids >= 0x7 )
+{
+__cpuidex( cpui, 0x7, 0 );
+ebx7 = cpui[ 1 ];
+ecx7 = cpui[ 2 ];
+}
+if( exIds >= 0x8001 )
+{
+__cpuidex( cpui, 0x8001, 0 );
+

Minutes from the UX/design meeting 2020-Jan-20

2021-01-20 Thread Heiko Tietze


Present: Heiko, (Hakeem)
Comments: Telesto, Sascha, Andreas, Timur, Stuart, Regina

Tickets/Topic

 * UI: The Base preview for recent opened files isn't it. The
   transparency around the icon feels off
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139453
   + white background, large icon, placement at bottom right,
 or WF (all until real preview)
   + enlarge (Telesto), rather have a dummy preview (Andreas)
   + hard to impossible to implement an usable preview for databases,
 though a larger icon e.g. similar to A1 letter could improve the view 
(Sascha)
   => design some kind of dummy preview and show behind the icon which goes to
  the usual position then

 * VIEWING: Enhancement: Provide a window for foot notes in Web Layout view
   + https://bugs.documentfoundation.org/show_bug.cgi?id=67168
   + web layout is just not suited for footnotes; the Navigator has
 everything to quickly jump to the FN position (and back thanks
 the new Recency option) WF (Heiko)
   => very old ticket, no more opinions = WF

 * Usability: "Move or Copy Sheet"; the difference is subtle, but important
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139464
   + change the default to Copy or use Copy/Move instead of Ok
   + no need for a change (Timur)
   + Copy is a bit safer (Heiko)
   => do it

 * Import support for open image formats - ORA and XCF
   + https://bugs.documentfoundation.org/show_bug.cgi?id=83256
   + out of scope (Heiko)
   + these are work-files of there specific applications not image-files
 itselves (Sascha)
   + if well-spec'ed and licensed we could add an import filter (Stuart)
   => not worth the effort, WF

 * WRITER: context menu "Unstyle selected text" from  list style to
   "no-list" style
   + https://bugs.documentfoundation.org/show_bug.cgi?id=92622
   + a "None"-entry on top of the list could be useful (Sascha)
   + Character Style has a Default to unset (Heiko)
   => add "No List" on top

 * UI: Main toolbar lacking option to enable border for textbox in Draw/Impress
   (contrary to Calc/Writer)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139619
   + add line style dropdown (Heiko), +1 (Andreas)
   + different toolbars, different function, WFM (Regina)
   => go with the line style dropdown



OpenPGP_signature
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: dbaccess/source

2021-01-20 Thread Caolán McNamara (via logerrit)

 dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45dbc3023595edf50685776b1d803cdc2e5b0316
Author: Caolán McNamara 
AuthorDate: Wed Jan 20 11:20:23 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 20:59:19 2021 +0100

set parent for database authentication user/password dialog

Change-Id: Idd351405dbdccdf75d350ace876f8a8d00d9e549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109700
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2853110b1959..dfb3cc1db655 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -232,7 +232,7 @@ bool 
ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
 if ( !xHandler.is() )
 {
 // instantiate the default SDB interaction handler
-xHandler = 
task::InteractionHandler::createWithParent(m_xContext, nullptr);
+xHandler = 
task::InteractionHandler::createWithParent(m_xContext, m_pParent->GetXWindow());
 }
 
 OUString sName = pName ? pName->GetValue() : OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/source

2021-01-20 Thread Caolán McNamara (via logerrit)

 dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 240830f5831203ec558747f569baae068827f061
Author: Caolán McNamara 
AuthorDate: Wed Jan 20 11:20:23 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 21:00:05 2021 +0100

set parent for database authentication user/password dialog

Change-Id: Idd351405dbdccdf75d350ace876f8a8d00d9e549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109681
Reviewed-by: Michael Stahl 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2437196f14e3..7fe641e230a8 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -232,7 +232,7 @@ bool 
ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
 if ( !xHandler.is() )
 {
 // instantiate the default SDB interaction handler
-xHandler = 
task::InteractionHandler::createWithParent(m_xContext, nullptr);
+xHandler = 
task::InteractionHandler::createWithParent(m_xContext, m_pParent->GetXWindow());
 }
 
 OUString sName = pName ? pName->GetValue() : OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source

2021-01-20 Thread Caolán McNamara (via logerrit)

 dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9f5a92b9612e134994aad5f05a543860c6f098c
Author: Caolán McNamara 
AuthorDate: Wed Jan 20 11:20:23 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 20:59:34 2021 +0100

set parent for database authentication user/password dialog

Change-Id: Idd351405dbdccdf75d350ace876f8a8d00d9e549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109680
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2853110b1959..dfb3cc1db655 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -232,7 +232,7 @@ bool 
ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
 if ( !xHandler.is() )
 {
 // instantiate the default SDB interaction handler
-xHandler = 
task::InteractionHandler::createWithParent(m_xContext, nullptr);
+xHandler = 
task::InteractionHandler::createWithParent(m_xContext, m_pParent->GetXWindow());
 }
 
 OUString sName = pName ? pName->GetValue() : OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source

2021-01-20 Thread Tamás Zolnai (via logerrit)

 sfx2/source/sidebar/SidebarDockingWindow.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 90511b3c20be54284eaad1d3c888cf2d1ca16569
Author: Tamás Zolnai 
AuthorDate: Tue Dec 29 08:59:54 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Jan 20 21:17:22 2021 +0100

lok: send sidebar dialog update to the right view.

SfxViewShell::Current() might point to wrong client,
not the actual owner of the sidebar. Better to use
the LOKNotifier which points to the correct view.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108444
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit a6a3b9b665a874e98cedebbb2566d57285a40772)

Change-Id: I2a3f18eaf51e4bf9a9f811595ec4fc02ce86fa7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109622
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 302605d6a65a..737b9195b617 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -60,8 +60,12 @@ public:
 
 try
 {
-auto pMobileNotifier = SfxViewShell::Current();
-if (pMobileNotifier && pMobileNotifier->isLOKMobilePhone())
+auto pNotifier = m_rSidebarDockingWin.GetLOKNotifier();
+if (!pNotifier)
+return;
+
+const SfxViewShell* pOwnerView = dynamic_cast(pNotifier);
+if (pOwnerView && pOwnerView->isLOKMobilePhone())
 {
 // Mobile phone.
 std::stringstream aStream;
@@ -72,16 +76,12 @@ public:
 if (message != m_LastNotificationMessage)
 {
 m_LastNotificationMessage = message;
-
pMobileNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
message.c_str());
+
pOwnerView->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str());
 }
 }
 
 // Notify the sidebar is created, and its LOKWindowId, which
 // is needed on mobile phones, tablets, and desktop.
-auto pNotifier = m_rSidebarDockingWin.GetLOKNotifier();
-if (!pNotifier)
-return;
-
 const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(),
 m_rSidebarDockingWin.GetOutOffYPixel());
 const OString posMessage = pos.toString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/Makefile-clang.mk

2021-01-20 Thread Stephan Bergmann (via logerrit)

 compilerplugins/Makefile-clang.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db1561f0510a179045ccea857f9386af83af729f
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 14:24:19 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 20 22:17:35 2021 +0100

Build compilerplugings code with -fvisibility-inlines-hidden

Even though `llvm-config --cxxflags` does not reflect it, LLVM generally 
uses
-fvisibility-inlines-hidden on Unix-like platforms at least since 
"[CMake] Support -fvisibility-inlines-hidden when LLVM_ENABLE_PIC=Off" 
debuting
in release/3.8.x.

At least with my build on macOS 11.1 ARM64 against recent LLVM 12 trunk, 
that
caused a mismatch between

> $ nm -m compilerplugins/clang/sharedvisitor/analyzer.o | grep 
__ZGVZNK5clang24TemplateTemplateParmDecl18getDefaultArgumentEvE7NoneLoc
> 00028038 (__DATA,__data) weak external 
__ZGVZNK5clang24TemplateTemplateParmDecl18getDefaultArgumentEvE7NoneLoc

and

> $ nm -m ~/llvm/inst/lib/libclangAST.a\(JSONNodeDumper.cpp.o\) | grep 
__ZGVZNK5clang24TemplateTemplateParmDecl18getDefaultArgumentEvE7NoneLoc
> 0001ccf0 (__DATA,__data) weak private external 
__ZGVZNK5clang24TemplateTemplateParmDecl18getDefaultArgumentEvE7NoneLoc

etc., causing (albeit harmless) warnings

> [GEN] compilerplugins/clang/sharedvisitor/analyzer
> ld: warning: direct access in function 
'clang::JSONNodeDumper::VisitTemplateTemplateParmDecl(clang::TemplateTemplateParmDecl
 const*)' from file '~/llvm/inst/lib/libclangAST.a(JSONNodeDumper.cpp.o)' to 
global weak symbol 'guard variable for 
clang::TemplateTemplateParmDecl::getDefaultArgument() const::NoneLoc' from file 
'compilerplugins/clang/sharedvisitor/analyzer.o' means the weak symbol cannot 
be overridden at runtime. This was likely caused by different translation units 
being compiled with different visibility settings.
[...]

-fvisibility-inline-hidden is presumably supported by all
$(COMPILER_PLUGINS_CXX) used on non-Windows platforms in the wild, so lets 
be
bold and add it unconditionally.

Change-Id: I0d405b4f57066baa098977e65e5ba4a3a47575c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109712
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index 9d6b46019344..7d993433c030 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -26,7 +26,7 @@ else
 CLANGCXXFLAGS+=/DEBUG /Od
 endif
 else # WNT
-CLANGCXXFLAGS=-Wall -Wextra -Wundef
+CLANGCXXFLAGS=-Wall -Wextra -Wundef -fvisibility-inlines-hidden
 ifeq ($(CLANGDEBUG),)
 CLANGCXXFLAGS+=-O2
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source

2021-01-20 Thread Tamás Zolnai (via logerrit)

 sfx2/source/control/unoctitm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 761a0eb179938d6dab9a85e86c2a7c5b264599ca
Author: Tamás Zolnai 
AuthorDate: Wed Dec 30 12:07:10 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Jan 20 23:02:35 2021 +0100

lok: send uno command state update to the right view.

We get the correct view as a parameter(pViewFrame).

Change-Id: I36e99a7660fee69c6c7cb10977763b1136eb6e22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108511
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 0b1fb051d1bcbfc9f08f288193cff8b039558afd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109623

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a4e7c3e27aca..d14a6ecd6982 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1293,7 +1293,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 else
 {
 // Try to send JSON state version
-SfxLokHelper::sendUnoStatus(SfxViewShell::Current(), pState);
+SfxLokHelper::sendUnoStatus(pViewFrame->GetViewShell(), pState);
 
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

2021-01-20 Thread Tamás Zolnai (via logerrit)

 sw/source/core/crsr/crsrsh.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1423d6e79ebc3d82d1971061273103c55073e358
Author: Tamás Zolnai 
AuthorDate: Tue Jan 12 16:00:46 2021 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Jan 20 23:02:56 2021 +0100

tdf#139566: Fix select all (table + text) when document window looses focus.

Without setting mbSelectAll properly the selection cursor
is converted to a SwShellTableCursor, which can't handle
if a selection is extended outside of the table.

Change-Id: Ibd43097ac782b9fc02ff818d3911ebcd20efbd21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109185
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 7f150d63253e171e87c09225291c4e059aaf2476)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109624

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 3e29c1b83f3b..57c8fe107028 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2402,6 +2402,8 @@ void SwCursorShell::ShellLoseFocus()
 
 void SwCursorShell::ShellGetFocus()
 {
+comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && 
ExtendedSelectedAll());
+
 m_bHasFocus = true;
 if( !m_bBasicHideCursor && VisArea().Width() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Carlos Segura González license statement

2021-01-20 Thread Carlos Segura

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

2021-01-20 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/svx/res/markers.png |binary
 icon-themes/elementary_svg/svx/res/markers.svg |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51de39229d45259d2cdc13e2e102d3b73e436d06
Author: Rizal Muttaqin 
AuthorDate: Wed Jan 20 21:45:28 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Wed Jan 20 23:16:06 2021 +0100

elementary: tdf#125779, tdf#139056 update color to follow upstream brand

Change-Id: Ifb2f623858274c21c234db34ded9425c3215ffba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109713
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/svx/res/markers.png 
b/icon-themes/elementary/svx/res/markers.png
index 2667c0fd2d9b..ae3ecca170b5 100644
Binary files a/icon-themes/elementary/svx/res/markers.png and 
b/icon-themes/elementary/svx/res/markers.png differ
diff --git a/icon-themes/elementary_svg/svx/res/markers.svg 
b/icon-themes/elementary_svg/svx/res/markers.svg
index 1bdb34d04df4..3ca237d7d236 100644
--- a/icon-themes/elementary_svg/svx/res/markers.svg
+++ b/icon-themes/elementary_svg/svx/res/markers.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file

... etc. - the rest is truncated
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2021-01-20 Thread Seth Chaiklin (via logerrit)

 source/text/shared/optionen/01130200.xhp |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e9b5c5c090e4874daf878dd555329bfed6c07229
Author: Seth Chaiklin 
AuthorDate: Wed Jan 20 07:46:28 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Jan 21 00:07:27 2021 +0100

tdf#132695 export of character highlighting to MS Word - improve help

   Added explanations of the consequences of choosing highlighting or
   shading for export to MS Office. Each choice has an advantage and
   a disadvantage, and these are inverse to each other, so seemed better
   to give clear information so that users can make an informed choice
   that is relevant to their situation, rather than try to recommend a
   better or preferred choice.

   Also:
 + added information about default setting in different LO versions
   because some users might have files exported with older LO versions.

 + added  about using compatibility filter in "Character
   Highlighting Color" dialog box.

   Thanks to Justin Luth and Mike Kaganski for expert advice.

Change-Id: I16c2df016c00ed60b18d9fddfbb3573f425a851d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109672
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/optionen/01130200.xhp 
b/source/text/shared/optionen/01130200.xhp
index c04c11e6d..584a87a0c 100644
--- a/source/text/shared/optionen/01130200.xhp
+++ b/source/text/shared/optionen/01130200.xhp
@@ -1,6 +1,5 @@
 
 
-
 
 
-
 
   
  Microsoft Office
@@ -40,6 +38,7 @@
 OLE objects;Microsoft Office
 OLE objects;PDF
 character highlighting;Microsoft Office export
+character shading;Microsoft Office export
 
 Microsoft Office
 Specifies the settings for importing and exporting Microsoft Office and 
other documents.
@@ -60,7 +59,10 @@
 
 
 Character Highlighting
-Microsoft Office has two character attributes similar to $[officename] 
character background. Select the appropriate attribute (highlighting or 
shading) which you would like to use during export to Microsoft Office file 
formats.
+Microsoft Office has two character attributes similar to $[officename] 
character highlighting. Use this control to select the attribute, 
highlighting or shading, that $[officename] should 
use when exporting $[officename] character highlighting to Microsoft Office 
file formats.
+Highlighting exports the 
closest match between a $[officename] highlighting color and one of the 16 
Microsoft highlighting colors, using the Office character attribute that makes 
it easy for Office users to edit with the highlighting tool in Office 
applications. This is the default setting in $[officename] 5.0 to 
6.4.
+Shading exports all RGB 
colors to the other Office character attribute. This preserves color fidelity 
between $[officename] and Microsoft Office documents, but Office users must 
edit this character attribute with a tool that is not commonly used or easy to 
find in Office applications. This is the default setting since $[officename] 
7.0.
+The compatibility filter in the Character 
Highlighting Color dialog provides the Microsoft Office highlighting 
colors. Use those colors and choose Export as: Highlighting if you 
want both color fidelity and ease of editing for Office users.
 
 Lock files
 Mark this 
checkbox to generate a Microsoft Office lock file in addition to %PRODUCTNAME 
own lock file. Lock files signal to applications that a resource or 
file should not be used until the lock is released.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2021-01-20 Thread Seth Chaiklin (via logerrit)

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18fc6012a3ccbe33605e8f6d593c8457cece98ee
Author: Seth Chaiklin 
AuthorDate: Thu Jan 21 00:07:27 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Jan 21 00:07:27 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to e9b5c5c090e4874daf878dd555329bfed6c07229
  - tdf#132695 export of character highlighting to MS Word - improve help

   Added explanations of the consequences of choosing highlighting or
   shading for export to MS Office. Each choice has an advantage and
   a disadvantage, and these are inverse to each other, so seemed better
   to give clear information so that users can make an informed choice
   that is relevant to their situation, rather than try to recommend a
   better or preferred choice.

   Also:
 + added information about default setting in different LO versions
   because some users might have files exported with older LO versions.

 + added  about using compatibility filter in "Character
   Highlighting Color" dialog box.

   Thanks to Justin Luth and Mike Kaganski for expert advice.

Change-Id: I16c2df016c00ed60b18d9fddfbb3573f425a851d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109672
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index a3932cc1047b..e9b5c5c090e4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a3932cc1047b133170c08c45add70b8197fe9dd2
+Subproject commit e9b5c5c090e4874daf878dd555329bfed6c07229
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/mathml

2021-01-20 Thread dante (via logerrit)

 starmath/mathml/inc/mathmlexport.hxx|6 +++---
 starmath/mathml/inc/mathmlimport.hxx|6 +++---
 starmath/mathml/source/mathmlexport.cxx |8 
 starmath/mathml/source/mathmlimport.cxx |8 
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 160d406d5abdabf36e57e2d72b35d9b3fec52cbd
Author: dante 
AuthorDate: Tue Jan 19 12:53:38 2021 +0100
Commit: Mike Kaganski 
CommitDate: Thu Jan 21 05:27:48 2021 +0100

Replace bbUseHTMLMLEntities with m_bUseHTMLMLEntities

Change-Id: I3cc0b185de647333591ce28140b37f7e99a2520d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109628
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/starmath/mathml/inc/mathmlexport.hxx 
b/starmath/mathml/inc/mathmlexport.hxx
index ed5a598d6abf..1a6072118991 100644
--- a/starmath/mathml/inc/mathmlexport.hxx
+++ b/starmath/mathml/inc/mathmlexport.hxx
@@ -46,19 +46,19 @@ class SmXMLExportWrapper
 
 private:
 // Use customized entities
-bool bbUseHTMLMLEntities;
+bool m_bUseHTMLMLEntities;
 
 public:
 explicit SmXMLExportWrapper(css::uno::Reference const& 
rRef)
 : xModel(rRef)
 , bFlat(true)
-, bbUseHTMLMLEntities(false)
+, m_bUseHTMLMLEntities(false)
 {
 }
 
 bool Export(SfxMedium& rMedium);
 void SetFlat(bool bIn) { bFlat = bIn; }
-void useHTMLMLEntities(bool bUseHTMLMLEntities) { bbUseHTMLMLEntities = 
bUseHTMLMLEntities; }
+void useHTMLMLEntities(bool bUseHTMLMLEntities) { m_bUseHTMLMLEntities = 
bUseHTMLMLEntities; }
 
 static bool
 WriteThroughComponent(const css::uno::Reference& 
xOutputStream,
diff --git a/starmath/mathml/inc/mathmlimport.hxx 
b/starmath/mathml/inc/mathmlimport.hxx
index af7611852adc..215948b4a3cb 100644
--- a/starmath/mathml/inc/mathmlimport.hxx
+++ b/starmath/mathml/inc/mathmlimport.hxx
@@ -44,17 +44,17 @@ class SmXMLImportWrapper
 
 private:
 // Use customized entities
-bool bbUseHTMLMLEntities;
+bool m_bUseHTMLMLEntities;
 
 public:
 explicit SmXMLImportWrapper(css::uno::Reference const& 
rRef)
 : xModel(rRef)
-, bbUseHTMLMLEntities(false)
+, m_bUseHTMLMLEntities(false)
 {
 }
 
 ErrCode Import(SfxMedium& rMedium);
-void useHTMLMLEntities(bool bUseHTMLMLEntities) { bbUseHTMLMLEntities = 
bUseHTMLMLEntities; }
+void useHTMLMLEntities(bool bUseHTMLMLEntities) { m_bUseHTMLMLEntities = 
bUseHTMLMLEntities; }
 
 static ErrCode
 ReadThroughComponent(const css::uno::Reference& 
xInputStream,
diff --git a/starmath/mathml/source/mathmlexport.cxx 
b/starmath/mathml/source/mathmlexport.cxx
index 2936b7fba5be..2c621217504f 100644
--- a/starmath/mathml/source/mathmlexport.cxx
+++ b/starmath/mathml/source/mathmlexport.cxx
@@ -187,7 +187,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
 bRet = WriteThroughComponent(xStg, xModelComp, "meta.xml", 
xContext, xInfoSet,
  (bOASIS ? 
"com.sun.star.comp.Math.XMLOasisMetaExporter"
  : 
"com.sun.star.comp.Math.XMLMetaExporter"),
- bbUseHTMLMLEntities);
+ m_bUseHTMLMLEntities);
 }
 if (bRet)
 {
@@ -196,7 +196,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
 
 bRet = WriteThroughComponent(xStg, xModelComp, "content.xml", 
xContext, xInfoSet,
  
"com.sun.star.comp.Math.XMLContentExporter",
- bbUseHTMLMLEntities);
+ m_bUseHTMLMLEntities);
 }
 
 if (bRet)
@@ -207,7 +207,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
 bRet = WriteThroughComponent(xStg, xModelComp, "settings.xml", 
xContext, xInfoSet,
  (bOASIS ? 
"com.sun.star.comp.Math.XMLOasisSettingsExporter"
  : 
"com.sun.star.comp.Math.XMLSettingsExporter"),
- bbUseHTMLMLEntities);
+ m_bUseHTMLMLEntities);
 }
 }
 else
@@ -220,7 +220,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
 
 bRet = WriteThroughComponent(xOut, xModelComp, xContext, xInfoSet,
  
"com.sun.star.comp.Math.XMLContentExporter",
- bbUseHTMLMLEntities);
+ m_bUseHTMLMLEntities);
 }
 
 if (xStatusIndicator.is())
diff --git a/starmath/mathml/source/mathmlimport.cxx 
b/starmath/mathml/source/mathmlimport.cxx
index cbdfcc52abb1..061af451bf3a 100644
--- a/starmath/mathml/source/mathmlimport.cxx
+++ b/starmath/mathml/source/mathmlimport.cxx
@@ -188,7 +188,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium)
 = ReadThroughCom

[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/jsdialog/jsdialogbuilder.hxx |3 ++-
 vcl/jsdialog/executor.cxx|4 ++--
 vcl/jsdialog/jsdialogbuilder.cxx |4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 30afe838d35471c3d3e8f90e997ea0f4c152c6ae
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 08:39:15 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 06:51:13 2021 +0100

jsdialog: set entry text without back notification

We don't want to disturb user while editing the text

Change-Id: I8a8b9a688133d27fc2aeaee6178a773641f4a79f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109612
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index cefa5776c79b..b638ac01a417 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -246,7 +246,7 @@ public:
 virtual void set_sensitive(bool sensitive) override
 {
 BaseInstanceClass::set_sensitive(sensitive);
-notifyDialogState();
+sendUpdate(BaseInstanceClass::m_xWidget);
 }
 
 virtual css::uno::Reference 
get_drop_target() override
@@ -320,6 +320,7 @@ public:
 JSEntry(JSDialogSender* pSender, ::Edit* pEntry, SalInstanceBuilder* 
pBuilder,
 bool bTakeOwnership);
 virtual void set_text(const OUString& rText) override;
+void set_text_without_notify(const OUString& rText);
 };
 
 class JSListBox : public JSWidget
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 655104633410..1de6db627f96 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -166,12 +166,12 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 }
 else if (sControlType == "edit")
 {
-auto pEdit = dynamic_cast(pWidget);
+auto pEdit = dynamic_cast(pWidget);
 if (pEdit)
 {
 if (sAction == "change")
 {
-pEdit->set_text(rData["data"]);
+pEdit->set_text_without_notify(rData["data"]);
 LOKTrigger::trigger_changed(*pEdit);
 return true;
 }
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 38ef2a44e354..0c57aaf4fa44 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -750,7 +750,7 @@ JSLabel::JSLabel(JSDialogSender* pSender, FixedText* 
pLabel, SalInstanceBuilder*
 void JSLabel::set_label(const OUString& rText)
 {
 SalInstanceLabel::set_label(rText);
-notifyDialogState();
+sendUpdate(m_xWidget);
 };
 
 JSButton::JSButton(JSDialogSender* pSender, ::Button* pButton, 
SalInstanceBuilder* pBuilder,
@@ -771,6 +771,8 @@ void JSEntry::set_text(const OUString& rText)
 notifyDialogState();
 }
 
+void JSEntry::set_text_without_notify(const OUString& rText) { 
SalInstanceEntry::set_text(rText); }
+
 JSListBox::JSListBox(JSDialogSender* pSender, ::ListBox* pListBox, 
SalInstanceBuilder* pBuilder,
  bool bTakeOwnership)
 : JSWidget(pSender, pListBox, 
pBuilder,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/jsdialog/jsdialogbuilder.hxx |   16 +++
 vcl/jsdialog/jsdialogbuilder.cxx |   78 +--
 2 files changed, 48 insertions(+), 46 deletions(-)

New commits:
commit f9e05d9472d1d82734f10e8237a597a342ae32f3
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 12:09:45 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 06:51:50 2021 +0100

jsdialog: send updates also for source treeview on drag

+ simplify updates
+ unify naming

Change-Id: Iebdaae3d910ef2cba0c818aa17d407e39f62a5e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109635
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index b638ac01a417..bf35c54609cf 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -86,7 +86,7 @@ public:
 
 virtual ~JSDialogSender() = default;
 
-virtual void notifyDialogState(bool bForce = false);
+virtual void sendFullUpdate(bool bForce = false);
 void sendClose();
 virtual void sendUpdate(VclPtr pWindow);
 
@@ -233,20 +233,20 @@ public:
 virtual void show() override
 {
 BaseInstanceClass::show();
-notifyDialogState();
+sendFullUpdate();
 }
 
 virtual void hide() override
 {
 BaseInstanceClass::hide();
-notifyDialogState();
+sendFullUpdate();
 }
 
 using BaseInstanceClass::set_sensitive;
 virtual void set_sensitive(bool sensitive) override
 {
 BaseInstanceClass::set_sensitive(sensitive);
-sendUpdate(BaseInstanceClass::m_xWidget);
+sendUpdate();
 }
 
 virtual css::uno::Reference 
get_drop_target() override
@@ -275,16 +275,16 @@ public:
 m_pSender->sendClose();
 }
 
-void sendUpdate(VclPtr pWindow)
+void sendUpdate()
 {
 if (!m_bIsFreezed && m_pSender)
-m_pSender->sendUpdate(pWindow);
+m_pSender->sendUpdate(BaseInstanceClass::m_xWidget);
 }
 
-void notifyDialogState(bool bForce = false)
+void sendFullUpdate(bool bForce = false)
 {
 if ((!m_bIsFreezed || bForce) && m_pSender)
-m_pSender->notifyDialogState(bForce);
+m_pSender->sendFullUpdate(bForce);
 }
 };
 
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 0c57aaf4fa44..e40e098b74e0 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -155,7 +155,7 @@ void JSDialogNotifyIdle::Invoke()
 m_aMessageQueue.clear();
 }
 
-void JSDialogSender::notifyDialogState(bool bForce)
+void JSDialogSender::sendFullUpdate(bool bForce)
 {
 if (bForce)
 mpIdleNotify->forceUpdate();
@@ -726,13 +726,13 @@ JSDialog::JSDialog(JSDialogSender* pSender, ::Dialog* 
pDialog, SalInstanceBuilde
 void JSDialog::collapse(weld::Widget* pEdit, weld::Widget* pButton)
 {
 SalInstanceDialog::collapse(pEdit, pButton);
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSDialog::undo_collapse()
 {
 SalInstanceDialog::undo_collapse();
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSDialog::response(int response)
@@ -750,7 +750,7 @@ JSLabel::JSLabel(JSDialogSender* pSender, FixedText* 
pLabel, SalInstanceBuilder*
 void JSLabel::set_label(const OUString& rText)
 {
 SalInstanceLabel::set_label(rText);
-sendUpdate(m_xWidget);
+sendUpdate();
 };
 
 JSButton::JSButton(JSDialogSender* pSender, ::Button* pButton, 
SalInstanceBuilder* pBuilder,
@@ -768,7 +768,7 @@ JSEntry::JSEntry(JSDialogSender* pSender, ::Edit* pEntry, 
SalInstanceBuilder* pB
 void JSEntry::set_text(const OUString& rText)
 {
 SalInstanceEntry::set_text(rText);
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSEntry::set_text_without_notify(const OUString& rText) { 
SalInstanceEntry::set_text(rText); }
@@ -784,19 +784,19 @@ void JSListBox::insert(int pos, const OUString& rStr, 
const OUString* pId,
const OUString* pIconName, VirtualDevice* pImageSurface)
 {
 SalInstanceComboBoxWithoutEdit::insert(pos, rStr, pId, pIconName, 
pImageSurface);
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSListBox::remove(int pos)
 {
 SalInstanceComboBoxWithoutEdit::remove(pos);
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSListBox::set_active(int pos)
 {
 SalInstanceComboBoxWithoutEdit::set_active(pos);
-notifyDialogState();
+sendFullUpdate();
 }
 
 JSComboBox::JSComboBox(JSDialogSender* pSender, ::ComboBox* pComboBox, 
SalInstanceBuilder* pBuilder,
@@ -810,25 +810,25 @@ void JSComboBox::insert(int pos, const OUString& rStr, 
const OUString* pId,
 const OUString* pIconName, VirtualDevice* 
pImageSurface)
 {
 SalInstanceComboBoxWithEdit::insert(pos, rStr, pId, pIconName, 
pImageSurface);
-notifyDialogState();
+sendFullUpdate();
 }
 
 void JSComboBox::remove(int pos)

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 include/vcl/weld.hxx |2 +-
 vcl/inc/jsdialog/jsdialogbuilder.hxx |2 --
 vcl/jsdialog/jsdialogbuilder.cxx |6 --
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit b08e5a649c6bff4368e9a6629a940bc2b8f8b07b
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 14:20:51 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 06:52:50 2021 +0100

jsdialog: remove unnecessary handler

Change-Id: I4e4d032c73fc090f443dcc7bef0267e1df123810
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109643
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index b788a1313b74..00afd2fc45b9 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2259,7 +2259,7 @@ protected:
 
 friend class ::LOKTrigger;
 
-virtual void signal_clicked(const OString& rIdent) { 
m_aClickHdl.Call(rIdent); }
+void signal_clicked(const OString& rIdent) { m_aClickHdl.Call(rIdent); }
 void signal_toggle_menu(const OString& rIdent) { 
m_aToggleMenuHdl.Call(rIdent); }
 
 public:
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index bf35c54609cf..0c274868c716 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -409,8 +409,6 @@ class JSToolbar : public JSWidget
 public:
 JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, 
SalInstanceBuilder* pBuilder,
   bool bTakeOwnership);
-
-virtual void signal_clicked(const OString& rIdent) override;
 };
 
 class JSTextView : public JSWidget
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e40e098b74e0..98eb4fbdeb3a 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -949,12 +949,6 @@ JSToolbar::JSToolbar(JSDialogSender* pSender, ::ToolBox* 
pToolbox, SalInstanceBu
 {
 }
 
-void JSToolbar::signal_clicked(const OString& rIdent)
-{
-SalInstanceToolbar::signal_clicked(rIdent);
-sendFullUpdate();
-}
-
 JSTextView::JSTextView(JSDialogSender* pSender, ::VclMultiLineEdit* pTextView,
SalInstanceBuilder* pBuilder, bool bTakeOwnership)
 : JSWidget(pSender, pTextView, 
pBuilder,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/jsdialog/jsdialogbuilder.hxx |1 +
 vcl/jsdialog/jsdialogbuilder.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 67cdf39b467fc4dffd4b1dafc6d4aff2a09bfe70
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 15:55:29 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 06:53:06 2021 +0100

jsdialog: flush message queue on dialog close

Change-Id: I9e7d24e43a7ee7bf1a006c8d16e7b47a6b714fd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109644
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 0c274868c716..137659e9b217 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -89,6 +89,7 @@ public:
 virtual void sendFullUpdate(bool bForce = false);
 void sendClose();
 virtual void sendUpdate(VclPtr pWindow);
+void flush() { mpIdleNotify->Invoke(); }
 
 protected:
 void initializeSender(VclPtr aNotifierWindow, 
VclPtr aContentWindow,
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 98eb4fbdeb3a..e8c8ff4d4232 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -167,7 +167,7 @@ void JSDialogSender::sendFullUpdate(bool bForce)
 void JSDialogSender::sendClose()
 {
 mpIdleNotify->sendMessage(jsdialog::MessageType::Close, nullptr);
-mpIdleNotify->Start();
+flush();
 }
 
 void JSDialogSender::sendUpdate(VclPtr pWindow)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/inc/jsdialog/jsdialogbuilder.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 30ee1dc7d3e479cf5f77452acf163ff61e2697da
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 17:06:22 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 06:53:59 2021 +0100

jsdialog: reduce number of unnecessary messages

Change-Id: I8dfa464a39931a12dd2ecf91fc48f4812d75301b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109645
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 137659e9b217..aa9de490c249 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -246,8 +246,10 @@ public:
 using BaseInstanceClass::set_sensitive;
 virtual void set_sensitive(bool sensitive) override
 {
+bool bIsSensitive = BaseInstanceClass::get_sensitive();
 BaseInstanceClass::set_sensitive(sensitive);
-sendUpdate();
+if (bIsSensitive != sensitive)
+sendUpdate();
 }
 
 virtual css::uno::Reference 
get_drop_target() override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2021-01-20 Thread Szymon Kłos (via logerrit)

 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fbef08d9cb9c5bfc852dc23d5bafc9d057ee3bcd
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 12:02:41 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 07:50:16 2021 +0100

pivot table: avoid crash on drag n drop

Change-Id: I8d081cf884c38b2e4f367143ad728c29b1466fbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109634
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 95d36776a5d7..0dad394bda80 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -177,6 +177,9 @@ void 
ScPivotLayoutTreeListData::PushDataFieldNames(std::vector& rDataF
 
 void ScPivotLayoutTreeListData::InsertEntryForSourceTarget(weld::TreeView& 
rSource, int nTarget)
 {
+if (rSource.count_selected_rows() <=0)
+return;
+
 ScItemValue* pItemValue = 
reinterpret_cast(rSource.get_selected_id().toInt64());
 
 if (mpParent->IsDataElement(pItemValue->maFunctionData.mnCol))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

2021-01-20 Thread Szymon Kłos (via logerrit)

 vcl/jsdialog/jsdialogbuilder.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit e64784c4e8775d0c831ad71c70e73854a4b9aaa4
Author: Szymon Kłos 
AuthorDate: Wed Jan 20 17:48:18 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 07:53:42 2021 +0100

jsdialog: don't send multiple updates with the same content

Change-Id: I601511a85386a8a35cbc6a121a4719928f585794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109726
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e8c8ff4d4232..836c73f3edea 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -68,6 +68,18 @@ void JSDialogNotifyIdle::send(tools::JsonWriter& aJsonWriter)
 
 void JSDialogNotifyIdle::sendMessage(jsdialog::MessageType eType, 
VclPtr pWindow)
 {
+// we want only the latest update of same type
+// TODO: also if we met full update - previous updates are not valid
+auto it = m_aMessageQueue.begin();
+
+while (it != m_aMessageQueue.end())
+{
+if (it->first == eType && it->second == pWindow)
+it = m_aMessageQueue.erase(it);
+else
+it++;
+}
+
 m_aMessageQueue.push_back(std::make_pair(eType, pWindow));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang configure.ac include/tools

2021-01-20 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/test/doubleconvert.cxx |2 +-
 configure.ac |   10 +-
 include/tools/color.hxx  |   10 --
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit af34108d90bbbce90cf00c4b23961787599c7fa5
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 11:29:18 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 21 07:58:02 2021 +0100

Use C++20 consteval for the Color(sal_uInt32) ctor

...to make it more obvious that, since 
63a68064bb33f180b8a231f7524d99405d910226
"make the Color constructors explicitly specify transparency", it should 
only be
called when the argument is known at compile-time to have no 
transparency/alpha
channel.

(This revealed a GCC bug causing bogus

> xmloff/source/chart/ColorPropertySet.cxx: In constructor 
‘xmloff::chart::ColorPropertySet::ColorPropertySet(Color)’:
> xmloff/source/chart/ColorPropertySet.cxx:81:9: error: ‘this’ is not a 
constant expression
>81 | m_nDefaultColor( 0x0099ccff )  // blue 8
>   | ^

so in configure.ac suppress HAVE_CPP_CONSTEVAL when the compiler is found
broken.)

Change-Id: I68df7bd5fbd9b2dcf2243b5a4bde4064d3d665fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109697
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/test/doubleconvert.cxx 
b/compilerplugins/clang/test/doubleconvert.cxx
index 17bd49aa4f6f..12763d966c21 100644
--- a/compilerplugins/clang/test/doubleconvert.cxx
+++ b/compilerplugins/clang/test/doubleconvert.cxx
@@ -12,7 +12,7 @@
 
 int main()
 {
-Color col1;
+constexpr Color col1;
 Color col2;
 col2 = sal_Int32(
 col1); // expected-error@-1 {{redundant double conversion 
[loplugin:doubleconvert]}}
diff --git a/configure.ac b/configure.ac
index 458a4857b378..f60c1ae5a199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7189,7 +7189,9 @@ AC_SUBST([HAVE_GCC_FNO_SIZED_DEALLOCATION])
 
 AC_MSG_CHECKING([whether $CXX_BASE supports a working C++20 consteval])
 dnl ...that does not suffer from 
 "Missing code
-dnl from consteval constructor initializing const variable":
+dnl from consteval constructor initializing const variable" or
+dnl  "wrong 'error: ‘this’ 
is not a constant
+dnl expression' with consteval constructor":
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
@@ -7199,6 +7201,12 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 int i = 0;
 };
 S const s;
+
+struct S1 { consteval S1(int) {} };
+struct S2 {
+S1 x;
+S2(): x(0) {}
+};
 ], [
 return (s.i == 1) ? 0 : 1;
 ])], [
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 209ed34169a8..cd472fd472ee 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -72,7 +73,12 @@ public:
 : mValue(0) // black
 {}
 
-constexpr Color(const sal_uInt32 nColor)
+#if HAVE_CPP_CONSTEVAL
+consteval
+#else
+constexpr
+#endif
+Color(const sal_uInt32 nColor)
 : mValue(nColor)
 {
 assert(nColor <= 0xff && "don't pass transparency to this 
constructor, use the Color(ColorTransparencyTag,...) or 
Color(ColorAlphaTag,...) constructor to make it explicit");
@@ -211,7 +217,7 @@ public:
   */
 Color GetRGBColor() const
 {
-return mValue & 0x00FF;
+return {R, G, B};
 }
 
 /* Comparison and operators */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2021-01-20 Thread Stephan Bergmann (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 067297cb7d81f442f8fed1bd40e52a109688320d
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 16:06:59 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 21 07:58:18 2021 +0100

Avoid Clang -Werror,-Wunused-command-line-argument

> [CXX] bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
> clang-12: error: argument unused during compilation: 
'-fno-stack-clash-protection' [-Werror,-Wunused-command-line-argument]

as seen e.g. on macOS 11.1 ARM64 when building against Clang 12 trunk.  
Clang
supports -fstack-clash-protection on

> $ clang --target=x86_64-unknown-linux-gnu -fstack-clash-protection 
-fsyntax-only -x c -  $ clang --target=aarch64-unknown-linux-gnu -fstack-clash-protection 
-fsyntax-only -x c -  clang-12: warning: argument unused during compilation: 
'-fstack-clash-protection' [-Wunused-command-line-argument]

or

> $ clang --target=arm64-apple-macosx11.0.0 -fstack-clash-protection 
-fsyntax-only -x c -  clang-12: warning: argument unused during compilation: 
'-fstack-clash-protection' [-Wunused-command-line-argument]

Change-Id: I98625bb7ed37bf00e97634c1c8d1f87fe3263af9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109719
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index f60c1ae5a199..53c393bbc067 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6809,7 +6809,7 @@ HAVE_GCC_STACK_CLASH_PROTECTION=
 if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 AC_MSG_CHECKING([whether $CC_BASE supports -fstack-clash-protection])
 save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -fstack-clash-protection"
+CFLAGS="$CFLAGS -Werror -fstack-clash-protection"
 AC_LINK_IFELSE(
 [AC_LANG_PROGRAM(, [[return 0;]])],
 [AC_MSG_RESULT([yes]); HAVE_GCC_STACK_CLASH_PROTECTION=TRUE],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2021-01-20 Thread Mert Tumer (via logerrit)

 sd/source/ui/view/drviewse.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5dbdf1d0833eaa5868bff4cef0714ee4cef81cb8
Author: Mert Tumer 
AuthorDate: Wed Dec 9 14:13:26 2020 +0300
Commit: Mert Tumer 
CommitDate: Thu Jan 21 08:13:32 2021 +0100

Insert draw connectors directly for online

Change-Id: I962a69c142151a43c47efbdb79428760ab07ad98
Signed-off-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108682
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109214
Tested-by: Jenkins

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index db9662bb7650..bd4c3775300d 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -448,6 +448,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
 case SID_CONNECTOR_LINES_CIRCLES:
 case SID_INSERT_SIGNATURELINE:
 {
+bCreateDirectly = comphelper::LibreOfficeKit::isActive();
 SetCurrentFunction( FuConstructRectangle::Create( this, 
GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq, bPermanent ) );
 rReq.Done();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sc/source

2021-01-20 Thread Attila Szűcs (via logerrit)

 sc/qa/unit/subsequent_export-test.cxx |   29 +
 sc/source/filter/xml/xmltabi.cxx  |   22 +-
 2 files changed, 42 insertions(+), 9 deletions(-)

New commits:
commit bd6214e2aa6f25e013eef769529b75c1e3b580cb
Author: Attila Szűcs 
AuthorDate: Thu Jan 14 15:01:13 2021 +0100
Commit: László Németh 
CommitDate: Thu Jan 21 08:19:40 2021 +0100

tdf#51022 sc import: fix lost print ranges of last sheet

of documents with external references.

Processing external sheets could remove (or extend) the
print ranges of the last non-external sheet (indexed by
nCurTab).

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: Ifc44148875106dad791de61953f3b046b6f2b188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109295
Tested-by: László Németh 
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 3bec0ecde3bd..6c68d2b02183 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -273,6 +273,7 @@ public:
 void testTdf126305_DataValidatyErrorAlert();
 void testTdf76047_externalLink();
 void testTdf87973_externalLinkSkipUnuseds();
+void testTdf51022_lostPrintRange();
 void testTdf138741_externalLinkSkipUnusedsCrash();
 void testTdf138824_linkToParentDirectory();
 void testTdf129969();
@@ -450,6 +451,7 @@ public:
 CPPUNIT_TEST(testTdf126305_DataValidatyErrorAlert);
 CPPUNIT_TEST(testTdf76047_externalLink);
 CPPUNIT_TEST(testTdf87973_externalLinkSkipUnuseds);
+CPPUNIT_TEST(testTdf51022_lostPrintRange);
 CPPUNIT_TEST(testTdf138741_externalLinkSkipUnusedsCrash);
 CPPUNIT_TEST(testTdf138824_linkToParentDirectory);
 CPPUNIT_TEST(testTdf129969);
@@ -5672,6 +5674,33 @@ void ScExportTest::testTdf87973_externalLinkSkipUnuseds()
 pDocSh->DoClose();
 }
 
+void ScExportTest::testTdf51022_lostPrintRange()
+{
+ScDocShellRef pShell = loadDoc(u"tdf87973_externalLinkSkipUnuseds.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(pShell.is());
+
+pShell->ReloadAllLinks();
+ScDocument& rDoc = pShell->GetDocument();
+
+//Add print ranges
+ScRange aRange1(1, 2, 0, 3, 4, 0);
+ScRange aRange2(1, 6, 0, 3, 7, 0);
+rDoc.AddPrintRange(0, aRange1);
+rDoc.AddPrintRange(0, aRange2);
+
+// save and load back
+ScDocShellRef pDocSh = saveAndReload(&(*pShell), FORMAT_ODS);
+CPPUNIT_ASSERT(pDocSh.is());
+
+// check if the same print ranges are present
+ScDocument& rDoc2 = pDocSh->GetDocument();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
rDoc2.GetPrintRangeCount(0));
+CPPUNIT_ASSERT_EQUAL(aRange1, *rDoc2.GetPrintRange(0, 0));
+CPPUNIT_ASSERT_EQUAL(aRange2, *rDoc2.GetPrintRange(0, 1));
+
+pDocSh->DoClose();
+}
+
 void ScExportTest::testTdf138741_externalLinkSkipUnusedsCrash()
 {
 ScDocShellRef xShell = loadDoc(u"tdf138741_externalLinkSkipUnusedsCrash.", 
FORMAT_XLSX);
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index ee09f9de2243..dab3e428305d 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -332,19 +332,23 @@ void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 
/*nElement*/)
 
 ScMyTables& rTables = rImport.GetTables();
 SCTAB nCurTab = rTables.GetCurrentSheet();
-if (!sPrintRanges.isEmpty())
+// tdf#51022 process only print ranges of internal sheets
+if (!pExternalRefInfo)
 {
-ScRangeList aRangeList;
-ScRangeStringConverter::GetRangeListFromString( aRangeList, 
sPrintRanges, *pDoc, ::formula::FormulaGrammar::CONV_OOO );
-size_t nCount = aRangeList.size();
-for (size_t i=0; i< nCount; i++ )
+if (!sPrintRanges.isEmpty())
 {
-pDoc->AddPrintRange( nCurTab, aRangeList[i] );
+ScRangeList aRangeList;
+ScRangeStringConverter::GetRangeListFromString(aRangeList, 
sPrintRanges, *pDoc, ::formula::FormulaGrammar::CONV_OOO);
+size_t nCount = aRangeList.size();
+for (size_t i = 0; i < nCount; i++)
+{
+pDoc->AddPrintRange(nCurTab, aRangeList[i]);
+}
 }
+else if (!bPrintEntireSheet)
+// Sheet has "print entire sheet" option by default.  Remove it.
+pDoc->ClearPrintRanges(nCurTab);
 }
-else if (!bPrintEntireSheet)
-// Sheet has "print entire sheet" option by default.  Remove it.
-pDoc->ClearPrintRanges(nCurTab);
 
 ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nCurTab));
 if (pOutlineTable)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - include/svx officecfg/registry sc/sdi sc/source svx/sdi sw/inc sw/sdi sw/source

2021-01-20 Thread Samuel Mehrbrodt (via logerrit)

 include/svx/svxids.hrc   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |5 --
 sc/sdi/docsh.sdi |2 +
 sc/source/ui/docshell/docsh3.cxx |5 ++
 sc/source/ui/docshell/docsh4.cxx |5 ++
 sc/source/ui/inc/docsh.hxx   |1 
 svx/sdi/svx.sdi  |   16 
+
 sw/inc/cmdid.h   |4 --
 sw/sdi/_viewsh.sdi   |2 -
 sw/sdi/swriter.sdi   |   17 
--
 sw/sdi/viewsh.sdi|2 -
 sw/source/uibase/uiview/pview.cxx|2 -
 sw/source/uibase/uiview/view2.cxx|2 -
 14 files changed, 40 insertions(+), 29 deletions(-)

New commits:
commit b524e70db6f01ed8bfe5dddb0401f8d1622c2d24
Author: Samuel Mehrbrodt 
AuthorDate: Wed Jan 13 13:50:39 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jan 21 08:53:20 2021 +0100

Bring uno:RefreshView to Calc

Allow refreshing the document layout via UNO slot

Change-Id: I956bb884b1fb4231b1f617c4aa5a80ff9a45ec92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109269
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6c5ae5c13117..e9abb5be0672 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -652,6 +652,7 @@ class SfxStringItem;
 #define SID_FM_SHOW_DATANAVIGATOR   ( SID_SVX_START + 773 )
 #define SID_FM_DATANAVIGATOR_CONTROL( SID_SVX_START + 774 )
 #define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 )
+#define SID_REFRESH_VIEW( SID_SVX_START + 776 )
 
 // CAUTION! Range <855 .. 855> used by EditEngine (!)
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 4143da531483..f0fa6e973d3e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5712,6 +5712,11 @@
   1
 
   
+  
+
+  Refresh document layout
+
+  
   
 
   Find Record...
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 286f44343fa9..dc37904c7c89 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2373,11 +2373,6 @@
   1
 
   
-  
-
-  Restore View
-
-  
   
 
   Directly to Document End
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index fdb22acf3e0c..0ec807cf6d73 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -75,6 +75,8 @@ interface TableDocument
 SID_SHARE_DOC   [ ExecMethod = Execute; StateMethod = GetState; ]
 SID_NOTEBOOKBAR [ ExecMethod = Execute; StateMethod = GetState; ]
 SID_LANGUAGE_STATUS [ ExecMethod = Execute; StateMethod = GetState; ]
+
+SID_REFRESH_VIEW[ ExecMethod = Execute; StateMethod = GetState; ]
 }
 
 
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 028e24dc9bf8..303cefe1ee43 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -177,6 +177,11 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 
+void ScDocShell::PostPaintAll()
+{
+PostPaint(0, 0, 0, MAXCOL, MAXROW, MAXTAB, PaintPartFlags::All);
+}
+
 void ScDocShell::PostPaintGridAll()
 {
 PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PaintPartFlags::Grid );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 853de4150c5b..52a44126539d 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1252,6 +1252,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
 }
 }
 break;
+case SID_REFRESH_VIEW:
+{
+PostPaintGridAll();
+}
+break;
 default:
 {
 // small (?) hack -> forwarding of the slots to TabViewShell
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 5b990f24e6a6..c81e40fcaf11 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/source

2021-01-20 Thread Samuel Mehrbrodt (via logerrit)

 sw/source/uibase/shells/basesh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aaa3358969cafe3edc2904599b69f7f3c6aee545
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 18 15:51:47 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jan 21 08:53:41 2021 +0100

"Update all" should do a full reformatting

Change-Id: I05b06e4b345c2125f4fd5272fc6a3354396a29ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 4ecabed3ac5aff26bee6d195136ca819cbeb995c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109604
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 9bd0e475b43f..37018af937e0 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -676,7 +676,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
 rDis.Execute( FN_UPDATE_FIELDS );
 rDis.Execute( FN_UPDATE_TOX );
 rDis.Execute( FN_UPDATE_CHARTS );
-rSh.CalcLayout();
+rSh.Reformat();
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/source

2021-01-20 Thread Samuel Mehrbrodt (via logerrit)

 sw/source/uibase/uno/unotxdoc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b510f403f9fb9e429ffe9faccf78808d64c5f8b5
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 18 12:07:16 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jan 21 08:54:10 2021 +0100

XTextDocument::refresh should do a full reformatting

Change-Id: Ia92e10e43cb8254b6dd35db03462b87d0fe93f45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109538
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit cbbfed893616f804cb6557185ddda26c0cef2ed6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109572
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 1db55d3c5831..1bbf2fc5a972 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2246,7 +2246,7 @@ void SwXTextDocument::refresh()
 SwViewShell *pViewShell = pDocShell->GetWrtShell();
 NotifyRefreshListeners();
 if(pViewShell)
-pViewShell->CalcLayout();
+pViewShell->Reformat();
 }
 
 void SAL_CALL SwXTextDocument::addRefreshListener(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

88 matches

Mail list logo