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

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_frmedt.mk|   73 
 sw/Module_sw.mk |1 
 sw/qa/core/frmedt/data/textbox-reanchor.odt |binary
 sw/qa/core/frmedt/frmedt.cxx|   63 
 sw/source/core/frmedt/fefly1.cxx|   19 ++-
 5 files changed, 155 insertions(+), 1 deletion(-)

New commits:
commit 58fab0b920303e58d3ac3be28b22763970085f02
Author: Miklos Vajna 
AuthorDate: Mon Feb 24 21:24:33 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 25 09:01:51 2020 +0100

tdf#91219 sw: don't allow anchoring a shape+textbox into itself

We already have code that detects this in the simple fly frame case,
extend that to cover the "paired fly frame + draw shape" case as well.

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

diff --git a/sw/CppunitTest_sw_core_frmedt.mk b/sw/CppunitTest_sw_core_frmedt.mk
new file mode 100644
index ..5f283bdadfba
--- /dev/null
+++ b/sw/CppunitTest_sw_core_frmedt.mk
@@ -0,0 +1,73 @@
+# -*- 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 can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_frmedt))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_frmedt))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_frmedt, \
+sw/qa/core/frmedt/frmedt \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_frmedt, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+svxcore \
+sw \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_frmedt,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_frmedt,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_frmedt,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_frmedt))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_frmedt))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_frmedt,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_frmedt,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_frmedt))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_frmedt, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_frmedt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index f8b250f57cbf..139dee1be4a1 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_uibase_shells \
 CppunitTest_sw_core_accessibilitycheck \
 CppunitTest_sw_core_layout \
+CppunitTest_sw_core_frmedt \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/frmedt/data/textbox-reanchor.odt 
b/sw/qa/core/frmedt/data/textbox-reanchor.odt
new file mode 100644
index ..dd4eb69d1701
Binary files /dev/null and b/sw/qa/core/frmedt/data/textbox-reanchor.odt differ
diff --git a/sw/qa/core/frmedt/frmedt.cxx b/sw/qa/core/frmedt/frmedt.cxx
new file mode 100644
index ..cf3d1945e049
--- /dev/null
+++ b/sw/qa/core/frmedt/frmedt.cxx
@@ -0,0 +1,63 @@
+/* -*- 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/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+static char const DATA_DIRECTORY[] = "/sw/qa/core/frmedt/data/";
+
+/// Covers sw/source/core/frmedt/ fixes.
+class SwCoreFrmedtTest : public SwModelTestBase
+{
+};
+
+CPPUNIT_TEST_FIXTURE(SwCoreFrmedtTest, testTextboxReanchor)
+{
+// Load a document with a textframe and a textbox(shape+textframe).
+load(DATA_DIRECTORY, "textbox-reanchor.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SdrPage* pDrawPage = 
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pDra

Re: Trusted certificates in LibreOffice 6.3

[Miklos Vajna]

Hi Steve,

On Mon, Feb 24, 2020 at 08:04:53PM +0100, Steve Martin 
 wrote:
> Do I have to save my certificate for this scenario in a specific
> certificate trust store in Windows?

Similarly to the nss backend, the xmlsec-mscng keys manager is based on
the simple keys store from xmlsec core. If keys are not found in the
simple keys store, then the MS Certificate store (the "MY" store by
default, visible as Personal -> Certificates in certmgr.msc) is used to
look up keys.

If the certificate is trusted there, LO is supposed to trust it as well.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: comphelper/source desktop/CppunitTest_desktop_lib.mk desktop/qa desktop/source include/comphelper include/sfx2 include/svl sfx2/source svl/source unotools/source

[Tomaž Vajngerl (via logerrit)]

 comphelper/source/misc/lok.cxx  |   73 
 desktop/CppunitTest_desktop_lib.mk  |1 
 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 
 desktop/source/lib/init.cxx |   39 --
 include/comphelper/lok.hxx  |7 +-
 include/sfx2/lokhelper.hxx  |6 ++
 include/sfx2/viewsh.hxx |6 ++
 include/svl/zforlist.hxx|2 
 sfx2/source/view/lokhelper.cxx  |   32 +++-
 sfx2/source/view/viewsh.cxx |   11 +++-
 svl/source/numbers/zforlist.cxx |   10 +++
 unotools/source/misc/syslocale.cxx  |2 
 12 files changed, 159 insertions(+), 32 deletions(-)

New commits:
commit 3810f28d784ff71d4c6d68557e70bd80c1d1d99c
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 24 08:07:12 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 09:25:33 2020 +0100

Fix currency symbol selection in Calc on mobile

In LOK we use one language identifier for both - UI language and
the locale used. This is a problem when we determine that we a
language for UI is not available and fall-back to the default
"en-US" langauge, which also changes the locale. This introduces
a separate variable that stores the language tag for the locale
independently to the language.

Another problem is that in some cases we don't reset the staticly
initialized data, when the new document is loaded, which is on
the other hand used to define which currency symbol is used as
SYSTEM locale. That can in some cases select the wrong currency
symbol even when we changed the locale to something else. This fix
introduces a reset function, which is triggered on every document
load.

Change-Id: I55c7f467600a832895f94346f8bf11a6ef6a1e49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89320
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89343
Tested-by: Jenkins

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index f339db2657dc..2deb105d8e02 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -35,7 +35,55 @@ static bool g_bLocalRendering(false);
 
 static Compat g_eCompatFlags(Compat::none);
 
-static LanguageTag g_aLanguageTag("en-US", true);
+namespace
+{
+
+class LanguageAndLocale
+{
+private:
+LanguageTag maLanguageTag;
+LanguageTag maLocaleLanguageTag;
+
+public:
+
+LanguageAndLocale()
+: maLanguageTag(LANGUAGE_NONE)
+, maLocaleLanguageTag(LANGUAGE_NONE)
+{}
+
+const LanguageTag& getLanguage()
+{
+return maLanguageTag;
+}
+
+void setLanguage(const LanguageTag& rLanguageTag)
+{
+if (maLanguageTag != rLanguageTag)
+{
+SAL_INFO("comphelper.lok", "Setting language from " << 
maLanguageTag.getBcp47() << " to " << rLanguageTag.getBcp47());
+maLanguageTag = rLanguageTag;
+}
+}
+
+const LanguageTag& getLocale()
+{
+return maLocaleLanguageTag;
+}
+
+void setLocale(const LanguageTag& rLocaleLanguageTag)
+{
+if (maLocaleLanguageTag != rLocaleLanguageTag)
+{
+SAL_INFO("comphelper.lok", "Setting locale from " << 
maLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
+maLocaleLanguageTag = rLocaleLanguageTag;
+}
+}
+
+};
+
+}
+
+static LanguageAndLocale g_aLanguageAndLocale;
 
 /// Scaling of the cairo canvas painting for hi-dpi
 static double g_fDPIScale(1.0);
@@ -153,23 +201,28 @@ void setCompatFlag(Compat flag) { g_eCompatFlags = 
static_cast(g_eCompat
 
 bool isCompatFlagSet(Compat flag) { return (g_eCompatFlags & flag) == flag; }
 
-void setLanguageTag(const OUString& lang, bool bCanonicalize)
+void setLocale(const LanguageTag& rLanguageTag)
 {
-g_aLanguageTag = LanguageTag(lang, bCanonicalize);
+g_aLanguageAndLocale.setLocale(rLanguageTag);
 }
 
-void setLanguageTag(const LanguageTag& languageTag)
+const LanguageTag& getLocale()
 {
-if (g_aLanguageTag != languageTag)
-{
-SAL_INFO("comphelper.lok", "setLanguageTag: from " << 
g_aLanguageTag.getBcp47() << " to " << languageTag.getBcp47());
-g_aLanguageTag = languageTag;
-}
+const LanguageTag& rLocale = g_aLanguageAndLocale.getLocale();
+SAL_WARN_IF(rLocale.getLanguageType() == LANGUAGE_NONE, "comphelper.lok", 
"Locale not set");
+return rLocale;
+}
+
+void setLanguageTag(const LanguageTag& rLanguageTag)
+{
+g_aLanguageAndLocale.setLanguage(rLanguageTag);
 }
 
 const LanguageTag& getLanguageTag()
 {
-return g_aLanguageTag;
+const LanguageTag& rLanguage = g_aLanguageAndLocale.getLanguage();
+SAL_WARN_IF(rLanguage.getLanguageType() == LANGUAGE_NONE, 
"comphelper.lok", "Language not set");
+return rLanguage;
 }
 
 bool isWhiteliste

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

[Marco Cecchetti (via logerrit)]

 sc/source/core/data/funcdesc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 968fe71f654937727e0708d1070ffabf90b9e527
Author: Marco Cecchetti 
AuthorDate: Thu Feb 20 14:47:13 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 09:28:45 2020 +0100

formula manager: wrong category returned by ScFuncDesc::getCategory

In the function manager the index associated to each category starts
from 0 while in ScFuncDesc starts from 1 (data member
ScFuncDesc::nCategory)

Change-Id: I92d0cd2a1a2871785e45faafd797dcf3a500bec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89198
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 15a2e22d8811..a7a62d2d8568 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -284,7 +284,7 @@ OUString ScFuncDesc::getFunctionName() const
 
 const formula::IFunctionCategory* ScFuncDesc::getCategory() const
 {
-return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory);
+return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory - 1);
 }
 
 OUString ScFuncDesc::getDescription() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optdict.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 91e8ee86d499b759aa6639368a40528482e49fb6
Author: Caolán McNamara 
AuthorDate: Fri Feb 14 14:35:11 2020 +
Commit: Xisco Faulí 
CommitDate: Tue Feb 25 09:35:50 2020 +0100

Resolves: tdf#130658 there isn't a second column in non-exception mode

Change-Id: I35edf263251c087976aa9a2506bb23c083e1f7c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88693
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index ab4711eb1a2f..ff6c597f1fe4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -677,6 +677,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::Entry&, 
rEdt, void)
 bool bTmpSelEntry=false;
 CDE_RESULT eCmpRes = CDE_DIFFERENT;
 
+bool bDoubleColumn = m_pWordsLB == m_xDoubleColumnLB.get();
+
 for (int i = 0, nCount = m_pWordsLB->n_children(); i < nCount; ++i)
 {
 OUString aTestStr(m_pWordsLB->get_text(i, 0));
@@ -688,7 +690,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::Entry&, 
rEdt, void)
 bDoNothing=true;
 m_pWordsLB->set_cursor(i);
 bDoNothing=false;
-m_xReplaceED->set_text(m_pWordsLB->get_text(i, 1));
+if (bDoubleColumn)
+m_xReplaceED->set_text(m_pWordsLB->get_text(i, 1));
 
 if (CDE_SIMILAR == eCmpRes)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - editeng/source

[Samuel Mehrbrodt (via logerrit)]

 editeng/source/editeng/impedit2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7db2d68ec0add7bbdc9067f2818274a569ab86fb
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 24 11:13:36 2020 +0100
Commit: Xisco Faulí 
CommitDate: Tue Feb 25 09:42:00 2020 +0100

tdf#130760 Fix crash when clicking link to other slide

Change-Id: Ie8b0cfb852fe1abc49b80b1d2d9d2c3be1241701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89332
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 5e8b6d3b721ba8730bc7a5b335418340e3f89c3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89285
Reviewed-by: Xisco Faulí 

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index c92cbe85cf98..7fe64b194097 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -606,7 +606,7 @@ bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, 
EditView* pView )
 css::system::SystemShellExecute::create(
 comphelper::getProcessComponentContext()));
 exec->execute(pUrlField->GetURL(), OUString(),
-  
css::system::SystemShellExecuteFlags::URIS_ONLY);
+  
css::system::SystemShellExecuteFlags::DEFAULTS);
 }
 }
 GetEditEnginePtr()->FieldClicked( *pFld );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/ui/inc/sdxfer.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0487363753960faccb8ba464414e18786dcd915
Author: Caolán McNamara 
AuthorDate: Mon Feb 24 14:33:18 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 09:51:23 2020 +0100

inherit SdTransferable from TransferDataContainer instead of 
TransferableHelper

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

diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index bebbcd2c7c11..0e40bd0618b2 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -37,7 +37,7 @@ class DrawDocShell;
 class View;
 }
 
-class SAL_DLLPUBLIC_RTTI SdTransferable : public TransferableHelper, public 
SfxListener
+class SAL_DLLPUBLIC_RTTI SdTransferable : public TransferDataContainer, public 
SfxListener
 {
 public:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 filter/source/svg/svgwriter.cxx |   58 +---
 filter/source/svg/svgwriter.hxx |2 -
 include/svx/svdograf.hxx|9 ++
 include/svx/unoshape.hxx|2 -
 svx/source/svdraw/svdograf.cxx  |   22 +++
 5 files changed, 82 insertions(+), 11 deletions(-)

New commits:
commit 570be56b37e4ff105649e604ff4c8a6c368e2e79
Author: Miklos Vajna 
AuthorDate: Tue Feb 25 09:04:10 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 25 10:03:10 2020 +0100

svx: cache PNG export of graphic shapes

One scenario where this is useful is: manipulate a JPEG photo in
Online's Impress, e.g. resize it multiple times. Each time we generate
an SVG preview of the shape, which includes the PNG export of the bitmap
itself.

This helps with a desktop CPU:

debug:9976:9974: SVGFilter::filter finished in 3422 ms
debug:9976:9974: SVGFilter::filter finished in 176 ms

But it is meant to help on mobile, too, where writing such a bitmap as
PNG takes 16-17 seconds without this.

(This works because SVG writes the original bitmap, even if it's scaled.
If that invariant will be broken in the future, we still emit correct
output, but then the cache will be less useful.)

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

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f70d11200be7..7706e2c26e44 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -2684,10 +2686,29 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, 
const OUString& rText,
 }
 }
 
+namespace
+{
+SdrGrafObj* GetSdrGrafObjFromXShape(const 
css::uno::Reference* pShape)
+{
+if (!pShape)
+{
+return nullptr;
+}
+
+auto pObject = dynamic_cast(pShape->get());
+if (!pObject)
+{
+return nullptr;
+}
+
+return dynamic_cast(pObject->GetSdrObject());
+}
+}
 
 void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 const Point& rPt, const Size& rSz,
-const Point& rSrcPt, const Size& rSrcSz )
+const Point& rSrcPt, const Size& rSrcSz,
+const 
css::uno::Reference* pShape )
 {
 if( !!rBmpEx )
 {
@@ -2702,8 +2723,27 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& 
rBmpEx,
 {
 SvMemoryStream aOStm( 65535, 65535 );
 
-if( GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE )
+bool bCached = false;
+SdrGrafObj* pGrafObj = nullptr;
+if (pShape)
 {
+pGrafObj = GetSdrGrafObjFromXShape(pShape);
+if (pGrafObj && pGrafObj->GetPNGPreviewChecksum() == 
rBmpEx.GetChecksum())
+{
+const std::vector& rPreviewData = 
pGrafObj->GetPNGPreviewData();
+aOStm.WriteBytes(rPreviewData.data(), rPreviewData.size());
+bCached = true;
+}
+}
+
+if( bCached || GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE )
+{
+if (!bCached && pGrafObj)
+{
+pGrafObj->SetPNGPreviewChecksum(rBmpEx.GetChecksum());
+pGrafObj->SetPNGPreviewData(aOStm);
+}
+
 PointaPt;
 Size aSz;
 Sequence< sal_Int8 > aSeq( static_cast(aOStm.GetData()), aOStm.Tell() );
@@ -3047,7 +3087,7 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 const MetaBmpScaleAction* pBmpScaleAction = 
static_cast(pSubstAct);
 ImplWriteBmp( 
BitmapEx(pBmpScaleAction->GetBitmap()),
   pA->GetPoint(), pA->GetSize(),
-  Point(), 
pBmpScaleAction->GetBitmap().GetSizePixel() );
+  Point(), 
pBmpScaleAction->GetBitmap().GetSizePixel(), pxShape );
 }
 }
 }
@@ -3430,7 +3470,7 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 
 ImplWriteBmp( BitmapEx(pA->GetBitmap()),
   pA->GetPoint(), mpVDev->PixelToLogic( 
pA->GetBitmap().GetSizePixel() ),
-  Point(), pA->GetBitmap().GetSizePixel() );
+  Point(), pA->GetBitmap().GetSizePixel(), 
pxShape );
 }
 }
  

[Libreoffice-commits] core.git: Changes to 'private/jmux/win-test-nohang'

[Jan-Marek Glogowski (via logerrit)]

New branch 'private/jmux/win-test-nohang' available with the following commits:
commit 1138c6f408c86ab5470aef3e152dece4a8bf1551
Author: Jan-Marek Glogowski 
Date:   Tue Feb 25 10:02:25 2020 +0100

WIN disable AttachThreadInput hack

just a test patch to fix eventual hangs.

Change-Id: I8de0a1744c24b1ee728b2ef6ec3aea951c54

commit 7efff8940c9dc1752686af4867ccdd10e93b0132
Author: Jan-Marek Glogowski 
Date:   Tue Feb 25 09:50:48 2020 +0100

change MultiLineEdit to Edit+Floating MLE

Change-Id: I7583e0ed1a70765c9f3bd7ff730e920a833bf30b

commit 1ada8216656cb5ada722b8585a4cc507e4566993
Author: Jan-Marek Glogowski 
Date:   Fri Jan 31 16:53:47 2020 +

Unit test for stable at-page anchored fly position

This is the unit test for commit
5cee586a97a11c23dd252accc42099bd5e9b4187 ("sw: fix moving of
at-page anchored flys to different page"). Originally the error
was just triggered by toggling "View -> Field Names". Luckily
it's also triggered by adding some text to page four, so no need
for some UI test.

Change-Id: I3a63b50dd898788607c3d24a848d8f43ae966377
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87776
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 5fed8bb5f6f65963fed27f96de3be14dff830d38)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87847
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 4db184ea279a2974679b05eaa8ca52ec087f68af)

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/win-test-nohang' - 9 commits - comphelper/source configure.ac external/breakpad external/neon package/source sc/source sfx2/source shell/source sw/

[Jan-Marek Glogowski (via logerrit)]

Rebased ref, commits from common ancestor:
commit e7b3f27362948a16b95a33220f0d826dce1b5ea5
Author: Jan-Marek Glogowski 
AuthorDate: Tue Feb 25 10:02:25 2020 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Feb 25 10:05:53 2020 +0100

WIN disable AttachThreadInput hack

just a test patch to fix eventual hangs.

Change-Id: I8de0a1744c24b1ee728b2ef6ec3aea951c54

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 8b0a64232927..298bb8e53a49 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1930,12 +1930,16 @@ static void ImplSalToTop( HWND hWnd, SalFrameToTop 
nFlags )
 // This magic code is necessary to connect the input focus of the
 // current window thread and the thread which owns the window that
 // should be the new foreground window.
+#if 0
 HWND   hCurrWnd = GetForegroundWindow();
 DWORD  myThreadID   = GetCurrentThreadId();
 DWORD  currThreadID = GetWindowThreadProcessId(hCurrWnd,nullptr);
 AttachThreadInput(myThreadID, currThreadID,TRUE);
 SetForegroundWindow_Impl(hWnd);
 AttachThreadInput(myThreadID,currThreadID,FALSE);
+#else
+SetForegroundWindow_Impl(hWnd);
+#endif
 }
 
 if ( nFlags & SalFrameToTop::RestoreWhenMin )
commit 8ba958c97b72738c9aceb47354ecff7d493e2d1c
Author: Thorsten Behrens 
AuthorDate: Mon Feb 10 01:05:35 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Feb 10 01:05:35 2020 +0100

breakpad: fix build against CentOS6 baseline

Change-Id: I7f7e88bb37c945e2f01ea60af7dc2a301aa5d6b0

diff --git 
a/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
 
b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
index a88c2cdd32bb..73b57ae06841 100644
--- 
a/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
+++ 
b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
@@ -21,7 +21,7 @@ index b895f6d7..4d58e510 100644
bool handled = false;
 -  for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) {
 -handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc);
-+  if (g_handler_stack_ != nullptr) {
++  if (g_handler_stack_ != 0) {
 +for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) {
 +  handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc);
 +}
commit b8081d2ffad30e60a05f7ed9d09812b989e06b7e
Author: Thorsten Behrens 
AuthorDate: Mon Feb 10 00:51:15 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Feb 10 00:51:15 2020 +0100

Bump version to 6.1.7.9

Change-Id: I6383689734a83a71ec90806dc12726168e89a612

diff --git a/configure.ac b/configure.ac
index 6bd8da094b2e..6348c853610c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.8],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.9],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 5b6c866d522e7eef636a5fa4048c39c1ea60e466
Author: Mike Kaganski 
AuthorDate: Fri Jan 3 22:40:07 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Sun Feb 9 15:19:00 2020 +0100

tdf#93389: keep encryption information for autorecovered MS formats

The autorecovery data is stored in ODF, regardless of the original
document format. When restoring, type detection generates ODF data,
which is stored in the media descriptor attached to document, even
after real filter was restored (see AutoRecovery::implts_openDocs).
If real filter is not ODF, then at the save time, it doesn't find
necessary information in encryption data, and makes not encrypted
package.

This patch adds both MS binary data, and OOXML data, to existing
ODF data for recovered password-protected documents (regardless of
their real filter).

TODO: only add required information to encryption data: pass real
filter name to DocPasswordHelper::requestAndVerifyDocPassword from
AutoRecovery::implts_openDocs.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86201
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit dd198398b6e5c84ab1255a90ef96e6445b66a64f)

Conflicts:
comphelper/source/misc/docpasswordhelper.cxx

Change-Id: I4717f067ad3c40167312b99eefef5584a467bfed
(cherry picked from commit 6017cdff264afc3b98beeba1330d6df28102fe7a)

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index f75997cfe440..1a4f29755c36 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/fmtfield.hxx|1 +
 vcl/source/control/fmtfield.cxx |   16 
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 1d50bf3839b37295dac7e3f91cdc21595285cecb
Author: Caolán McNamara 
AuthorDate: Wed Feb 19 11:27:29 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 10:40:18 2020 +0100

Resolves: tdf#130762 honour "wrap" in FormattedField

Change-Id: Iefd9a537aa358eab179cf6f0eeb6f80a9a77284a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89011
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 20c08e47f7c156a4726194215b389f4d0b165904)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88953
Reviewed-by: Xisco Faulí 
(cherry picked from commit 1c75d4df766098b51221ad20f9f569aff87d1b1b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89280

diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index 287146a62e6f..d181ebf6efe9 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -65,6 +65,7 @@ protected:
 boolm_bHasMin : 1;
 boolm_bHasMax : 1;
 
+boolm_bWrapOnLimits : 1;
 boolm_bStrictFormat : 1;
 
 boolm_bEnableEmptyField : 1;
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index dc584833cc07..96d5293a79be 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -296,7 +297,6 @@ FormattedField::StaticFormatter::~StaticFormatter()
 }
 }
 
-
 FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle)
 :SpinField(pParent, nStyle)
 ,m_aLastSelection(0,0)
@@ -304,6 +304,7 @@ FormattedField::FormattedField(vcl::Window* pParent, 
WinBits nStyle)
 ,m_dMaxValue(0)
 ,m_bHasMin(false)
 ,m_bHasMax(false)
+,m_bWrapOnLimits(false)
 ,m_bStrictFormat(true)
 ,m_bEnableEmptyField(true)
 ,m_bAutoColor(false)
@@ -849,11 +850,16 @@ void FormattedField::EnableEmptyField(bool bEnable)
 
 void FormattedField::ImplSetValue(double dVal, bool bForce)
 {
-
 if (m_bHasMin && (dValm_dMaxValue))
-dVal = m_dMaxValue;
+{
+dVal = m_bWrapOnLimits ? fmod(dVal - m_dMinValue, m_dMaxValue + 1) + 
m_dMinValue
+   : m_dMaxValue;
+}
 if (!bForce && (dVal == GetValue()))
 return;
 
@@ -988,6 +994,8 @@ bool FormattedField::set_property(const OString &rKey, 
const OUString &rValue)
 {
 if (rKey == "digits")
 SetDecimalDigits(rValue.toInt32());
+else if (rKey == "wrap")
+m_bWrapOnLimits = toBool(rValue);
 else
 return SpinField::set_property(rKey, rValue);
 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-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/findtxt.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 988383d3dce56536082a639d5a8b0cc0a23da7c4
Author: Michael Stahl 
AuthorDate: Wed Feb 19 17:14:54 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 10:41:39 2020 +0100

tdf#129553 sw_redlinehide: fix replace of paragraph breaks with $

The problem is that in the special selections that replace paragraph
breaks, the start and end node are actually different, hence have
different text frames.

(regression from 5e81b966778d82692b4763d892b457186a7f269d)

Practically the end content index is going to be 0 typically which
doesn't need mapping, but not sure if that's guaranteed anywhere.

Change-Id: I77c95c2f3e55edcc7aca6f4540cae90b3be5d79b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89050
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 83122add64ecbf0fd3ba30368d5d87bde3dac278)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88959
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 683904754e5a..69695279513e 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -1092,8 +1092,10 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 if( pPam && pPam->HasMark() &&
 SearchAlgorithms2::REGEXP == rSearchOpt.AlgorithmType2 )
 {
-const SwContentNode* pTextNode = pPam->GetContentNode();
-if (!pTextNode || !pTextNode->IsTextNode())
+SwContentNode const*const pTextNode = pPam->GetContentNode();
+SwContentNode const*const pMarkTextNode = pPam->GetContentNode(false);
+if (!pTextNode || !pTextNode->IsTextNode()
+|| !pMarkTextNode || !pMarkTextNode->IsTextNode())
 {
 return xRet;
 }
@@ -1103,7 +1105,7 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 const bool bParaEnd = rSearchOpt.searchString == "$" || 
rSearchOpt.searchString == "^$" || rSearchOpt.searchString == "$^";
 if (bParaEnd || (pLayout
 ? sw::FrameContainsNode(*pFrame, 
pPam->GetMark()->nNode.GetIndex())
-: pTextNode == pPam->GetContentNode(false)))
+: pTextNode == pMarkTextNode))
 {
 utl::TextSearch aSText( utl::TextSearch::UpgradeToSearchOptions2( 
rSearchOpt) );
 OUString rStr = pLayout
@@ -1113,8 +1115,16 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 AmbiguousIndex nEnd;
 if (pLayout)
 {
-
nStart.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->Start()));
-nEnd.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->End()));
+SwTextFrame const*const pStartFrame(
+bParaEnd && *pPam->GetMark() < *pPam->GetPoint()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+SwTextFrame const*const pEndFrame(
+bParaEnd && *pPam->GetPoint() <= *pPam->GetMark()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+
nStart.SetFrameIndex(pStartFrame->MapModelToViewPos(*pPam->Start()));
+nEnd.SetFrameIndex(pEndFrame->MapModelToViewPos(*pPam->End()));
 }
 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' - filter/source include/svx svx/source

[Miklos Vajna (via logerrit)]

 filter/source/svg/svgwriter.cxx |   58 +---
 filter/source/svg/svgwriter.hxx |2 -
 include/svx/svdograf.hxx|9 ++
 include/svx/unoshape.hxx|2 -
 svx/source/svdraw/svdograf.cxx  |   22 +++
 5 files changed, 82 insertions(+), 11 deletions(-)

New commits:
commit 22394a468eb8d594501e443bdb84608b6552a8a1
Author: Miklos Vajna 
AuthorDate: Tue Feb 25 09:04:10 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 25 10:59:18 2020 +0100

svx: cache PNG export of graphic shapes

One scenario where this is useful is: manipulate a JPEG photo in
Online's Impress, e.g. resize it multiple times. Each time we generate
an SVG preview of the shape, which includes the PNG export of the bitmap
itself.

This helps with a desktop CPU:

debug:9976:9974: SVGFilter::filter finished in 3422 ms
debug:9976:9974: SVGFilter::filter finished in 176 ms

But it is meant to help on mobile, too, where writing such a bitmap as
PNG takes 16-17 seconds without this.

(This works because SVG writes the original bitmap, even if it's scaled.
If that invariant will be broken in the future, we still emit correct
output, but then the cache will be less useful.)

Conflicts:
filter/source/svg/svgwriter.cxx
include/svx/svdograf.hxx
include/svx/unoshape.hxx

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

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1030c041ff1c..956651e41d01 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -2675,10 +2677,29 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, 
const OUString& rText,
 }
 }
 
+namespace
+{
+SdrGrafObj* GetSdrGrafObjFromXShape(const 
css::uno::Reference* pShape)
+{
+if (!pShape)
+{
+return nullptr;
+}
+
+auto pObject = dynamic_cast(pShape->get());
+if (!pObject)
+{
+return nullptr;
+}
+
+return dynamic_cast(pObject->GetSdrObject());
+}
+}
 
 void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 const Point& rPt, const Size& rSz,
-const Point& rSrcPt, const Size& rSrcSz )
+const Point& rSrcPt, const Size& rSrcSz,
+const 
css::uno::Reference* pShape )
 {
 if( !!rBmpEx )
 {
@@ -2693,8 +2714,27 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& 
rBmpEx,
 {
 SvMemoryStream aOStm( 65535, 65535 );
 
-if( GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE )
+bool bCached = false;
+SdrGrafObj* pGrafObj = nullptr;
+if (pShape)
 {
+pGrafObj = GetSdrGrafObjFromXShape(pShape);
+if (pGrafObj && pGrafObj->GetPNGPreviewChecksum() == 
rBmpEx.GetChecksum())
+{
+const std::vector& rPreviewData = 
pGrafObj->GetPNGPreviewData();
+aOStm.WriteBytes(rPreviewData.data(), rPreviewData.size());
+bCached = true;
+}
+}
+
+if( bCached || GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE )
+{
+if (!bCached && pGrafObj)
+{
+pGrafObj->SetPNGPreviewChecksum(rBmpEx.GetChecksum());
+pGrafObj->SetPNGPreviewData(aOStm);
+}
+
 PointaPt;
 Size aSz;
 Sequence< sal_Int8 > aSeq( static_cast(aOStm.GetData()), aOStm.Tell() );
@@ -3038,7 +3078,7 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 const MetaBmpScaleAction* pBmpScaleAction = 
static_cast(pSubstAct);
 ImplWriteBmp( 
BitmapEx(pBmpScaleAction->GetBitmap()),
   pA->GetPoint(), pA->GetSize(),
-  Point(), 
pBmpScaleAction->GetBitmap().GetSizePixel() );
+  Point(), 
pBmpScaleAction->GetBitmap().GetSizePixel(), pxShape );
 }
 }
 }
@@ -3421,7 +3461,7 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 
 ImplWriteBmp( BitmapEx(pA->GetBitmap()),
   pA->GetPoint(), mpVDev->PixelToLogic( 
pA->GetBitmap().GetSizePixel() ),
-  Point(), pA->GetBitmap().

[Libreoffice-commits] online.git: android/app android/lib loleaflet/po

[Weblate (via logerrit)]

 android/app/src/main/res/values-cs/strings.xml  |2 +-
 android/app/src/main/res/values-dsb/strings.xml |2 +-
 android/app/src/main/res/values-eu/strings.xml  |2 +-
 android/app/src/main/res/values-hsb/strings.xml |2 +-
 android/app/src/main/res/values-hu/strings.xml  |2 +-
 android/app/src/main/res/values-pt/strings.xml  |2 +-
 android/lib/src/main/res/values-hu/strings.xml  |2 ++
 loleaflet/po/ui-bg.po   |8 
 loleaflet/po/ui-ca.po   |6 +++---
 loleaflet/po/ui-cs.po   |4 ++--
 loleaflet/po/ui-cy.po   |8 
 loleaflet/po/ui-de.po   |   10 +-
 loleaflet/po/ui-dsb.po  |6 +++---
 loleaflet/po/ui-el.po   |6 +++---
 loleaflet/po/ui-en_GB.po|8 
 loleaflet/po/ui-es.po   |8 
 loleaflet/po/ui-eu.po   |6 +++---
 loleaflet/po/ui-fr.po   |6 +++---
 loleaflet/po/ui-gl.po   |8 
 loleaflet/po/ui-hsb.po  |6 +++---
 loleaflet/po/ui-hu.po   |8 
 loleaflet/po/ui-is.po   |   20 +---
 loleaflet/po/ui-it.po   |6 +++---
 loleaflet/po/ui-nl.po   |6 +++---
 loleaflet/po/ui-pl.po   |6 +++---
 loleaflet/po/ui-pt.po   |4 ++--
 loleaflet/po/ui-pt_BR.po|6 +++---
 loleaflet/po/ui-ru.po   |6 +++---
 loleaflet/po/ui-sl.po   |   20 +---
 loleaflet/po/ui-tr.po   |8 
 loleaflet/po/ui-uk.po   |6 +++---
 loleaflet/po/ui-zh_TW.po|8 
 32 files changed, 103 insertions(+), 105 deletions(-)

New commits:
commit 6f7229802647b6b2b8001e4232e2720dba03a14e
Author: Weblate 
AuthorDate: Sun Feb 23 19:15:54 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 11:21:10 2020 +0100

update translations

LibreOffice Online/android-app (Czech)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Ic104628d67d59f73041eb106ac50d50848cbde6e

update translations

LibreOffice Online/android-app (Lower Sorbian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I143fa07f1cbfeb73d3b1833f16dc26550db7e43e

update translations

LibreOffice Online/android-app (Basque)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I1887ef80e1f1cd243ab870e44adb174b15a88368

update translations

LibreOffice Online/android-app (Upper Sorbian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Idaeda0a44b3143cf10459b80225bd2d49b888f40

update translations

LibreOffice Online/android-app (Portuguese)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I1468acbb78f393081eba42fc385732f4c31712f6

update translations

LibreOffice Online/android-app (Hungarian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Ida536ad1b0a194eb37bddaae056f335f3d7e8a65

update translations

LibreOffice Online/android-lib (Hungarian)
Currently translated at 100.0% (8 of 8 strings)

Change-Id: I2bc806914e12e3fce7cfb5840448b544bc70c315

update translations

LibreOffice Online/loleaflet-ui (Chinese (Traditional))
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I2c396e85bfbac4ebc48d75738082f9522a40b487

update translations

LibreOffice Online/loleaflet-ui (Ukrainian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I705356ab54afae9aaee238e078ea432c3410bbcd

update translations

LibreOffice Online/loleaflet-ui (Turkish)
Currently translated at 97.2% (280 of 288 strings)

Change-Id: Ida18a8145a8e2bb718f7ca87e35427b21a74f11c

update translations

LibreOffice Online/loleaflet-ui (Slovenian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ib583b1efe8aefe154eb286e5cfda350c0438654e

update translations

LibreOffice Online/loleaflet-ui (Russian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I9f1b78c644f3f15a25e218b84eefb0f0e3ce4548

update translations

LibreOffice Online/loleaflet-ui (Portuguese (Brazil))
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I7e8026c4fb0c0a24186681f5ea3ebf19a7edcebe

update translations

LibreOffice Online/loleaflet-ui (Portuguese)
Currently translated at 100.0% (288 of

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/uiconfig

[Julien Nabet (via logerrit)]

 sw/uiconfig/swriter/ui/footnotepage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b3621d836611068cd699ed65d9936f020825c40
Author: Julien Nabet 
AuthorDate: Mon Feb 24 23:13:56 2020 +0100
Commit: Noel Grandin 
CommitDate: Tue Feb 25 11:30:43 2020 +0100

tdf#130912: "Before" and "After" text swapped in footnotes

Change-Id: I8022d3ec2385d35283711a144f6d610357790771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89387
Tested-by: Jenkins
(cherry picked from commit ee4ddf428e2ef85c710e1851ab9b9e7a2316d51b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89426
Reviewed-by: Noel Grandin 

diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui 
b/sw/uiconfig/swriter/ui/footnotepage.ui
index 2dd71e9acd74..14685272d45d 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -178,7 +178,7 @@
   
   
 1
-3
+2
   
 
 
@@ -189,7 +189,7 @@
   
   
 1
-2
+3
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/IwyuFilter_svx.yaml svx/source

[Gabor Kelemen (via logerrit)]

 svx/IwyuFilter_svx.yaml|7 
+++
 svx/source/sdr/animation/animationstate.cxx|1 -
 svx/source/sdr/animation/objectanimator.cxx|1 -
 svx/source/sdr/attribute/sdrallfillattributeshelper.cxx|2 --
 svx/source/sdr/attribute/sdrformtextattribute.cxx  |4 ++--
 svx/source/sdr/attribute/sdrtextattribute.cxx  |2 --
 svx/source/sdr/contact/objectcontact.cxx   |3 ---
 svx/source/sdr/contact/objectcontactofobjlistpainter.cxx   |1 -
 svx/source/sdr/contact/objectcontactofpageview.cxx |2 --
 svx/source/sdr/contact/viewcontact.cxx |2 --
 svx/source/sdr/contact/viewcontactofe3d.cxx|1 -
 svx/source/sdr/contact/viewcontactofe3dscene.cxx   |4 
 svx/source/sdr/contact/viewcontactofgraphic.cxx|4 
 svx/source/sdr/contact/viewcontactofgroup.cxx  |5 -
 svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx   |7 
---
 svx/source/sdr/contact/viewcontactofpageobj.cxx|5 -
 svx/source/sdr/contact/viewcontactofsdrcircobj.cxx |2 +-
 svx/source/sdr/contact/viewcontactofsdredgeobj.cxx |1 -
 svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx  |2 +-
 svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx|1 -
 svx/source/sdr/contact/viewcontactofsdrobj.cxx |7 
---
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx  |6 
--
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx |6 
--
 svx/source/sdr/contact/viewcontactofsdrpage.cxx|4 +---
 svx/source/sdr/contact/viewcontactofsdrrectobj.cxx |1 -
 svx/source/sdr/contact/viewcontactofunocontrol.cxx |4 
 svx/source/sdr/contact/viewcontactofvirtobj.cxx|2 --
 svx/source/sdr/contact/viewobjectcontact.cxx   |9 
-
 svx/source/sdr/contact/viewobjectcontactofe3d.cxx  |3 ---
 svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx |4 
 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx  |3 ---
 svx/source/sdr/contact/viewobjectcontactofgroup.cxx|4 
 svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx |2 --
 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx  |3 ---
 svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx   |1 -
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx   |2 --
 svx/source/sdr/contact/viewobjectcontactredirector.cxx |1 -
 svx/source/sdr/misc/ImageMapInfo.cxx   |1 -
 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx |2 --
 svx/source/sdr/overlay/overlaybitmapex.cxx |2 --
 svx/source/sdr/overlay/overlaycrosshair.cxx|1 -
 svx/source/sdr/overlay/overlayhandle.cxx   |8 

 svx/source/sdr/overlay/overlayhelpline.cxx |2 --
 svx/source/sdr/overlay/overlayline.cxx |4 
 svx/source/sdr/overlay/overlaymanager.cxx  |1 -
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx  |4 
 svx/source/sdr/overlay/overlayobject.cxx   |6 
--
 svx/source/sdr/overlay/overlayobjectcell.cxx   |3 ---
 svx/source/sdr/overlay/overlayobjectlist.cxx   |2 --
 svx/source/sdr/overlay/overlaypolypolygon.cxx  |3 ---
 svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx|2 --
 svx/source/sdr/overlay/overlayrectangle.cxx|5 -
 svx/source/sdr/overlay/overlayrollingrectangle.cxx |2 --
 svx/source/sdr/overlay/overlaytriangle.cxx |6 
--
 svx/source/sdr/primitive2d/primitivefactory2d.cxx  |2 --
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |9 
+++--
 svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx   |1 -
 svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx |1 -
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx   |1 -
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx   |1 -
 svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx   |2 --
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx  |4 
 svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx   |2 --
 svx/

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 684 commits - android/app android/lib android/Makefile.am android/README android/templates common/Authorization.cpp common/FileUt

[Weblate (via logerrit)]

Rebased ref, commits from common ancestor:
commit 6f7229802647b6b2b8001e4232e2720dba03a14e
Author: Weblate 
AuthorDate: Sun Feb 23 19:15:54 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 11:21:10 2020 +0100

update translations

LibreOffice Online/android-app (Czech)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Ic104628d67d59f73041eb106ac50d50848cbde6e

update translations

LibreOffice Online/android-app (Lower Sorbian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I143fa07f1cbfeb73d3b1833f16dc26550db7e43e

update translations

LibreOffice Online/android-app (Basque)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I1887ef80e1f1cd243ab870e44adb174b15a88368

update translations

LibreOffice Online/android-app (Upper Sorbian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Idaeda0a44b3143cf10459b80225bd2d49b888f40

update translations

LibreOffice Online/android-app (Portuguese)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I1468acbb78f393081eba42fc385732f4c31712f6

update translations

LibreOffice Online/android-app (Hungarian)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: Ida536ad1b0a194eb37bddaae056f335f3d7e8a65

update translations

LibreOffice Online/android-lib (Hungarian)
Currently translated at 100.0% (8 of 8 strings)

Change-Id: I2bc806914e12e3fce7cfb5840448b544bc70c315

update translations

LibreOffice Online/loleaflet-ui (Chinese (Traditional))
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I2c396e85bfbac4ebc48d75738082f9522a40b487

update translations

LibreOffice Online/loleaflet-ui (Ukrainian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I705356ab54afae9aaee238e078ea432c3410bbcd

update translations

LibreOffice Online/loleaflet-ui (Turkish)
Currently translated at 97.2% (280 of 288 strings)

Change-Id: Ida18a8145a8e2bb718f7ca87e35427b21a74f11c

update translations

LibreOffice Online/loleaflet-ui (Slovenian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ib583b1efe8aefe154eb286e5cfda350c0438654e

update translations

LibreOffice Online/loleaflet-ui (Russian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I9f1b78c644f3f15a25e218b84eefb0f0e3ce4548

update translations

LibreOffice Online/loleaflet-ui (Portuguese (Brazil))
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I7e8026c4fb0c0a24186681f5ea3ebf19a7edcebe

update translations

LibreOffice Online/loleaflet-ui (Portuguese)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I7034f98bddbd0d6839907d68d2852feb7cd6852f

update translations

LibreOffice Online/loleaflet-ui (Polish)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ic6b8e91bc6857b2135fa8fee7e6b5a576f39a5f9

update translations

LibreOffice Online/loleaflet-ui (Dutch)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ie74c18a72f44c778be4e02ca4b9a42f76efc7e38

update translations

LibreOffice Online/loleaflet-ui (Italian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ibc5496109cccb4c004de4f2590edb85faeef2318

update translations

LibreOffice Online/loleaflet-ui (Icelandic)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Ieb4fe8939e8289540d085c6e2ebabde79ca20b04

update translations

LibreOffice Online/loleaflet-ui (Hungarian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: If0bdc8119f683ea4141048dc51c33cdf314a8cb7

update translations

LibreOffice Online/loleaflet-ui (Upper Sorbian)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I48723bfd30552592327a352c1f3e8ceb12a9d54f

update translations

LibreOffice Online/loleaflet-ui (Galician)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I613b95666c292573016ad03b0d1c83681cb2fa63

update translations

LibreOffice Online/loleaflet-ui (French)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I6cff25e2bc5518ad1f0db7443a3d8b7a55658947

update translations

LibreOffice Online/loleaflet-ui (Basque)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: I797ed20d4bf8c8171db1c513a3b89614248eb26a

update translations

LibreOffice Online/loleaflet-ui (Spanish)
Currently translated at 100.0% (288 of 288 strings)

Change-Id: Iff004d986a01a23a5cc697f6ccfa8a4c76920

Re: Status of Windows builds TB77

[Noel Grandin]

should be fixed soon with

https://gerrit.libreoffice.org/c/core/+/89420
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 4 commits - configure.ac debian/changelog debian/control debian/rules .gitreview loolkitconfig.xcu loolwsd.spec.in

[Andras Timar (via logerrit)]

 .gitreview|2 
 configure.ac  |2 
 debian/changelog  |   34 --
 debian/control|   18 ++-
 debian/rules  |4 -
 loolkitconfig.xcu |9 ++-
 loolwsd.spec.in   |  125 +-
 7 files changed, 121 insertions(+), 73 deletions(-)

New commits:
commit c6d0dec5c91e580a56eeaeab6b6f637ffc2c6c6a
Author: Andras Timar 
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 11:58:31 2020 +0100

Bump package version to 4.2.0-5 and update deb/rpm package files

Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8

diff --git a/configure.ac b/configure.ac
index 398d303e3..c87291fc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..d61bdcaa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,29 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+loolwsd (4.2.0-5) unstable; urgency=medium
 
-  * Fix crash in Impress.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-5
 
- -- Jan Holesovsky   Thu, 11 Aug 2016 16:46:00 +0100
+ -- Andras Timar   Tue, 25 Feb 2020 11:58:00 +0100
 
-loolwsd (1.8.0-1) unstable; urgency=medium
+loolwsd (4.2.0-4) unstable; urgency=medium
 
-  [ Tor Lillqvist ]
-  * Back to packaging this for Debian.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-4
 
-  [ Jan Holesovsky ]
-  * Update to match Collabora Office 5.1
+ -- Andras Timar   Tue, 28 Jan 2020 18:58:00 +0100
 
- -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
+loolwsd (4.2.0-3) unstable; urgency=medium
 
-loolwsd (1.0.0-1) unstable; urgency=low
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-3
 
-  * Initial release
+ -- Andras Timar   Thu, 09 Jan 2020 22:12:00 +0100
 
-  * Local Variables:
-  * Mode: fundamental
-  * End:
+loolwsd (4.2.0-2) unstable; urgency=medium
 
- -- Tor Lillqvist   Fri, 15 May 2015 11:10:20 +0300
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-2
+
+ -- Andras Timar   Fri, 20 Dec 2019 13:27:00 +0100
+
+loolwsd (4.2.0-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-1
+
+ -- Andras Timar   Tue, 10 Dec 2019 20:47:00 +0100
diff --git a/debian/control b/debian/control
index 532367872..a4dc03ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, 
libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, 
pkg-config, devscripts, m4
 Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, 
libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-import,
+ collaboraofficebasis6.2-ooolinguistic
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/debian/rules b/debian/rules
index d675675c0..feb980c95 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@ override_dh_auto_test:
 
 override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
-   # put package names of LibreOffice here
-   # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d78760e82..2eb2a56e0 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,39 +12,45 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:5%{?dist}
 Vendor: %

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

[Michael Stahl (via logerrit)]

 sw/source/filter/ww8/docxexport.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit d9634e3c9bfaf826b3d4d39e9a57d6c2d8d9a3dc
Author: Michael Stahl 
AuthorDate: Mon Feb 24 15:20:20 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Feb 25 12:02:08 2020 +0100

sw: DOCX export: limit FORMDROPDOWN listEntry to Word's abilities

In theory wml.xsd says:

 

In practice Word 2013 refuses to load a file with 26 listEntry in one
FORMDROPDOWN field.

Interestingly w:result w:val larger than the number of entries does not
cause Word to complain. Go figure.

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

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index aff27a289917..c39cfea40b9d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -352,12 +352,13 @@ void DocxExport::DoComboBox(const OUString& rName,
 
 m_pDocumentFS->singleElementNS(XML_w, XML_result, FSNS(XML_w, XML_val), 
OString::number(nId));
 
-// Loop over the entries
-
-for (const auto& rItem : rListItems)
+// unfortunately Word 2013 refuses to load DOCX with more than 25 listEntry
+SAL_WARN_IF(25 < rListItems.getLength(), "sw.ww8", "DocxExport::DoComboBox 
data loss with more than 25 entries");
+auto const nSize(std::min(sal_Int32(25), rListItems.getLength()));
+for (auto i = 0; i < nSize; ++i)
 {
 m_pDocumentFS->singleElementNS( XML_w, XML_listEntry,
-FSNS( XML_w, XML_val ), rItem.toUtf8() );
+FSNS(XML_w, XML_val), rListItems[i].toUtf8() );
 }
 
 m_pDocumentFS->endElementNS( XML_w, XML_ddList );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests loleaflet/images loleaflet/src

[Pedro Pinto Silva (via logerrit)]

 cypress_test/integration_tests/mobile/writer/focus_spec.js  |  
  2 -
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js   |  
  2 -
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js |  
  4 +-
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js  |  
 12 
 loleaflet/images/lc_formattingmark.svg  |  
  3 ++
 loleaflet/images/lc_insertfield.svg |  
  1 
 loleaflet/images/lc_insertheaderfooter.svg  |  
  1 
 loleaflet/images/lc_insertnonbreakingspace.svg  |  
  3 ++
 loleaflet/images/lc_insertpagefooter.svg|  
  8 +
 loleaflet/images/lc_insertpageheader.svg|  
  8 +
 loleaflet/src/control/Control.Menubar.js|  
 14 +-
 11 files changed, 41 insertions(+), 17 deletions(-)

New commits:
commit f3b8455aaa8123e24e4e29a8cd79fa363a009d7f
Author: Pedro Pinto Silva 
AuthorDate: Mon Feb 24 11:10:19 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Tue Feb 25 12:06:31 2020 +0100

Mobile: Insert: Add missing icons, add missing ids, create missing icons, 
also add sub level icns for footerandheader and formattingmark (fixing cypress)

Change-Id: Id3ca33095b5eae7d13129f4b9629e2c0faf302fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89371
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js 
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 3874c6710..dce4cd646 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -135,7 +135,7 @@ describe('Focus tests', function() {
.should('not.be.empty');
 
// Select More Fields
-   cy.get('.ui-header.level-0.mobile-wizard.ui-widget 
.sub-menu-title')
+   cy.get('.ui-header.level-0.mobile-wizard.ui-widget')
.contains('More Fields...')
.parent().click();
 
diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
index 7f849dd25..5e9b14b89 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -15,7 +15,7 @@ describe('Insert fields via insertion wizard.', function() {
.click();
 
// Open fields submenu
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon.flex-fullwidth')
.contains('More Fields...')
.click();
 
diff --git 
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
index 90b6b0d9e..3f83e2a1f 100644
--- 
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++ 
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -15,7 +15,7 @@ describe('Insert formatting mark via insertion wizard.', 
function() {
.click();
 
// Open formatting marks
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon.flex-fullwidth')
.contains('Formatting Mark')
.click();
 
@@ -29,7 +29,7 @@ describe('Insert formatting mark via insertion wizard.', 
function() {
});
 
it('Insert non-breaking space.', function() {
-   cy.get('.menu-entry-no-icon')
+   cy.get('.menu-entry-with-icon')
.contains('Non-breaking space')
.click();
 
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index 70d13c570..ab58331ef 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -53,7 +53,7 @@ describe('Insert objects via insertion wizard.', function() {
.click();
 
// Open Table submenu
-   cy.get('.menu-entry-with-icon.flex-fullwidth')
+   cy.get('.ui-header.level-0.mobile-wizard.ui-widget')
.contains('Table')
.click();
cy.get('.mobile-wizard.ui-text')
@@ -88,7 +88,7 @@ describe('Insert objects via insertion wizard.', function() {
.click();
 
// Open Table submenu
-   cy.get('.menu-entry-with-icon.flex-fullwidth')
+  

[Libreoffice-commits] online.git: loleaflet/src

[Tamás Zolnai (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/core/LOUtil.js |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4ca5089d56369d335a39c13e428d2e932c0ac8a3
Author: Tamás Zolnai 
AuthorDate: Tue Feb 25 12:10:53 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Tue Feb 25 12:15:23 2020 +0100

mobile: fix-up non-breaking space insertion.

Make it to have the icon, but also trigger the right
uno command.

Change-Id: Ic762fee0eee0f1a6bc793edc98ed2217075364f7

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8517f8c0d..a4b876536 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -648,7 +648,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:HyperlinkDialog'), 
id: 'inserthyperlink', type: 'action'},
{name: _UNO('.uno:ShapesMenu'), id: 
'insertshape', type: 'action'},
{name: _UNO('.uno:FormattingMarkMenu', 
'text'), id: 'formattingmark', type: 'menu', menu: [
-   {name: 
_UNO('.uno:InsertNonBreakingSpace'), id: 'insertnonbreakingspace'},
+   {uno: 
'.uno:InsertNonBreakingSpace'},
{uno: '.uno:InsertHardHyphen'},
{uno: '.uno:InsertSoftHyphen'},
{uno: '.uno:InsertZWSP'},
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index f540e6da2..7ff1a5272 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -92,7 +92,6 @@ L.LOUtil = {
commandWithoutIcon: [
'InsertPageHeader',
'InsertPageFooter',
-   'InsertNonBreakingSpace',
'InsertHardHyphen',
'InsertSoftHyphen',
'InsertZWSP',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/findtxt.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 4f19b5b55d592621826e9904d3f4c5d48f52ee0f
Author: Michael Stahl 
AuthorDate: Wed Feb 19 17:14:54 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Feb 25 12:18:44 2020 +0100

tdf#129553 sw_redlinehide: fix replace of paragraph breaks with $

The problem is that in the special selections that replace paragraph
breaks, the start and end node are actually different, hence have
different text frames.

(regression from 5e81b966778d82692b4763d892b457186a7f269d)

Practically the end content index is going to be 0 typically which
doesn't need mapping, but not sure if that's guaranteed anywhere.

Change-Id: I77c95c2f3e55edcc7aca6f4540cae90b3be5d79b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89050
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 83122add64ecbf0fd3ba30368d5d87bde3dac278)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88959
Reviewed-by: Caolán McNamara 
(cherry picked from commit 988383d3dce56536082a639d5a8b0cc0a23da7c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89429
Tested-by: Michael Stahl 

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 53b345c25759..4d44a6d41838 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -1092,8 +1092,10 @@ OUString *ReplaceBackReferences(const 
i18nutil::SearchOptions2& rSearchOpt,
 if( pPam && pPam->HasMark() &&
 SearchAlgorithms2::REGEXP == rSearchOpt.AlgorithmType2 )
 {
-const SwContentNode* pTextNode = pPam->GetContentNode();
-if (!pTextNode || !pTextNode->IsTextNode())
+SwContentNode const*const pTextNode = pPam->GetContentNode();
+SwContentNode const*const pMarkTextNode = pPam->GetContentNode(false);
+if (!pTextNode || !pTextNode->IsTextNode()
+|| !pMarkTextNode || !pMarkTextNode->IsTextNode())
 {
 return pRet;
 }
@@ -1103,7 +1105,7 @@ OUString *ReplaceBackReferences(const 
i18nutil::SearchOptions2& rSearchOpt,
 const bool bParaEnd = rSearchOpt.searchString == "$" || 
rSearchOpt.searchString == "^$" || rSearchOpt.searchString == "$^";
 if (bParaEnd || (pLayout
 ? sw::FrameContainsNode(*pFrame, 
pPam->GetMark()->nNode.GetIndex())
-: pTextNode == pPam->GetContentNode(false)))
+: pTextNode == pMarkTextNode))
 {
 utl::TextSearch aSText( utl::TextSearch::UpgradeToSearchOptions2( 
rSearchOpt) );
 OUString rStr = pLayout
@@ -1113,8 +1115,16 @@ OUString *ReplaceBackReferences(const 
i18nutil::SearchOptions2& rSearchOpt,
 AmbiguousIndex nEnd;
 if (pLayout)
 {
-
nStart.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->Start()));
-nEnd.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->End()));
+SwTextFrame const*const pStartFrame(
+bParaEnd && *pPam->GetMark() < *pPam->GetPoint()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+SwTextFrame const*const pEndFrame(
+bParaEnd && *pPam->GetPoint() <= *pPam->GetMark()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+
nStart.SetFrameIndex(pStartFrame->MapModelToViewPos(*pPam->Start()));
+nEnd.SetFrameIndex(pEndFrame->MapModelToViewPos(*pPam->End()));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/laycache.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1d46d4d8f76791817e73663838d41860390f03eb
Author: Michael Stahl 
AuthorDate: Thu Feb 20 14:17:19 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Feb 25 12:19:51 2020 +0100

tdf#129529 sw_redlinehide: infinite loop in SwLayHelper::CheckInsert()

The bugdoc has this in meta.xml:

meta:page-count="819" meta:paragraph-count="302"

... for which SwLayHelper::CalcPageCount() cunningly estimates a maximum
of 0 paragraphs per page, and at that rate an infinite number of pages
are required...

Not sure what a reasonable minimum should be, paragraphs could be 16
pages long even with 64k limit, but it does appear unlikely.

(regression from 7e8b4756d95057f069467b34e7849f9354856578 which disabled
 the use of the layout-cache in the bugdoc)

Change-Id: Icd9ab145cc2f0714b50de9b5b4a1ef10ac1d49a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89106
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a9f2f4b4c9e1fa4e4c4a69517c31d0b8e2063f01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89133
Tested-by: Michael Stahl 

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 2d6e23c6fe49..a70de2657c86 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -598,7 +598,9 @@ sal_uLong SwLayHelper::CalcPageCount()
 if ( nNdCount > 100 ) // no estimation below this value
 {
 if ( nPgCount > 0 )
-mnMaxParaPerPage = nNdCount / nPgCount;
+{   // tdf#129529 avoid 0...
+mnMaxParaPerPage = std::max(3, nNdCount / nPgCount);
+}
 else
 {
 mnMaxParaPerPage = std::max( sal_uLong(20),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   25 +
 sw/source/core/edit/acorrect.cxx   |7 +++
 2 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit 1e8a19e21b6b939548c512a169ef9dc17c3530f3
Author: Michael Stahl 
AuthorDate: Thu Feb 20 18:28:45 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Feb 25 12:21:20 2020 +0100

tdf#130274 sw_redlinehide: fix ChgAutoCorrWord() if replaced text ...

... is fully deleted.

This crashes on English text with 'i'->'I' substitution.

The assumption that there's some part of the found text that is not
deleted is only correct for the case where tracked changes are hidden,
but not when they are shown.

(regression from 9926ea7dd07f1f3d012ddf97941a42bb7fa5717d)

Change-Id: I0e81494659ea7e187101a703f64483dd68c73d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89151
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b7922b56e2dcf1dc1abbf5574bcb672068fa8dbd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89135
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 1e97fb44829481845a7e768392f92f6c00f324de)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89279
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index bdd766c461ad..88a8fe9d3930 100755
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -190,6 +190,7 @@ public:
 void testFdo85554();
 void testAutoCorr();
 void testTdf83260();
+void testTdf130274();
 void testMergeDoc();
 void testCreatePortions();
 void testBookmarkUndo();
@@ -387,6 +388,7 @@ public:
 CPPUNIT_TEST(testFdo85554);
 CPPUNIT_TEST(testAutoCorr);
 CPPUNIT_TEST(testTdf83260);
+CPPUNIT_TEST(testTdf130274);
 CPPUNIT_TEST(testMergeDoc);
 CPPUNIT_TEST(testCreatePortions);
 CPPUNIT_TEST(testBookmarkUndo);
@@ -1569,6 +1571,29 @@ void SwUiWriterTest::testTdf83260()
 }
 }
 
+void SwUiWriterTest::testTdf130274()
+{
+SwDoc *const pDoc(createDoc());
+SwWrtShell *const pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwAutoCorrect corr(*SvxAutoCorrCfg::Get().GetAutoCorrect());
+
+CPPUNIT_ASSERT(!pWrtShell->GetLayout()->IsHideRedlines());
+CPPUNIT_ASSERT(!IDocumentRedlineAccess::IsRedlineOn(
+pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// "tset" may be replaced by the AutoCorrect in the test profile
+pWrtShell->Insert("tset");
+// select from left to right
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 4, 
/*bBasicCall=*/false);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 4, 
/*bBasicCall=*/false);
+
+pWrtShell->SetRedlineFlags(pWrtShell->GetRedlineFlags() | 
RedlineFlags::On);
+// this would crash in AutoCorrect
+pWrtShell->AutoCorrect(corr, '.');
+
+
CPPUNIT_ASSERT(!pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty());
+}
+
 void SwUiWriterTest::testMergeDoc()
 {
 SwDoc* const pDoc1(createDoc("merge-change1.odt"));
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 366560dad139..b5e423b94099 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -406,10 +406,10 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, 
sal_Int32 nEndPos,
 if (sw::GetRanges(ranges, *rEditSh.GetDoc(), aPam))
 {
 pDoc->getIDocumentContentOperations().ReplaceRange(aPam, 
pFnd->GetLong(), false);
+bRet = true;
 }
-else
+else if (!ranges.empty())
 {
-assert(!ranges.empty());
 assert(ranges.front()->GetPoint()->nNode == 
ranges.front()->GetMark()->nNode);
 pDoc->getIDocumentContentOperations().ReplaceRange(
 *ranges.front(), pFnd->GetLong(), false);
@@ -417,6 +417,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, 
sal_Int32 nEndPos,
 {
 DeleteSelImpl(**it);
 }
+bRet = true;
 }
 
 // tdf#83260 After calling 
sw::DocumentContentOperationsManager::ReplaceRange
@@ -424,8 +425,6 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, 
sal_Int32 nEndPos,
 // ReplaceRange shows changes, this moves deleted nodes from 
special section to document.
 // Then Show mode is disabled again. As a result pTextNd may 
be invalidated.
 pTextNd = rCursor.GetNode().GetTextNode();
-
-bRet = true;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.o

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - cypress_test/integration_tests loleaflet/images loleaflet/src

[Pedro Pinto Silva (via logerrit)]

 cypress_test/integration_tests/mobile/writer/focus_spec.js  |  
  2 -
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js   |  
  2 -
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js |  
  4 +-
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js  |  
 12 
 loleaflet/images/lc_formattingmark.svg  |  
  3 ++
 loleaflet/images/lc_insertfield.svg |  
  1 
 loleaflet/images/lc_insertheaderfooter.svg  |  
  1 
 loleaflet/images/lc_insertnonbreakingspace.svg  |  
  3 ++
 loleaflet/images/lc_insertpagefooter.svg|  
  8 +
 loleaflet/images/lc_insertpageheader.svg|  
  8 +
 loleaflet/src/control/Control.Menubar.js|  
 14 +-
 11 files changed, 41 insertions(+), 17 deletions(-)

New commits:
commit 1905272783923cf191220c8de59a4b53ccd794ed
Author: Pedro Pinto Silva 
AuthorDate: Mon Feb 24 11:10:19 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 13:12:13 2020 +0100

Mobile: Insert: Add missing icons, add missing ids, create missing icons, 
also add sub level icns for footerandheader and formattingmark (fixing cypress)

Change-Id: Id3ca33095b5eae7d13129f4b9629e2c0faf302fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89371
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit f3b8455aaa8123e24e4e29a8cd79fa363a009d7f)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89433
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js 
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 3874c6710..dce4cd646 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -135,7 +135,7 @@ describe('Focus tests', function() {
.should('not.be.empty');
 
// Select More Fields
-   cy.get('.ui-header.level-0.mobile-wizard.ui-widget 
.sub-menu-title')
+   cy.get('.ui-header.level-0.mobile-wizard.ui-widget')
.contains('More Fields...')
.parent().click();
 
diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
index 7f849dd25..5e9b14b89 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -15,7 +15,7 @@ describe('Insert fields via insertion wizard.', function() {
.click();
 
// Open fields submenu
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon.flex-fullwidth')
.contains('More Fields...')
.click();
 
diff --git 
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
index 90b6b0d9e..3f83e2a1f 100644
--- 
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++ 
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -15,7 +15,7 @@ describe('Insert formatting mark via insertion wizard.', 
function() {
.click();
 
// Open formatting marks
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon.flex-fullwidth')
.contains('Formatting Mark')
.click();
 
@@ -29,7 +29,7 @@ describe('Insert formatting mark via insertion wizard.', 
function() {
});
 
it('Insert non-breaking space.', function() {
-   cy.get('.menu-entry-no-icon')
+   cy.get('.menu-entry-with-icon')
.contains('Non-breaking space')
.click();
 
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index 70d13c570..ab58331ef 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -53,7 +53,7 @@ describe('Insert objects via insertion wizard.', function() {
.click();
 
// Open Table submenu
-   cy.get('.menu-entry-with-icon.flex-fullwidth')
+   cy.get('.ui-header.level-0.mobile-wizard.ui-widget')
.contains('Table')
.click();
cy.get('.mobile-wizard.ui-text')
@@ -88,7 +88,7 @@ d

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

[Szymon Kłos (via logerrit)]

 sw/source/ui/dialog/wordcountdialog.cxx  |   41 -
 sw/source/uibase/inc/wordcountdialog.hxx |8 
 sw/uiconfig/swriter/ui/wordcount.ui  |  720 +--
 3 files changed, 129 insertions(+), 640 deletions(-)

New commits:
commit 189c8a7caba5f7bf31c8bab96f6ca0a6aa8a8066
Author: Szymon Kłos 
AuthorDate: Mon Feb 24 19:08:09 2020 +0100
Commit: Szymon Kłos 
CommitDate: Tue Feb 25 13:16:37 2020 +0100

Revert "WordCountDIalog in vertical mobile version"

This reverts commit 4ab0993f2537fade3c02b788508519070f44ebb8.
This reverts commit 542f509a41cf0cae7fca0660ba3858c6b0e9bf52.

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

diff --git a/sw/source/ui/dialog/wordcountdialog.cxx 
b/sw/source/ui/dialog/wordcountdialog.cxx
index 5e4b3aa0208d..7dc7370f4b82 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -28,10 +28,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-
-#define IS_MOBILE (comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
 
 SwWordCountFloatDlg::~SwWordCountFloatDlg()
 {
@@ -87,8 +83,6 @@ void SwWordCountFloatDlg::showCJK(bool bShowCJK)
 m_xCurrentCjkcharsFT->set_visible(bShowCJK);
 m_xDocCjkcharsFT->set_visible(bShowCJK);
 m_xCjkcharsLabelFT->set_visible(bShowCJK);
-if (m_xCjkcharsLabel2FT.get())
-m_xCjkcharsLabel2FT->set_visible(bShowCJK);
 }
 
 void SwWordCountFloatDlg::showStandardizedPages(bool bShowStandardizedPages)
@@ -96,8 +90,6 @@ void SwWordCountFloatDlg::showStandardizedPages(bool 
bShowStandardizedPages)
 m_xCurrentStandardizedPagesFT->set_visible(bShowStandardizedPages);
 m_xDocStandardizedPagesFT->set_visible(bShowStandardizedPages);
 m_xStandardizedPagesLabelFT->set_visible(bShowStandardizedPages);
-if (m_xStandardizedPagesLabel2FT.get())
-m_xStandardizedPagesLabel2FT->set_visible(bShowStandardizedPages);
 }
 
 SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
@@ -105,42 +97,19 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* 
_pBindings,
  weld::Window *pParent,
  SfxChildWinInfo const * pInfo)
 : SfxModelessDialogController(_pBindings, pChild, pParent, 
"modules/swriter/ui/wordcount.ui", "WordCountDialog")
-, m_xCloseButton(m_xBuilder->weld_button("close"))
-, m_xHelpButton(m_xBuilder->weld_button("help"))
-, m_xDocumentLabelFT(m_xBuilder->weld_label(IS_MOBILE ? 
"documentlabel-mobile" : "documentlabel"))
-, m_xWordsLabelFT(m_xBuilder->weld_label(IS_MOBILE ? "wordslabel-mobile" : 
"wordslabel"))
-, m_xIncludingSpacesLabelFT(m_xBuilder->weld_label(IS_MOBILE ? 
"inclspaceslabel-mobile" : "inclspaceslabel"))
-, m_xExcludingSpacesLabelFT(m_xBuilder->weld_label(IS_MOBILE ? 
"exclspaceslabel-mobile" : "exclspaceslabel"))
 , m_xCurrentWordFT(m_xBuilder->weld_label("selectwords"))
 , m_xCurrentCharacterFT(m_xBuilder->weld_label("selectchars"))
 , 
m_xCurrentCharacterExcludingSpacesFT(m_xBuilder->weld_label("selectcharsnospaces"))
 , m_xCurrentCjkcharsFT(m_xBuilder->weld_label("selectcjkchars"))
 , 
m_xCurrentStandardizedPagesFT(m_xBuilder->weld_label("selectstandardizedpages"))
-, m_xDocWordFT(m_xBuilder->weld_label(IS_MOBILE ? "docwords-mobile" : 
"docwords"))
-, m_xDocCharacterFT(m_xBuilder->weld_label(IS_MOBILE ? "docchars-mobile" : 
"docchars"))
-, m_xDocCharacterExcludingSpacesFT(m_xBuilder->weld_label(IS_MOBILE ? 
"doccharsnospaces-mobile" : "doccharsnospaces"))
-, m_xDocCjkcharsFT(m_xBuilder->weld_label(IS_MOBILE ? "doccjkchars-mobile" 
: "doccjkchars"))
-, m_xDocStandardizedPagesFT(m_xBuilder->weld_label(IS_MOBILE ? 
"docstandardizedpages-mobile" : "docstandardizedpages"))
+, m_xDocWordFT(m_xBuilder->weld_label("docwords"))
+, m_xDocCharacterFT(m_xBuilder->weld_label("docchars"))
+, 
m_xDocCharacterExcludingSpacesFT(m_xBuilder->weld_label("doccharsnospaces"))
+, m_xDocCjkcharsFT(m_xBuilder->weld_label("doccjkchars"))
+, m_xDocStandardizedPagesFT(m_xBuilder->weld_label("docstandardizedpages"))
 , m_xCjkcharsLabelFT(m_xBuilder->weld_label("cjkcharsft"))
-, m_xCjkcharsLabel2FT(IS_MOBILE ? m_xBuilder->weld_label("cjkcharsft2") : 
nullptr)
 , m_xStandardizedPagesLabelFT(m_xBuilder->weld_label("standardizedpages"))
-, m_xStandardizedPagesLabel2FT(IS_MOBILE ? 
m_xBuilder->weld_label("standardizedpages2") : nullptr)
 {
-if (IS_MOBILE)
-{
-m_xCloseButton->set_visible(false);
-m_xHelpButton->set_visible(false);
-}
-
-m_xDocumentLabelFT->show();
-m_xDocWordFT->show();
-m_xDocCharacterFT->show();
-m_xDocCharacterExcludingSpacesFT->show();
-
-m_xWordsLabelFT->show();
-m_xIncludingSpacesLabelFT->show();
-

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/misc/WColumnSelect.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fe5366d9d2d57ee3648589db86d2c17f43febb6b
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 10:13:54 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 13:31:20 2020 +0100

Resolves: tdf#130922 don't crash removing non-existing elements

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

diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx 
b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 077e01049767..0e57a26828b2 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -130,7 +130,9 @@ void OWizColumnSelect::Activate( )
 {
 OUString sId(OUString::number(reinterpret_cast(new 
OFieldDescription(*(column->second);
 m_xNewColumnNames->append(sId, column->first);
-m_xOrgColumnNames->remove_text(column->first);
+int nRemove = m_xOrgColumnNames->find_text(column->first);
+if (nRemove != -1)
+m_xOrgColumnNames->remove(nRemove);
 }
 }
 m_pParent->GetOKButton().set_sensitive(m_xNewColumnNames->n_children() != 
0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/parallel_cypress' - Makefile.am

[Tamás Zolnai (via logerrit)]

 Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e76bba6d7311081eeae313ba901afac2ba666271
Author: Tamás Zolnai 
AuthorDate: Tue Feb 25 12:56:42 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Tue Feb 25 12:56:57 2020 +0100

[DONT PUSH TO MASTER]: Don't run C++ unit tests.

Change-Id: I7a8a10187e63668f04c9af18fa6352fbbe958251

diff --git a/Makefile.am b/Makefile.am
index 1ee125b1f..8b2e2513e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 else
 
-SUBDIRS = . test loleaflet cypress_test
+SUBDIRS = . loleaflet cypress_test
 
 export ENABLE_DEBUG
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 64ad7b44e3b36f538a23a851b0e9df7ee0df52b7
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 09:07:09 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 15:03:33 2020 +0100

cancelling drag from drag-begin doesn't work, call it async

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9d958393a5f1..155472a91532 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1819,6 +1819,7 @@ protected:
 
 DECL_LINK(async_signal_focus_in, void*, void);
 DECL_LINK(async_signal_focus_out, void*, void);
+DECL_LINK(async_drag_cancel, void*, void);
 
 void launch_signal_focus_in()
 {
@@ -1871,6 +1872,15 @@ protected:
 return false;
 }
 
+void launch_drag_cancel(GdkDragContext* context)
+{
+// post our drag cancel to happen at the next available event cycle
+if (m_pDragCancelEvent)
+return;
+g_object_ref(context);
+m_pDragCancelEvent = Application::PostUserEvent(LINK(this, 
GtkInstanceWidget, async_drag_cancel), context);
+}
+
 void signal_focus_out()
 {
 m_aFocusOutHdl.Call(*this);
@@ -1958,6 +1968,7 @@ private:
 int m_nPressStartY;
 ImplSVEvent* m_pFocusInEvent;
 ImplSVEvent* m_pFocusOutEvent;
+ImplSVEvent* m_pDragCancelEvent;
 GtkCssProvider* m_pBgCssProvider;
 GdkDragAction m_eDragAction;
 gulong m_nFocusInSignalId;
@@ -2238,7 +2249,7 @@ private:
 {
 if (do_signal_drag_begin())
 {
-gtk_drag_cancel(context);
+launch_drag_cancel(context);
 return;
 }
 if (!m_xDragSource)
@@ -2318,6 +2329,7 @@ public:
 , m_nPressStartY(-1)
 , m_pFocusInEvent(nullptr)
 , m_pFocusOutEvent(nullptr)
+, m_pDragCancelEvent(nullptr)
 , m_pBgCssProvider(nullptr)
 , m_eDragAction(GdkDragAction(0))
 , m_nFocusInSignalId(0)
@@ -2895,6 +2907,8 @@ public:
 Application::RemoveUserEvent(m_pFocusInEvent);
 if (m_pFocusOutEvent)
 Application::RemoveUserEvent(m_pFocusOutEvent);
+if (m_pDragCancelEvent)
+Application::RemoveUserEvent(m_pDragCancelEvent);
 if (m_nDragMotionSignalId)
 g_signal_handler_disconnect(m_pWidget, m_nDragMotionSignalId);
 if (m_nDragDropSignalId)
@@ -3012,6 +3026,14 @@ IMPL_LINK_NOARG(GtkInstanceWidget, 
async_signal_focus_out, void*, void)
 signal_focus_out();
 }
 
+IMPL_LINK(GtkInstanceWidget, async_drag_cancel, void*, arg, void)
+{
+m_pDragCancelEvent = nullptr;
+GdkDragContext* context = static_cast(arg);
+gtk_drag_cancel(context);
+g_object_unref(context);
+}
+
 namespace
 {
 OString MapToGtkAccelerator(const OUString &rStr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/inc/treeglue.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e0122fc683157b5f41724b9514e072f0ce5e5c15
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 10:41:12 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 15:04:40 2020 +0100

turn off dnd target indicator on old target when changing target

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

diff --git a/vcl/inc/treeglue.hxx b/vcl/inc/treeglue.hxx
index ebc0e57b2ccb..ac7416590e92 100644
--- a/vcl/inc/treeglue.hxx
+++ b/vcl/inc/treeglue.hxx
@@ -129,7 +129,10 @@ public:
 
 virtual SvTreeListEntry* GetDropTarget(const Point& rPos) override
 {
+SvTreeListEntry* pOldTargetEntry = pTargetEntry;
 pTargetEntry = pImpl->GetEntry(rPos);
+if (pOldTargetEntry != pTargetEntry)
+ImplShowTargetEmphasis(pOldTargetEntry, false);
 
 // scroll
 if (rPos.Y() < 12)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 2 commits - configure.ac xmlscript/source

[Samuel Mehrbrodt (via logerrit)]

 configure.ac|2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx |4 +++-
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |   11 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit d67bcc90d98b2268f2434e1077c09b0f08c11aeb
Author: Samuel Mehrbrodt 
AuthorDate: Tue Feb 25 15:06:22 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Feb 25 15:06:22 2020 +0100

Release 6.3.5.3

Change-Id: I25e2df1d163eefe4a442b0cd7176b4e10ad6c38a

diff --git a/configure.ac b/configure.ac
index bb17f3ef95a9..9eca69a31a9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.5.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.5.3],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 636d659d86c078300b595a8ed45d0e2fdc2f569f
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 24 23:38:40 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Feb 25 15:04:35 2020 +0100

tdf#130793 Fix import/export of image URLs

Change-Id: I329af3b0d5a81d9f31def9c2ad861d0e83e3714c

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index eca2feb26fa0..e3141cf60b57 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -742,7 +742,9 @@ void ElementDescriptor::readImageOrGraphicAttr(OUString 
const & rAttrName)
 }
 }
 }
-else if (beans::PropertyState_DEFAULT_VALUE != 
_xPropState->getPropertyState("ImageURL"))
+// tdf#130793 Above fails if the dialog is not part of a document. Export 
the ImageURL then.
+if (sURL.isEmpty()
+&& beans::PropertyState_DEFAULT_VALUE != 
_xPropState->getPropertyState("ImageURL"))
 {
 _xProps->getPropertyValue("ImageURL") >>= sURL;
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 50b86b5f601e..c52c23f05210 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -882,6 +882,17 @@ bool ImportContext::importGraphicOrImageProperty(
 return true;
 }
 }
+else if (!sURL.isEmpty())
+{
+// tdf#130793 Above fails if the dialog is not part of a document.
+// In this case we need to set the ImageURL.
+Reference xProps = getControlModel();
+if (xProps.is())
+{
+xProps->setPropertyValue("ImageURL", makeAny(sURL));
+return true;
+}
+}
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/inc sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/inc/pagedesc.hxx  |2 ++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|3 +++
 sw/source/core/layout/ftnfrm.cxx |   12 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |   24 +++-
 4 files changed, 38 insertions(+), 3 deletions(-)

New commits:
commit d2b590614c71f195a5ea14c4e950e0129ca4e120
Author: Michael Stahl 
AuthorDate: Fri Feb 21 16:34:56 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Feb 25 15:34:28 2020 +0100

sw: improve DOCX export of footnote separator a little more

The Writer footnote separator has configurable line thickness and
spacing above and below; let's abuse the font size of the paragraph to
approximate the height of the separator (in the bugdoc that's currently
interesting there isn't a separator line so if it works in that case
it's good enough).

Change-Id: I7f33e5a226ecaa9f9ab233e003c71aaed145b638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89228
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 12d88808fbde933c0498c895ddb74700c263bf0f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89138
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 86e3fc075a7c..684bd040820d 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -377,6 +377,8 @@ public:
 
 namespace sw {
 class PageFootnoteHint final : public SfxHint {};
+
+SW_DLLPUBLIC SwTwips FootnoteSeparatorHeight(SwPageFootnoteInfo const&);
 }
 
 typedef boost::multi_index_container<
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 9dfd7da47ecf..cb4b0ad2e3e7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -339,9 +339,12 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFootnoteSeparator, 
"footnotesep.fodt")
 assertXPath(pXmlFootnotes, "/w:footnotes[1]/w:footnote[1]", "id", "0");
 assertXPath(pXmlFootnotes, "/w:footnotes[1]/w:footnote[1]", "type", 
"separator");
 assertXPath(pXmlFootnotes, 
"/w:footnotes[1]/w:footnote[1]/w:p[1]/w:r[1]/w:separator", 0);
+// use paragraph font size to simulate height
+assertXPath(pXmlFootnotes, 
"/w:footnotes[1]/w:footnote[1]/w:p[1]/w:pPr[1]/w:rPr[1]/w:sz", "val", "12");
 assertXPath(pXmlFootnotes, "/w:footnotes[1]/w:footnote[2]", "id", "1");
 assertXPath(pXmlFootnotes, "/w:footnotes[1]/w:footnote[2]", "type", 
"continuationSeparator");
 assertXPath(pXmlFootnotes, 
"/w:footnotes[1]/w:footnote[2]/w:p[1]/w:r[1]/w:continuationSeparator", 0);
+assertXPath(pXmlFootnotes, 
"/w:footnotes[1]/w:footnote[2]/w:p[1]/w:pPr[1]/w:rPr[1]/w:sz", "val", "12");
 
 xmlDocPtr pXmlSettings = parseExport("word/settings.xml");
 assertXPath(pXmlSettings, "/w:settings[1]/w:footnotePr[1]/w:footnote[1]", 
"id", "0");
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index da0cf0334de5..767ead4c6ef1 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -184,14 +184,22 @@ static long lcl_Undersize( const SwFrame* pFrame )
 return nRet;
 }
 
+namespace sw {
+
+SwTwips FootnoteSeparatorHeight(SwPageFootnoteInfo const& rInf)
+{
+return rInf.GetTopDist() + rInf.GetBottomDist() + rInf.GetLineWidth();
+}
+
+} // namespace sw
+
 /// "format" the frame (Fixsize is not set here).
 void SwFootnoteContFrame::Format( vcl::RenderContext* /*pRenderContext*/, 
const SwBorderAttrs * )
 {
 // calculate total border, only one distance to the top
 const SwPageFrame* pPage = FindPageFrame();
 const SwPageFootnoteInfo &rInf = pPage->GetPageDesc()->GetFootnoteInfo();
-const SwTwips nBorder = rInf.GetTopDist() + rInf.GetBottomDist() +
-rInf.GetLineWidth();
+const SwTwips nBorder = sw::FootnoteSeparatorHeight(rInf);
 SwRectFnSet aRectFnSet(this);
 
 if ( !isFramePrintAreaValid() )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 553d4b907583..d41691d39d59 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7546,6 +7546,21 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
 }
 }
 
+static void WriteFootnoteSeparatorHeight(
+::sax_fastparser::FSHelperPtr const& pSerializer, SwTwips const nHeight)
+{
+// try to get the height by setting font size of the paragraph
+if (nHeight != 0)
+{
+pSerializer->startElementNS(XML_w, XML_pPr);
+pSerializer->startElementNS(XML_w, XML_rPr);
+pSerializer->singleElementNS(XML_w, XML_sz, FSNS(XML_w, XML_val),
+OString::number((nHeight + 5) / 10));
+pSerializer->endElementNS(XML_w, XML_rPr);
+pSerializer->endElementNS(XML_w, XML_pPr);
+}
+}
+
 void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
 {
  

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

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/findtxt.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit df88c042a978c4c14aa1c12fdbb106ec7a1190e9
Author: Michael Stahl 
AuthorDate: Wed Feb 19 17:14:54 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Feb 25 15:35:07 2020 +0100

tdf#129553 sw_redlinehide: fix replace of paragraph breaks with $

The problem is that in the special selections that replace paragraph
breaks, the start and end node are actually different, hence have
different text frames.

(regression from 5e81b966778d82692b4763d892b457186a7f269d)

Practically the end content index is going to be 0 typically which
doesn't need mapping, but not sure if that's guaranteed anywhere.

Change-Id: I77c95c2f3e55edcc7aca6f4540cae90b3be5d79b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89050
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 83122add64ecbf0fd3ba30368d5d87bde3dac278)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89428
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index def2a7529d72..d438d2df99f6 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -1095,8 +1095,10 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 if( pPam && pPam->HasMark() &&
 SearchAlgorithms2::REGEXP == rSearchOpt.AlgorithmType2 )
 {
-const SwContentNode* pTextNode = pPam->GetContentNode();
-if (!pTextNode || !pTextNode->IsTextNode())
+SwContentNode const*const pTextNode = pPam->GetContentNode();
+SwContentNode const*const pMarkTextNode = pPam->GetContentNode(false);
+if (!pTextNode || !pTextNode->IsTextNode()
+|| !pMarkTextNode || !pMarkTextNode->IsTextNode())
 {
 return xRet;
 }
@@ -1106,7 +1108,7 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 const bool bParaEnd = rSearchOpt.searchString == "$" || 
rSearchOpt.searchString == "^$" || rSearchOpt.searchString == "$^";
 if (bParaEnd || (pLayout
 ? sw::FrameContainsNode(*pFrame, 
pPam->GetMark()->nNode.GetIndex())
-: pTextNode == pPam->GetContentNode(false)))
+: pTextNode == pMarkTextNode))
 {
 utl::TextSearch aSText( utl::TextSearch::UpgradeToSearchOptions2( 
rSearchOpt) );
 OUString rStr = pLayout
@@ -1116,8 +1118,16 @@ boost::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2&
 AmbiguousIndex nEnd;
 if (pLayout)
 {
-
nStart.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->Start()));
-nEnd.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->End()));
+SwTextFrame const*const pStartFrame(
+bParaEnd && *pPam->GetMark() < *pPam->GetPoint()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+SwTextFrame const*const pEndFrame(
+bParaEnd && *pPam->GetPoint() <= *pPam->GetMark()
+? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
+: pFrame);
+
nStart.SetFrameIndex(pStartFrame->MapModelToViewPos(*pPam->Start()));
+nEnd.SetFrameIndex(pEndFrame->MapModelToViewPos(*pPam->End()));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 filter/source/svg/svgwriter.cxx |   45 ++--
 include/svx/svdograf.hxx|9 
 svx/source/svdraw/svdograf.cxx  |   22 ---
 3 files changed, 34 insertions(+), 42 deletions(-)

New commits:
commit c7af36a6504a192f72fcd3a30712ca8c14e12fa5
Author: Miklos Vajna 
AuthorDate: Tue Feb 25 11:28:44 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 25 16:20:51 2020 +0100

SVG export: try to reuse original bitmap data for JPG and PNG bitmaps

This has a number of benefits:

1) For a sample JPG photo, the SVG output is now 4,9MB, not 20MB.

2) Even the first export to SVG is fast, see commit
570be56b37e4ff105649e604ff4c8a6c368e2e79 (svx: cache PNG export of
graphic shapes, 2020-02-25) for exact numbers.

3) Allow using less memory as the SdrGrafObj doesn't have to store a PNG
result till the document is closed.

We still require matching checksums, so in case anything problematic
happens with the bitmap (grayscale filter applied, etc), then the
optimization is meant to not help, but still produces correct output.

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

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 7706e2c26e44..9ccd18eaafee 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2725,29 +2725,52 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& 
rBmpEx,
 
 bool bCached = false;
 SdrGrafObj* pGrafObj = nullptr;
+bool bPNG = false;
+bool bJPG = false;
 if (pShape)
 {
 pGrafObj = GetSdrGrafObjFromXShape(pShape);
-if (pGrafObj && pGrafObj->GetPNGPreviewChecksum() == 
rBmpEx.GetChecksum())
+if (pGrafObj)
 {
-const std::vector& rPreviewData = 
pGrafObj->GetPNGPreviewData();
-aOStm.WriteBytes(rPreviewData.data(), rPreviewData.size());
-bCached = true;
+const Graphic& rGraphic = pGrafObj->GetGraphic();
+if (rGraphic.GetType() == GraphicType::Bitmap)
+{
+const BitmapEx& rGraphicBitmap = 
rGraphic.GetBitmapExRef();
+if (rGraphicBitmap.GetChecksum() == 
rBmpEx.GetChecksum())
+{
+GfxLink aGfxLink = rGraphic.GetGfxLink();
+if (aGfxLink.GetType() == GfxLinkType::NativePng)
+{
+bPNG = true;
+}
+else if (aGfxLink.GetType() == 
GfxLinkType::NativeJpg)
+{
+bJPG = true;
+}
+if (bPNG || bJPG)
+{
+aOStm.WriteBytes(aGfxLink.GetData(), 
aGfxLink.GetDataSize());
+bCached = true;
+}
+}
+}
 }
 }
 
 if( bCached || GraphicConverter::Export( aOStm, rBmpEx, 
ConvertDataFormat::PNG ) == ERRCODE_NONE )
 {
-if (!bCached && pGrafObj)
-{
-pGrafObj->SetPNGPreviewChecksum(rBmpEx.GetChecksum());
-pGrafObj->SetPNGPreviewData(aOStm);
-}
-
 PointaPt;
 Size aSz;
 Sequence< sal_Int8 > aSeq( static_cast(aOStm.GetData()), aOStm.Tell() );
-OUStringBuffer aBuffer( "data:image/png;base64," );
+OUStringBuffer aBuffer;
+if (bJPG)
+{
+aBuffer.append("data:image/jpeg;base64,");
+}
+else
+{
+aBuffer.append("data:image/png;base64,");
+}
 ::comphelper::Base64::encode( aBuffer, aSeq );
 
 ImplMap( rPt, aPt );
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 098ae70d73a2..8944db82bc2d 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -123,9 +122,6 @@ private:
 void onGraphicChanged();
 GDIMetaFile GetMetaFile(GraphicType &rGraphicType) const;
 
-BitmapChecksum mnPNGPreviewChecksum = 0;
-std::vector maPNGPreviewData;
-
 protected:
 // protected destructor
 virtual ~SdrGrafObj() override;
@@ -301,11 +297,6 @@ public:
 {
 return mpQrCode.get();
 };
-
-void

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

[Heiko Tietze (via logerrit)]

 vcl/source/window/printdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b268715912d4c2034b9b9d38e75446bef7bbb11f
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 11:58:02 2020 +0100
Commit: Heiko Tietze 
CommitDate: Tue Feb 25 16:24:08 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Amends Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb

Change-Id: Ic669332245ad9c5ee6366765da8a5bc632dd159c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89423
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ad54af15ce7e..614b8d4eaf13 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -147,8 +147,8 @@ void PrintDialog::PrintPreviewWindow::Resize()
 
 void PrintDialog::PrintPreviewWindow::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 {
-pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 55,
-   pDrawingArea->get_text_height() * 40);
+pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 45,
+   pDrawingArea->get_text_height() * 30);
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Hakan Bakacak (via logerrit)]

 extras/source/autocorr/lang/tr/DocumentList.xml |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit ea5c1272c653897172a7d08403061f2159331914
Author: Hakan Bakacak 
AuthorDate: Mon Feb 17 00:32:41 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Feb 25 17:13:19 2020 +0100

tdf#130711: [tr] Extend Autocorrect list for Turkish language (Start with B)

Change-Id: I566233c184fd67032828cfe53ea84fa1b5e876c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88825
Tested-by: Jenkins
Reviewed-by: PhD. Ayhan YALÇINSOY 
Reviewed-by: Yusuf Keten 
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index e7553e3aba55..21984140f44a 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -100,18 +100,36 @@
   
   
   
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
   
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bc8488ed715102f08423ce5953727ad8e97fd687
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 11:45:41 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 17:19:18 2020 +0100

tdf#130915 SvTreeList::Move needs to move from lower index to higher

the reverse doesn't work

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 49acab55dcb7..0dc8b989f408 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3571,9 +3571,11 @@ public:
 
 virtual void swap(int pos1, int pos2) override
 {
+int min = std::min(pos1, pos2);
+int max = std::max(pos1, pos2);
 SvTreeList* pModel = m_xTreeView->GetModel();
-SvTreeListEntry* pEntry1 = pModel->GetEntry(nullptr, pos1);
-SvTreeListEntry* pEntry2 = pModel->GetEntry(nullptr, pos2);
+SvTreeListEntry* pEntry1 = pModel->GetEntry(nullptr, min);
+SvTreeListEntry* pEntry2 = pModel->GetEntry(nullptr, max);
 pModel->Move(pEntry1, pEntry2);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 solenv/gbuild/LinkTarget.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef6d1789e45cc9b3ab8a351d84d98dd81cfd84a0
Author: Noel Grandin 
AuthorDate: Tue Feb 25 12:32:07 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 25 18:05:55 2020 +0100

fix --enable-mergedlibs build

after my recent additions to the list of libs exceeded Windows
command line length limit (mostly affecting those people whose
workspace was under a fairly long folder name)

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9e14f599b690..c0203c01a959 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -648,8 +648,8 @@ TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXCLROBJECTS),$(call 
gb_GenCxxClrObject_get_target,$(object))) \
-   $(PCHOBJS)) && \
-$(if $(EXTRAOBJECTLISTS),cat $(EXTRAOBJECTLISTS) >> $${TEMPFILE} && ) \
+   $(PCHOBJS) \
+   $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat 
$(extraobjectlist && \
 mv $${TEMPFILE} $(1)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk solenv/bin xmlscript/Library_xmlscript.mk xmlscript/source xmlscript/util

[Noel Grandin (via logerrit)]

 offapi/UnoApi_offapi.mk |3 
 offapi/com/sun/star/document/XMLBasicImporter.idl   |   59 -
 offapi/com/sun/star/document/XMLOasisBasicImporter.idl  |   46 -
 offapi/com/sun/star/document/XXMLOasisBasicImporter.idl |   52 -
 offapi/type_reference/offapi.idl|9 
 solenv/bin/native-code.py   |2 
 xmlscript/Library_xmlscript.mk  |1 
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx|  645 
 xmlscript/source/xmlflat_imexp/xmlbas_import.hxx|  261 --
 xmlscript/util/xmlscript.component  |8 
 10 files changed, 1086 deletions(-)

New commits:
commit 214e6caf2c503d817c47ebcc419e4f7e33b336ac
Author: Noel Grandin 
AuthorDate: Thu Feb 20 15:33:05 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 25 18:07:04 2020 +0100

[API CHANGE] remove BasicImport UNO interfaces

which are unused since
commit 4e97fa0f4e73acdf522643aeec486b1395e63727
Date:   Thu Feb 20 13:09:32 2020 +0200
use fast-parser APIs for embedded script parsing

and highly unlikely to be externally used since they parse document
internal script code.

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

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0453d1fd9614..8814f0076e31 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -134,7 +134,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/document,\
OOXMLDocumentPropertiesImporter \
XMLBasicExporter \
XMLOasisBasicExporter \
-   XMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/drawing,\
ColorTable \
@@ -757,7 +756,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/document,\
PDFDialog \
Settings \
TypeDetection \
-   XMLBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\
AccessibleDrawDocumentView \
@@ -2258,7 +2256,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/document,\
XVbaMethodParameter \
XViewDataSupplier \
XXMLBasicExporter \
-   XXMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\
Alignment \
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl 
b/offapi/com/sun/star/document/XMLBasicImporter.idl
deleted file mode 100644
index 208d95ddd003..
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- 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:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_document_XMLBasicImporter_idl__
-#define __com_sun_star_document_XMLBasicImporter_idl__
-
-#include 
-#include 
-
-
-
-module com { module sun { module star { module document {
-
-
-/** Filter for importing Basic macros from the OpenOffice.org file format.
-
-The XImporter::setTargetDocument() method must be
-called in order to provide the import component with the target document
-to which the data should be imported.
-The com::sun::star::xml::sax::XDocumentHandler
-interface is used to stream the XML data into the filter.
-
-@since OOo 2.0
- */
-published service XMLBasicImporter
-{
-
-/** sets the target document for this filter.
- */
-interface com::sun::star::document::XImporter;
-
-
-/** receives notification of general document events.
- */
-interface com::sun::star::xml::sax::XDocumentHandler;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl 
b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
deleted file mode 100644
index 6d1fb9113606..
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; inde

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 94c9d1e61702e64c03b2261ce1359bf3e459b75a
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 11:45:41 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Feb 25 18:20:35 2020 +0100

tdf#130915 SvTreeList::Move needs to move from lower index to higher

the reverse doesn't work

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 48f960f851c0..6b092f4d89cd 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3659,9 +3659,11 @@ public:
 
 virtual void swap(int pos1, int pos2) override
 {
+int min = std::min(pos1, pos2);
+int max = std::max(pos1, pos2);
 SvTreeList* pModel = m_xTreeView->GetModel();
-SvTreeListEntry* pEntry1 = pModel->GetEntry(nullptr, pos1);
-SvTreeListEntry* pEntry2 = pModel->GetEntry(nullptr, pos2);
+SvTreeListEntry* pEntry1 = pModel->GetEntry(nullptr, min);
+SvTreeListEntry* pEntry2 = pModel->GetEntry(nullptr, max);
 pModel->Move(pEntry1, pEntry2);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/uiconfig/ui/namematchingpage.ui |   24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

New commits:
commit 9bb7f05793e208f6340a6bdac9e38d63d447552a
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 11:57:43 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 18:35:02 2020 +0100

tdf#130915 second treeview doesn't use its checkboxes

so we end up with blank lines under gtk

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

diff --git a/dbaccess/uiconfig/ui/namematchingpage.ui 
b/dbaccess/uiconfig/ui/namematchingpage.ui
index 8528976ba386..543f192c67bf 100644
--- a/dbaccess/uiconfig/ui/namematchingpage.ui
+++ b/dbaccess/uiconfig/ui/namematchingpage.ui
@@ -18,16 +18,10 @@
   
   
 
-  
-  
   
   
   
   
-  
-  
-  
-  
 
   
   
@@ -230,25 +224,11 @@
 True
 liststore2
 False
-1
+0
 False
 
   
 
-
-  
-True
-6
-
-  
-  
-3
-0
-4
-  
-
-  
-
 
   
 True
@@ -256,7 +236,7 @@
 
   
   
-1
+0
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 6d23f2667edc9f8b867066a432dff152f8427ce0
Author: Jim Raykowski 
AuthorDate: Mon Feb 24 23:43:52 2020 -0900
Commit: Jim Raykowski 
CommitDate: Tue Feb 25 19:12:06 2020 +0100

tdf#128814 follow up: check for nullptr and dispose unused sub pop menu

Prevent nullptr crash in lcl_IsContent and dispose and clear sub pop
outline tracking menu if unused.

Change-Id: I6d3e1a48776426ae18156cc70b799f74f349bf5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89410
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index d0b1934aa1d8..f70f72815075 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1287,15 +1287,15 @@ VclPtr SwContentTree::CreateContextMenu()
 else if (State::HIDDEN == m_eState)
 pSubPop3->CheckItem( nId );
 
-SvTreeListEntry* pEntry = nullptr;
-if (lcl_IsContent(FirstSelected()))
+SvTreeListEntry* pEntry = FirstSelected();
+if (pEntry && lcl_IsContent(pEntry))
 {
 pPop->InsertItem(900, SwResId(STR_GOTO));
 pPop->SetAccelKey(900, vcl::KeyCode(KEY_RETURN, false, false, false, 
false));
 }
 // Edit only if the shown content is coming from the current view.
 if ((State::ACTIVE == m_eState || m_pActiveShell == 
pActiveView->GetWrtShellPtr())
-&& nullptr != (pEntry = FirstSelected()) && lcl_IsContent(pEntry))
+&& pEntry && lcl_IsContent(pEntry))
 {
 
assert(dynamic_cast(static_cast(pEntry->GetUserData(;
 const SwContentType* pContType = 
static_cast(pEntry->GetUserData())->GetParent();
@@ -1425,7 +1425,10 @@ VclPtr SwContentTree::CreateContextMenu()
 pPop->SetPopupMenu(1, pSubPop1);
 }
 else
+{
+pSubPopOutlineTracking.disposeAndClear();
 pSubPop1.disposeAndClear();
+}
 pPop->InsertItem(2, m_aContextStrings[IDX_STR_DRAGMODE]);
 pPop->SetPopupMenu(2, pSubPop2);
 pPop->InsertItem(3, m_aContextStrings[IDX_STR_DISPLAY]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/Library_vcl.mk   |1 
 vcl/inc/graphic/GraphicID.hxx|   47 
 vcl/inc/impgraph.hxx |   21 ---
 vcl/source/gdi/impgraph.cxx  |   83 
 vcl/source/graphic/GraphicID.cxx |  112 +++
 5 files changed, 161 insertions(+), 103 deletions(-)

New commits:
commit b6bc43f354bcbe6a98db9fb372fd47bc5b23f4d8
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 24 23:02:20 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Feb 25 19:30:53 2020 +0100

vcl: move GraphicID out of impgraph.{cxx,hxx}

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

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a38c84874ff9..79f2002c8c9d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -318,6 +318,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/TypeSerializer \
 vcl/source/pdf/ResourceDict \
 vcl/source/pdf/Matrix3 \
+vcl/source/graphic/GraphicID \
 vcl/source/graphic/GraphicLoader \
 vcl/source/graphic/GraphicObject \
 vcl/source/graphic/GraphicObject2 \
diff --git a/vcl/inc/graphic/GraphicID.hxx b/vcl/inc/graphic/GraphicID.hxx
new file mode 100644
index ..87ac6a50f37a
--- /dev/null
+++ b/vcl/inc/graphic/GraphicID.hxx
@@ -0,0 +1,47 @@
+/* -*- 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:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+class ImpGraphic;
+
+class GraphicID
+{
+private:
+sal_uInt32 mnID1;
+sal_uInt32 mnID2;
+sal_uInt32 mnID3;
+BitmapChecksum mnID4;
+
+public:
+GraphicID(ImpGraphic const& rGraphic);
+
+bool operator==(const GraphicID& rID) const
+{
+return rID.mnID1 == mnID1 && rID.mnID2 == mnID2 && rID.mnID3 == mnID3 
&& rID.mnID4 == mnID4;
+}
+
+OString getIDString() const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 90e658c67308..56c663d2d687 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include "graphic/Manager.hxx"
+#include "graphic/GraphicID.hxx"
 
 struct ImpSwapInfo
 {
@@ -45,26 +46,6 @@ struct ImpSwapFile;
 class GraphicConversionParameters;
 class ImpGraphic;
 
-class GraphicID
-{
-private:
-sal_uInt32  mnID1;
-sal_uInt32  mnID2;
-sal_uInt32  mnID3;
-BitmapChecksum  mnID4;
-
-public:
-GraphicID(ImpGraphic const & rGraphic);
-
-bool operator==(const GraphicID& rID) const
-{
-return rID.mnID1 == mnID1 && rID.mnID2 == mnID2 &&
-   rID.mnID3 == mnID3 && rID.mnID4 == mnID4;
-}
-
-OString getIDString() const;
-};
-
 class ImpGraphic final
 {
 friend class Graphic;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 7e9c96feddf2..df736a274d87 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -69,89 +69,6 @@ struct ImpSwapFile
 ~ImpSwapFile();
 };
 
-GraphicID::GraphicID(ImpGraphic const & rGraphic)
-{
-rGraphic.ensureAvailable();
-
-mnID1 = static_cast(rGraphic.ImplGetType()) << 28;
-mnID2 = mnID3 = mnID4 = 0;
-
-if (rGraphic.ImplGetType() == GraphicType::Bitmap)
-{
-if (rGraphic.getVectorGraphicData().get())
-{
-const VectorGraphicDataPtr& rVectorGraphicDataPtr = 
rGraphic.getVectorGraphicData();
-const basegfx::B2DRange& rRange = 
rVectorGraphicDataPtr->getRange();
-
-mnID1 |= rVectorGraphicDataPtr->getVectorGraphicDataArrayLength();
-mnID2 = basegfx::fround(rRange.getWidth());
-mnID3 = basegfx::fround(rRange.getHeight());
-mnID4 = vcl_get_checksum(0, 
rVectorGraphicDataPtr->getVectorGraphicDataArray().getConstArray(), 
rVectorGraphicDataPtr->getVectorGraphicDataArrayLength());
-}
-else if (rGraphic.hasPdfData())
-{
-std::shared_ptr> pPdfData = 
rGraphic.getPdfData();
-const BitmapEx& rBmpEx

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf123757.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |7 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   24 +++
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |2 -
 4 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit d5aeb48c7035c5518c4978760e93a49351a9e57a
Author: László Németh 
AuthorDate: Tue Feb 25 09:46:15 2020 +0100
Commit: László Németh 
CommitDate: Tue Feb 25 19:54:19 2020 +0100

tdf#123757 DOCX import: separate different style tables

to avoid of losing table layout, color etc. during
their prohibited combination into one table: table
style of the second table overwrote the table style
of the first table, or without table style, the
second table was overwritten by the table style of
the first table.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf123757.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123757.docx
new file mode 100644
index ..6cfc8210c011
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123757.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 9a35092981ba..ae8c0a86be45 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -544,6 +544,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128290, 
"tdf128290.odt")
 assertXPath(pXml, "/w:document/w:body/w:tbl/w:tblPr/w:tblLayout", "type", 
"fixed");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf123757, "tdf123757.docx")
+{
+xmlDocPtr pXml = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXml);
+assertXPath(pXml, "/w:document/w:body/w:tbl", 2);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testContSectBreakHeaderFooter, 
"cont-sect-break-header-footer.docx")
 {
 // Load a document with a continuous section break on page 2.
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0701dc1610e1..18ddcd902b35 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -238,9 +238,8 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 break;
 case NS_ooxml::LN_CT_TblPrBase_tblStyle: //table style name
 {
-m_sTableStyleName = pValue->getString();
 TablePropertyMapPtr pPropMap( new TablePropertyMap );
-pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::makeAny( 
m_sTableStyleName ));
+pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::makeAny( 
pValue->getString() ));
 insertTableProps(pPropMap);
 }
 break;
@@ -444,6 +443,8 @@ void DomainMapperTableManager::startLevel( )
 m_aGridSpans.push_back( pNewSpans );
 m_aCellWidths.push_back( pNewCellWidths );
 m_aTablePositions.push_back( pNewPositionHandler );
+// empty name will be replaced by the table style name, if it exists
+m_aTableStyleNames.push_back( OUString() );
 
 TablePositionHandlerPtr pTmpPosition;
 TablePropertyMapPtr pTmpProperties( new TablePropertyMap( ) );
@@ -500,6 +501,7 @@ void DomainMapperTableManager::endLevel( )
 // Pop back the table position after endLevel as it's used
 // in the endTable method called in endLevel.
 m_aTablePositions.pop_back();
+m_aTableStyleNames.pop_back();
 }
 
 void DomainMapperTableManager::endOfCellAction()
@@ -521,7 +523,7 @@ void DomainMapperTableManager::endOfRowAction()
 TagLogger::getInstance().startElement("endOfRowAction");
 #endif
 
-// Compare the table position with the previous ones. We may need to split
+// Compare the table position and style with the previous ones. We may 
need to split
 // into two tables if those are different. We surely don't want to do 
anything
 // if we don't have any row yet.
 TablePositionHandlerPtr pTmpPosition = m_aTmpPosition.back();
@@ -529,7 +531,13 @@ void DomainMapperTableManager::endOfRowAction()
 TablePositionHandlerPtr pCurrentPosition = m_aTablePositions.back();
 bool bSamePosition = ( pTmpPosition == pCurrentPosition ) ||
  ( pTmpPosition && pCurrentPosition && *pTmpPosition 
== *pCurrentPosition );
-if ( !bSamePosition && m_nRow > 0 )
+bool bIsSetTableStyle = pTablePropMap->isSet(META_PROP_TABLE_STYLE_NAME);
+OUString sTableStyleName;
+bool bSameTableStyle = ( !bIsSetTableStyle && 
m_aTableStyleNames.back().isEmpty()) ||
+( bIsSetTableStyle &&
+  (pTablePropMap->getProperty(META_PROP_TABLE_STYLE_NAME)->second 
>>= sTableStyleName) &&
+  

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - loleaflet/src

[Tamás Zolnai (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/core/LOUtil.js |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 445e847e0c720c6bdb756ce3512218778ce8dd8d
Author: Tamás Zolnai 
AuthorDate: Tue Feb 25 12:10:53 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 20:44:26 2020 +0100

mobile: fix-up non-breaking space insertion.

Make it to have the icon, but also trigger the right
uno command.

Change-Id: Ic762fee0eee0f1a6bc793edc98ed2217075364f7
(cherry picked from commit 4ca5089d56369d335a39c13e428d2e932c0ac8a3)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89452
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8517f8c0d..a4b876536 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -648,7 +648,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:HyperlinkDialog'), 
id: 'inserthyperlink', type: 'action'},
{name: _UNO('.uno:ShapesMenu'), id: 
'insertshape', type: 'action'},
{name: _UNO('.uno:FormattingMarkMenu', 
'text'), id: 'formattingmark', type: 'menu', menu: [
-   {name: 
_UNO('.uno:InsertNonBreakingSpace'), id: 'insertnonbreakingspace'},
+   {uno: 
'.uno:InsertNonBreakingSpace'},
{uno: '.uno:InsertHardHyphen'},
{uno: '.uno:InsertSoftHyphen'},
{uno: '.uno:InsertZWSP'},
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index f540e6da2..7ff1a5272 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -92,7 +92,6 @@ L.LOUtil = {
commandWithoutIcon: [
'InsertPageHeader',
'InsertPageFooter',
-   'InsertNonBreakingSpace',
'InsertHardHyphen',
'InsertSoftHyphen',
'InsertZWSP',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/dlg/dlgsize.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72a5c8a6f5d5515aed47ff803bc277353aa54061
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 12:30:38 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 20:50:25 2020 +0100

Resolves: tdf130874 reversed logic

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

diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx 
b/dbaccess/source/ui/dlg/dlgsize.cxx
index 2c10d235cdcc..45c624518f1a 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -66,8 +66,8 @@ sal_Int32 DlgSize::GetValue() const
 
 IMPL_LINK_NOARG(DlgSize, CbClickHdl, weld::ToggleButton&, void)
 {
-m_xMF_VALUE->set_sensitive(m_xCB_STANDARD->get_active());
-if (!m_xCB_STANDARD->get_active())
+m_xMF_VALUE->set_sensitive(!m_xCB_STANDARD->get_active());
+if (m_xCB_STANDARD->get_active())
 {
 // don't use getValue as this will use m_xCB_STANDARD->to determine if 
we're standard
 m_nPrevValue = 
static_cast(m_xMF_VALUE->get_value(FieldUnit::CM));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/src/map/handler/Map.SlideShow.js |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 6f3f52304f122036e1bc405a8882d9a6ef1a90d1
Author: Jan Holesovsky 
AuthorDate: Mon Feb 24 21:49:27 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Feb 25 21:03:37 2020 +0100

Don't bind the slideshow downloading to the richdocuments...

... decide based on the DownloadAsPostMessage wopi value instead.

The idea is that the Nextcloud app actually sets the DownloadAsPostMessage
wopi value to true, which means that all the downloading (including
slideshow) is passed as Download_As postMessage anyway.

So deciding here based on the existence of the Nextcloud app is
not necessary, because there might be others who set the
DownloadAsPostMessage and rely on the Download_As postMessage,
but would get a non-functional iframe over the top of the editing
window.

Change-Id: I4a5c1d9ef6276908a1b3910a4269091955cdc490
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89382
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/map/handler/Map.SlideShow.js 
b/loleaflet/src/map/handler/Map.SlideShow.js
index 4f268df24..0a1987707 100644
--- a/loleaflet/src/map/handler/Map.SlideShow.js
+++ b/loleaflet/src/map/handler/Map.SlideShow.js
@@ -29,7 +29,7 @@ L.Map.SlideShow = L.Handler.extend({
return;
}
 
-   if (!window.RichDocumentsMobileInterface) {
+   if (!this._map['wopi'].DownloadAsPostMessage) {
this._slideShow = L.DomUtil.create('iframe', 
'leaflet-slideshow', this._map._container);
if (this._slideShow.requestFullscreen) {
this._slideShow.requestFullscreen();
@@ -53,7 +53,7 @@ L.Map.SlideShow = L.Handler.extend({
},
 
_onFullScreenChange: function () {
-   if (window.RichDocumentsMobileInterface) {
+   if (this._map['wopi'].DownloadAsPostMessage) {
return;
}
 
@@ -67,12 +67,8 @@ L.Map.SlideShow = L.Handler.extend({
},
 
_onSlideDownloadReady: function (e) {
-   if (window.RichDocumentsMobileInterface) {
-   window.RichDocumentsMobileInterface.slideShow(e.url);
-   } else {
-   this._slideShow.src = e.url;
-   this._slideShow.contentWindow.focus();
-   }
+   this._slideShow.src = e.url;
+   this._slideShow.contentWindow.focus();
}
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/filter/ww8/docxexport.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 09775c1806e9dd32eee8aeff96609186368cb0e7
Author: Michael Stahl 
AuthorDate: Mon Feb 24 15:20:20 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 21:25:12 2020 +0100

sw: DOCX export: limit FORMDROPDOWN listEntry to Word's abilities

In theory wml.xsd says:

 

In practice Word 2013 refuses to load a file with 26 listEntry in one
FORMDROPDOWN field.

Interestingly w:result w:val larger than the number of entries does not
cause Word to complain. Go figure.

Change-Id: I3a61533f9ee4ba3917a9c3bc55a483fd587f0471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89358
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit d9634e3c9bfaf826b3d4d39e9a57d6c2d8d9a3dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89432
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 312500a4502c..d025d6b712ec 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -358,12 +358,13 @@ void DocxExport::DoComboBox(const OUString& rName,
 
 m_pDocumentFS->singleElementNS(XML_w, XML_result, FSNS(XML_w, XML_val), 
OString::number(nId));
 
-// Loop over the entries
-
-for (const auto& rItem : rListItems)
+// unfortunately Word 2013 refuses to load DOCX with more than 25 listEntry
+SAL_WARN_IF(25 < rListItems.getLength(), "sw.ww8", "DocxExport::DoComboBox 
data loss with more than 25 entries");
+auto const nSize(std::min(sal_Int32(25), rListItems.getLength()));
+for (auto i = 0; i < nSize; ++i)
 {
 m_pDocumentFS->singleElementNS( XML_w, XML_listEntry,
-FSNS( XML_w, XML_val ), rItem.toUtf8() );
+FSNS(XML_w, XML_val), rListItems[i].toUtf8() );
 }
 
 m_pDocumentFS->endElementNS( XML_w, XML_ddList );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: configure.ac ios/Mobile.xcodeproj

[Tor Lillqvist (via logerrit)]

 configure.ac |1 +
 ios/Mobile.xcodeproj/project.pbxproj |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3de577d2c20d83be0079be4066196b476c46fa8d
Author: Tor Lillqvist 
AuthorDate: Tue Feb 25 17:29:09 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Feb 25 21:40:03 2020 +0100

Use the loolkitconfig-mobile.xcu on iOS, too

We can't rename a file in the Xcode project, so copy it to
ios/Mobile/loolkitconfig.xcu in the configure script, and use from
there.

Change-Id: I1e50235c06f528dd24d0d968aaccc994418b57d8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89466
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 398d303e3..1a038efaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -983,6 +983,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
   # iOS app.
   touch ios/Mobile/Branding/branding.css
   fi
+  cp loolkitconfig-mobile.xcu ios/Mobile/loolkitconfig.xcu
fi
   ])
 AC_SUBST(IOSAPP_FONTS)
diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 9fab320d2..e20f49084 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
BE7D6A6523FA9C2700C2E605 /* defaultprovider.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
defaultprovider.hxx; path = 
"../../ios-device/configmgr/source/defaultprovider.hxx"; sourceTree = 
""; };
BE7D6A6623FA9C2700C2E605 /* parser.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = parser.hxx; path 
= "../../ios-device/configmgr/source/parser.hxx"; sourceTree = ""; };
BE7D6A6723FA9C2700C2E605 /* rootnode.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rootnode.cxx; 
path = "../../ios-device/configmgr/source/rootnode.cxx"; sourceTree = 
""; };
-   BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = 
loolkitconfig.xcu; path = ../../../loolkitconfig.xcu; sourceTree = ""; };
+   BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = 
loolkitconfig.xcu; path = ../loolkitconfig.xcu; sourceTree = ""; };
BE7E5B7623AD07BE00F9462A /* SvxPresetListBox.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
SvxPresetListBox.cxx; path = 
"../../ios-device/svx/source/tbxctrls/SvxPresetListBox.cxx"; sourceTree = 
""; };
BE7E5B7723AD07BE00F9462A /* tbxcolor.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx; 
path = "../../ios-device/svx/source/tbxctrls/tbxcolor.cxx"; sourceTree = 
""; };
BE7E5B7823AD07BE00F9462A /* tbxdrctl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxdrctl.cxx; 
path = "../../ios-device/svx/source/tbxctrls/tbxdrctl.cxx"; sourceTree = 
""; };
___
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' - cui/source svx/source

[Henry Castro (via logerrit)]

 cui/source/tabpages/tpline.cxx|8 ++--
 svx/source/sidebar/line/LinePropertyPanelBase.cxx |5 -
 svx/source/tbxctrls/linectrl.cxx  |6 +-
 svx/source/tbxctrls/tbcontrl.cxx  |8 ++--
 svx/source/xoutdev/xattr2.cxx |4 +++-
 svx/source/xoutdev/xtabdash.cxx   |5 -
 6 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit b214ef1f016f7470c363987e28dafea0b0a4
Author: Henry Castro 
AuthorDate: Mon Feb 24 13:34:03 2020 -0400
Commit: Andras Timar 
CommitDate: Tue Feb 25 21:47:58 2020 +0100

lok: use "None" string item in the ListBox control

The string item "- none -" confuse mobile users,
it is preferable to use the "None" string

Change-Id: Ib9b5716aa796624255fed7fac5413db69e028bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89368
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index b4498348c8ed..790c6dd3e082 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
@@ -227,7 +228,8 @@ void SvxLineTabPage::FillListboxes()
 m_xLbLineStyle->set_active( nOldSelect );
 
 // Line end style
-OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
+OUString sNone( comphelper::LibreOfficeKit::isActive() ? SvxResId( 
RID_SVXSTR_INVISIBLE )
+: SvxResId( RID_SVXSTR_NONE ) );
 nOldSelect = m_xLbStartStyle->get_active();
 m_xLbStartStyle->clear();
 m_xLbStartStyle->append_text(sNone);
@@ -289,7 +291,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
 *m_pnLineEndListState = ChangeType::NONE;
 
 nPos = m_xLbLineStyle->get_active();
-OUString sNone(SvxResId(RID_SVXSTR_NONE));
+OUString sNone( comphelper::LibreOfficeKit::isActive() ? SvxResId( 
RID_SVXSTR_INVISIBLE )
+: SvxResId( RID_SVXSTR_NONE ) );
+
 m_xLbStartStyle->clear();
 m_xLbStartStyle->append_text(sNone);
 
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx 
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 50da4a9d6b14..824ee8126095 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -47,6 +47,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace css;
 using namespace css::uno;
 
@@ -58,7 +60,8 @@ namespace
 void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const 
XLineEndList& rList, const BitmapEx& rBitmapZero)
 {
 const sal_uInt32 nCount(rList.Count());
-const OUString sNone(SvxResId(RID_SVXSTR_NONE));
+const OUString sNone(comphelper::LibreOfficeKit::isActive() ? 
SvxResId(RID_SVXSTR_INVISIBLE)
+: SvxResId(RID_SVXSTR_NONE));
 
 rListBoxStart.SetUpdateMode(false);
 rListBoxEnd.SetUpdateMode(false);
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 1f158dab2855..fa67f56f7fb5 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -41,6 +41,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
@@ -370,7 +372,9 @@ void SvxLineEndWindow::FillValueSet()
 // First entry: no line end.
 // An entry is temporarily added to get the UI bitmap
 basegfx::B2DPolyPolygon aNothing;
-mpLineEndList->Insert(o3tl::make_unique(aNothing, 
SvxResId(RID_SVXSTR_NONE)));
+mpLineEndList->Insert(o3tl::make_unique(aNothing,
+comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
+: SvxResId(RID_SVXSTR_NONE)));
 const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount);
 BitmapEx aBmp = mpLineEndList->GetUiBitmap( nCount );
 OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6aa577dbf859..7c4bf4ad20e0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -109,6 +109,8 @@
 #include 
 #include 
 
+#include 
+
 #define MAX_MRU_FONTNAME_ENTRIES5
 
 // don't make more than 15 entries visible at once
@@ -1640,7 +1642,8 @@ namespace
 
 NamedColor GetNoneColor()
 {
-return std::make_pair(COL_NONE_COLOR, SvxResId(RID_SVXSTR_NONE));
+return std::make_pair(COL_NONE_COLOR, 
comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
+: SvxResId(RID_SVXSTR_NONE));
 }
 }
 
@@ -2376,7 +2379,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( 
svt::ToolboxController& rController, vcl
 SetOutputSizePixel( Size( 114, 144 ) );
 
 m_aLineStyleLb->SetSourceUnit( FieldUnit::TWIP );
-   

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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/moduldlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1f9917a1bc9d11f6d76469a455a5337a89384ea
Author: Caolán McNamara 
AuthorDate: Tue Feb 25 14:02:48 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 25 22:11:26 2020 +0100

check if edit can be enabled after setting cursor into tree

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

diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index bf675de02fce..2e7191ee8abe 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -577,6 +577,7 @@ ObjectPage::~ObjectPage()
 void ObjectPage::ActivatePage()
 {
 m_xBasicBox->UpdateEntries();
+CheckButtons();
 }
 
 void ObjectPage::CheckButtons()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 047f66240c6b09a556a2aa3685507c05625ddd26
Author: Miklos Vajna 
AuthorDate: Tue Feb 25 15:44:24 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 25 22:28:20 2020 +0100

configure: fix outdated doc on --with-tls default

This was changed in commit 133d59adf744b2279a7d59071ca834ac766b9719
(configure: build oox with NSS backend by default, 2013-11-01), but the
documentation was not updated.

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

diff --git a/configure.ac b/configure.ac
index c2c528b750c6..973866050a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1652,8 +1652,8 @@ AC_ARG_WITH(tls,
 AS_HELP_STRING([--with-tls],
 [Decides which TLS/SSL and cryptographic implementations to use for
  LibreOffice's code. Notice that this doesn't apply for depending
- libraries like "neon", for example. Default is to use OpenSSL
- although NSS is also possible. Notice that selecting NSS restricts
+ libraries like "neon", for example. Default is to use NSS
+ although OpenSSL is also possible. Notice that selecting NSS restricts
  the usage of OpenSSL in LO's code but selecting OpenSSL doesn't
  restrict by now the usage of NSS in LO's code. Possible values:
  openssl, nss. Example: --with-tls="nss"]),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/README

[Marco Marinello (via logerrit)]

 docker/README |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 0326037cbfcea000daaa52dcf2da1b571144cdd0
Author: Marco Marinello 
AuthorDate: Tue Feb 25 21:40:30 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Feb 25 22:45:43 2020 +0100

Add a README for docker directory

Signed-off-by: Marco Marinello 
Change-Id: I0cc9da9945763c48afd01ea231d9dfb5bb384d71
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89482
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/docker/README b/docker/README
new file mode 100644
index 0..36dbb7180
--- /dev/null
+++ b/docker/README
@@ -0,0 +1,10 @@
+LibreOffice Online docker
+
+This directory contains everything needed to compile a
+working docker container with LOOL.
+
+The provided l10n-docker-nightly.sh provides an automatic
+way to compile it with nightly translations.
+
+Further docs:
+https://wiki.documentfoundation.org/Development/BuildingOnline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Ashod Nakashian (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit af58e1975028d1f35171b94b1a1393814607d023
Author: Ashod Nakashian 
AuthorDate: Wed Feb 19 09:47:56 2020 -0500
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 01:32:38 2020 +0100

leaflet: remove redundant check

Map.editorHasFocus() implies map.getWinId === 0.

Change-Id: I522a377df095683453d2499a87485465437f9abb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89356
Tested-by: Ashod Nakashian 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index a0fff8280..3ff3e8a58 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1135,7 +1135,7 @@ L.TileLayer = L.GridLayer.extend({
.openOn(this._map);
}
 
-   if (!this._map.editorHasFocus() && (modifierViewId === 
this._viewId) && (this._map.getWinId === 0) && (this._map._permission === 
'edit')) {
+   if (!this._map.editorHasFocus() && (modifierViewId === 
this._viewId) && (this._map._permission === 'edit')) {
// Regain cursor if we had been out of focus and now 
have input.
// (only if it is our own cursor and the input is 
actually not
// going into a dialog)
@@ -2108,8 +2108,7 @@ L.TileLayer = L.GridLayer.extend({
var updated = true;
if (!this._cursorMarker) {
this._cursorMarker = L.cursor(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), 
{blink: true});
-   }
-   else {
+   } else {
var oldLatLng = this._cursorMarker.getLatLng();
this._cursorMarker.setLatLng(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom(;
var newLatLng = this._cursorMarker.getLatLng();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |5 +++--
 loleaflet/src/layer/tile/TileLayer.js|1 +
 loleaflet/src/map/Map.js |   13 +
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 8ad7c4790c4a34d3e6a5ebfe5810b6cb00354acc
Author: Ashod Nakashian 
AuthorDate: Tue Feb 11 08:34:04 2020 -0500
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 01:33:30 2020 +0100

leaflet: fix searching in document functionality

This makes searching work again, but typing 'r'
still triggers F3, which simply matches the next
hit (on desktop, on mobile it works fine).

So (on desktop) typing 'your' will match the first 'you'
and the 'r' will move the search results to the
second 'you' (assuming there are at least two 'you'
entries in the document and one 'your').

Change-Id: Iab425afdfb3848ecff97f5599ceb7cae160b097d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89357
Tested-by: Ashod Nakashian 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 6c47153f2..95c36dedd 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1372,8 +1372,9 @@ function onSearchKeyPress(e) {
 }
 
 function onSearchFocus() {
-   // hide the caret in the main document
-   map._onLostFocus();
+   // Start searching.
+   map.fire('searchstart');
+
updateSearchButtons();
 }
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 3ff3e8a58..6f7c924eb 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2159,6 +2159,7 @@ L.TileLayer = L.GridLayer.extend({
if (this._map._permission === 'edit'
&& this._map._isCursorVisible   // only when LOK has told us it 
is ok
&& this._map.editorHasFocus()   // not when document is not 
focused
+   && !this._map.isSearching() // not when searching within 
the doc
&& !this._isZooming // not when zooming
 // && !this.isGraphicVisible() // not when sizing / 
positioning graphics
&& !this._isEmptyRectangle(this._visibleCursor)) {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index cd2c8aad1..4aa7fd7c7 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -120,6 +120,8 @@ L.Map = L.Evented.extend({
this._winId = 0;
// The object of the dialog, if any (must have .focus callable).
this._activeDialog = null;
+   // True only when searching within the doc, as we need to use 
winId==0.
+   this._isSearching = false;
 
 
vex.dialogID = -1;
@@ -248,6 +250,8 @@ L.Map = L.Evented.extend({
// Fired to signal that the input focus is being changed.
this.on('changefocuswidget', this._onChangeFocusWidget, this);
 
+   this.on('searchstart', this._onSearchStart, this);
+
// View info (user names and view ids)
this._viewInfo = {};
this._viewInfoByUserName = {};
@@ -947,6 +951,10 @@ L.Map = L.Evented.extend({
this.fire('hyperlinkclicked', {url: helpURL});
},
 
+   isSearching: function() {
+   return this._isSearching;
+   },
+
_fireInitComplete: function (condition) {
if (this.initComplete) {
return;
@@ -1358,6 +1366,7 @@ L.Map = L.Evented.extend({
 
this._winId = winId;
this._activeDialog = dialog;
+   this._isSearching = false;
 
var doclayer = this._docLayer;
if (doclayer)
@@ -1402,6 +1411,10 @@ L.Map = L.Evented.extend({
}
},
 
+   _onSearchStart: function () {
+   this._isSearching = true;
+   },
+
_onUpdateProgress: function (e) {
if (e.statusType === 'start') {
if (this._socket.socket.readyState === 1) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 16f1c624ea7070748d1ef05acd8f448b9af14419
Author: Ashod Nakashian 
AuthorDate: Tue Feb 25 19:27:14 2020 -0500
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 01:35:30 2020 +0100

leaflet: don't lose focus when the dialog cursor is hiden

The cursor visibility can change rapidly, and the formula-bar
seems to do this when typing into it. The result is that
because of losing the input focus we lose some of the input.

Instead, we only use the dialog cursor update to show the keyboard
rather than to hide it. For hiding, other messages will do it.

Change-Id: I0e8674170aa9d05b6ddc15de8d35792377b6725b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89490
Tested-by: Ashod Nakashian 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 2a8d5688a..d106b1504 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -414,8 +414,11 @@ L.Control.LokDialog = L.Control.extend({
L.DomUtil.setStyle(this._dialogs[dlgId].cursor, 'left', x + 
'px');
L.DomUtil.setStyle(this._dialogs[dlgId].cursor, 'top', y + 
'px');
 
-   // Make sure the keyboard is visible if the user can type.
-   this._map.focus(cursorVisible);
+   // Make sure the keyboard is visible if there is a cursor.
+   // But don't hide the keyboard otherwise.
+   // At least the formula-input hides the cursor after each key 
input.
+   if (cursorVisible)
+   this._map.focus(true);
},
 
_createDialogCursor: function(dialogId) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/Makefile.am loleaflet/src

[Henry Castro (via logerrit)]

 loleaflet/Makefile.am|3 +--
 loleaflet/src/core/Socket.js |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d622386116376360d679b7c5e4db39598469c4d3
Author: Henry Castro 
AuthorDate: Wed Feb 13 11:04:44 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 02:08:29 2020 +0100

loleaflet: remove jquery.time ago

use Date.toLocaleDateString that returns a string with a language sensitive
representation of the date portion of this date

Change-Id: Id2e207e5b4d0dbc8d82498567c97105052d70b90
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89111
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 258801b0e..d32257ab1 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -102,7 +102,6 @@ NODE_MODULES_JS =\
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/timeago/jquery.timeago.js \
node_modules/timeago.js/dist/timeago.min.js \
node_modules/timeago.js/dist/timeago.locales.min.js \
node_modules/autolinker/dist/Autolinker.js \
@@ -235,7 +234,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(builddir)/build/dist/loleaflet-src.js \
$(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js \
-   --source-map --output $@
+   --output $@
 endif
 
 $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) \
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index c4468543b..e5cead41f 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -113,7 +113,9 @@ L.Socket = L.Class.extend({
if (parseInt(this._map.options.docParams.access_token_ttl) - 
Date.now() <= 0) {
expirymsg = errorMessages.sessionexpired;
}
-   var timerepr = 
$.timeago(parseInt(this._map.options.docParams.access_token_ttl)).replace(' 
ago', '');
+   var dateTime = new 
Date(parseInt(this._map.options.docParams.access_token_ttl));
+   var dateOptions = { year: 'numeric', month: 'short', day: 
'numeric', hour: '2-digit', minute: '2-digit' };
+   var timerepr = dateTime.toLocaleDateString(String.locale, 
dateOptions);
this._map.fire('warn', {msg: expirymsg.replace('%time', 
timerepr)});
 
// If user still doesn't refresh the session, warn again 
periodically
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/Makefile.am loleaflet/src

[Henry Castro (via logerrit)]

 loleaflet/Makefile.am|2 --
 loleaflet/src/core/Socket.js |2 +-
 loleaflet/src/map/Map.js |   39 ++-
 3 files changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 68d55526267a4cda3185aefc677fdae6afb220f4
Author: Henry Castro 
AuthorDate: Sat Feb 16 18:09:52 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 02:11:36 2020 +0100

loleaflet: remove timeago.min.js

simplify using Date.toLocaleDateString

Change-Id: Ib264cd90edd7ddacb3b944ee7f252648a629ab3f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89112
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d32257ab1..98225ec67 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -102,8 +102,6 @@ NODE_MODULES_JS =\
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/timeago.js/dist/timeago.min.js \
-   node_modules/timeago.js/dist/timeago.locales.min.js \
node_modules/autolinker/dist/Autolinker.js \
node_modules/json-js/json2.js \
node_modules/select2/dist/js/select2.js \
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index e5cead41f..ec55e72b1 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -310,7 +310,7 @@ L.Socket = L.Class.extend({
return;
}
else if (textMsg.startsWith('lastmodtime: ')) {
-   var time = textMsg.substring(textMsg.indexOf(' '));
+   var time = textMsg.substring(textMsg.indexOf(' ') + 1);
this._map.updateModificationIndicator(time);
return;
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 0e7642925..dabf7023e 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -16,7 +16,7 @@ function moveObjectVertically(obj, diff) {
}
 }
 
-/* global timeago closebutton vex revHistoryEnabled $ _ */
+/* global closebutton vex revHistoryEnabled $ _ */
 L.Map = L.Evented.extend({
 
options: {
@@ -326,20 +326,33 @@ L.Map = L.Evented.extend({
},
 
updateModificationIndicator: function(newModificationTime) {
-   this._lastmodtime = newModificationTime;
+   var timeout;
+
+   if (typeof newModificationTime === 'string') {
+   this._lastmodtime = newModificationTime;
+   }
+
+   clearTimeout(this._modTimeout);
+
if (this.lastModIndicator !== null && this.lastModIndicator !== 
undefined) {
-   // Get locale
-   var special = [ 'bn_IN', 'hi_IN', 'id_ID', 'nb_NO', 
'nn_NO', 'pt_BR', 'zh_CN', 'zh_TW'];
-   var locale = String.locale;
-   locale = locale.replace('-', '_');
-   if ($.inArray(locale, special) < 0) {
-   if (locale.indexOf('_') > 0) {
-   locale = locale.substring(0, 
locale.indexOf('_'));
-   }
+   var dateTime = new 
Date(this._lastmodtime.replace(/,.*/, 'Z'));
+   var dateValue = 
dateTime.toLocaleDateString(String.locale,
+   { year: 'numeric', month: 'short', day: 
'numeric', hour: '2-digit', minute: '2-digit' });
+
+   var elapsed = Date.now() - dateTime;
+   if (elapsed < 6) {
+   dateValue = Math.round(elapsed / 1000) + ' ' + 
_('seconds ago');
+   timeout = 6000;
+   } else if (elapsed < 360) {
+   dateValue = Math.round(elapsed / 6) + ' ' + 
_('minutes ago');
+   timeout = 6;
+   }
+
+   this.lastModIndicator.innerHTML = dateValue;
+
+   if (timeout) {
+   this._modTimeout = 
setTimeout(L.bind(this.updateModificationIndicator, this, -1), timeout);
}
-   // Real-time auto update
-   this.lastModIndicator.setAttribute('datetime', 
newModificationTime);
-   timeago().render(this.lastModIndicator, locale);
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/po loleaflet/src

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-ui.pot |   58 ++--
 loleaflet/src/map/Map.js|4 +-
 2 files changed, 36 insertions(+), 26 deletions(-)

New commits:
commit 223aaf242df148b3fd7713a10c1b8e4268050256
Author: Andras Timar 
AuthorDate: Sat Mar 30 23:14:45 2019 +0100
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 02:13:24 2020 +0100

make these strings better localizable: minutes ago/seconds ago

Change-Id: Idf46c11bc4fccb14e4a3955e9ac88901ed94586b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89113
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 0c2520c14..add48dd1d 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-18 23:51+0100\n"
+"POT-Creation-Date: 2020-02-20 15:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -183,14 +183,14 @@ msgstr ""
 
 #: admin/src/AdminSocketOverview.js:104 admin/src/AdminSocketSettings.js:36
 #: js/toolbar.js:200 src/control/Control.Menubar.js:769
-#: src/control/Control.Tabs.js:74
+#: src/control/Control.Tabs.js:74 src/control/Control.Tabs.js:91
 msgid "OK"
 msgstr ""
 
 #: admin/src/AdminSocketOverview.js:105 admin/src/AdminSocketSettings.js:37
 #: js/toolbar.js:201 js/toolbar.js:894 js/toolbar.js:1076
 #: src/control/Control.Menubar.js:770 src/control/Control.Tabs.js:75
-#: src/layer/marker/Annotation.js:181
+#: src/control/Control.Tabs.js:92 src/layer/marker/Annotation.js:181
 msgid "Cancel"
 msgstr ""
 
@@ -756,7 +756,7 @@ msgstr ""
 msgid "Downloading..."
 msgstr ""
 
-#: src/control/Toolbar.js:103 src/map/Map.js:1193
+#: src/control/Toolbar.js:103 src/map/Map.js:1206
 msgid "Saving..."
 msgstr ""
 
@@ -780,81 +780,81 @@ msgstr ""
 msgid "Oops, there is a problem connecting to LibreOffice Online : "
 msgstr ""
 
-#: src/core/Socket.js:278
+#: src/core/Socket.js:280
 msgid "Unsupported server version."
 msgstr ""
 
-#: src/core/Socket.js:334
+#: src/core/Socket.js:336
 msgid "Session terminated by document owner"
 msgstr ""
 
-#: src/core/Socket.js:338
+#: src/core/Socket.js:340
 msgid "Idle document - please click to reload and resume editing"
 msgstr ""
 
-#: src/core/Socket.js:345
+#: src/core/Socket.js:347
 msgid "Server is shutting down for maintenance (auto-saving)"
 msgstr ""
 
-#: src/core/Socket.js:349
+#: src/core/Socket.js:351
 msgid "Oops, there is a problem connecting the document"
 msgstr ""
 
-#: src/core/Socket.js:353
+#: src/core/Socket.js:355
 msgid "Server is recycling and will be available shortly"
 msgstr ""
 
-#: src/core/Socket.js:385
+#: src/core/Socket.js:387
 msgid ""
 "Document has changed in storage. Loading the new document. Your version is "
 "available as revision."
 msgstr ""
 
-#: src/core/Socket.js:391
+#: src/core/Socket.js:393
 msgid ""
 "Restoring older revision. Any unsaved changes will be available in version "
 "history"
 msgstr ""
 
-#: src/core/Socket.js:513
+#: src/core/Socket.js:515
 msgid ""
 "Document has been changed in storage. What would you like to do with your "
 "unsaved changes?"
 msgstr ""
 
-#: src/core/Socket.js:518
+#: src/core/Socket.js:520
 msgid "Discard"
 msgstr ""
 
-#: src/core/Socket.js:523
+#: src/core/Socket.js:525
 msgid "Overwrite"
 msgstr ""
 
-#: src/core/Socket.js:528
+#: src/core/Socket.js:530
 msgid "Save to new file"
 msgstr ""
 
-#: src/core/Socket.js:599
+#: src/core/Socket.js:601
 msgid "Document requires password to view."
 msgstr ""
 
-#: src/core/Socket.js:602
+#: src/core/Socket.js:604
 msgid "Document requires password to modify."
 msgstr ""
 
-#: src/core/Socket.js:604
+#: src/core/Socket.js:606
 msgid "Hit Cancel to open in view-only mode."
 msgstr ""
 
-#: src/core/Socket.js:608
+#: src/core/Socket.js:610
 msgid "Wrong password provided. Please try again."
 msgstr ""
 
-#: src/core/Socket.js:724
+#: src/core/Socket.js:726
 msgid "Connecting..."
 msgstr ""
 
-#: src/core/Socket.js:884
+#: src/core/Socket.js:886
 msgid ""
 "Well, this is embarrassing, we cannot connect to your document. Please try "
 "again."
@@ -989,11 +989,21 @@ msgstr ""
 msgid "Initializing..."
 msgstr ""
 
-#: src/map/Map.js:1052
+#: src/map/Map.js:344
+#, javascript-format
+msgid "%d seconds ago"
+msgstr ""
+
+#: src/map/Map.js:347
+#, javascript-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: src/map/Map.js:1065
 msgid "Inactive document - please click to resume editing"
 msgstr ""
 
-#: src/map/Map.js:1196
+#: src/map/Map.js:1209
 msgid "Loading..."
 msgstr ""
 
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index dabf7023e..b91a3d779 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -341,10 +341,10 @@ L.Map = L.Evented.ext

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/po

[Andras Timar (via logerrit)]

 loleaflet/po/ui-ru.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c40d1d6e276e7d137b3a0ab8d339af35442af435
Author: Andras Timar 
AuthorDate: Thu Feb 20 16:18:27 2020 +0100
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 02:36:28 2020 +0100

Updated ru translation

Change-Id: I297eb7b2eac78de76601b13f2bcb075119b0f7db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89120
Tested-by: Jenkins CollaboraOffice 
Tested-by: Ashod Nakashian 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/po/ui-ru.po b/loleaflet/po/ui-ru.po
index d86975d1b..906aad9da 100644
--- a/loleaflet/po/ui-ru.po
+++ b/loleaflet/po/ui-ru.po
@@ -439,19 +439,19 @@ msgstr "Сервер столкнулся с ошибкой %0 при анали
 
 #: src/control/Control.ContextMenu.js:131
 msgid "Internal Cut"
-msgstr ""
+msgstr "Вырезать (внутр.)"
 
 #: src/control/Control.ContextMenu.js:134
 msgid "Internal Copy"
-msgstr ""
+msgstr "Копировать (внутр.)"
 
 #: src/control/Control.ContextMenu.js:137
 msgid "Internal Paste"
-msgstr ""
+msgstr "Вставить (внутр.)"
 
 #: src/control/Control.ContextMenu.js:159
 msgid "Internal Paste Special"
-msgstr ""
+msgstr "Специальная вставка (внутр.)"
 
 #: src/control/Control.DocumentRepair.js:33
 msgid "Repair Document"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Ashod Nakashian (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 23f484813116a9e130e697708dbb4621da163712
Author: Ashod Nakashian 
AuthorDate: Tue Feb 25 20:51:58 2020 -0500
Commit: Ashod Nakashian 
CommitDate: Wed Feb 26 02:57:33 2020 +0100

leaflet: don't hide the keyboard when changing selection

We now don't change the keyboard state when the user
drags the selection markers.

Change-Id: Ic3dec8011808df8d1028e1925190854a50588e1c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89492
Tested-by: Ashod Nakashian 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6f7c924eb..c38e132d0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2623,7 +2623,6 @@ L.TileLayer = L.GridLayer.extend({
}
if (e.type === 'dragend') {
e.target.isDragged = false;
-   this._map.focus();
this._map.fire('scrollvelocity', {vx: 0, vy: 0});
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |3 -
 sc/qa/extras/sctablesheetsobj.cxx|   24 
++
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 49eb4906de8f499ae14b789e90df9ba654895af5
Author: Jens Carl 
AuthorDate: Mon Feb 24 22:56:27 2020 -0800
Commit: Jens Carl 
CommitDate: Wed Feb 26 05:05:24 2020 +0100

tdf#45904 Move XNameAccess Java tests to C++

Move XNameAccess Java tests to C++ for ScTableSheetsObj.

Change-Id: I5fdaafe35852ea3c6e260d490200ce99e990c3b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89408
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 8eca36532a14..83fbb64ec41d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,6 +1,3 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"hasByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameReplace";"replaceByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx 
b/sc/qa/extras/sctablesheetsobj.cxx
index 99d55ea75a16..82c74e832c7d 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -19,11 +20,12 @@ using namespace css;
 using namespace css::uno;
 
 namespace sc_apitest {
-
-class ScTableSheetsObj : public CalcUnoApiTest, public 
apitest::XEnumerationAccess,
-public 
::apitest::XSpreadsheets,
-public 
::apitest::XSpreadsheets2,
-public apitest::XNameContainer
+class ScTableSheetsObj : public CalcUnoApiTest,
+ public ::apitest::XEnumerationAccess,
+ public ::apitest::XNameAccess,
+ public ::apitest::XNameContainer,
+ public ::apitest::XSpreadsheets,
+ public ::apitest::XSpreadsheets2
 {
 public:
 ScTableSheetsObj();
@@ -36,6 +38,11 @@ public:
 // XEnumerationAccess
 CPPUNIT_TEST(testCreateEnumeration);
 
+// XNameAccess
+CPPUNIT_TEST(testGetByName);
+CPPUNIT_TEST(testGetElementNames);
+CPPUNIT_TEST(testHasByName);
+
 // XSpreadsheets
 CPPUNIT_TEST(testInsertNewByName);
 CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -69,9 +76,10 @@ protected:
 uno::Reference< lang::XComponent > mxComponent;
 };
 
-ScTableSheetsObj::ScTableSheetsObj():
-CalcUnoApiTest("/sc/qa/extras/testdocuments"),
-apitest::XNameContainer("Sheet2")
+ScTableSheetsObj::ScTableSheetsObj()
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, ::apitest::XNameAccess("Sheet1")
+, ::apitest::XNameContainer("Sheet2")
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx |4 +++-
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |   11 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 6d9cf22b2239611a6612a7855f8a701ed723cbd4
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 24 23:38:40 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Feb 26 06:40:23 2020 +0100

tdf#130793 Fix import/export of image URLs

Change-Id: I329af3b0d5a81d9f31def9c2ad861d0e83e3714c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89388
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 1e192e3c387d..413facd87652 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -738,7 +738,9 @@ void ElementDescriptor::readImageOrGraphicAttr(OUString 
const & rAttrName)
 }
 }
 }
-else if (beans::PropertyState_DEFAULT_VALUE != 
_xPropState->getPropertyState("ImageURL"))
+// tdf#130793 Above fails if the dialog is not part of a document. Export 
the ImageURL then.
+if (sURL.isEmpty()
+&& beans::PropertyState_DEFAULT_VALUE != 
_xPropState->getPropertyState("ImageURL"))
 {
 _xProps->getPropertyValue("ImageURL") >>= sURL;
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 791976b55c5e..5aa953cd6562 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -880,6 +880,17 @@ bool ImportContext::importGraphicOrImageProperty(
 return true;
 }
 }
+else if (!sURL.isEmpty())
+{
+// tdf#130793 Above fails if the dialog is not part of a document.
+// In this case we need to set the ImageURL.
+Reference xProps = getControlModel();
+if (xProps.is())
+{
+xProps->setPropertyValue("ImageURL", makeAny(sURL));
+return true;
+}
+}
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/filter/graphicfilter.cxx |   56 +++-
 1 file changed, 5 insertions(+), 51 deletions(-)

New commits:
commit b90eaab5c51c2b0f2aba66da35a5b494c3211f1d
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 25 14:51:22 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Wed Feb 26 07:04:59 2020 +0100

vcl: use UCBContentHelper in instead of implement own functions

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

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index c32015e7d222..9ae7e393c8b7 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -64,6 +64,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -103,54 +104,6 @@ public:
 
 }
 
-static bool DirEntryExists( const INetURLObject& rObj )
-{
-bool bExists = false;
-
-try
-{
-::ucbhelper::Content aCnt( rObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ),
- css::uno::Reference< 
css::ucb::XCommandEnvironment >(),
- comphelper::getProcessComponentContext() );
-
-bExists = aCnt.isDocument();
-}
-catch(const css::ucb::CommandAbortedException&)
-{
-SAL_WARN( "vcl.filter", "CommandAbortedException" );
-}
-catch(const css::ucb::ContentCreationException&)
-{
-SAL_WARN( "vcl.filter", "ContentCreationException" );
-}
-catch( ... )
-{
-SAL_WARN( "vcl.filter", "Any other exception" );
-}
-return bExists;
-}
-
-static void KillDirEntry( const OUString& rMainUrl )
-{
-try
-{
-::ucbhelper::Content aCnt( rMainUrl,
- css::uno::Reference< 
css::ucb::XCommandEnvironment >(),
- comphelper::getProcessComponentContext() );
-
-aCnt.executeCommand( "delete",
- css::uno::makeAny( true ) );
-}
-catch(const css::ucb::CommandAbortedException&)
-{
-SAL_WARN( "vcl.filter", "CommandAbortedException" );
-}
-catch( ... )
-{
-SAL_WARN( "vcl.filter", "Any other exception" );
-}
-}
-
 // Helper functions
 
 sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, 
sal_uLong nComp, sal_uLong nSize )
@@ -1881,9 +1834,10 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const INetURLObje
 SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
 ErrCode  nRetValue = ERRCODE_GRFILTER_FORMATERROR;
 SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl.filter", 
"GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" );
-bool bAlreadyExists = DirEntryExists( rPath );
 
-OUStringaMainUrl( rPath.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
+OUString aMainUrl(rPath.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+bool bAlreadyExists = utl::UCBContentHelper::IsDocument(aMainUrl);
+
 std::unique_ptr xStream(::utl::UcbStreamHelper::CreateStream( 
aMainUrl, StreamMode::WRITE | StreamMode::TRUNC ));
 if (xStream)
 {
@@ -1891,7 +1845,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const INetURLObje
 xStream.reset();
 
 if( ( ERRCODE_NONE != nRetValue ) && !bAlreadyExists )
-KillDirEntry( aMainUrl );
+utl::UCBContentHelper::Kill(aMainUrl);
 }
 return nRetValue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 4ec76bdeeb000881cf46c78166dc02badb4f44db
Author: Noel Grandin 
AuthorDate: Fri Feb 21 08:46:02 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 26 07:07:04 2020 +0100

add some libs to libmerged

another small chunk of libs shared by calc/write/impress,
doing this in stages in case anything goes wrong.

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

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 9cb91a5d4a15..976de14e8967 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -83,13 +83,24 @@ MERGE_LIBRARY_LIST := \
svx \
svxcore \
syssh \
+   textfd \
tk \
tl \
ucb1 \
ucbhelper \
ucpexpand1 \
+   ucpext \
+   ucphier1 \
+   ucpimage \
ucpfile1 \
+   ucptdoc1 \
+   unordf \
unoxml \
+   $(if $(ENABLE_ONLINE_UPDATE), \
+   updatecheckui \
+updchk \
+   ) \
+   updatefeed \
utl \
uui \
vcl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source editeng/source include/xmloff linguistic/source reportdesign/source solenv/CompilerTest_compilerplugins_clang.mk sw/source xmloff/

[Noel Grandin (via logerrit)]

 compilerplugins/clang/test/xmlimport.cxx   |   54 ++
 compilerplugins/clang/xmlimport.cxx|  139 +
 dbaccess/source/filter/xml/xmlfilter.cxx   |4 
 editeng/source/misc/SvXMLAutoCorrectImport.hxx |6 
 include/xmloff/XMLCharContext.hxx  |3 
 linguistic/source/convdicxml.cxx   |3 
 reportdesign/source/filter/xml/xmlColumn.hxx   |3 
 reportdesign/source/filter/xml/xmlCondPrtExpr.hxx  |3 
 reportdesign/source/filter/xml/xmlControlProperty.hxx  |4 
 reportdesign/source/filter/xml/xmlFormatCondition.hxx  |3 
 reportdesign/source/filter/xml/xmlFunction.hxx |3 
 reportdesign/source/filter/xml/xmlGroup.hxx|3 
 reportdesign/source/filter/xml/xmlMasterFields.hxx |3 
 reportdesign/source/filter/xml/xmlReportElement.hxx|3 
 reportdesign/source/filter/xml/xmlSection.hxx  |3 
 reportdesign/source/filter/xml/xmlTable.hxx|2 
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 sw/source/filter/xml/xmlimp.cxx|4 
 sw/source/uibase/config/StoredChapterNumbering.cxx |4 
 xmloff/source/text/XMLAutoTextContainerEventImport.hxx |3 
 20 files changed, 251 insertions(+)

New commits:
commit 9b18f4b2b064c823ac1500a0c297d113587a9bd4
Author: Noel Grandin 
AuthorDate: Tue Feb 25 19:05:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 26 07:06:32 2020 +0100

new loplugin:xmlimport

to help me maintain the invariants when updating code to use the
FastParser APIs. One weird invariant is that you need to override
startFastElement or the createFastChildContext will not get called.

Not all of these changes are probably necessary - some of the classes
are never constructured themselves, only their subclasses are
constructed, and their subclasses maintain the invariants, but it is
just easier to scatter a few more startFastElement around

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

diff --git a/compilerplugins/clang/test/xmlimport.cxx 
b/compilerplugins/clang/test/xmlimport.cxx
new file mode 100644
index ..965d4936e41c
--- /dev/null
+++ b/compilerplugins/clang/test/xmlimport.cxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "sal/config.h"
+
+// Cannot include this, makes clang crash
+//#include "xmloff/xmlimp.hxx"
+
+class SvXMLImportContext
+{
+public:
+virtual ~SvXMLImportContext() {}
+
+virtual void createFastChildContext() {}
+virtual void startFastElement() {}
+virtual void endFastElement() {}
+};
+
+class Test1 : public SvXMLImportContext
+{
+public:
+// expected-error@+1 {{must override startFastElement too 
[loplugin:xmlimport]}}
+virtual void createFastChildContext() override;
+};
+
+class Test2 : public SvXMLImportContext
+{
+public:
+// no warning expected
+virtual void createFastChildContext() override;
+virtual void startFastElement() override {}
+};
+
+class Test3 : public Test2
+{
+public:
+// no warning expected
+virtual void createFastChildContext() override;
+};
+
+class Test4 : public SvXMLImportContext
+{
+public:
+// expected-error@+1 {{must override startFastElement too 
[loplugin:xmlimport]}}
+virtual void endFastElement() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/xmlimport.cxx 
b/compilerplugins/clang/xmlimport.cxx
new file mode 100644
index ..bdb41f616859
--- /dev/null
+++ b/compilerplugins/clang/xmlimport.cxx
@@ -0,0 +1,139 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include "compat.hxx"
+#include "plugin.hxx"
+#include "check.hxx"
+#include 
+#include "clang/AST/CXXInheritance.h"
+
+/*
+ * This is a compile-time checker.
+ *
+ * Check that when we override SvXmlImportContext, and we override 
createFastChildContext,
+ * we have also overridden startFastElement, or the fast-parser stuff will not 
work
+ * correctly.
+*/
+
+namespace
+{
+class XmlImport : public loplugin::FilteringPlugin
+{
+public:
+explicit XmlImport(loplugin::InstantiationData const& 

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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |1 -
 sc/qa/extras/sctablesheetsobj.cxx|   10 
++
 sc/qa/unoapi/knownissues.xcl |3 ---
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 20747665a60b5c8782ab77962380ea34a30c20fa
Author: Jens Carl 
AuthorDate: Tue Feb 25 20:27:40 2020 -0800
Commit: Jens Carl 
CommitDate: Wed Feb 26 07:11:50 2020 +0100

tdf#45904 Move XNameReplace Java test to C++

Move XNameReplace Java test to C++ for ScTableSheetsObj.
Fixes i#23594 by creating a new "com.sun.star.sheet.Spreadsheet" rather
then using an existing one.

Change-Id: If7058647cc5d79d11e5542a82017d5bd02f7049e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89493
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 83fbb64ec41d..e348d3613059 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,4 +1,3 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameReplace";"replaceByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
 "ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
 "ScTableSheetsObj";"com::sun::star::container::XIndexAccess";"getCount()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx 
b/sc/qa/extras/sctablesheetsobj.cxx
index 82c74e832c7d..34b1e03cfa90 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -24,6 +25,7 @@ class ScTableSheetsObj : public CalcUnoApiTest,
  public ::apitest::XEnumerationAccess,
  public ::apitest::XNameAccess,
  public ::apitest::XNameContainer,
+ public ::apitest::XNameReplace,
  public ::apitest::XSpreadsheets,
  public ::apitest::XSpreadsheets2
 {
@@ -43,6 +45,9 @@ public:
 CPPUNIT_TEST(testGetElementNames);
 CPPUNIT_TEST(testHasByName);
 
+// XNameReplace
+CPPUNIT_TEST(testReplaceByName);
+
 // XSpreadsheets
 CPPUNIT_TEST(testInsertNewByName);
 CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -80,6 +85,7 @@ ScTableSheetsObj::ScTableSheetsObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , ::apitest::XNameAccess("Sheet1")
 , ::apitest::XNameContainer("Sheet2")
+, ::apitest::XNameReplace("Sheet2")
 {
 }
 
@@ -103,6 +109,10 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init()
 xDocument.set(mxComponent, UNO_QUERY_THROW);
 uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), 
UNO_QUERY_THROW);
 
+uno::Reference xMSF(mxComponent, 
uno::UNO_QUERY_THROW);
+// XNameReplace
+
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
+
 return xReturn;
 }
 
diff --git a/sc/qa/unoapi/knownissues.xcl b/sc/qa/unoapi/knownissues.xcl
index 7da16e74cf43..999c7681d327 100644
--- a/sc/qa/unoapi/knownissues.xcl
+++ b/sc/qa/unoapi/knownissues.xcl
@@ -38,9 +38,6 @@ sc.ScTableSheetObj::com::sun::star::sheet::XCellRangeData
 ### i84669 ###
 sc.ScTabViewObj::com::sun::star::sheet::XRangeSelection
 
-### i23594 ###
-sc.ScTableSheetsObj::com::sun::star::container::XNameReplace
-
 ### i31378 ###
 sc.ScDocumentConfiguration::com::sun::star::document::Settings
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

New commits:
commit 387e0b4f4c33dfaa48b26098819726824f23f9d2
Author: Jim Raykowski 
AuthorDate: Mon Feb 24 22:58:45 2020 -0900
Commit: Noel Grandin 
CommitDate: Wed Feb 26 07:12:40 2020 +0100

tdf#108766 followup: outline tracking fixes for floating navigator

Fixes tracking not working and selection misbehaviour on document open
when navigator is floating.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index f70f72815075..d55c38febdf9 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1888,28 +1888,28 @@ void SwContentTree::Display( bool bActive )
 Expand(pParent);
 
 // reselect the entry
-SvTreeListEntry* pChild = pParent;
-SvTreeListEntry* pTemp = nullptr;
-sal_uLong nPos = 1;
-while(nullptr != (pChild = Next(pChild)))
-{
-// The old text will be slightly favored
-if(sEntryName == GetEntryText(pChild) ||
-nPos == nEntryRelPos )
+if (nEntryRelPos)
+{
+SvTreeListEntry* pChild = pParent;
+sal_uLong nPos = 1;
+while(nullptr != (pChild = Next(pChild)))
 {
-pSelEntry = pChild;
-break;
+// The old text will be slightly favored
+if(sEntryName == GetEntryText(pChild) ||
+nPos == nEntryRelPos)
+{
+pSelEntry = pChild;
+break;
+}
+nPos++;
+}
+if(pSelEntry)
+{
+SetCurEntry(pSelEntry); // unselect all entries, make 
pSelEntry visible, and select
 }
-pTemp = pChild;
-nPos++;
-}
-if(!pSelEntry)
-pSelEntry = pTemp;
-if(pSelEntry)
-{
-MakeVisible(pSelEntry);
-Select(pSelEntry);
 }
+else
+SetCurEntry(pParent);
 }
 }
 SetUpdateMode( true );
@@ -2754,10 +2754,9 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, 
void)
 // No update while drag and drop.
 // Query view because the Navigator is cleared too late.
 SwView* pView = GetParentWindow()->GetCreateView();
-
-if(pView && pView->GetWrtShellPtr() &&
-((pView->GetWrtShellPtr()->GetWin() == GetFocusedWindow()) || 
m_bViewHasChanged) &&
-!bIsInDrag && !m_bIsInternalDrag && 
!pView->GetWrtShellPtr()->ActionPend())
+if(pView && pView->GetWrtShellPtr() && pView->GetWrtShellPtr()->GetWin() &&
+(pView->GetWrtShellPtr()->GetWin()->HasFocus() || m_bViewHasChanged) &&
+!bIsInDrag && !m_bIsInternalDrag && 
!pView->GetWrtShellPtr()->ActionPend())
 {
 m_bViewHasChanged = false;
 m_bIsIdleClear = false;
@@ -2797,11 +2796,11 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, 
void)
 if (lcl_IsContent(pEntry) &&
 
static_cast(pEntry->GetUserData())->GetParent()->GetType() == 
ContentTypeId::OUTLINE)
 {
-// only select if not already selected
 // might have been scrolled out of view by the user so 
leave it that way
 if 
(static_cast(pEntry->GetUserData())->GetOutlinePos() == 
nActPos)
 {
-if (pEntry != pFirstSelected)
+// only select if not already selected or tree has 
multiple entries selected
+if (pEntry != pFirstSelected || GetSelectionCount() > 
1)
 {
 if (m_nOutlineTracking == 2) // focused outline 
tracking
 {
@@ -2814,9 +2813,7 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void)
 break;
 }
 }
-SelectAll(false);
-Select(pEntry);
-MakeVisible(pEntry);
+SetCurEntry(pEntry); // unselect all entries, make 
pEntry visible, and select
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[rizmut (via logerrit)]

 dev/null   
|binary
 icon-themes/sifr/chart2/res/typenet_16.png 
|binary
 icon-themes/sifr/cmd/32/slidechangewindow.png  
|binary
 icon-themes/sifr/cmd/32/tabledeselectall.png   
|binary
 icon-themes/sifr/cmd/lc_showgraphics.png   
|binary
 icon-themes/sifr/cmd/lc_slidechangewindow.png  
|binary
 icon-themes/sifr/cmd/lc_tabledeselectall.png   
|binary
 icon-themes/sifr/cmd/sc_slidechangewindow.png  
|binary
 icon-themes/sifr/cmd/sc_tabledeselectall.png   
|binary
 icon-themes/sifr/dbaccess/res/lc039.png
|binary
 icon-themes/sifr/dbaccess/res/lc040.png
|binary
 icon-themes/sifr/dbaccess/res/linked_text_table.png
|binary
 icon-themes/sifr/dbaccess/res/sc039.png
|binary
 icon-themes/sifr/dbaccess/res/sc040.png
|binary
 icon-themes/sifr/links.txt 
|  427 +++---
 icon-themes/sifr/sd/res/effectole_16.png   
|binary
 icon-themes/sifr/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png  
|binary
 icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png  
|binary
 icon-themes/sifr/sw/res/sidebar/pageproppanel/formatcopy_24x24.png 
|binary
 icon-themes/sifr/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png   
|binary
 icon-themes/sifr_dark/chart2/res/areas3d_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/areas_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/areasfull3d_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/areasfull_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/areaspiled3d_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/areaspiled_52x60.png  
|binary
 icon-themes/sifr_dark/chart2/res/bar3d_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/bar3ddeep_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/bar_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/barpercent3d_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/barpercent_52x60.png  
|binary
 icon-themes/sifr_dark/chart2/res/barstack3d_52x60.png  
|binary
 icon-themes/sifr_dark/chart2/res/barstack_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/bubble_52x60.png  
|binary
 icon-themes/sifr_dark/chart2/res/columnline_52x60.png  
|binary
 icon-themes/sifr_dark/chart2/res/columnpercent3d_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/columnpercent_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/columns3d_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/columns3ddeep_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/columns_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/columnstack3d_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/columnstack_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/columnstackline_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/cone_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/conedeep_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/conehori_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/conehorideep_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/conehoripercent_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/conehoristack_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/conepercent_52x60.png 
|binary
 icon-themes/sifr_dark/chart2/res/conestack_52x60.png   
|binary
 icon-themes/sifr_dark/chart2/res/cylinder_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/cylinderdeep_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/cylinderhori_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/cylinderhorideep_52x60.png
|binary
 icon-themes/sifr_dark/chart2/res/cylinderhoriprocent_52x60.png 
|binary
 icon

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 92df944f54696012963415111a706fca438e703b
Author: Stephan Bergmann 
AuthorDate: Tue Feb 25 16:25:24 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 26 08:40:54 2020 +0100

Detect -std=c++20

at least Clang trunk accepts it now since 
 "Add -std=c++20 flag, 
replace
C++2a with C++20 throughout the Clang"

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

diff --git a/configure.ac b/configure.ac
index 973866050a4e..c9d75b19ecf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6563,7 +6563,7 @@ CXXFLAGS_CXX11=
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-my_flags='-std=c++2a -std=c++17 -std=c++1z'
+my_flags='-std=c++20 -std=c++2a -std=c++17 -std=c++1z'
 for flag in $my_flags; do
 if test "$COM" = MSC; then
 flag="-Xclang $flag"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/skia/win/gdiimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6fc261fa1a33fb62e97a8e5beeba7fbb44e8774c
Author: Stephan Bergmann 
AuthorDate: Tue Feb 25 17:23:21 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 26 08:41:17 2020 +0100

loplugin:external (clang-cl)

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

diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index b90239fdedc2..4d726ec2d215 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -291,6 +291,8 @@ SkiaControlCacheType& SkiaControlsCache::get()
 return data->m_pSkiaControlsCache->cache;
 }
 
+namespace
+{
 std::unique_ptr createVulkanWindowContext()
 {
 SkiaZone zone;
@@ -298,8 +300,6 @@ std::unique_ptr 
createVulkanWindowContext()
 return sk_app::window_context_factory::MakeVulkanForWin(0, displayParams);
 }
 
-namespace
-{
 struct SetFunction
 {
 SetFunction() { 
SkiaHelper::setCreateVulkanWindowContext(createVulkanWindowContext); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/skia/win/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b629d98e6f9fc71ee0f43a973cf9cbb85148f073
Author: Stephan Bergmann 
AuthorDate: Tue Feb 25 17:24:08 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 26 08:41:36 2020 +0100

loplugin:nullptr (clang-cl)

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

diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 4d726ec2d215..3c034856e7aa 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -297,7 +297,7 @@ std::unique_ptr 
createVulkanWindowContext()
 {
 SkiaZone zone;
 sk_app::DisplayParams displayParams;
-return sk_app::window_context_factory::MakeVulkanForWin(0, displayParams);
+return sk_app::window_context_factory::MakeVulkanForWin(nullptr, 
displayParams);
 }
 
 struct SetFunction
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits