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

[Szymon Kłos (via logerrit)]

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

New commits:
commit bc9f90ce8f5eb06b25cc65c0877050f6d6e59e9e
Author: Szymon Kłos 
AuthorDate: Wed Dec 2 15:06:35 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 3 08:45:17 2020 +0100

jsdialog: use valid window instance

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

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index bc80416ac335..befb682849a7 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -356,12 +356,6 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id,
 
 InsertWindowToMap(m_nWindowId);
 
-std::unique_ptr pRet(pDialog ? new 
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
-  pDialog, this, 
false, m_sTypeOfJSON)
-   : nullptr);
-
-RememberWidget("__DIALOG__", pRet.get());
-
 if (bTakeOwnership && pDialog)
 {
 assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed");
@@ -370,6 +364,12 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id,
 m_bHasTopLevelDialog = true;
 }
 
+std::unique_ptr pRet(pDialog ? new 
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
+  pDialog, this, 
false, m_sTypeOfJSON)
+   : nullptr);
+
+RememberWidget("__DIALOG__", pRet.get());
+
 const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
 if (pNotifier)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 include/tools/json_writer.hxx |3 ++
 tools/source/misc/json_writer.cxx |   49 +++---
 vcl/source/control/combobox.cxx   |   18 +++--
 vcl/source/control/listbox.cxx|   10 +++
 vcl/source/window/toolbox2.cxx|4 +--
 vcl/source/window/window.cxx  |4 +--
 6 files changed, 56 insertions(+), 32 deletions(-)

New commits:
commit 7fc2fe5c612f95b9624f49b5fdea2d3c8c94caf1
Author: Szymon Kłos 
AuthorDate: Tue Nov 24 15:03:27 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 3 08:45:24 2020 +0100

jsdialog: fix arrays in JsonWriter output

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

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 10e1a3a7aafc..440fedccf45e 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -64,6 +64,8 @@ public:
 void put(const char* pPropName, bool);
 void put(const char* pPropName, double);
 
+void putSimpleValue(const OUString& rPropValue);
+
 /// This assumes that this data belongs at this point in the stream, and 
is valid, and properly encoded
 void putRaw(const rtl::OStringBuffer&);
 
@@ -82,6 +84,7 @@ private:
 void endStruct();
 void addCommaBeforeField();
 void reallocBuffer(int noMoreBytesRequired);
+void writeEscapedOUString(const OUString& rPropVal);
 
 // this part inline to speed up the fast path
 inline void ensureSpace(int noMoreBytesRequired)
diff --git a/tools/source/misc/json_writer.cxx 
b/tools/source/misc/json_writer.cxx
index 1ccee8569480..a0e0280b840e 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -120,21 +120,8 @@ void JsonWriter::endStruct()
 mbFirstFieldInNode = false;
 }
 
-void JsonWriter::put(const char* pPropName, const OUString& rPropVal)
+void JsonWriter::writeEscapedOUString(const OUString& rPropVal)
 {
-auto nPropNameLength = strlen(pPropName);
-auto nWorstCasePropValLength = rPropVal.getLength() * 2;
-ensureSpace(nPropNameLength + nWorstCasePropValLength + 8);
-
-addCommaBeforeField();
-
-*mPos = '"';
-++mPos;
-memcpy(mPos, pPropName, nPropNameLength);
-mPos += nPropNameLength;
-memcpy(mPos, "\": \"", 4);
-mPos += 4;
-
 // Convert from UTF-16 to UTF-8 and perform escaping
 for (int i = 0; i < rPropVal.getLength(); ++i)
 {
@@ -175,6 +162,24 @@ void JsonWriter::put(const char* pPropName, const 
OUString& rPropVal)
 ++mPos;
 }
 }
+}
+
+void JsonWriter::put(const char* pPropName, const OUString& rPropVal)
+{
+auto nPropNameLength = strlen(pPropName);
+auto nWorstCasePropValLength = rPropVal.getLength() * 2;
+ensureSpace(nPropNameLength + nWorstCasePropValLength + 8);
+
+addCommaBeforeField();
+
+*mPos = '"';
+++mPos;
+memcpy(mPos, pPropName, nPropNameLength);
+mPos += nPropNameLength;
+memcpy(mPos, "\": \"", 4);
+mPos += 4;
+
+writeEscapedOUString(rPropVal);
 
 *mPos = '"';
 ++mPos;
@@ -332,6 +337,22 @@ void JsonWriter::put(const char* pPropName, bool nPropVal)
 mPos += strlen(pVal);
 }
 
+void JsonWriter::putSimpleValue(const OUString& rPropVal)
+{
+auto nWorstCasePropValLength = rPropVal.getLength() * 2;
+ensureSpace(nWorstCasePropValLength + 4);
+
+addCommaBeforeField();
+
+*mPos = '"';
+++mPos;
+
+writeEscapedOUString(rPropVal);
+
+*mPos = '"';
+++mPos;
+}
+
 void JsonWriter::putRaw(const rtl::OStringBuffer& rRawBuf)
 {
 ensureSpace(rRawBuf.getLength() + 2);
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 666feb9e3216..89bf43b075f7 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1544,18 +1544,20 @@ void ComboBox::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
 {
 Control::DumpAsPropertyTree(rJsonWriter);
 
-auto entriesNode = rJsonWriter.startNode("entries");
-for (int i = 0; i < GetEntryCount(); ++i)
 {
-auto entryNode = rJsonWriter.startNode("");
-rJsonWriter.put("", GetEntry(i));
+auto entriesNode = rJsonWriter.startArray("entries");
+for (int i = 0; i < GetEntryCount(); ++i)
+{
+rJsonWriter.putSimpleValue(GetEntry(i));
+}
 }
 
-auto selectedNode = rJsonWriter.startNode("selectedEntries");
-for (int i = 0; i < GetSelectedEntryCount(); ++i)
 {
-auto entryNode = rJsonWriter.startNode("");
-rJsonWriter.put("", GetSelectedEntryPos(i));
+auto selectedNode = rJsonWriter.startArray("selectedEntries");
+for (int i = 0; i < GetSelectedEntryCount(); ++i)
+{
+
rJsonWriter.putSimpleValue(OUString::number(GetSelectedEntryPos(i)));
+}
 }
 
 rJsonWriter.put("selectedCount", GetSelectedEntryCount());
diff --

Re: unowinreg.dll and Win64

[Stephan Bergmann]

On 28/11/2020 17:49, Rene Engelhard wrote:

I am currently doing some cleanups in my packages and I noticed a
possible inconsistency...

On Windows 64bit, what is unowinreg.dll supposed to be?

A 64 bit dll? A 32 bit dll?

And what is it supposed to be on Linux x86_64 nowadays?


Traditionally, before the advent of a x86-64 (or even arm64) Windows LO, 
unowinreg.dll was intended to always be a 32-bit x86 Windows DLL, 
regardless of where and how it was built.  It appears that nobody paid 
attention to the implications caused by introduction of Windows LO 
versions other than 32-bit x86.  However, 
 "Replace unowinreg.dll 
with execution of `reg QUERY`" should make that issue moot now, by 
getting rid of unowinreg.dll.


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

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

[cu-16bcs1798 (via logerrit)]

 framework/inc/uifactory/configurationaccessfactorymanager.hxx |5 +
 framework/inc/uifactory/factoryconfiguration.hxx  |4 +---
 framework/inc/uifactory/menubarfactory.hxx|5 +
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 1d3d958e0089429e05265cfd13dc540fce5887d1
Author: cu-16bcs1798 
AuthorDate: Thu Dec 3 01:34:39 2020 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Thu Dec 3 08:41:11 2020 +0100

tdf#124176 Use #pragma once in framework/inc/uifactory

Change-Id: Ibb2d7c8a8fac7fabace2d751f0082533ce2c1f50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107132
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx 
b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 4f186107a729..cf4f151f40dc 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
-#define INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
+#pragma once
 
 #include 
 
@@ -79,6 +78,4 @@ class ConfigurationAccess_FactoryManager final : public 
::cppu::WeakImplHelper<
 
 } // namespace framework
 
-#endif // 
INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx 
b/framework/inc/uifactory/factoryconfiguration.hxx
index fad809575c2a..9a8112702ec0 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
-#define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
+#pragma once
 
 #include 
 #include 
@@ -88,6 +87,5 @@ private:
 };
 
 } // namespace framework
-#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/menubarfactory.hxx 
b/framework/inc/uifactory/menubarfactory.hxx
index 661b5887760f..9019928182d7 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
-#define INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
+#pragma once
 
 #include 
 #include 
@@ -71,6 +70,4 @@ typedef ::cppu::WeakImplHelper<
 };
 }
 
-#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 xmloff/source/text/XMLSectionImportContext.cxx |   64 +++--
 xmloff/source/text/XMLSectionImportContext.hxx |4 +
 2 files changed, 44 insertions(+), 24 deletions(-)

New commits:
commit 8b961a2aa5ca8bee4081f083ce4accacb110137b
Author: Noel 
AuthorDate: Wed Dec 2 14:41:22 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 08:06:01 2020 +0100

fastparser in XMLSectionImportContext

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

diff --git a/xmloff/source/text/XMLSectionImportContext.cxx 
b/xmloff/source/text/XMLSectionImportContext.cxx
index 11716281bd7e..4cf133e11225 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -229,41 +229,41 @@ void XMLSectionImportContext::ProcessAttributes(
 {
 for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
 {
-OUString sAttr = aIter.toString();
+OUString sValue = aIter.toString();
 
 switch (aIter.getToken())
 {
 case XML_ELEMENT(XML, XML_ID):
-sXmlId = sAttr;
+sXmlId = sValue;
 break;
 case XML_ELEMENT(TEXT, XML_STYLE_NAME):
-sStyleName = sAttr;
+sStyleName = sValue;
 break;
 case XML_ELEMENT(TEXT, XML_NAME):
-sName = sAttr;
+sName = sValue;
 bValid = true;
 break;
 case XML_ELEMENT(TEXT, XML_CONDITION):
 {
 OUString sTmp;
 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-GetKeyByAttrValueQName(sAttr, &sTmp);
+GetKeyByAttrValueQName(sValue, &sTmp);
 if( XML_NAMESPACE_OOOW == nPrefix )
 {
 sCond = sTmp;
 bCondOK = true;
 }
 else
-sCond = sAttr;
+sCond = sValue;
 }
 break;
 case XML_ELEMENT(TEXT, XML_DISPLAY):
-if (IsXMLToken(sAttr, XML_TRUE))
+if (IsXMLToken(sValue, XML_TRUE))
 {
 bIsVisible = true;
 }
-else if ( IsXMLToken(sAttr, XML_NONE) ||
-  IsXMLToken(sAttr, XML_CONDITION) )
+else if ( IsXMLToken(sValue, XML_NONE) ||
+  IsXMLToken(sValue, XML_CONDITION) )
 {
 bIsVisible = false;
 }
@@ -272,7 +272,7 @@ void XMLSectionImportContext::ProcessAttributes(
 case XML_ELEMENT(TEXT, XML_IS_HIDDEN):
 {
 bool bTmp(false);
-if (::sax::Converter::convertBool(bTmp, sAttr))
+if (::sax::Converter::convertBool(bTmp, sValue))
 {
 bIsCurrentlyVisible = !bTmp;
 bIsCurrentlyVisibleOK = true;
@@ -280,7 +280,7 @@ void XMLSectionImportContext::ProcessAttributes(
 }
 break;
 case XML_ELEMENT(TEXT, XML_PROTECTION_KEY):
-::comphelper::Base64::decode(aSequence, sAttr);
+::comphelper::Base64::decode(aSequence, sValue);
 bSequenceOK = true;
 break;
 case XML_ELEMENT(TEXT, XML_PROTECTED):
@@ -288,7 +288,7 @@ void XMLSectionImportContext::ProcessAttributes(
 case XML_ELEMENT(TEXT, XML_PROTECT):
 {
 bool bTmp(false);
-if (::sax::Converter::convertBool(bTmp, sAttr))
+if (::sax::Converter::convertBool(bTmp, sValue))
 {
 bProtect = bTmp;
 }
@@ -324,10 +324,37 @@ void XMLSectionImportContext::endFastElement(sal_Int32 )
 rHelper->RedlineAdjustStartNodeCursor();
 }
 
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLSectionImportContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+{
+// section-source (-dde) elements
+if ( nElement == XML_ELEMENT(TEXT, XML_SECTION_SOURCE) )
+{
+}
+else if ( nElement == XML_ELEMENT(OFFICE, XML_DDE_SOURCE) )
+{
+}
+else
+{
+// otherwise: text context
+auto pContext = GetImport().GetTextImport()->CreateTextChildContext(
+GetImport(), nElement, xAttrList, XMLTextType::Section );
+
+// if that fails, default context
+if (pContext)
+bHasContent = true;
+else
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
+return

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

[Noel (via logerrit)]

 xmloff/inc/XMLTextHeaderFooterContext.hxx |7 +++
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |9 -
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 8a4d1cc66bc728c68002a415e5aecabbf5ec433b
Author: Noel 
AuthorDate: Wed Dec 2 14:40:05 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 08:03:09 2020 +0100

fastparser in XMLTextHeaderFooterContext

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

diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx 
b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 9e0a0b86cec9..350e9a747d66 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -50,10 +50,9 @@ public:
 
 virtual ~XMLTextHeaderFooterContext() override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & 
xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
AttrList ) override;
 
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 1bb70bdd081e..356e50f7260e 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -93,10 +93,9 @@ XMLTextHeaderFooterContext::~XMLTextHeaderFooterContext()
 {
 }
 
-SvXMLImportContextRef XMLTextHeaderFooterContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLTextHeaderFooterContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 SvXMLImportContext *pContext = nullptr;
 if( bInsertContent )
@@ -166,7 +165,7 @@ SvXMLImportContextRef 
XMLTextHeaderFooterContext::CreateChildContext(
 
 pContext =
 GetImport().GetTextImport()->CreateTextChildContext(
-GetImport(), nPrefix, rLocalName, xAttrList,
+GetImport(), nElement, xAttrList,
 XMLTextType::HeaderFooter );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sw/source/filter/xml/xmltext.cxx |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 6a54cb56ae418db5088bbf874785b086616ceb45
Author: Noel 
AuthorDate: Wed Dec 2 14:36:17 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 08:02:44 2020 +0100

fastparser in SwXMLBodyContentContext

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

diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 1d7e33a23414..115dc1a5236d 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -33,9 +33,9 @@ public:
 
 SwXMLBodyContentContext_Impl( SwXMLImport& rImport );
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList ) override;
+css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 
 // The body element's text:global attribute can be ignored, because
 // we must have the correct object shell already.
@@ -49,15 +49,13 @@ SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( 
SwXMLImport& rImport
 {
 }
 
-SvXMLImportContextRef SwXMLBodyContentContext_Impl::CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
SwXMLBodyContentContext_Impl::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-SvXMLImportContext *pContext = 
GetSwImport().GetTextImport()->CreateTextChildContext(
-GetImport(), nPrefix, rLocalName, xAttrList,
+return GetSwImport().GetTextImport()->CreateTextChildContext(
+GetImport(), nElement, xAttrList,
XMLTextType::Body );
-
-return pContext;
 }
 
 void SwXMLBodyContentContext_Impl::endFastElement(sal_Int32 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sw/source/filter/xml/xmltbli.cxx |  170 +--
 sw/source/filter/xml/xmltbli.hxx |2 
 2 files changed, 150 insertions(+), 22 deletions(-)

New commits:
commit 90304fec75b2aa0ca2b1976228e30e8bfbb34389
Author: Noel 
AuthorDate: Wed Dec 2 14:10:30 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 08:02:26 2020 +0100

fastparser in SwXMLTableContext

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

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index e26da2ab50b0..22be0dad5587 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -417,9 +417,9 @@ public:
 const Reference< xml::sax::XFastAttributeList > & xAttrList,
 SwXMLTableContext *pTable );
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList ) override;
+virtual css::uno::Reference SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const Reference< xml::sax::XFastAttributeList > & xAttrList ) 
override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
 SwXMLImport& GetSwImport() { return 
static_cast(GetImport()); }
@@ -586,32 +586,24 @@ inline void SwXMLTableCellContext_Impl::InsertContent(
 m_bHasTableContent = true;
 }
 
-SvXMLImportContextRef SwXMLTableCellContext_Impl::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList )
+css::uno::Reference 
SwXMLTableCellContext_Impl::createFastChildContext(
+sal_Int32 nElement,
+const Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
 SvXMLImportContext *pContext = nullptr;
 
 bool bSubTable = false;
-if( XML_NAMESPACE_TABLE == nPrefix &&
-IsXMLToken( rLocalName, XML_TABLE ) )
+if( nElement == XML_ELEMENT(TABLE, XML_TABLE) )
 {
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for( sal_Int16 i=0; i < nAttrCount; i++ )
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
 {
-const OUString& rAttrName = xAttrList->getNameByIndex( i );
-
-OUString aLocalName;
-const sal_uInt16 nPrefix2 =
-GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
-&aLocalName );
-if( XML_NAMESPACE_TABLE == nPrefix2 &&
- IsXMLToken( aLocalName, XML_IS_SUB_TABLE ) &&
- IsXMLToken( xAttrList->getValueByIndex( i ), XML_TRUE ) )
+if( aIter.getToken() == XML_ELEMENT(TABLE, XML_IS_SUB_TABLE) )
 {
-bSubTable = true;
+if ( IsXMLToken( aIter.toString(), XML_TRUE ) )
+bSubTable = true;
 }
+else
+XMLOFF_WARN_UNKNOWN("sw", aIter);
 //FIXME: RDFa
 }
 }
@@ -637,7 +629,7 @@ SvXMLImportContextRef 
SwXMLTableCellContext_Impl::CreateChildContext(
 if (!(m_bValueTypeIsString && m_bHasStringValue))
 {
 pContext = GetImport().GetTextImport()->CreateTextChildContext(
-GetImport(), nPrefix, rLocalName, xAttrList,
+GetImport(), nElement, xAttrList,
 XMLTextType::Cell  );
 }
 }
@@ -1324,6 +1316,140 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& 
rImport,
 m_pSttNd1 = m_pBox1->GetSttNd();
 }
 
+SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
+const Reference< xml::sax::XFastAttributeList > & xAttrList ) :
+XMLTextTableContext( rImport ),
+m_pRows( new SwXMLTableRows_Impl ),
+m_pTableNode( nullptr ),
+m_pBox1( nullptr ),
+m_bOwnsBox1( false ),
+m_pSttNd1( nullptr ),
+m_pBoxFormat( nullptr ),
+m_pLineFormat( nullptr ),
+m_bFirstSection( true ),
+m_bRelWidth( true ),
+m_bHasSubTables( false ),
+m_nHeaderRows( 0 ),
+m_nCurRow( 0 ),
+m_nCurCol( 0 ),
+m_nWidth( 0 )
+{
+OUString aName;
+OUString sXmlId;
+
+// this method will modify the document directly -> lock SolarMutex
+SolarMutexGuard aGuard;
+
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
+{
+const OUString sValue = aIter.toString();
+switch(aIter.getToken())
+{
+case XML_ELEMENT(TABLE, XML_STYLE_NAME):
+m_aStyleName = sValue;
+break;
+case XML_ELEMENT(TABLE, XML_NAME):
+aName = sValue;
+break;
+case XML_ELEMENT(TABLE, XML_DEFAULT_CELL_STYLE_NAME):
+   

[Libreoffice-commits] core.git: basic/source cui/source include/unotools sd/source sfx2/source sw/source unotools/source

[Noel (via logerrit)]

 basic/source/basmgr/basmgr.cxx|2 
 cui/source/inc/optpath.hxx|5 
 cui/source/options/optpath.cxx|  105 ++--
 include/unotools/defaultoptions.hxx   |3 
 include/unotools/pathoptions.hxx  |   62 +++
 sd/source/filter/ppt/pptin.cxx|4 
 sd/source/filter/ppt/propread.cxx |2 
 sd/source/filter/ppt/propread.hxx |4 
 sfx2/source/appl/appcfg.cxx   |   97 +--
 sw/source/filter/html/swhtml.cxx  |4 
 sw/source/ui/index/cnttab.cxx |2 
 unotools/source/config/defaultoptions.cxx |   62 +++
 unotools/source/config/pathoptions.cxx|  260 ++
 13 files changed, 306 insertions(+), 306 deletions(-)

New commits:
commit a5216cf1eb647862f377bed9b9a447e8bccf338f
Author: Noel 
AuthorDate: Wed Dec 2 09:41:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 07:05:02 2020 +0100

convert SvtPathOptions::Paths to scoped enum

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

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 50ff14effade..77f5939cd9d0 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -715,7 +715,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, 
const OUString& rBase
 OUString aSearchFile = pInfo->GetRelStorageName();
 OUString aSearchFileOldFormat(aSearchFile);
 SvtPathOptions aPathCFG;
-if( aPathCFG.SearchFile( aSearchFileOldFormat, 
SvtPathOptions::PATH_BASIC ) )
+if( aPathCFG.SearchFile( aSearchFileOldFormat, 
SvtPathOptions::Paths::Basic ) )
 {
 pInfo->SetStorageName( aSearchFile );
 }
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 4447c98425b9..d4eca9c83413 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 // forward ---
 struct OptPath_Impl;
@@ -51,9 +52,9 @@ private:
 
 DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void);
 
-voidGetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath,
+voidGetPathList( SvtPathOptions::Paths _nPathHandle, OUString& 
_rInternalPath,
  OUString& _rUserPath, OUString& _rWritablePath, 
bool& _rReadOnly );
-voidSetPathList( sal_uInt16 _nPathHandle,
+voidSetPathList( SvtPathOptions::Paths _nPathHandle,
  const OUString& _rUserPath, const OUString& 
_rWritablePath );
 
 public:
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 45b2c14d5c0d..b5cf2dc2378b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -76,13 +76,13 @@ namespace {
 
 struct PathUserData_Impl
 {
-sal_uInt16  nRealId;
+SvtPathOptions::Paths  nRealId;
 SfxItemStateeState;
 OUStringsUserPath;
 OUStringsWritablePath;
 boolbReadOnly;
 
-explicit PathUserData_Impl(sal_uInt16 nId)
+explicit PathUserData_Impl(SvtPathOptions::Paths nId)
 : nRealId(nId)
 , eState(SfxItemState::UNKNOWN)
 , bReadOnly(false)
@@ -92,7 +92,7 @@ struct PathUserData_Impl
 
 struct Handle2CfgNameMapping_Impl
 {
-sal_uInt16  m_nHandle;
+SvtPathOptions::Paths m_nHandle;
 const char* m_pCfgName;
 };
 
@@ -100,27 +100,27 @@ struct Handle2CfgNameMapping_Impl
 
 Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
 {
-{ SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" },
-{ SvtPathOptions::PATH_AUTOTEXT,"AutoText" },
-{ SvtPathOptions::PATH_BACKUP,  "Backup" },
-{ SvtPathOptions::PATH_GALLERY, "Gallery" },
-{ SvtPathOptions::PATH_GRAPHIC, "Graphic" },
-{ SvtPathOptions::PATH_TEMP,"Temp" },
-{ SvtPathOptions::PATH_TEMPLATE,"Template" },
-{ SvtPathOptions::PATH_WORK,"Work" },
-{ SvtPathOptions::PATH_DICTIONARY,"Dictionary" },
-{ SvtPathOptions::PATH_CLASSIFICATION, "Classification" },
+{ SvtPathOptions::Paths::AutoCorrect, "AutoCorrect" },
+{ SvtPathOptions::Paths::AutoText,"AutoText" },
+{ SvtPathOptions::Paths::Backup,  "Backup" },
+{ SvtPathOptions::Paths::Gallery, "Gallery" },
+{ SvtPathOptions::Paths::Graphic, "Graphic" },
+{ SvtPathOptions::Paths::Temp,"Temp" },
+{ SvtPathOptions::Paths::Template,"Template" },
+{ SvtPathOptions::Paths::Work,"Work" },
+{ SvtPathOptions::Paths::Dictionary,"Dictionary" },
+{ SvtPathOptions::Paths::Classification, "Classification" },
 #if OSL_DEBU

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

[Noel (via logerrit)]

 include/xmloff/xmlictxt.hxx   |5 +
 sc/source/filter/xml/XMLTrackedChangesContext.cxx |   84 +-
 xmloff/source/core/xmlictxt.cxx   |   39 ++
 3 files changed, 82 insertions(+), 46 deletions(-)

New commits:
commit a186fd4f2427df7baa50f78e99644dc5a50dfb12
Author: Noel 
AuthorDate: Wed Dec 2 13:49:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 3 07:04:22 2020 +0100

fastparser in ScXMLChangeTextPContext

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

diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 82f4c11632f1..c0d484844faf 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -107,6 +107,11 @@ public:
 
 virtual css::uno::Reference< XFastContextHandler >  SAL_CALL 
createFastChildContext(sal_Int32 Element,
 const css::uno::Reference& Attribs) 
override;
+/**
+ * temporary method to forward call to CreateChildContext, for use during 
slow-to-fastparser transition
+ */
+css::uno::Reference< XFastContextHandler > 
createFastChildContextFallback(sal_Int32 Element,
+const css::uno::Reference& Attribs);
 
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createUnknownChildContext(
 const OUString & Namespace, const OUString & Name,
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 7a6f7a0a7e56..3467c1eb9c7f 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -142,24 +142,21 @@ class ScXMLChangeCellContext;
 
 class ScXMLChangeTextPContext : public ScXMLImportContext
 {
-css::uno::Reference< css::xml::sax::XAttributeList> xAttrList;
-OUStringsLName;
+css::uno::Reference< css::xml::sax::XFastAttributeList> mxAttrList;
+sal_Int32   mnElement;
 OUStringBuffer  sText;
 ScXMLChangeCellContext* pChangeCellContext;
 rtl::Reference
 pTextPContext;
-sal_uInt16  nPrefix;
 
 public:
 
-ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-   const OUString& rLName,
-   const 
css::uno::Reference& xAttrList,
+ScXMLChangeTextPContext( ScXMLImport& rImport, sal_Int32 nElement,
+   const 
css::uno::Reference& xAttrList,
 ScXMLChangeCellContext* pChangeCellContext);
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const 
css::uno::Reference& xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& xAttrList ) override;
 
 virtual void SAL_CALL characters( const OUString& rChars ) override;
 
@@ -189,12 +186,8 @@ public:
   OUString& rInputString, double& fValue, 
sal_uInt16& nType,
   ScMatrixMode& nMatrixFlag, sal_Int32& 
nMatrixCols, sal_Int32& nMatrixRows);
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const 
css::uno::Reference& xAttrList ) override;
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
-sal_Int32 /*nElement*/, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override
-{ return nullptr; }
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& xAttrList ) override;
 
 void CreateTextPContext(bool bIsNewParagraph);
 bool IsEditCell() const { return mpEditTextObj.is(); }
@@ -649,39 +642,35 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
ScXMLDeletionsContext::
 }
 
 ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport,
-  sal_uInt16 nPrfx,
-  const OUString& rLName,
-  const 
css::uno::Reference& xTempAttrList,
+  sal_Int32 nElement,
+  const 
css::uno::Reference& xAttrList,
   ScXMLChangeCellContext* 
pTempChangeCellContext) :
-ScXMLImportContext( rImport, nPrfx, rLName ),
-xAttrList(xTempAttrList),
-sLName(rLName),
+ScXMLImportContext( rImport ),
+mxAttrList(xAttrList

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

[Jim Raykowski (via logerrit)]

 sw/inc/unotxdoc.hxx|   30 +
 sw/source/uibase/docvw/edtwin2.cxx |3 
 sw/source/uibase/inc/wrtsh.hxx |1 
 sw/source/uibase/uiview/view2.cxx  |7 +
 sw/source/uibase/uno/unotxdoc.cxx  |  192 +++--
 sw/source/uibase/utlui/content.cxx |   41 +--
 sw/source/uibase/wrtsh/move.cxx|   37 +++
 7 files changed, 250 insertions(+), 61 deletions(-)

New commits:
commit 1df2581cfffc87386c6de7614793b2d664244e5a
Author: Jim Raykowski 
AuthorDate: Sun Nov 1 13:00:41 2020 -0900
Commit: Jim Raykowski 
CommitDate: Thu Dec 3 06:23:33 2020 +0100

tdf#137838 SW: Add ability to create a hyperlink to a drawing object

within a document

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

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 1f814a915b05..48f49a2694b7 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -480,6 +480,7 @@ class SwXLinkTargetSupplier final : public 
cppu::WeakImplHelper
 OUString m_sSections;
 OUString m_sOutlines;
 OUString m_sBookmarks;
+OUString m_sDrawingObjects;
 
 public:
 SwXLinkTargetSupplier(SwXTextDocument& rxDoc);
@@ -579,6 +580,35 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 };
 
+class SwXDrawingObjectTarget final : public cppu::WeakImplHelper
+<
+css::beans::XPropertySet,
+css::lang::XServiceInfo
+>
+{
+const SfxItemPropertySet*   m_pPropSet;
+OUStringm_sDrawingObjectText;
+
+public:
+SwXDrawingObjectTarget(const OUString& rDrawingObjectText);
+virtual ~SwXDrawingObjectTarget() override;
+
+//XPropertySet
+virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL 
getPropertySetInfo(  ) override;
+virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 
const css::uno::Any& aValue ) override;
+virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& 
PropertyName ) override;
+virtual void SAL_CALL addPropertyChangeListener( const OUString& 
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener 
>& xListener ) override;
+virtual void SAL_CALL removePropertyChangeListener( const OUString& 
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener 
>& aListener ) override;
+virtual void SAL_CALL addVetoableChangeListener( const OUString& 
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& 
aListener ) override;
+virtual void SAL_CALL removeVetoableChangeListener( const OUString& 
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& 
aListener ) override;
+
+//XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
override;
+virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
+};
+
+
 enum class SwCreateDrawTable {
 Dash = 1, Gradient, Hatch, Bitmap, TransGradient, Marker, Defaults
 };
diff --git a/sw/source/uibase/docvw/edtwin2.cxx 
b/sw/source/uibase/docvw/edtwin2.cxx
index ae168908de6f..5770afbd4c05 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -171,7 +171,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 sSuffix == "outline" ||
 sSuffix == "text" ||
 sSuffix == "graphic" ||
-sSuffix == "ole" )
+sSuffix == "ole" ||
+sSuffix == "drawingobject" )
 sText = sText.copy( 0, nFound - 1);
 }
 // #i104300#
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 4499c0c15763..d4c9a6be9d64 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -482,6 +482,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
 bool GotoTable( const OUString& rName );
 void GotoFormatField( const SwFormatField& rField );
 const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool 
bSelect);
+bool GotoDrawingObject(std::u16string_view rName);
 
 void ChangeHeaderOrFooter(std::u16string_view rStyleName, bool bHeader, 
bool bOn, bool bShowWarning);
 virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool 
bShow ) override;
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 1071ed43501f..cd8e948c78b7 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2066,7 +2066,9 @@ bool SwView::JumpToSwMark( const OUString& rMark )
 sCmp = sCmp.toAsciiLowerCase();
 FlyCntType eFlyType = FLYCNTTYPE_ALL;
 
-   

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

[Justin Luth (via logerrit)]

 sd/source/ui/sidebar/SlideBackground.cxx   |2 
 sd/uiconfig/sdraw/menubar/menubar.xml  |4 
 sd/uiconfig/sdraw/ui/notebookbar.ui|  146 ---
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui|  215 -
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui |   14 -
 sd/uiconfig/sdraw/ui/notebookbar_single.ui |  122 -
 6 files changed, 2 insertions(+), 501 deletions(-)

New commits:
commit 78ec4f4cbd5b7cc5b7eeb465fe7950fc72ce2847
Author: Justin Luth 
AuthorDate: Tue Dec 1 12:09:34 2020 +0300
Commit: Justin Luth 
CommitDate: Thu Dec 3 06:11:45 2020 +0100

tdf#116815 Draw UI: remove presentation-only stuff

These items are not saved or imported into Draw,
so remove them from the UI interface.
They are just inherited from Impress.

Specifically:
-Display Master Background
-Display Master Objects
-Master Elements

This patch removes these 3 elements in Draw from:
-sidebar page properties
-main traditional menu
-Tabbed Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Compact Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Single Notebook bar's master context view
-Compact groupped bar's Page menu
(even though it isn't visible.)

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

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index fb720af1f034..5341acc24f13 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -348,6 +348,8 @@ void SlideBackground::HandleContextChange(
 else if ( IsDraw() )
 {
 mxMasterLabel->set_label(SdResId(STR_MASTERPAGE_LABEL));
+mxDspMasterBackground->hide();
+mxDspMasterObjects->hide();
 
 if (maContext == maDrawOtherContext)
 {
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index bdcc15444dc8..a2d06a2ec2ec 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -448,10 +448,6 @@
   
   
   
-  
-  
-  
-  
   
 
   
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 512ddb512df7..8824cc4637cc 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1354,20 +1354,6 @@
 .uno:PresentationLayout
   
 
-
-  
-True
-False
-.uno:DisplayMasterBackground
-  
-
-
-  
-True
-False
-.uno:DisplayMasterObjects
-  
-
 
   
 True
@@ -6280,83 +6266,6 @@
 8
   
 
-
-  
-True
-False
-center
-True
-
-  
-True
-False
-center
-vertical
-
-  
-True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:DisplayMasterBackground
-  
-  
-False
-True
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:DisplayMasterObjects
-  
-  
-False
-True
-  
-  

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

[Alain Romedenne (via logerrit)]

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

New commits:
commit cbbed438b0229b168b90414af2e64489aae2d107
Author: Alain Romedenne 
AuthorDate: Thu Dec 3 06:09:02 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 3 06:09:02 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-1'
  to e017c71c1ca6e86fd65bab2af300fe149fcc01ab
  - tdf#131416 Basic Syntax Diagrams - the end

+ Beep
+ MkDir
+ RmDir
+ Stop
+ With

Note: Basic functions are not provided with a syntax 'diagram' as their 
syntax is conventional.

Change-Id: I36e37947f8982dd0f27241e6a76edc84572bc636
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106947
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 37d03e7d61caa560373268675ad87d91242bce05)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107102
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index fdcc3f43b6cc..e017c71c1ca6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fdcc3f43b6cca1494f32c2dd10f03b05c2d8ebd6
+Subproject commit e017c71c1ca6e86fd65bab2af300fe149fcc01ab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - Package_html_media.mk source/media source/text

[Alain Romedenne (via logerrit)]

 Package_html_media.mk   |5 +
 source/media/helpimg/sbasic/Beep_statement.svg  |   32 ++
 source/media/helpimg/sbasic/MkDir_statement.svg |   33 ++
 source/media/helpimg/sbasic/RmDir_statement.svg |   33 ++
 source/media/helpimg/sbasic/Stop_statement.svg  |   32 ++
 source/media/helpimg/sbasic/With_statement.svg  |   35 +++
 source/text/sbasic/shared/03020411.xhp  |   73 
 source/text/sbasic/shared/03020413.xhp  |   20 --
 source/text/sbasic/shared/03090408.xhp  |   21 +++---
 source/text/sbasic/shared/03090411.xhp  |   28 +
 source/text/sbasic/shared/03130100.xhp  |   21 --
 11 files changed, 264 insertions(+), 69 deletions(-)

New commits:
commit e017c71c1ca6e86fd65bab2af300fe149fcc01ab
Author: Alain Romedenne 
AuthorDate: Tue Dec 1 14:39:32 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Dec 3 06:09:02 2020 +0100

tdf#131416 Basic Syntax Diagrams - the end

+ Beep
+ MkDir
+ RmDir
+ Stop
+ With

Note: Basic functions are not provided with a syntax 'diagram' as their 
syntax is conventional.

Change-Id: I36e37947f8982dd0f27241e6a76edc84572bc636
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106947
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 37d03e7d61caa560373268675ad87d91242bce05)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107102
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 0d36c6773..2fb33193b 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -114,6 +114,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/char_fragment.svg \
 helpimg/sbasic/comment_fragment.svg \
 helpimg/sbasic/typename_fragment.svg \
+helpimg/sbasic/Beep_statement.svg \
 helpimg/sbasic/Call_statement.svg \
 helpimg/sbasic/Close_statement.svg \
 helpimg/sbasic/Const_statement.svg \
@@ -134,6 +135,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/Input_statement.svg \
 helpimg/sbasic/LetSet_statement.svg \
 helpimg/sbasic/Line-Input_statement.svg \
+helpimg/sbasic/MkDir_statement.svg \
 helpimg/sbasic/On-Error_statement.svg \
 helpimg/sbasic/On-GoSub-GoTo_statement.svg \
 helpimg/sbasic/Option_statement.svg \
@@ -146,11 +148,14 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/ReDim_statement.svg \
 helpimg/sbasic/Resume_statement.svg \
 helpimg/sbasic/Reset_statement.svg \
+helpimg/sbasic/RmDir_statement.svg \
 helpimg/sbasic/Seek_statement.svg \
 helpimg/sbasic/Select-Case_statement.svg \
+helpimg/sbasic/Stop_statement.svg \
 helpimg/sbasic/Sub_statement.svg \
 helpimg/sbasic/Type_statement.svg \
 helpimg/sbasic/While_statement.svg \
+helpimg/sbasic/With_statement.svg \
 helpimg/sbasic/Write_statement.svg \
 helpimg/scalc/coordinates-to-polar-01.svg \
 helpimg/sdraw/control_points.png \
diff --git a/source/media/helpimg/sbasic/Beep_statement.svg 
b/source/media/helpimg/sbasic/Beep_statement.svg
new file mode 100644
index 0..61606af11
--- /dev/null
+++ b/source/media/helpimg/sbasic/Beep_statement.svg
@@ -0,0 +1,32 @@
+http://www.w3.org/2000/svg";>
+
+/*  */
+
+
+Beep
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/MkDir_statement.svg 
b/source/media/helpimg/sbasic/MkDir_statement.svg
new file mode 100644
index 0..bfd00fb10
--- /dev/null
+++ b/source/media/helpimg/sbasic/MkDir_statement.svg
@@ -0,0 +1,33 @@
+http://www.w3.org/2000/svg";>
+
+/* 

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 sfx2/source/view/viewprn.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9b0824e2b4d2228325d17190c63d8d1641e12798
Author: Samuel Mehrbrodt 
AuthorDate: Wed Nov 25 23:09:18 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 3 02:45:17 2020 +0100

uno:Printersetup: Allow preselecting a printer

When calling "uno:Printersetup" from a macro, allow preselecting a
printer in the printer setup dialog by passing the printer name
as an argument "PrinterName"

Change-Id: I6b435f52a4123dc7fd49f6d771052ff1b8e743c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106634
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit ccb0b825305a158d9142e1a5316c6ff7905f6ecb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106678
Reviewed-by: Thorsten Behrens 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index a0de55dbfddb..6cdad85a8d53 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3238,7 +3238,7 @@ SfxStringItem Printer SID_PRINTER_NAME
 
 
 SfxVoidItem PrinterSetup SID_SETUPPRINTER
-()
+(SfxStringItem PrinterName SID_PRINTER_NAME)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 45341cd1892a..796a505ed8d4 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -820,8 +820,8 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 return;
 }
 
-// if no arguments are given, retrieve them from a dialog
-if ( !bIsAPI )
+// Open Printer Setup dialog
+if ( nId == SID_SETUPPRINTER )
 {
 // PrinterDialog needs a temporary printer
 VclPtr pDlgPrinter = pPrinter->Clone();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/vcl offapi/com sfx2/source vcl/osx vcl/source vcl/unx

[Samuel Mehrbrodt (via logerrit)]

 include/vcl/print.hxx |3 +++
 offapi/com/sun/star/view/PrintOptions.idl |4 
 sfx2/source/doc/printhelper.cxx   |9 +
 vcl/osx/salprn.cxx|7 +--
 vcl/source/gdi/print3.cxx |   16 
 vcl/unx/generic/print/genprnpsp.cxx   |8 +---
 6 files changed, 26 insertions(+), 21 deletions(-)

New commits:
commit 7ed3ab4fd497ffa20359cdc73201e18508fcad54
Author: Samuel Mehrbrodt 
AuthorDate: Wed Nov 25 16:22:11 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 3 02:44:59 2020 +0100

Add 'SinglePrintJobs' to PrintOptions

So that this option can be set via UNO API

Change-Id: I0b69162661a4327d59aaed82d5eff98cb50d852c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106593
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 2e2c162b7a816d990415fca434e6d3d5600b2858)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106677
Reviewed-by: Thorsten Behrens 

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 6d3adf0e00d7..631b2f5b83fe 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -168,6 +168,7 @@ private:
 boolmbPrintFile;
 boolmbInPrintPage;
 boolmbNewJobSetup;
+boolmbSinglePrintJobs;
 
 VCL_DLLPRIVATE void ImplInitData();
 VCL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
@@ -316,6 +317,8 @@ public:
 voidSetCopyCount( sal_uInt16 nCopy, bool bCollate 
);
 sal_uInt16  GetCopyCount() const { return mnCopyCount; }
 boolIsCollateCopy() const { return mbCollateCopy; }
+voidSetSinglePrintJobs(bool bSinglePrintJobs) { 
mbSinglePrintJobs = bSinglePrintJobs; }
+boolIsSinglePrintJobs() const { return 
mbSinglePrintJobs; }
 
 boolIsPrinting() const { return mbPrinting; }
 
diff --git a/offapi/com/sun/star/view/PrintOptions.idl 
b/offapi/com/sun/star/view/PrintOptions.idl
index eea96f98937e..4ed8b23baaf0 100644
--- a/offapi/com/sun/star/view/PrintOptions.idl
+++ b/offapi/com/sun/star/view/PrintOptions.idl
@@ -76,6 +76,10 @@ published service PrintOptions
 /** if set, specifies name of the printer to use.
  */
 [optional, property] string PrinterName;
+
+/** advises the printer to create a single print job for each copy.
+ */
+[optional, property] boolean SinglePrintJobs;
 };
 
 
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e0c2cc75ad77..e2ce74172288 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -696,6 +696,15 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< 
beans::PropertyValue >&
 aCheckedArgs[nProps++].Value <<= bTemp;
 }
 
+else if ( rProp.Name == "SinglePrintJobs" )
+{
+bool bTemp;
+if ( !(rProp.Value >>= bTemp) )
+throw css::lang::IllegalArgumentException();
+aCheckedArgs[nProps].Name = "SinglePrintJobs";
+aCheckedArgs[nProps++].Value <<= bTemp;
+}
+
 // Pages-Property
 else if ( rProp.Name == "Pages" )
 {
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 0f2f38fa530a..a066f881164b 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -381,12 +381,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* 
i_pFileName,
 bShowProgressPanel = false;
 
 // possibly create one job for collated output
-bool bSinglePrintJobs = false;
-beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( 
"PrintCollateAsSingleJobs" ) );
-if( pSingleValue )
-{
-pSingleValue->Value >>= bSinglePrintJobs;
-}
+bool bSinglePrintJobs = i_rController.getPrinter()->IsSinglePrintJobs();
 
 // FIXME: jobStarted() should be done after the print dialog has ended (if 
there is one)
 // how do I know when that might be ?
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 04ac1f5a92e6..1cc0ce8c1c93 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -509,8 +509,7 @@ bool 
Printer::PreparePrintJob(std::shared_ptr xController,
 }
 else if (aDlg.isSingleJobs())
 {
-xController->setValue( "PrintCollateAsSingleJobs",
-css::uno::makeAny( true ) );
+xController->getPrinter()->SetSinglePrintJobs(true);
 }
 }
 catch (const std::bad_alloc&)
@@ -585,12 +584,7 @@ bool Printer::StartJob( const OUString& i_rJobName, 
std::shared_ptrgetValue("PrintCollateAsSingleJobs");
-if( pSingleValue )
-{
-pSingleValue->Value >>= bSinglePri

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 39e962f5356b5fbbf269607b4432a4f28f56ae4f
Author: Alain Romedenne 
AuthorDate: Thu Dec 3 02:41:19 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 3 02:41:19 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 37d03e7d61caa560373268675ad87d91242bce05
  - tdf#131416 Basic Syntax Diagrams - the end

+ Beep
+ MkDir
+ RmDir
+ Stop
+ With

Note: Basic functions are not provided with a syntax 'diagram' as their 
syntax is conventional.

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

diff --git a/helpcontent2 b/helpcontent2
index 845da7694bd6..37d03e7d61ca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 845da7694bd6e444db9cea206ccd15bd21e97921
+Subproject commit 37d03e7d61caa560373268675ad87d91242bce05
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 Package_html_media.mk   |5 +
 source/media/helpimg/sbasic/Beep_statement.svg  |   32 ++
 source/media/helpimg/sbasic/MkDir_statement.svg |   33 ++
 source/media/helpimg/sbasic/RmDir_statement.svg |   33 ++
 source/media/helpimg/sbasic/Stop_statement.svg  |   32 ++
 source/media/helpimg/sbasic/With_statement.svg  |   35 +++
 source/text/sbasic/shared/03020411.xhp  |   73 
 source/text/sbasic/shared/03020413.xhp  |   20 --
 source/text/sbasic/shared/03090408.xhp  |   21 +++---
 source/text/sbasic/shared/03090411.xhp  |   28 +
 source/text/sbasic/shared/03130100.xhp  |   21 --
 11 files changed, 264 insertions(+), 69 deletions(-)

New commits:
commit 37d03e7d61caa560373268675ad87d91242bce05
Author: Alain Romedenne 
AuthorDate: Tue Dec 1 14:39:32 2020 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 3 02:41:19 2020 +0100

tdf#131416 Basic Syntax Diagrams - the end

+ Beep
+ MkDir
+ RmDir
+ Stop
+ With

Note: Basic functions are not provided with a syntax 'diagram' as their 
syntax is conventional.

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

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 0d36c6773..2fb33193b 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -114,6 +114,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/char_fragment.svg \
 helpimg/sbasic/comment_fragment.svg \
 helpimg/sbasic/typename_fragment.svg \
+helpimg/sbasic/Beep_statement.svg \
 helpimg/sbasic/Call_statement.svg \
 helpimg/sbasic/Close_statement.svg \
 helpimg/sbasic/Const_statement.svg \
@@ -134,6 +135,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/Input_statement.svg \
 helpimg/sbasic/LetSet_statement.svg \
 helpimg/sbasic/Line-Input_statement.svg \
+helpimg/sbasic/MkDir_statement.svg \
 helpimg/sbasic/On-Error_statement.svg \
 helpimg/sbasic/On-GoSub-GoTo_statement.svg \
 helpimg/sbasic/Option_statement.svg \
@@ -146,11 +148,14 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/sbasic/ReDim_statement.svg \
 helpimg/sbasic/Resume_statement.svg \
 helpimg/sbasic/Reset_statement.svg \
+helpimg/sbasic/RmDir_statement.svg \
 helpimg/sbasic/Seek_statement.svg \
 helpimg/sbasic/Select-Case_statement.svg \
+helpimg/sbasic/Stop_statement.svg \
 helpimg/sbasic/Sub_statement.svg \
 helpimg/sbasic/Type_statement.svg \
 helpimg/sbasic/While_statement.svg \
+helpimg/sbasic/With_statement.svg \
 helpimg/sbasic/Write_statement.svg \
 helpimg/scalc/coordinates-to-polar-01.svg \
 helpimg/sdraw/control_points.png \
diff --git a/source/media/helpimg/sbasic/Beep_statement.svg 
b/source/media/helpimg/sbasic/Beep_statement.svg
new file mode 100644
index 0..61606af11
--- /dev/null
+++ b/source/media/helpimg/sbasic/Beep_statement.svg
@@ -0,0 +1,32 @@
+http://www.w3.org/2000/svg";>
+
+/*  */
+
+
+Beep
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/MkDir_statement.svg 
b/source/media/helpimg/sbasic/MkDir_statement.svg
new file mode 100644
index 0..bfd00fb10
--- /dev/null
+++ b/source/media/helpimg/sbasic/MkDir_statement.svg
@@ -0,0 +1,33 @@
+http://www.w3.org/2000/svg";>
+
+/*  */
+
+
+MkDir
+path
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Rm

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

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit e985ca01bc24a099e2a57e7f56d424e063d02e46
Author: Ayhan Yalçınsoy 
AuthorDate: Thu Dec 3 02:29:37 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 3 02:29:37 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-1'
  to fdcc3f43b6cca1494f32c2dd10f03b05c2d8ebd6
  - tdf#137720: Help files-Page Setup replaced with Page Properties

Change-Id: I131e80d08076fd2d7d198a65e4fb7cb77acc16f8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107029
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 845da7694bd6e444db9cea206ccd15bd21e97921)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107096
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 3a7095a6de5b..fdcc3f43b6cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3a7095a6de5b431e80987da81311505e6639bbbd
+Subproject commit fdcc3f43b6cca1494f32c2dd10f03b05c2d8ebd6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - source/text

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit fdcc3f43b6cca1494f32c2dd10f03b05c2d8ebd6
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Dec 2 13:40:58 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Dec 3 02:29:37 2020 +0100

tdf#137720: Help files-Page Setup replaced with Page Properties

Change-Id: I131e80d08076fd2d7d198a65e4fb7cb77acc16f8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107029
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 845da7694bd6e444db9cea206ccd15bd21e97921)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107096
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sdraw/01/page_properties.xhp 
b/source/text/sdraw/01/page_properties.xhp
index dab5c11e0..5388c8158 100644
--- a/source/text/sdraw/01/page_properties.xhp
+++ b/source/text/sdraw/01/page_properties.xhp
@@ -36,6 +36,6 @@
 
 
 
-To 
change the background of all of the pages in the active file, select a 
background, click OK and click Yes in the Page 
Setup dialog.
+To 
change the background of all of the pages in the active file, select a 
background, click OK and click Yes in the Page 
Properties dialog.
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 18 commits - configure.ac download.lst external/pdfium external/redland include/vcl RepositoryExternal.mk shell/source solenv/flat

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 5b7a7b6f41acfd2378e19b3e2f8d23053f2fd9d6
Author: Thorsten Behrens 
AuthorDate: Wed Dec 2 11:40:53 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 3 02:20:17 2020 +0100

Bump version to 6.1.7.20

Change-Id: I6d03755f4203d2ae71bc7c55ddb76038a04a7c89

diff --git a/configure.ac b/configure.ac
index e519d688b62a..1906280e583b 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.19],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.20],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 363997c76749219b900f47043d1b17ba8ec9bccd
Author: Miklos Vajna 
AuthorDate: Wed Nov 4 21:39:04 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 3 02:20:17 2020 +0100

xmlsecurity: reject a few dangerous annotation types during pdf sig verify

(cherry picked from commit f231dacde9df1c4aa5f4e0970535c4f4093364a7)

Conflicts:
xmlsecurity/source/helper/pdfsignaturehelper.cxx

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit fcab45e0e22f4cf46e71856dba7ae5abd6f99bc5)

Change-Id: I950b49a6e7181639daf27348ddfa0f36586baa65

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 783b9a6da8b4..027e4939fab1 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -59,6 +59,8 @@ public:
 FPDF_ClosePage(mpPage);
 }
 
+FPDF_PAGE getPointer() { return mpPage; }
+
 /// Get bitmap checksum of the page, without annotations/commenting.
 BitmapChecksum getChecksum(int nMDPPerm);
 };
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf
new file mode 100644
index ..b30f5b03867c
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index b5a6d5914833..63990fb36225 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -76,6 +76,7 @@ public:
 /// Test a valid signature that does not cover the whole file.
 void testPartial();
 void testBadCertP1();
+void testBadCertP3Stamp();
 void testPartialInBetween();
 /// Test writing a PAdES signature.
 void testSigningCertificateAttribute();
@@ -99,6 +100,7 @@ public:
 CPPUNIT_TEST(testPDFPAdESGood);
 CPPUNIT_TEST(testPartial);
 CPPUNIT_TEST(testBadCertP1);
+CPPUNIT_TEST(testBadCertP3Stamp);
 CPPUNIT_TEST(testPartialInBetween);
 CPPUNIT_TEST(testSigningCertificateAttribute);
 CPPUNIT_TEST(testGood);
@@ -455,6 +457,22 @@ void PDFSigningTest::testBadCertP1()
  rInformation.nStatus);
 }
 
+void PDFSigningTest::testBadCertP3Stamp()
+{
+std::vector aInfos
+= verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"bad-cert-p3-stamp.pdf", 1,
+ /*rExpectedSubFilter=*/OString());
+CPPUNIT_ASSERT(!aInfos.empty());
+SignatureInformation& rInformation = aInfos[0];
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0 (SecurityOperationStatus_UNKNOWN)
+// - Actual  : 1 (SecurityOperationStatus_OPERATION_SUCCEEDED)
+// i.e. adding a stamp annotation was not considered as a bad modification.
+
CPPUNIT_ASSERT_EQUAL(xml::crypto::SecurityOperationStatus::SecurityOperationStatus_UNKNOWN,
+ rInformation.nStatus);
+}
+
 /// Test writing a PAdES signature.
 void PDFSigningTest::testSigningCertificateAttribute()
 {
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 9d056de0a15c..51eac91495a7 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -24,6 +24,11 @@
 #include 
 #include 
 #include 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+#include 
+#endif
 
 using namespace com::sun::star;
 
@@ -138,8 +143,29 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
 return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
 }
 
+/**
+ * Contains checksums of a PDF page, which is rendered without annotations. It 
also contains
+ * the geometry of a few dangerous annotation types.
+ */
+struct PageChecksum
+{
+BitmapChecksum m_nPageContent;
+std::vector m_aAnnotations;
+bool operator==(const PageChecksum& rChecksum) const;
+};
+
+bool Page

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sal/rtl sc/qa

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx  |   24 
++
 sc/qa/unit/data/functions/addin/fods/convert.fods |6 +-
 sc/qa/unit/data/functions/financial/fods/nper.fods|2 
 sc/qa/unit/data/functions/fods/gammaln.precise.fods   |4 -
 sc/qa/unit/data/functions/mathematical/fods/convert_add.fods  |6 +-
 sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods |   12 ++---
 sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods |   14 ++---
 sc/qa/unit/data/functions/statistical/fods/gammaln.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/geomean.fods   |2 
 sc/qa/unit/data/functions/statistical/fods/harmean.fods   |6 +-
 sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/stdev.fods |4 -
 sc/qa/unit/data/functions/statistical/fods/stdev.p.fods   |6 +-
 sc/qa/unit/data/functions/statistical/fods/stdev.s.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/stdeva.fods|4 -
 sc/qa/unit/data/functions/statistical/fods/stdevp.fods|6 +-
 17 files changed, 49 insertions(+), 63 deletions(-)

New commits:
commit 84473267c5b77d12e3fa80a116995d645cc768c3
Author: Eike Rathke 
AuthorDate: Wed Dec 2 22:21:12 2020 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 3 02:19:33 2020 +0100

Related: tdf#138360 Use approxFloor() in rtl_math_round()

Ditch mostly but not always working correction value and use
approxFloor() instead which yields better results. With this we
now have one single place approxValue() in case more fine grained
tuning is needed.

Unfortunately all numeric spreadsheet function tests use ROUND()
in a manner such that they mostly blindly do a ROUND(...;12)
regardless of magnitude, sometimes effectively rounding to the
14th significant digit that may fail in cases like for

14.2040730851385
  ^
where the constant (rounded) value is stored as is but the
calculated value is
14.204073085138471
and the old round() yielded
14.204073085139 for both but the new round() more correctly
results in
14.204073085139 and
14.204073085138
so the spreadsheet test case sources had to be changed to
ROUND(...;11) in such places.

Change-Id: I211bb868a4f4dc9e68f4c7dcc2a187b5e175416f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107135
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit deb119e415213716a76b9b489a700949c031c6fe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107101

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index e6f09f18030e..a296927635bf 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1133,6 +1133,9 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 {
 OSL_ASSERT(nDecPlaces >= -20 && nDecPlaces <= 20);
 
+if (!std::isfinite(fValue))
+return fValue;
+
 if (fValue == 0.0)
 return fValue;
 
@@ -1190,24 +1193,7 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 switch ( eMode )
 {
 case rtl_math_RoundingMode_Corrected :
-{
-int nExp;   // exponent for correction
-if ( fValue > 0.0 )
-nExp = static_cast( floor( log10( fValue ) ) );
-else
-nExp = 0;
-
-int nIndex;
-
-if (nExp < 0)
-nIndex = 15;
-else if (nExp >= 14)
-nIndex = 0;
-else
-nIndex = 15 - nExp;
-
-fValue = floor(fValue + 0.5 + nCorrVal[nIndex]);
-}
+fValue = rtl::math::approxFloor(fValue + 0.5);
 break;
 case rtl_math_RoundingMode_Down:
 fValue = rtl::math::approxFloor(fValue);
@@ -1321,7 +1307,7 @@ double SAL_CALL rtl_math_approxValue( double fValue ) 
SAL_THROW_EXTERN_C()
 if (!std::isfinite(fValue))
 return fOrigValue;
 
-fValue = rtl_math_round(fValue, 0, rtl_math_RoundingMode_Corrected);
+fValue = std::round(fValue);
 fValue /= fExpValue;
 
 // If the original value was near DBL_MAX we got an overflow. Restore and
diff --git a/sc/qa/unit/data/functions/addin/fods/convert.fods 
b/sc/qa/unit/data/functions/addin/fods/convert.fods
index 12ba09dcd326..64eb2db5ff82 100644
--- a/sc/qa/unit/data/functions/addin/fods/convert.fods
+++ b/sc/qa/unit/data/functions/addin/fods/convert.fods
@@ -3409,7 +3409,7 @@
  
   14.2857127610345
  
- 
+ 
   TRUE
  
  
@@ -4425,7 +4425,7 @@
  
   11.1445349270435
  
- 
+ 
   TRUE
  
  
@@ -5867,4 +5867,4 @@

   
  
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/fu

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

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx  |   24 
++
 sc/qa/unit/data/functions/addin/fods/convert.fods |6 +-
 sc/qa/unit/data/functions/financial/fods/nper.fods|2 
 sc/qa/unit/data/functions/fods/gammaln.precise.fods   |4 -
 sc/qa/unit/data/functions/mathematical/fods/convert_add.fods  |6 +-
 sc/qa/unit/data/functions/statistical/fods/chisq.inv.fods |   12 ++---
 sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods |   14 ++---
 sc/qa/unit/data/functions/statistical/fods/gammaln.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/gammaln.precise.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/geomean.fods   |2 
 sc/qa/unit/data/functions/statistical/fods/harmean.fods   |6 +-
 sc/qa/unit/data/functions/statistical/fods/lognorm.inv.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/stdev.fods |4 -
 sc/qa/unit/data/functions/statistical/fods/stdev.p.fods   |6 +-
 sc/qa/unit/data/functions/statistical/fods/stdev.s.fods   |4 -
 sc/qa/unit/data/functions/statistical/fods/stdeva.fods|4 -
 sc/qa/unit/data/functions/statistical/fods/stdevp.fods|6 +-
 17 files changed, 49 insertions(+), 63 deletions(-)

New commits:
commit deb119e415213716a76b9b489a700949c031c6fe
Author: Eike Rathke 
AuthorDate: Wed Dec 2 22:21:12 2020 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 3 01:28:18 2020 +0100

Related: tdf#138360 Use approxFloor() in rtl_math_round()

Ditch mostly but not always working correction value and use
approxFloor() instead which yields better results. With this we
now have one single place approxValue() in case more fine grained
tuning is needed.

Unfortunately all numeric spreadsheet function tests use ROUND()
in a manner such that they mostly blindly do a ROUND(...;12)
regardless of magnitude, sometimes effectively rounding to the
14th significant digit that may fail in cases like for

14.2040730851385
  ^
where the constant (rounded) value is stored as is but the
calculated value is
14.204073085138471
and the old round() yielded
14.204073085139 for both but the new round() more correctly
results in
14.204073085139 and
14.204073085138
so the spreadsheet test case sources had to be changed to
ROUND(...;11) in such places.

Change-Id: I211bb868a4f4dc9e68f4c7dcc2a187b5e175416f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107135
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index e6f09f18030e..a296927635bf 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1133,6 +1133,9 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 {
 OSL_ASSERT(nDecPlaces >= -20 && nDecPlaces <= 20);
 
+if (!std::isfinite(fValue))
+return fValue;
+
 if (fValue == 0.0)
 return fValue;
 
@@ -1190,24 +1193,7 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 switch ( eMode )
 {
 case rtl_math_RoundingMode_Corrected :
-{
-int nExp;   // exponent for correction
-if ( fValue > 0.0 )
-nExp = static_cast( floor( log10( fValue ) ) );
-else
-nExp = 0;
-
-int nIndex;
-
-if (nExp < 0)
-nIndex = 15;
-else if (nExp >= 14)
-nIndex = 0;
-else
-nIndex = 15 - nExp;
-
-fValue = floor(fValue + 0.5 + nCorrVal[nIndex]);
-}
+fValue = rtl::math::approxFloor(fValue + 0.5);
 break;
 case rtl_math_RoundingMode_Down:
 fValue = rtl::math::approxFloor(fValue);
@@ -1321,7 +1307,7 @@ double SAL_CALL rtl_math_approxValue( double fValue ) 
SAL_THROW_EXTERN_C()
 if (!std::isfinite(fValue))
 return fOrigValue;
 
-fValue = rtl_math_round(fValue, 0, rtl_math_RoundingMode_Corrected);
+fValue = std::round(fValue);
 fValue /= fExpValue;
 
 // If the original value was near DBL_MAX we got an overflow. Restore and
diff --git a/sc/qa/unit/data/functions/addin/fods/convert.fods 
b/sc/qa/unit/data/functions/addin/fods/convert.fods
index 12ba09dcd326..64eb2db5ff82 100644
--- a/sc/qa/unit/data/functions/addin/fods/convert.fods
+++ b/sc/qa/unit/data/functions/addin/fods/convert.fods
@@ -3409,7 +3409,7 @@
  
   14.2857127610345
  
- 
+ 
   TRUE
  
  
@@ -4425,7 +4425,7 @@
  
   11.1445349270435
  
- 
+ 
   TRUE
  
  
@@ -5867,4 +5867,4 @@

   
  
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/financial/fods/nper.fods 
b/sc/qa/unit/data/functions/financial/fods/nper.fods
index 2eac9b8f339f..83dc438afa34 100644
--- a/sc/q

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

[andreas kainz (via logerrit)]

 extras/source/tipoftheday/formdocuments.png  |binary
 extras/source/tipoftheday/masterdocument.png |binary
 extras/source/tipoftheday/printnote.png  |binary
 extras/source/tipoftheday/statusbar.png  |binary
 4 files changed

New commits:
commit 4e97666d72541b0b48fbe2884d1bc76f7b5aa2f8
Author: andreas kainz 
AuthorDate: Wed Dec 2 11:30:11 2020 +0100
Commit: Andreas Kainz 
CommitDate: Wed Dec 2 23:44:10 2020 +0100

ToD previews resize to 150px to fit into preview area

Change-Id: Ia0f4215d82348f96856364710fbfef87d54eb960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107054
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 
(cherry picked from commit 1ef87d3c3a3ea4652f5898b7871559af2cebf0e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107100

diff --git a/extras/source/tipoftheday/formdocuments.png 
b/extras/source/tipoftheday/formdocuments.png
index 74c778965102..a8bd178732c9 100644
Binary files a/extras/source/tipoftheday/formdocuments.png and 
b/extras/source/tipoftheday/formdocuments.png differ
diff --git a/extras/source/tipoftheday/masterdocument.png 
b/extras/source/tipoftheday/masterdocument.png
index 6695790fd90f..9f4aab020f25 100644
Binary files a/extras/source/tipoftheday/masterdocument.png and 
b/extras/source/tipoftheday/masterdocument.png differ
diff --git a/extras/source/tipoftheday/printnote.png 
b/extras/source/tipoftheday/printnote.png
index fb5c4c9b11c0..b952a539d8a7 100644
Binary files a/extras/source/tipoftheday/printnote.png and 
b/extras/source/tipoftheday/printnote.png differ
diff --git a/extras/source/tipoftheday/statusbar.png 
b/extras/source/tipoftheday/statusbar.png
index 6c7329ddc3b3..729c8217e84f 100644
Binary files a/extras/source/tipoftheday/statusbar.png and 
b/extras/source/tipoftheday/statusbar.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 vcl/inc/quartz/salvd.h |2 +-
 vcl/quartz/salvd.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 65dc2fdc67537fe061052d53811c10bf03d5a113
Author: Tor Lillqvist 
AuthorDate: Thu Dec 3 00:23:46 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 3 00:26:49 2020 +0200

There is nothing called "Quartz layer"

We mean CGLayer, so say so.

Change-Id: Iaa24471ce790114dc5cf2bbf353f9aa4a1d59893

diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index 41d43fa5e538..939bd041cee1 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -43,7 +43,7 @@ private:
 bool mbForeignContext;   // is mxContext from outside VCL
 CGContextHolder maBitmapContext;
 int mnBitmapDepth;
-CGLayerHolder maLayer; // Quartz layer
+CGLayerHolder maLayer;
 AquaSalGraphics* mpGraphics; // current VirDev graphics
 
 tools::Long mnWidth;
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 57ba971a927a..6462a51573ce 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -228,7 +228,7 @@ bool AquaSalVirtualDevice::SetSize( tools::Long nDX, 
tools::Long nDY )
 mnWidth = nDX;
 mnHeight = nDY;
 
-// create a Quartz layer matching to the intended virdev usage
+// create a CGLayer matching to the intended virdev usage
 CGContextHolder xCGContextHolder;
 if( mnBitmapDepth && (mnBitmapDepth < 16) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/options/optionsDialog.py |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit cf61ce8bc95ba0bc27070b503360dc5ac7a204b3
Author: Xisco Fauli 
AuthorDate: Wed Dec 2 17:19:54 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 2 23:14:58 2020 +0100

tdf#138596: sw: Add UItest

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

diff --git a/sw/qa/uitest/options/optionsDialog.py 
b/sw/qa/uitest/options/optionsDialog.py
index d991eae826f1..cf1229e1f315 100644
--- a/sw/qa/uitest/options/optionsDialog.py
+++ b/sw/qa/uitest/options/optionsDialog.py
@@ -40,4 +40,27 @@ class optionsDialog(UITestCase):
 
 self.ui_test.close_doc()
 
+def test_tdf138596(self):
+self.ui_test.create_doc_in_start_center("writer")
+
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xPages = xDialog.getChild("pages")
+xWriterEntry = xPages.getChild('3')
+xWriterEntry.executeAction("EXPAND", tuple())
+xFormattingAidsEntry = xWriterEntry.getChild('2')
+xFormattingAidsEntry.executeAction("SELECT", tuple())
+
+xApplyBtn = xDialog.getChild("apply")
+
+# Click apply button twice
+# Without the fix in place, this test would have crashed here
+xApplyBtn.executeAction("CLICK", tuple())
+xApplyBtn.executeAction("CLICK", tuple())
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen (via logerrit)]

 sw/inc/swtblfmt.hxx  |2 
 sw/source/core/table/swtable.cxx |  339 +++
 2 files changed, 171 insertions(+), 170 deletions(-)

New commits:
commit e53584fd17c1024728c573cadce2e5ef6d6ae1fd
Author: Bjoern Michaelsen 
AuthorDate: Tue Dec 1 19:59:33 2020 +0100
Commit: Bjoern Michaelsen 
CommitDate: Wed Dec 2 22:02:51 2020 +0100

SwTableBoxFormat: Modify no more

Change-Id: I02775fa3ac4cdc01ed89e969449ec96427de30db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107008
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen 

diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index c1a114ea4066..14b200164b5d 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -55,7 +55,7 @@ class SAL_DLLPUBLIC_RTTI SwTableBoxFormat final : public 
SwFrameFormat
 {}
 
 // For recognition of changes (especially TableBoxAttribute).
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue 
) override;
+virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
 
 public:
 virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 8864701cb59b..39fd910b599a 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2155,215 +2155,216 @@ static void ChgNumToText( SwTableBox& rBox, sal_uLong 
nFormat )
 }
 
 // for detection of modifications (mainly TableBoxAttribute)
-void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* 
pNew )
+void SwTableBoxFormat::SwClientNotify(const SwModify& rMod, const SfxHint& 
rHint)
 {
-if( !IsModifyLocked() && GetDoc() && !GetDoc()->IsInDtor())
+auto pLegacy = dynamic_cast(&rHint);
+if(!pLegacy)
+return;
+if(IsModifyLocked() || !GetDoc() || GetDoc()->IsInDtor())
 {
-const SwTableBoxNumFormat *pNewFormat = nullptr;
-const SwTableBoxFormula *pNewFormula = nullptr;
-const SwTableBoxValue *pNewVal = nullptr;
-sal_uLong nOldFormat = getSwDefaultTextFormat();
+SwFrameFormat::SwClientNotify(rMod, rHint);
+return;
+}
+const SwTableBoxNumFormat* pNewFormat = nullptr;
+const SwTableBoxFormula* pNewFormula = nullptr;
+const SwTableBoxValue* pNewVal = nullptr;
+sal_uLong nOldFormat = getSwDefaultTextFormat();
 
-switch( pNew ? pNew->Which() : 0 )
+switch(pLegacy->m_pNew ? pLegacy->m_pNew->Which() : 0)
+{
+case RES_ATTRSET_CHG:
 {
-case RES_ATTRSET_CHG:
-{
-const SfxItemSet& rSet = *static_cast(pNew)->GetChgSet();
-if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT,
-false, reinterpret_cast(&pNewFormat) ) )
-nOldFormat = static_cast(pOld)->
-GetChgSet()->Get( RES_BOXATR_FORMAT ).GetValue();
-rSet.GetItemState( RES_BOXATR_FORMULA, false,
-reinterpret_cast(&pNewFormula) );
-rSet.GetItemState( RES_BOXATR_VALUE, false,
-reinterpret_cast(&pNewVal) );
-break;
-}
-case RES_BOXATR_FORMAT:
-pNewFormat = static_cast(pNew);
-nOldFormat = static_cast(pOld)->GetValue();
-break;
-case RES_BOXATR_FORMULA:
-pNewFormula = static_cast(pNew);
-break;
-case RES_BOXATR_VALUE:
-pNewVal = static_cast(pNew);
-break;
+const SfxItemSet& rSet = *static_cast(pLegacy->m_pNew)->GetChgSet();
+if(SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, 
false, reinterpret_cast(&pNewFormat)))
+nOldFormat = static_cast(pLegacy->m_pOld)->GetChgSet()->Get(RES_BOXATR_FORMAT).GetValue();
+rSet.GetItemState(RES_BOXATR_FORMULA, false, 
reinterpret_cast(&pNewFormula));
+rSet.GetItemState(RES_BOXATR_VALUE, false, reinterpret_cast(&pNewVal));
+break;
 }
+case RES_BOXATR_FORMAT:
+pNewFormat = static_cast(pLegacy->m_pNew);
+nOldFormat = static_cast(pLegacy->m_pOld)->GetValue();
+break;
+case RES_BOXATR_FORMULA:
+pNewFormula = static_cast(pLegacy->m_pNew);
+break;
+case RES_BOXATR_VALUE:
+pNewVal = static_cast(pLegacy->m_pNew);
+break;
+}
 
-// something changed and some BoxAttribut remained in the set!
-if( pNewFormat || pNewFormula || pNewVal )
-{
-GetDoc()->getIDocumentFieldsAccess().SetFieldsDirty(true, nullptr, 
0);
+// something changed and some BoxAttribut remained in the set!
+if( pNewFormat || pNewFormula || pNewVal )
+{
+GetDoc()->getIDocumentFieldsAccess().SetFi

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

[andreas kainz (via logerrit)]

 extras/source/tipoftheday/formdocuments.png  |binary
 extras/source/tipoftheday/masterdocument.png |binary
 extras/source/tipoftheday/printnote.png  |binary
 extras/source/tipoftheday/statusbar.png  |binary
 4 files changed

New commits:
commit 1ef87d3c3a3ea4652f5898b7871559af2cebf0e7
Author: andreas kainz 
AuthorDate: Wed Dec 2 11:30:11 2020 +0100
Commit: Andreas Kainz 
CommitDate: Wed Dec 2 21:29:49 2020 +0100

ToD previews resize to 150px to fit into preview area

Change-Id: Ia0f4215d82348f96856364710fbfef87d54eb960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107054
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/extras/source/tipoftheday/formdocuments.png 
b/extras/source/tipoftheday/formdocuments.png
index 74c778965102..a8bd178732c9 100644
Binary files a/extras/source/tipoftheday/formdocuments.png and 
b/extras/source/tipoftheday/formdocuments.png differ
diff --git a/extras/source/tipoftheday/masterdocument.png 
b/extras/source/tipoftheday/masterdocument.png
index 6695790fd90f..9f4aab020f25 100644
Binary files a/extras/source/tipoftheday/masterdocument.png and 
b/extras/source/tipoftheday/masterdocument.png differ
diff --git a/extras/source/tipoftheday/printnote.png 
b/extras/source/tipoftheday/printnote.png
index fb5c4c9b11c0..b952a539d8a7 100644
Binary files a/extras/source/tipoftheday/printnote.png and 
b/extras/source/tipoftheday/printnote.png differ
diff --git a/extras/source/tipoftheday/statusbar.png 
b/extras/source/tipoftheday/statusbar.png
index 6c7329ddc3b3..729c8217e84f 100644
Binary files a/extras/source/tipoftheday/statusbar.png and 
b/extras/source/tipoftheday/statusbar.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |2 +-
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |8 

 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9c85e2a69310d10a1413cce2c304f2f5b026b7f9
Author: Michael Stahl 
AuthorDate: Tue Dec 1 20:05:32 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 21:13:05 2020 +0100

mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem plugins

They were already compiled in some way.

Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107028
Reviewed-by: Caolán McNamara 

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index a93e353afaa0..3a7647b937ed 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -73,9 +73,9 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt 
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
-   , \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
+   , \

UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
) \
 ))
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index b34c3490661c..241e12db6581 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,11 +36,19 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
+   $(if $(filter WNT,$(OS)), \
+   extern struct st_mysql_client_plugin 
pvio_shmem_client_plugin\; \
+   extern struct st_mysql_client_plugin 
pvio_npipe_client_plugin\; \
+   ) \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
+   $(if $(filter WNT,$(OS)), \
+   (struct st_mysql_client_plugin 
*)\&pvio_shmem_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&pvio_npipe_client_plugin$(COMMA) \
+   ) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |1 -
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ac5e72d01b3d95596b7c6aa8e701514c69b6f88
Author: Michael Stahl 
AuthorDate: Tue Dec 1 19:58:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 21:12:35 2020 +0100

tdf#135202 mariadb-connector-c: enable native_password plugin

... and remove dialog authentication plugin; it quite uselessly defaults
to asking for a password on stdin, unless a function symbol is defined
by the library that links the connector static library.

There are more authentication plugins but no idea if those are needed.

Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107022
Reviewed-by: Caolán McNamara 

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 664d58b03e5e..a93e353afaa0 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -67,7 +67,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 2f679294f7c6..b34c3490661c 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -35,10 +35,12 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-e 's/@EXTERNAL_PLUGINS@/ \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
+   extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/options/treeopt.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 0eb6ad223272325278d52e21d4fb257025d3b54c
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 15:03:01 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 21:07:39 2020 +0100

tdf#138596 don't destroy SfxItemSet that are still in use

update the existing ones instead

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

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e098040e7c7c..968d3f6c14cc 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -724,13 +724,18 @@ IMPL_LINK(OfaTreeOptionsDialog, ApplyHdl_Impl, 
weld::Button&, rButton, void)
 m_xDialog->response(RET_OK);
 else
 {
-// tdf#137930 rebuild the in and out itemsets
-// to reflect the current post-apply state
+// tdf#137930 rebuild the in and out itemsets to reflect the current
+// post-apply state
 if (pGroupInfo && pGroupInfo->m_pInItemSet)
 {
-pGroupInfo->m_pInItemSet.reset();
-pGroupInfo->m_pOutItemSet.reset();
-InitItemSets(*pGroupInfo);
+// tdf#138596 seeing as the SfxTabPages keep pointers to the 
m_pInItemSet
+// we update the contents of the existing SfxItemSets to match
+// the current settings, rather than create new ones
+auto xInItemSet = pGroupInfo->m_pShell
+? pGroupInfo->m_pShell->CreateItemSet( pGroupInfo->m_nDialogId 
)
+: CreateItemSet( pGroupInfo->m_nDialogId );
+pGroupInfo->m_pInItemSet->Set(*xInItemSet, false);
+pGroupInfo->m_pOutItemSet->ClearItem();
 }
 
 // for the Apply case, now that the settings are saved to config,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adding a dictionary

[Ilmari Lauhakangas]

On 2.12.2020 18.17, Ilmari Lauhakangas wrote:

On 2.12.2020 18.08, Batmunkh Dorjgotov wrote:
I want to add a new mongolian dictionary. Would you please review the 
latest pull request?


I went looking for it, but could not find it. Can you point to it?


Áron found it:
https://github.com/LibreOffice/dictionaries/pull/29

GitHub is provided as a read-only mirror, you should not submit anything 
to it. For some reason the "Issues" functionality in that repo is 
enabled - it should be disabled.


The instructions for adding a dictionary are here:
https://wiki.documentfoundation.org/Development/Dictionaries#Adding.2FUpdating_bundled_Dictionaries

It is also possible to create Gerrit patches in the web interface:
https://gerrit.libreoffice.org/Documentation/user-inline-edit.html

With the latest version we use, you can upload whole files from your 
computer.


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

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

[Caolán McNamara (via logerrit)]

 cui/source/options/treeopt.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 62c0d42e179476da5fcad02722a9d3c6f83ef258
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 15:03:01 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 21:06:24 2020 +0100

tdf#138596 don't destroy SfxItemSet that are still in use

update the existing ones instead

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

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 6e822e974c5e..3c8fcdadeff1 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -724,13 +724,18 @@ IMPL_LINK(OfaTreeOptionsDialog, ApplyHdl_Impl, 
weld::Button&, rButton, void)
 m_xDialog->response(RET_OK);
 else
 {
-// tdf#137930 rebuild the in and out itemsets
-// to reflect the current post-apply state
+// tdf#137930 rebuild the in and out itemsets to reflect the current
+// post-apply state
 if (pGroupInfo && pGroupInfo->m_pInItemSet)
 {
-pGroupInfo->m_pInItemSet.reset();
-pGroupInfo->m_pOutItemSet.reset();
-InitItemSets(*pGroupInfo);
+// tdf#138596 seeing as the SfxTabPages keep pointers to the 
m_pInItemSet
+// we update the contents of the existing SfxItemSets to match
+// the current settings, rather than create new ones
+auto xInItemSet = pGroupInfo->m_pShell
+? pGroupInfo->m_pShell->CreateItemSet( pGroupInfo->m_nDialogId 
)
+: CreateItemSet( pGroupInfo->m_nDialogId );
+pGroupInfo->m_pInItemSet->Set(*xInItemSet, false);
+pGroupInfo->m_pOutItemSet->ClearItem();
 }
 
 // for the Apply case, now that the settings are saved to config,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 forms/source/component/clickableimage.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 07be45d03f80fa681c697ca9f5a13084a81c7a26
Author: Julien Nabet 
AuthorDate: Wed Dec 2 00:05:14 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Dec 2 21:01:45 2020 +0100

tdf#46579: fix form fields 'Image Button' in Forms

urls have this form:
.uno:FormController/moveToFirst
.uno:FormController/moveToPrev
etc.

So we must use these links for hyperlinks
+ interceptor with ControlFeatureInterception

Change-Id: I9cff19833d859624239ca6c76152cc88f9cbb278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107037
Tested-by: Jenkins
Reviewed-by: Lionel Mamane 
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index e3d19da934db..431506adbf1f 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -311,9 +311,9 @@ namespace frm
 }
 else
 {
-URL aHyperLink = 
m_pFeatureInterception->getTransformer().getStrictURLFromAscii( 
".uno:OpenHyperlink" );
+URL aHyperLink = 
m_pFeatureInterception->getTransformer().getStrictURLFromAscii( 
OUStringToOString(aURL.Complete, RTL_TEXTENCODING_ASCII_US).getStr() );
 
-Reference< XDispatch >  xDisp = Reference< 
XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink, 
OUString() , 0);
+Reference< XDispatch > xDisp =  
m_pFeatureInterception->queryDispatch(aHyperLink);
 
 if ( xDisp.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 filter/source/msfilter/eschesdo.cxx   |   37 +++---
 sw/qa/extras/ww8export/data/tdf128501.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   17 +
 3 files changed, 46 insertions(+), 8 deletions(-)

New commits:
commit 36a46273a010f35b9a475ea5601fa1c10fb5abbf
Author: Xisco Fauli 
AuthorDate: Tue Dec 1 19:17:24 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 2 20:04:16 2020 +0100

tdf#128501: DOC export: fix lost bitmap fill for OOXML custom shapes

this fix is based on 7032be2e9edd82dad2d67f1582aaa57676bda4a1
which fixes the same problem for PPT filter

Change-Id: Id62c29892dd3fce42d27e2e46a7933154cb973f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107003
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2f9325b270fab10f6900aec30ca27135363c4c69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107032

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 7132b8067e98..24f47d62909f 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -263,15 +264,35 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 }
 else
 {
-addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
- nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
-aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
-aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
-if ( rObj.ImplGetText() )
+const Reference< XPropertySet > xPropSet = rObj.mXPropSet;
+drawing::FillStyle eFS = drawing::FillStyle_NONE;
+if(xPropSet.is())
+{
+uno::Reference< XPropertySetInfo > xPropInfo = 
xPropSet->getPropertySetInfo();
+if ( xPropInfo.is() && 
xPropInfo->hasPropertyByName("FillStyle"))
+xPropSet->getPropertyValue("FillStyle") >>= eFS;
+}
+
+if (eFS == drawing::FillStyle_BITMAP && eShapeType == 
mso_sptMax)
+{
+// We can't map this custom shape to a DOC preset and it 
has a bitmap fill.
+// Make sure that at least the bitmap fill is not lost.
+addShape( ESCHER_ShpInst_PictureFrame, 
ShapeFlag::HaveShapeProperty | ShapeFlag::HaveAnchor );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, 
"Bitmap", false, true, true, bOOxmlExport ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 
0x800080 );
+}
+else
 {
-if ( !aPropOpt.IsFontWork() )
-aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
-rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
+ nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
+aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
+aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
+if ( rObj.ImplGetText() )
+{
+if ( !aPropOpt.IsFontWork() )
+aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
+rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+}
 }
 }
 }
diff --git a/sw/qa/extras/ww8export/data/tdf128501.doc 
b/sw/qa/extras/ww8export/data/tdf128501.doc
new file mode 100644
index ..3313e397a961
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf128501.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index c32ff278cc7a..dd7de5ff543a 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -92,6 +92,23 @@ DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, 
"arabic-zero-numbering.doc")
  aMap["NumberingType"].get());
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf128501, "tdf128501.doc")
+{
+if (!mbExported)
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.CustomShape"), 
xShapeDescriptor->getShapeType());
+}
+else
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+// Without the fix in place, this test would have failed with
+// - Expected: FrameShape
+// - Actual  : com.sun.star.drawing.CustomShap

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

[Xisco Fauli (via logerrit)]

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 528f1ddc89020b3640b901ab213bdf699ad22fda
Author: Xisco Fauli 
AuthorDate: Wed Dec 2 10:23:57 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 2 20:03:10 2020 +0100

related: tdf#127086: PPT: export custom shapes as Bitmap

this way the cropping is kept after roundtrip

found while working on fix for tdf#128501

Change-Id: I5cf023b469407d5a70d83cbb5b499b2a1d6310e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107051
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins
(cherry picked from commit 0956226ca535a62ab22d8d2502b159037c327f7d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107033

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b17dc66364e9..0c5ab79f3c82 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1712,7 +1712,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, 
EscherSolverContainer& a
 // We can't map this custom shape to a PPT preset 
and it has a bitmap
 // fill. Make sure that at least the bitmap fill 
is not lost.
 mType = "drawing.GraphicObject";
-aGraphicPropertyName = "FillBitmap";
+aGraphicPropertyName = "Bitmap";
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 sc/qa/unit/data/ods/ManualColWidthRowHeight.ods |binary
 sc/qa/unit/scshapetest.cxx  |  121 
 sc/source/core/data/drwlayer.cxx|   22 ++--
 3 files changed, 135 insertions(+), 8 deletions(-)

New commits:
commit d0921aa753c43600272865602df3c7c2a8f13196
Author: Regina Henschel 
AuthorDate: Tue Dec 1 00:05:43 2020 +0100
Commit: Regina Henschel 
CommitDate: Wed Dec 2 19:06:43 2020 +0100

tdf#137576 Improve cell anchored measure line in Calc

Measure lines do not always have a logic rectangle. It might be empty
or the 1cm x 1cm default square. But Calc needs it to calculate
NonRotatedAnchor. The latter is needed for cell anchored shapes when
saving in ODF. Always generating a logic rectangle in class
SdrMeasureObj is difficult (I got crashes in Draw) and not necessary.
Calc now forces the calculation of the logic rectangle where it is
needed by Calc.

Change-Id: I8689bc95985db1619eb5e72df99901bd52086cb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106990
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/sc/qa/unit/data/ods/ManualColWidthRowHeight.ods 
b/sc/qa/unit/data/ods/ManualColWidthRowHeight.ods
new file mode 100644
index ..1cc738e05244
Binary files /dev/null and b/sc/qa/unit/data/ods/ManualColWidthRowHeight.ods 
differ
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index 236cbc0879b4..c13ec7189622 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -13,10 +13,12 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -35,6 +37,8 @@ public:
 ScShapeTest();
 void saveAndReload(css::uno::Reference& xComponent,
const OUString& rFilter);
+void testTdf137576_LogicRectInDefaultMeasureline();
+void testTdf137576_LogicRectInNewMeasureline();
 void testMeasurelineHideColSave();
 void testHideColsShow();
 void testTdf138138_MoveCellWithRotatedShape();
@@ -46,6 +50,8 @@ public:
 void testCustomShapeCellAnchoredRotatedShape();
 
 CPPUNIT_TEST_SUITE(ScShapeTest);
+CPPUNIT_TEST(testTdf137576_LogicRectInDefaultMeasureline);
+CPPUNIT_TEST(testTdf137576_LogicRectInNewMeasureline);
 CPPUNIT_TEST(testMeasurelineHideColSave);
 CPPUNIT_TEST(testHideColsShow);
 CPPUNIT_TEST(testTdf138138_MoveCellWithRotatedShape);
@@ -121,6 +127,121 @@ static void lcl_AssertPointEqualWithTolerance(const 
OString& sInfo, const Point
 CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), std::abs(rExpected.Y() - 
rActual.Y()) <= nTolerance);
 }
 
+void ScShapeTest::testTdf137576_LogicRectInDefaultMeasureline()
+{
+// Error was, that the empty logical rectangle of a default measure line 
(Ctrl+Click)
+// resulted in zeros in NonRotatedAnchor and a wrong position when 
reloading.
+
+// Load an empty document.
+OUString aFileURL;
+createFileURL("ManualColWidthRowHeight.ods", aFileURL);
+uno::Reference xComponent = 
loadFromDesktop(aFileURL);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get ScDocShell
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ScDocShell* pDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT_MESSAGE("No ScDocShell", pDocSh);
+
+// Create default measureline by SfxRequest that corresponds to Ctrl+Click
+ScTabViewShell* pTabViewShell = pDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT_MESSAGE("No ScTabViewShell", pTabViewShell);
+SfxRequest aReq(pTabViewShell->GetViewFrame(), SID_DRAW_MEASURELINE);
+aReq.SetModifier(KEY_MOD1); // Ctrl
+pTabViewShell->ExecDraw(aReq);
+
+// Get document and newly created measure line.
+ScDocument& rDoc = pDocSh->GetDocument();
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE("No ScDrawLayer", pDrawLayer);
+const SdrPage* pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE("No draw page", pPage);
+SdrObject* pObj = pPage->GetObj(0);
+CPPUNIT_ASSERT_MESSAGE("No object found", pObj);
+
+// Anchor "to Cell (resize with cell)"
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, rDoc, 0 /*SCTAB*/, true 
/*bResizeWithCell*/);
+// Deselect shape and switch to object selection type "Cell".
+pTabViewShell->SetDrawShell(false);
+
+// Hide column A.
+uno::Sequence aPropertyValues = {
+comphelper::makePropertyValue("ToPoint", OUString("$A$1")),
+};
+dispatchCommand(xComponent, ".uno:GoToCell", aPropertyValues);
+dispatchCommand(xComponent, ".uno:HideColumn", {});
+
+// Get current position. I will not use absolute values for comparison, 
because document is loaded
+// in full screen mode of unknown size and default object is placed in 
center of window.
+Point aOldPos = pObj->GetRelativePos();
+
+//

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 17 commits - download.lst external/pdfium external/redland include/vcl RepositoryExternal.mk shell/source solenv/flatpak-manifest.

[Miklos Vajna (via logerrit)]

 RepositoryExternal.mk  
   |1 
 download.lst   
   |4 
 external/pdfium/Library_pdfium.mk  
   |  175 ++
 external/pdfium/UnpackedTarball_pdfium.mk  
   |   17 
 external/pdfium/build.patch.1  
   |  118 +-
 external/pdfium/c++20-comparison.patch 
   |   13 
 external/pdfium/configs/build_config.h 
   |6 
 external/pdfium/icu.patch.1
   |   13 
 external/pdfium/ubsan.patch
   |   26 -
 external/pdfium/visibility.patch.1 
   |   30 -
 external/pdfium/windows7.patch.1   
   |   34 +
 external/redland/UnpackedTarball_raptor.mk 
   |1 
 
external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
 |   33 +
 include/vcl/filter/PDFiumLibrary.hxx   
   |4 
 include/vcl/filter/pdfdocument.hxx 
   |6 
 shell/source/unix/exec/shellexec.cxx   
   |4 
 shell/source/win32/SysShExec.cxx   
   |3 
 solenv/flatpak-manifest.in 
   |6 
 vcl/CppunitTest_vcl_filter_ipdf.mk 
   |   49 ++
 vcl/Module_vcl.mk  
   |6 
 vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
   |   55 +++
 vcl/qa/cppunit/filter/ipdf/ipdf.cxx
   |   81 
 vcl/qa/cppunit/pdfexport/pdfexport.cxx 
   |6 
 vcl/source/filter/ipdf/pdfdocument.cxx 
   |   95 -
 vcl/source/pdf/PDFiumLibrary.cxx   
   |   12 
 xmlsecurity/inc/pdfio/pdfdocument.hxx  
   |2 
 xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p1.pdf
   |binary
 xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf  
   |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  
   |   46 ++
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   
   |5 
 xmlsecurity/source/pdfio/pdfdocument.cxx   
   |   77 +++-
 xmlsecurity/workben/pdfverify.cxx  
   |3 
 32 files changed, 670 insertions(+), 261 deletions(-)

New commits:
commit ee9b23faf4c4369d3504a896614fc2ed68d2ada7
Author: Miklos Vajna 
AuthorDate: Wed Nov 4 21:39:04 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 18:49:26 2020 +0100

xmlsecurity: reject a few dangerous annotation types during pdf sig verify

(cherry picked from commit f231dacde9df1c4aa5f4e0970535c4f4093364a7)

Conflicts:
xmlsecurity/source/helper/pdfsignaturehelper.cxx

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit fcab45e0e22f4cf46e71856dba7ae5abd6f99bc5)

Change-Id: I950b49a6e7181639daf27348ddfa0f36586baa65

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 783b9a6da8b4..027e4939fab1 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -59,6 +59,8 @@ public:
 FPDF_ClosePage(mpPage);
 }
 
+FPDF_PAGE getPointer() { return mpPage; }
+
 /// Get bitmap checksum of the page, without annotations/commenting.
 BitmapChecksum getChecksum(int nMDPPerm);
 };
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf
new file mode 100644
index ..b30f5b03867c
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index b5a6d5914833..63990fb36225 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -76,6

[Libreoffice-commits] core.git: external/firebird

[Stephan Bergmann (via logerrit)]

 external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
|   41 ++
 external/firebird/UnpackedTarball_firebird.mk  
|6 +
 2 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 0cffcf74a17449da56fb75557c7da1e1f6c5e94e
Author: Stephan Bergmann 
AuthorDate: Wed Dec 2 11:14:19 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 2 18:38:55 2020 +0100

external/firebird: Fix checks for null HANDLE in Windows-only code

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

diff --git 
a/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
 
b/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
new file mode 100644
index ..22cc1e119a32
--- /dev/null
+++ 
b/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
@@ -0,0 +1,41 @@
+From f4c0aa3ba070e5c3ce996b33a31323a3a6820f0c Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Wed, 2 Dec 2020 10:44:28 +0100
+Subject: Fix checks for null HANDLE in Windows-only code
+
+clang-cl failed with "error: unordered comparison between pointer and zero
+('HANDLE' (aka 'void *') and 'int')" in these two places introduced with
+f219283b72ab537c2b5938222708f35227c1ebde "Sub-task CORE-4463: Windows
+implementation for CORE-4462 (Make it possible to restore compressed .nbk files
+without explicitly decompressing them)" and
+c2cfa7824189ed7c3e5a19721effdf97c07dadfd "Prevent child process hung if it
+writes too much data to the pipe and overflow the pipe buffer".
+---
+ src/utilities/nbackup/nbackup.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/utilities/nbackup/nbackup.cpp 
b/src/utilities/nbackup/nbackup.cpp
+index 6598b6e331..4703079d67 100644
+--- a/src/utilities/nbackup/nbackup.cpp
 b/src/utilities/nbackup/nbackup.cpp
+@@ -385,7 +385,7 @@ FB_SIZE_T NBackup::read_file(FILE_HANDLE &file, void 
*buffer, FB_SIZE_T bufsize)
+ #ifdef WIN_NT
+   // Read child's stderr often to prevent child process hung if 
it writes
+   // too much data to the pipe and overflow the pipe buffer.
+-  const bool checkChild = (childStdErr > 0 && file == backup);
++  const bool checkChild = (childStdErr != 0 && file == backup);
+   if (checkChild)
+   print_child_stderr();
+ 
+@@ -790,7 +790,7 @@ void NBackup::close_backup()
+   return;
+ #ifdef WIN_NT
+   CloseHandle(backup);
+-  if (childId > 0)
++  if (childId != 0)
+   {
+   const bool killed = (WaitForSingleObject(childId, 5000) != 
WAIT_OBJECT_0);
+   if (killed)
+-- 
+2.28.0
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 27f4bfad36a5..57df8ca6d957 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,7 +20,10 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
 
 # * 
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
is upstream at
 #    "Make comparison 
operator member functions
-#   const":
+#   const";
+# * 
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
is upstream at
+#    "Fix checks for null 
HANDLE in Windows-only
+#   code":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
@@ -35,6 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/macos-arm64.patch.0 \
 external/firebird/firebird-btyacc-add-explicit-rule.patch \
 external/firebird/firebird-307.patch.1 \
+
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 m4/README |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0db58e76d4055a21f4945e86d4cd80797d284075
Author: Stephan Bergmann 
AuthorDate: Wed Dec 2 15:37:24 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 2 18:25:57 2020 +0100

Remove odd comment about MINGWSTRIP from m4/README

...which had been added with 4aed4f436cf8e4b0f3f034dfb1d1025b05a61f0a "add a
README files", at a time when there was a m4/mingw.m4 file (even though 
that did
not mention any "MINGWSTRIP") that has meanwhile been removed with
8646ab97dc37c0606b19057686bf3d610f9c15ee "Remove MinGW support"

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

diff --git a/m4/README b/m4/README
index f5f4656b24a0..33ac576e2685 100644
--- a/m4/README
+++ b/m4/README
@@ -1,3 +1 @@
 m4 - Macros to locate and utilise pkg-config.
-
-work around m4 bracket stripping in MINGWSTRIP construction
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9a688ed40d3b4ed391dc5bcc90d3c691b607c9f
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 13:10:40 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 18:18:08 2020 +0100

cid#1371301 silence Missing move assignment operator

and

cid#1371215 Missing move assignment operator

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

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 40850e25fd40..4d140fcd5b00 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3478,7 +3478,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 
 if (bEndIsEqualEndPos)
 {
-const_cast(rRg.aEnd) = SwNodeIndex(aSavePos, +1);
+const_cast(rRg.aEnd).Assign(aSavePos.GetNode(), +1);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/outdevmap.hxx |   10 ++
 vcl/source/outdev/map.cxx |   18 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 2a988b1ecddd17f9c851b625d33fbe0c4dfa2325
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 13:04:27 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 18:17:36 2020 +0100

cid#1470369 Uninitialized scalar variable

and

cid#1470372 Uninitialized scalar variable
cid#1470364 Uninitialized scalar variable
cid#1470363 Uninitialized scalar variable
cid#1470359 Uninitialized scalar variable
cid#1470357 Uninitialized scalar variable
cid#1470355 Uninitialized scalar variable
cid#1470354 Uninitialized scalar variable
cid#1470353 Uninitialized scalar variable

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

diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx
index d4ef27e94e91..467dd688c612 100644
--- a/include/vcl/outdevmap.hxx
+++ b/include/vcl/outdevmap.hxx
@@ -28,6 +28,16 @@ struct ImplMapRes
 tools::LongmnMapScNumY;// Scaling factor - 
numerator in Y direction
 tools::LongmnMapScDenomX;  // Scaling factor - 
denominator in X direction
 tools::LongmnMapScDenomY;  // Scaling factor - 
denominator in Y direction
+
+ImplMapRes()
+: mnMapOfsX(0)
+, mnMapOfsY(0)
+, mnMapScNumX(1)
+, mnMapScNumY(1)
+, mnMapScDenomX(1)
+, mnMapScDenomY(1)
+{
+}
 };
 
 #endif // INCLUDED_VCL_OUTDEVMAP_HXX
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index efd8e587ce0e..09ae63b0174d 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1289,17 +1289,11 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( 
const basegfx::B2DPolyPolygo
 return rSource; \
 \
 ImplMapRes aMapResSource;   \
-aMapResSource.mnMapOfsX  = 0;   \
-aMapResSource.mnMapOfsY  = 0;   \
-aMapResSource.mnMapScNumX= 1;   \
-aMapResSource.mnMapScNumY= 1;   \
-aMapResSource.mnMapScDenomX  = 1;   \
-aMapResSource.mnMapScDenomY  = 1;   \
-ImplMapRes aMapResDest(aMapResSource);  \
+ImplMapRes aMapResDest; \
 \
 if ( !mbMap || pMapModeSource != &maMapMode )   \
 {   \
-if ( pMapModeSource->GetMapUnit() == MapUnit::MapRelative )
 \
+if ( pMapModeSource->GetMapUnit() == MapUnit::MapRelative ) \
 aMapResSource = maMapRes;   \
 ImplCalcMapResolution( *pMapModeSource, \
mnDPIX, mnDPIY, aMapResSource ); \
@@ -1347,13 +1341,7 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, 
MapUnit eUnitDest )
 
 #define ENTER4( rMapModeSource, rMapModeDest )  \
 ImplMapRes aMapResSource;   \
-aMapResSource.mnMapOfsX  = 0;   \
-aMapResSource.mnMapOfsY  = 0;   \
-aMapResSource.mnMapScNumX= 1;   \
-aMapResSource.mnMapScNumY= 1;   \
-aMapResSource.mnMapScDenomX  = 1;   \
-aMapResSource.mnMapScDenomY  = 1;   \
-ImplMapRes aMapResDest(aMapResSource);  \
+ImplMapRes aMapResDest; \
 \
 ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \
 ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/qa/uitest/data/tdf66043.fodt   |   35 ++
 sw/qa/uitest/writer_tests4/spellDialog.py |   33 +++-
 sw/source/core/txtnode/txtedt.cxx |   15 ++--
 3 files changed, 79 insertions(+), 4 deletions(-)

New commits:
commit d08e41379d39a3b552c2c8a34fe1c4849bb80bc9
Author: László Németh 
AuthorDate: Tue Dec 1 15:12:54 2020 +0100
Commit: László Németh 
CommitDate: Wed Dec 2 18:06:08 2020 +0100

tdf#66043 sw: fix spell checking of word with deletion

Correct words were underlined as spelling mistakes,
if they contained tracked deletions, related to the
unwanted CH_TXTATR_INWORD characters (result of
removing tracked deletions) at calling spell checking
API functions. Fix it by checking the "invalid"
words without CH_TXTATR_INWORD characters, too.

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

diff --git a/sw/qa/uitest/data/tdf66043.fodt b/sw/qa/uitest/data/tdf66043.fodt
new file mode 100644
index ..5fcdde71d4ae
--- /dev/null
+++ b/sw/qa/uitest/data/tdf66043.fodt
@@ -0,0 +1,35 @@
+
+http://openoffice.org/2009/office"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text" 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ 
+  
+  
+   
+  
+ 
+  
+
+  
+
+  
+
+  Unknown Author
+  2020-12-01T12:49:53
+
+o
+  
+
+
+  
+
+  Unknown Author
+  2020-12-01T12:50:00
+
+a
+  
+
+  
+  good baad eeend
+
+  
+
+
diff --git a/sw/qa/uitest/writer_tests4/spellDialog.py 
b/sw/qa/uitest/writer_tests4/spellDialog.py
index e678afea53e9..3b9e4c31f3da 100644
--- a/sw/qa/uitest/writer_tests4/spellDialog.py
+++ b/sw/qa/uitest/writer_tests4/spellDialog.py
@@ -5,6 +5,8 @@
 #
 
 import re
+import org.libreoffice.unotest
+import pathlib
 
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict
@@ -12,6 +14,9 @@ from uitest.uihelper.common import get_state_as_dict
 from libreoffice.linguistic.linguservice import get_spellchecker
 from com.sun.star.lang import Locale
 
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
 class SpellingAndGrammarDialog(UITestCase):
 
 def is_supported_locale(self, language, country):
@@ -99,4 +104,30 @@ frog, dogg, catt"""
 
 output_text = document.Text.getString().replace('\r\n', '\n')
 self.assertTrue(re.match(self.TDF46852_REGEX, output_text))
-
+
+def test_tdf66043(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf66043.fodt"))
+document = self.ui_test.get_component()
+# Step 1: Initiate spellchecking, and make sure "Check grammar" is
+# unchecked
+spell_dialog = self.launch_dialog()
+checkgrammar = spell_dialog.getChild('checkgrammar')
+if get_state_as_dict(checkgrammar)['Selected'] == 'true':
+checkgrammar.executeAction('CLICK', ())
+self.assertTrue(get_state_as_dict(checkgrammar)['Selected'] == 'false')
+
+# Step 2: Click on "Correct all" for each misspelling
+# prompt until end of document is reached.
+changeall = spell_dialog.getChild('changeall')
+changeall.executeAction("CLICK", ())
+
+xCloseBtn = spell_dialog.getChild("close")
+xCloseBtn.executeAction("CLICK", tuple())
+
+output_text = document.Text.getString().replace('\r\n', '\n')
+# This was "gooodgood baaad eeend" ("goood" is a deletion,
+# "good" is an insertion by fixing the first misspelling),
+# but now "goood" is not a misspelling because it is accepted
+# correctly without the redline containing a deleted "o"
+self.assertTrue(output_text == 'goood baaadbaaed eeend')
+
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 67aae7f85650..edc0ac296d00 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1023,7 +1023,12 @@ bool SwTextNode::Spell(SwSpellArgs* pArgs)
 }
 if( pArgs->xSpellAlt.is() )
 {
-if (IsSymbolAt(aScanner.GetBegin()))
+if ( IsSymbolAt(aScanner.GetBegin()) ||
+// redlines can leave "in word" character within word,
+// we must remove them before spell checking
+// to avoid false alarm
+( bRestoreString && pArgs->xSpeller->isValid( 
rWord.replaceAll(OUStringChar(CH_TXTATR_INWORD), ""),
+static_cast(eActLang), Sequenc

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

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db72eef56a99392af2579bb9a4026519e843c3bf
Author: Eike Rathke 
AuthorDate: Tue Dec 1 23:22:33 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 2 17:55:25 2020 +0100

Typo in rounded digit string, tdf#138360 follow-up

Change-Id: Ic436d3e9f0c93cb36c5e4377519f2aeb6b7fbd5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107034
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit d8e0b1c81ffa16be8aae2231bcd3c02e8c01cf88)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107025

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 10417742b3a2..e6f09f18030e 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -290,7 +290,7 @@ void doubleToString(typename T::String ** pResult,
 // Writing pDig up to decimals(-1,-2) then appending one digit from
 // pRou xor one or two digits from pSlot[].
 constexpr char pDig[] = "7976931348623157";
-constexpr char pRou[] = "8087931459623267"; // the only up-carry 
is 80
+constexpr char pRou[] = "8087931359623267"; // the only up-carry 
is 80
 static_assert(SAL_N_ELEMENTS(pDig) == SAL_N_ELEMENTS(pRou), "digit 
count mismatch");
 constexpr sal_Int32 nDig2 = RTL_CONSTASCII_LENGTH(pRou) - 2;
 sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH(pRou) + 8;  // + "-1.E+308"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/uiconfig

[Seth Chaiklin (via logerrit)]

 svx/uiconfig/ui/crashreportdlg.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09e1970c268f2f6197dbee614c12cbc6238d37d0
Author: Seth Chaiklin 
AuthorDate: Wed Dec 2 01:41:36 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Dec 2 17:47:51 2020 +0100

Partially resolve: tdf#113286 Add https:// to URL in Crash Report

   Also:
 "Don't" --> "Do Not" in another button label

Change-Id: I320a2f3fbe1ad1d2ac3efff94c0195be15335a17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107018
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
Reviewed-by: Heiko Tietze 
(cherry picked from commit ea9863c0104bfa74e7542f850768c2c0ee63a577)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107026
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index a4c6e6308c76..65b0931c280b 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,7 +5,7 @@
   
 The crash report was successfully uploaded.
 You can soon find the report at:
-crashreport.libreoffice.org/stats/crash_details/%CRASHID
+https://crashreport.libreoffice.org/stats/crash_details/%CRASHID
   
   
 Please check the report and if no bug 
report is connected to the crash report yet, open a new bug report at 
bugs.documentfoundation.org.
@@ -47,7 +47,7 @@ Thank you for your help in improving %PRODUCTNAME.
 
 
   
-Do_n’t Send
+Do _Not Send
 True
 True
 True
___
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-4+backports' - vcl/CppunitTest_vcl_filter_ipdf.mk vcl/Module_vcl.mk vcl/qa vcl/source

[Miklos Vajna (via logerrit)]

 vcl/CppunitTest_vcl_filter_ipdf.mk  |   49 +
 vcl/Module_vcl.mk   |1 
 vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf |   55 +++
 vcl/qa/cppunit/filter/ipdf/ipdf.cxx |   73 
 vcl/source/filter/ipdf/pdfdocument.cxx  |   13 +++
 5 files changed, 189 insertions(+), 2 deletions(-)

New commits:
commit be9f6bccbaa2a447f9a3053e46027c42e9c3018d
Author: Miklos Vajna 
AuthorDate: Fri Oct 16 18:15:21 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Dec 2 17:41:05 2020 +0100

vcl pdf tokenizer: fix handling of dict -> array -> dict tokens

Needed to be able to parse the /Reference key of signatures.

(cherry picked from commit 056c1284d6a68525002c54bef10834cc135385db)

Conflicts:
vcl/qa/cppunit/filter/ipdf/ipdf.cxx

Change-Id: I6b81089a3f58a2de461ad92ca5a891c284f8686a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105626
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8f46af565680bef0ff8ca32781e6d813a7446543)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107061
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/vcl/CppunitTest_vcl_filter_ipdf.mk 
b/vcl/CppunitTest_vcl_filter_ipdf.mk
new file mode 100644
index ..403836ac781a
--- /dev/null
+++ b/vcl/CppunitTest_vcl_filter_ipdf.mk
@@ -0,0 +1,49 @@
+# -*- 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,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_filter_ipdf,\
+   boost_headers \
+   pdfium \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_filter_ipdf, \
+vcl/qa/cppunit/filter/ipdf/ipdf \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_filter_ipdf, \
+comphelper \
+cppu \
+sal \
+sfx \
+svx \
+test \
+tl \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_filter_ipdf))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_filter_ipdf,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,vcl_filter_ipdf,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_filter_ipdf))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 5620f188c7f2..38984ac44be2 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -246,6 +246,7 @@ endif
 ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_slowcheck_targets,vcl,\
CppunitTest_vcl_pdfexport \
+CppunitTest_vcl_filter_ipdf \
 ))
 endif
 
diff --git a/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf 
b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
new file mode 100644
index ..73de3117b9a6
--- /dev/null
+++ b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
@@ -0,0 +1,55 @@
+%PDF-1.7
+%���
+1 0 obj <<
+  /Type /Catalog
+  /Pages 2 0 R
+>>
+endobj
+2 0 obj <<
+  /Type /Pages
+  /MediaBox [0 0 200 300]
+  /Count 1
+  /Kids [3 0 R]
+>>
+endobj
+3 0 obj <<
+  /Type /Page
+  /Parent 2 0 R
+  /Contents 4 0 R
+  /Key[<>]
+>>
+endobj
+4 0 obj <<
+  /Length 188
+>>
+stream
+q
+0 0 0 rg
+0 290 10 10 re B*
+10 150 50 30 re B*
+0 0 1 rg
+190 290 10 10 re B*
+70 232 50 30 re B*
+0 1 0 rg
+190 0 10 10 re B*
+130 150 50 30 re B*
+1 0 0 rg
+0 0 10 10 re B*
+70 67 50 30 re B*
+Q
+endstream
+endobj
+xref
+0 5
+00 65535 f 
+15 0 n 
+68 0 n 
+000157 0 n 
+000251 0 n 
+trailer <<
+  /Root 1 0 R
+  /Size 5
+>>
+startxref
+491
+%%EOF
diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx 
b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
new file mode 100644
index ..037d4427dbbf
--- /dev/null
+++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
@@ -0,0 +1,73 @@
+/* -*- 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+namespace

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

[Xisco Fauli (via logerrit)]

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0956226ca535a62ab22d8d2502b159037c327f7d
Author: Xisco Fauli 
AuthorDate: Wed Dec 2 10:23:57 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 2 17:26:42 2020 +0100

related: tdf#127086: PPT: export custom shapes as Bitmap

this way the cropping is kept after roundtrip

found while working on fix for tdf#128501

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

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b17dc66364e9..0c5ab79f3c82 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1712,7 +1712,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, 
EscherSolverContainer& a
 // We can't map this custom shape to a PPT preset 
and it has a bitmap
 // fill. Make sure that at least the bitmap fill 
is not lost.
 mType = "drawing.GraphicObject";
-aGraphicPropertyName = "FillBitmap";
+aGraphicPropertyName = "Bitmap";
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 filter/source/msfilter/eschesdo.cxx   |   37 +++---
 sw/qa/extras/ww8export/data/tdf128501.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   17 +
 3 files changed, 46 insertions(+), 8 deletions(-)

New commits:
commit 2f9325b270fab10f6900aec30ca27135363c4c69
Author: Xisco Fauli 
AuthorDate: Tue Dec 1 19:17:24 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 2 17:25:35 2020 +0100

tdf#128501: DOC export: fix lost bitmap fill for OOXML custom shapes

this fix is based on 7032be2e9edd82dad2d67f1582aaa57676bda4a1
which fixes the same problem for PPT filter

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

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 7132b8067e98..24f47d62909f 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -263,15 +264,35 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 }
 else
 {
-addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
- nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
-aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
-aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
-if ( rObj.ImplGetText() )
+const Reference< XPropertySet > xPropSet = rObj.mXPropSet;
+drawing::FillStyle eFS = drawing::FillStyle_NONE;
+if(xPropSet.is())
+{
+uno::Reference< XPropertySetInfo > xPropInfo = 
xPropSet->getPropertySetInfo();
+if ( xPropInfo.is() && 
xPropInfo->hasPropertyByName("FillStyle"))
+xPropSet->getPropertyValue("FillStyle") >>= eFS;
+}
+
+if (eFS == drawing::FillStyle_BITMAP && eShapeType == 
mso_sptMax)
+{
+// We can't map this custom shape to a DOC preset and it 
has a bitmap fill.
+// Make sure that at least the bitmap fill is not lost.
+addShape( ESCHER_ShpInst_PictureFrame, 
ShapeFlag::HaveShapeProperty | ShapeFlag::HaveAnchor );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, 
"Bitmap", false, true, true, bOOxmlExport ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 
0x800080 );
+}
+else
 {
-if ( !aPropOpt.IsFontWork() )
-aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
-rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
+ nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
+aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
+aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
+if ( rObj.ImplGetText() )
+{
+if ( !aPropOpt.IsFontWork() )
+aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
+rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+}
 }
 }
 }
diff --git a/sw/qa/extras/ww8export/data/tdf128501.doc 
b/sw/qa/extras/ww8export/data/tdf128501.doc
new file mode 100644
index ..3313e397a961
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf128501.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 14991fa89484..5bb4d752cd41 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -106,6 +106,23 @@ DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, 
"arabic-zero-numbering.doc")
  aMap["NumberingType"].get());
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf128501, "tdf128501.doc")
+{
+if (!mbExported)
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.CustomShape"), 
xShapeDescriptor->getShapeType());
+}
+else
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+// Without the fix in place, this test would have failed with
+// - Expected: FrameShape
+// - Actual  : com.sun.star.drawing.CustomShape
+CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"), 
xShapeDescriptor->getShapeType());
+}
+}
+
 CPPUNIT_TEST_FIXTURE(SwModelTe

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

[Miklos Vajna (via logerrit)]

 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx|3 -
 svx/qa/unit/unodraw.cxx  |   44 ++-
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5 +-
 svx/source/table/viewcontactoftableobj.cxx   |   34 ++
 4 files changed, 81 insertions(+), 5 deletions(-)

New commits:
commit a75bf43a8d6c5dec6dcc86908c142ceec541aa8c
Author: Miklos Vajna 
AuthorDate: Wed Dec 2 14:09:31 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 2 17:19:47 2020 +0100

tdf#129961 svx: add rendering for table shadow as direct format

There was already shadow support in
ViewContactOfTableObj::createViewIndependentPrimitive2DSequence(), but
the UNO API and UI could only set the shadow properties on a shape
style, so shadow-as-direct-format is new.

One difference between the PowerPoint shadow and our shadow is that we
draw shadow for table text as well, while PowerPoint only does it for
the borders / cell fill style.

This means we're either backwards-compatible or compatible with
PowerPoint. Solve this problem by leaving the style case unchanged, but
render direct formatting like PowerPoint.

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

diff --git a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx 
b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
index 202354332b55..db1c94c1b7fa 100644
--- a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -71,7 +71,8 @@ namespace drawinglayer::primitive2d
 Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedShadowPrimitive(
 const Primitive2DContainer& rContent,
 const attribute::SdrShadowAttribute& rShadow,
-const basegfx::B2DHomMatrix& rObjectMatrix = 
basegfx::B2DHomMatrix());
+const basegfx::B2DHomMatrix& rObjectMatrix = 
basegfx::B2DHomMatrix(),
+const Primitive2DContainer* pContentForShadow = nullptr);
 
 Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedGlowPrimitive(
 const Primitive2DContainer& rContent,
diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx
index 51b1c8b43847..938e44f9ca21 100644
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@@ -16,12 +16,23 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
 
 using namespace ::com::sun::star;
 
@@ -30,7 +41,7 @@ namespace
 char const DATA_DIRECTORY[] = "/svx/qa/unit/data/";
 
 /// Tests for svx/source/unodraw/ code.
-class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest
+class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest, 
public XmlTestTools
 {
 protected:
 uno::Reference mxComponent;
@@ -132,6 +143,37 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect)
 xShapeProps->setPropertyValue("ShadowColor", uno::makeAny(nRed));
 CPPUNIT_ASSERT(xShapeProps->getPropertyValue("ShadowColor") >>= nRed);
 CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nRed);
+
+// Add text.
+uno::Reference 
xTable(xShapeProps->getPropertyValue("Model"),
+ uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByPosition(0, 0), 
uno::UNO_QUERY);
+xCell->setString("A1");
+
+// Generates drawinglayer primitives for the shape.
+auto pDrawPage = dynamic_cast(xDrawPage.get());
+CPPUNIT_ASSERT(pDrawPage);
+SdrPage* pSdrPage = pDrawPage->GetSdrPage();
+ScopedVclPtrInstance aVirtualDevice;
+sdr::contact::ObjectContactOfObjListPainter aObjectContact(*aVirtualDevice,
+   { 
pSdrPage->GetObj(0) }, nullptr);
+const sdr::contact::ViewObjectContact& rDrawPageVOContact
+= pSdrPage->GetViewContact().GetViewObjectContact(aObjectContact);
+sdr::contact::DisplayInfo aDisplayInfo;
+drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence
+= rDrawPageVOContact.getPrimitive2DSequenceHierarchy(aDisplayInfo);
+
+// Check the primitives.
+drawinglayer::Primitive2dXmlDump aDumper;
+xmlDocUniquePtr pDocument = aDumper.dumpAndParse(xPrimitiveSequence);
+assertXPath(pDocument, "//shadow", /*nNumberOfNodes=*/1);
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual  : 1
+// i.e. there was shadow for the cell text, while here 
PowerPoint-compatible output is expected,
+// which has no shadow for cell text (only for cell borders and cell 
background).
+assertXPath(pDocument, "//shadow//sdrblocktext", /*nNumberOfNodes=*/0);
 }
 }
 
diff --git a/svx/source/sdr/pr

Re: Adding a dictionary

[Ilmari Lauhakangas]

On 2.12.2020 18.08, Batmunkh Dorjgotov wrote:

I want to add a new mongolian dictionary. Would you please review the latest 
pull request?


I went looking for it, but could not find it. Can you point to it?

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

Adding a dictionary

[Batmunkh Dorjgotov]

Hello,

I want to add a new mongolian dictionary. Would you please review the latest 
pull request?

Thanks!

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

[Libreoffice-commits] core.git: officecfg/registry

[Rafael Lima (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|5 
-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |9 
++---
 3 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 5b464179c19310504e5a6f900811b7cc523120b6
Author: Rafael Lima 
AuthorDate: Fri Nov 13 18:10:44 2020 -0300
Commit: Heiko Tietze 
CommitDate: Wed Dec 2 17:04:55 2020 +0100

Resolves tdf#137481: Changes the "Formula" labels in 
Writer/Calc/Draw/Impress

Change-Id: Id64be29854dd23b8022861dd9fb0b97f5fc34603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105813
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index eaa4e6f6c184..e247c92524d0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -5,7 +5,10 @@
 
   
 
-  ~Formula...
+  ~Formula Object...
+
+
+  Insert Formula Object
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 337294bf8a22..7a66a901e65c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3339,7 +3339,10 @@
   
   
 
-  ~Formula...
+  ~Formula Object...
+
+
+  Insert Formula Object
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2aea98007e00..35a4e60a69bb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -818,10 +818,10 @@
   
   
 
-  ~Formula...
+  ~Formula Object...
 
 
-  Insert Formula
+  Insert Formula Object
 
 
   1
@@ -1802,7 +1802,10 @@
   
   
 
-  Fo~rmula
+  Text Fo~rmula
+
+
+  Insert Text Formulak
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   37 ++---
 sc/source/ui/app/inputwin.cxx |   53 +++---
 sc/source/ui/inc/inputwin.hxx |   11 +++-
 3 files changed, 82 insertions(+), 19 deletions(-)

New commits:
commit dee8f1aff762bdec03c7a0fa9b4107d86580ec35
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 11:42:51 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 16:58:53 2020 +0100

tdf#138540 formula popover in the wrong place

since...

commit e087e25f05e689091cbf1c4f91b6e93878ac17ec
Date:   Mon Oct 5 14:19:05 2020 +0100

weld InputBar

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 7027f8317535..5b236f0394ea 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1245,15 +1245,19 @@ void ScInputHandler::ShowTip( const OUString& rText )
 
 Point aPos;
 if (pInputWin && pInputWin->GetEditView() == pActiveView)
-pTipVisibleParent = pInputWin;
+{
+pTipVisibleParent = pInputWin->GetEditWindow();
+aPos = pInputWin->GetCursorScreenPixelPos();
+}
 else
+{
 pTipVisibleParent = pActiveView->GetWindow();
-vcl::Cursor* pCur = pActiveView->GetCursor();
-if (pCur)
-aPos = pTipVisibleParent->LogicToPixel( pCur->GetPos() );
-aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
-tools::Rectangle aRect( aPos, aPos );
+if (vcl::Cursor* pCur = pActiveView->GetCursor())
+aPos = pTipVisibleParent->LogicToPixel( pCur->GetPos() );
+aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
+}
 
+tools::Rectangle aRect( aPos, aPos );
 QuickHelpFlags const nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom;
 nTipVisible = Help::ShowPopover(pTipVisibleParent, aRect, rText, nAlign);
 pTipVisibleParent->AddEventListener( LINK( this, ScInputHandler, 
ShowHideTipVisibleParentListener ) );
@@ -1269,17 +1273,22 @@ void ScInputHandler::ShowTipBelow( const OUString& 
rText )
 
 Point aPos;
 if (pInputWin && pInputWin->GetEditView() == pActiveView)
-pTipVisibleSecParent = pInputWin;
+{
+pTipVisibleSecParent = pInputWin->GetEditWindow();
+aPos = pInputWin->GetCursorScreenPixelPos(true);
+}
 else
-pTipVisibleSecParent = pActiveView->GetWindow();
-vcl::Cursor* pCur = pActiveView->GetCursor();
-if ( pCur )
 {
-Point aLogicPos = pCur->GetPos();
-aLogicPos.AdjustY(pCur->GetHeight() );
-aPos = pTipVisibleSecParent->LogicToPixel( aLogicPos );
+pTipVisibleSecParent = pActiveView->GetWindow();
+if (vcl::Cursor* pCur = pActiveView->GetCursor())
+{
+Point aLogicPos = pCur->GetPos();
+aLogicPos.AdjustY(pCur->GetHeight() );
+aPos = pTipVisibleSecParent->LogicToPixel( aLogicPos );
+}
+aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos );
 }
-aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos );
+
 tools::Rectangle aRect( aPos, aPos );
 QuickHelpFlags const nAlign = QuickHelpFlags::Left | QuickHelpFlags::Top | 
QuickHelpFlags::NoEvadePointer;
 nTipVisibleSec = Help::ShowPopover(pTipVisibleSecParent, aRect, rText, 
nAlign);
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2a1a5d20102c..2be36193748a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -646,6 +646,16 @@ EditView* ScInputWindow::GetEditView()
 return mxTextWindow->GetEditView();
 }
 
+vcl::Window* ScInputWindow::GetEditWindow()
+{
+return mxTextWindow;
+}
+
+Point ScInputWindow::GetCursorScreenPixelPos(bool bBelow)
+{
+return mxTextWindow->GetCursorScreenPixelPos(bBelow);
+}
+
 void ScInputWindow::MakeDialogEditView()
 {
 mxTextWindow->MakeDialogEditView();
@@ -885,6 +895,11 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, 
ScTabViewShell* pViewSh)
 mxButtonDown->show();
 }
 
+Point ScInputBarGroup::GetCursorScreenPixelPos(bool bBelow)
+{
+return mxTextWndGroup->GetCursorScreenPixelPos(bBelow);
+}
+
 ScInputBarGroup::~ScInputBarGroup()
 {
 disposeOnce();
@@ -1096,7 +,7 @@ void ScInputBarGroup::TextGrabFocus()
 mxTextWndGroup->TextGrabFocus();
 }
 
-constexpr tools::Long gnBorderWidth = INPUTLINE_INSET_MARGIN + 1;
+constexpr tools::Long gnBorderWidth = (INPUTLINE_INSET_MARGIN + 1) * 2;
 constexpr tools::Long gnBorderHeight = INPUTLINE_INSET_MARGIN + 1;
 
 ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, ScTabViewShell* 
pViewSh)
@@ -1108,6 +1123,28 @@ ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, 
ScTabViewShell* pViewSh
 mxScrollWin->connect_vadjustment_changed(LINK(this, ScTextWndGroup, 
Impl_ScrollHdl));

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

[ShyamPraveenSingh (via logerrit)]

 include/sfx2/strings.hrc   |3 +++
 sfx2/inc/charmapcontrol.hxx|1 +
 sfx2/source/control/charmapcontrol.cxx |6 ++
 3 files changed, 10 insertions(+)

New commits:
commit b6c69a0e3b6860efadb294a5b4d924bed819
Author: ShyamPraveenSingh 
AuthorDate: Wed Nov 25 10:31:13 2020 +0530
Commit: Heiko Tietze 
CommitDate: Wed Dec 2 16:58:27 2020 +0100

Resolves tdf#137547 CharmapCtrl label depending on recent chars

Label shows now "No recent characters" if none has been used

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

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 9927afe17e93..794d1a4b7af6 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -348,6 +348,9 @@
 #define STR_SPREADSHEET NC_("STR_SPREADSHEET", 
"Spreadsheet")
 #define STR_PRESENTATIONNC_("STR_PRESENTATION", 
"Presentation")
 #define STR_DRAWING NC_("STR_DRAWING", "Drawing")
+#define STR_RECENT  NC_("STR_RECENT", "Recently 
used")
+#define STR_NORECENTNC_("STR_NORECENT", "No recent 
characters")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/charmapcontrol.hxx b/sfx2/inc/charmapcontrol.hxx
index 0902f17fa94f..039fed4aae4b 100644
--- a/sfx2/inc/charmapcontrol.hxx
+++ b/sfx2/inc/charmapcontrol.hxx
@@ -49,6 +49,7 @@ private:
 
 SvxCharView m_aRecentCharView[16];
 SvxCharView m_aFavCharView[16];
+std::unique_ptr m_xRecentLabel;
 std::unique_ptr m_xDlgBtn;
 std::unique_ptr m_xRecentCharView[16];
 std::unique_ptr m_xFavCharView[16];
diff --git a/sfx2/source/control/charmapcontrol.cxx 
b/sfx2/source/control/charmapcontrol.cxx
index 56af57524a88..7987fb6aa600 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -22,6 +22,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -61,6 +63,7 @@ SfxCharmapCtrl::SfxCharmapCtrl(CharmapPopup* pControl, 
weld::Widget* pParent)
  SvxCharView(m_xVirDev),
  SvxCharView(m_xVirDev),
  SvxCharView(m_xVirDev)}
+, m_xRecentLabel(m_xBuilder->weld_label("label2"))
 , m_xDlgBtn(m_xBuilder->weld_button("specialchardlg"))
 , m_xRecentCharView{std::make_unique(*m_xBuilder, 
"viewchar1", m_aRecentCharView[0]),
 std::make_unique(*m_xBuilder, 
"viewchar2", m_aRecentCharView[1]),
@@ -175,6 +178,9 @@ void SfxCharmapCtrl::updateRecentCharControl()
 m_aRecentCharView[i].SetText(OUString());
 m_aRecentCharView[i].Hide();
 }
+
+//checking if the characters are recently used or no
+m_xRecentLabel->set_label(m_aRecentCharList.size() > 0 ? 
SfxResId(STR_RECENT) : SfxResId(STR_NORECENT));
 }
 
 IMPL_LINK(SfxCharmapCtrl, CharClickHdl, SvxCharView*, pView, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/itiff/ccidecom.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit a9665403cd997c1c593efc52682a87ffb3c1e87a
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 09:26:54 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 16:45:43 2020 +0100

ofz#27839 Timeout

use sal_uInt32 and truncate to limit instead of using sal_uInt16

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

diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx 
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 9c9b916a1d8c..407aab17d669 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -871,12 +871,12 @@ void CCIDecompressor::FillBits(sal_uInt8 * pTarget, 
sal_uInt16 nTargetBits,
 }
 
 sal_uInt16 CCIDecompressor::CountBits(const sal_uInt8 * pData, sal_uInt16 
nDataSizeBits,
-  sal_uInt16 nBitPos, sal_uInt8 nBlackOrWhite)
+  sal_uInt16 nBitPos, sal_uInt8 
nBlackOrWhite)
 {
 // here the number of bits belonging together is being counted
 // which all have the color nBlackOrWhite (0xff or 0x00)
 // from the position nBitPos on
-sal_uInt16 nPos = nBitPos;
+sal_uInt32 nPos = nBitPos;
 for (;;)
 {
 if (nPos>=nDataSizeBits)
@@ -888,9 +888,6 @@ sal_uInt16 CCIDecompressor::CountBits(const sal_uInt8 * 
pData, sal_uInt16 nDataS
 sal_uInt16 nLo = nPos & 7;
 if (nLo==0 && nData==nBlackOrWhite)
 {
-//fail on overflow attempt
-if (nPos > SAL_MAX_UINT16-8)
-return 0;
 nPos+=8;
 }
 else
@@ -900,8 +897,6 @@ sal_uInt16 CCIDecompressor::CountBits(const sal_uInt8 * 
pData, sal_uInt16 nDataS
 ++nPos;
 }
 }
-if (nPos<=nBitPos)
-return 0;
 return nPos-nBitPos;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/unocore/unoobj2.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2e2b97f0c919afffb262bfed7058c91264c3107c
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 12:07:48 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 16:45:17 2020 +0100

cid#1470356 silence Dereference null return value

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

diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index 4852fcca9662..eb73fa0f1e80 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -810,14 +810,15 @@ void SwXTextRange::DeleteAndInsert(
 
 if (RANGE_IS_SECTION == m_pImpl->m_eRangePosition)
 {
-SwSectionFormat const* pFormat(
-static_cast(m_pImpl->m_pTableOrSectionFormat));
-if (!pFormat)
+SwSectionNode const* pSectionNode = m_pImpl->m_pTableOrSectionFormat ?
+static_cast(m_pImpl->m_pTableOrSectionFormat)->GetSectionNode() :
+nullptr;
+if (!pSectionNode)
 {
 throw uno::RuntimeException("disposed?");
 }
 m_pImpl->m_rDoc.GetIDocumentUndoRedo().StartUndo(SwUndoId::INSERT, 
nullptr);
-SwNodeIndex const start(*pFormat->GetSectionNode());
+SwNodeIndex const start(*pSectionNode);
 SwNodeIndex const end(*start.GetNode().EndOfSectionNode());
 
 // delete tables at start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   37 ++---
 sc/source/ui/app/inputwin.cxx |   53 +++---
 sc/source/ui/inc/inputwin.hxx |   11 +++-
 3 files changed, 82 insertions(+), 19 deletions(-)

New commits:
commit c90c6c1316d6788601319c1bca8ac1ff1f869c83
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 11:42:51 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 16:44:58 2020 +0100

tdf#138540 formula popover in the wrong place

since...

commit e087e25f05e689091cbf1c4f91b6e93878ac17ec
Date:   Mon Oct 5 14:19:05 2020 +0100

weld InputBar

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b5f43ace6d15..5d802fd9d5f7 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1244,15 +1244,19 @@ void ScInputHandler::ShowTip( const OUString& rText )
 
 Point aPos;
 if (pInputWin && pInputWin->GetEditView() == pActiveView)
-pTipVisibleParent = pInputWin;
+{
+pTipVisibleParent = pInputWin->GetEditWindow();
+aPos = pInputWin->GetCursorScreenPixelPos();
+}
 else
+{
 pTipVisibleParent = pActiveView->GetWindow();
-vcl::Cursor* pCur = pActiveView->GetCursor();
-if (pCur)
-aPos = pTipVisibleParent->LogicToPixel( pCur->GetPos() );
-aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
-tools::Rectangle aRect( aPos, aPos );
+if (vcl::Cursor* pCur = pActiveView->GetCursor())
+aPos = pTipVisibleParent->LogicToPixel( pCur->GetPos() );
+aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
+}
 
+tools::Rectangle aRect( aPos, aPos );
 QuickHelpFlags const nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom;
 nTipVisible = Help::ShowPopover(pTipVisibleParent, aRect, rText, nAlign);
 pTipVisibleParent->AddEventListener( LINK( this, ScInputHandler, 
ShowHideTipVisibleParentListener ) );
@@ -1268,17 +1272,22 @@ void ScInputHandler::ShowTipBelow( const OUString& 
rText )
 
 Point aPos;
 if (pInputWin && pInputWin->GetEditView() == pActiveView)
-pTipVisibleSecParent = pInputWin;
+{
+pTipVisibleSecParent = pInputWin->GetEditWindow();
+aPos = pInputWin->GetCursorScreenPixelPos(true);
+}
 else
-pTipVisibleSecParent = pActiveView->GetWindow();
-vcl::Cursor* pCur = pActiveView->GetCursor();
-if ( pCur )
 {
-Point aLogicPos = pCur->GetPos();
-aLogicPos.AdjustY(pCur->GetHeight() );
-aPos = pTipVisibleSecParent->LogicToPixel( aLogicPos );
+pTipVisibleSecParent = pActiveView->GetWindow();
+if (vcl::Cursor* pCur = pActiveView->GetCursor())
+{
+Point aLogicPos = pCur->GetPos();
+aLogicPos.AdjustY(pCur->GetHeight() );
+aPos = pTipVisibleSecParent->LogicToPixel( aLogicPos );
+}
+aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos );
 }
-aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos );
+
 tools::Rectangle aRect( aPos, aPos );
 QuickHelpFlags const nAlign = QuickHelpFlags::Left | QuickHelpFlags::Top | 
QuickHelpFlags::NoEvadePointer;
 nTipVisibleSec = Help::ShowPopover(pTipVisibleSecParent, aRect, rText, 
nAlign);
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 90ef42a0be39..17a7c8160285 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -642,6 +642,16 @@ EditView* ScInputWindow::GetEditView()
 return mxTextWindow->GetEditView();
 }
 
+vcl::Window* ScInputWindow::GetEditWindow()
+{
+return mxTextWindow;
+}
+
+Point ScInputWindow::GetCursorScreenPixelPos(bool bBelow)
+{
+return mxTextWindow->GetCursorScreenPixelPos(bBelow);
+}
+
 void ScInputWindow::MakeDialogEditView()
 {
 mxTextWindow->MakeDialogEditView();
@@ -881,6 +891,11 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, 
ScTabViewShell* pViewSh)
 mxButtonDown->show();
 }
 
+Point ScInputBarGroup::GetCursorScreenPixelPos(bool bBelow)
+{
+return mxTextWndGroup->GetCursorScreenPixelPos(bBelow);
+}
+
 ScInputBarGroup::~ScInputBarGroup()
 {
 disposeOnce();
@@ -1092,7 +1107,7 @@ void ScInputBarGroup::TextGrabFocus()
 mxTextWndGroup->TextGrabFocus();
 }
 
-constexpr tools::Long gnBorderWidth = INPUTLINE_INSET_MARGIN + 1;
+constexpr tools::Long gnBorderWidth = (INPUTLINE_INSET_MARGIN + 1) * 2;
 constexpr tools::Long gnBorderHeight = INPUTLINE_INSET_MARGIN + 1;
 
 ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, ScTabViewShell* 
pViewSh)
@@ -1104,6 +1119,28 @@ ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, 
ScTabViewShell* pViewSh
 mxScrollWin->connect_vadjustment_changed(LINK(this, ScTextWndGroup, 
Impl_ScrollHdl));

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3753' - offapi/com xmlsecurity/source

[brinzing (via logerrit)]

 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |   18 
 xmlsecurity/source/component/documentdigitalsignatures.cxx  |   47 +++-
 2 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit d91ecd644ff9b236bcc891b60d07c4f05e4e2e3d
Author: brinzing 
AuthorDate: Thu Jan 2 18:12:31 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Dec 2 15:57:36 2020 +0100

[API CHANGE] extend css.security.XDocumentDigitalSignatures

Add support for macro and package signing with a provided certificate
which is already possible for document signing since LO 6.2:

boolean signScriptingContentWithCertificate(
  [in] ::com::sun::star::security::XCertificate xCertificate,
  [in] ::com::sun::star::embed::XStorage xStorage,
  [in] ::com::sun::star::io::XStream xStream);

boolean signPackageWithCertificate(
  [in] ::com::sun::star::security::XCertificate xCertificate,
  [in] ::com::sun::star::embed::XStorage xStorage,
  [in] ::com::sun::star::io::XStream xStream);

Change-Id: I9783cd317a7202691913be186eca95964b1e0ff7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86141
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 697989d11e25b3eb83e5ca2dad5d71b178abfbc1)

diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl 
b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index dc6affc62a9b..541d1d822121 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -205,6 +205,24 @@ interface XDocumentDigitalSignatures : 
com::sun::star::uno::XInterface
 @since LibreOffice 6.3
 */
 void setParentWindow([in] ::com::sun::star::awt::XWindow xParentWindow);
+
+/** signs the content of the Scripting including macros and basic dialogs 
with the provided certificate.
+
+The rest of document content will not be signed.
+
+@since LibreOffice 6.5
+*/
+boolean signScriptingContentWithCertificate([in] 
::com::sun::star::security::XCertificate xCertificate,
+[in] 
::com::sun::star::embed::XStorage xStorage,
+[in] 
::com::sun::star::io::XStream xStream);
+
+/** signs the full Package, which means everything in the storage except 
the content of META-INF with the provided certificate.
+
+@since LibreOffice 6.5
+*/
+boolean signPackageWithCertificate([in] 
::com::sun::star::security::XCertificate xCertificate,
+[in] 
::com::sun::star::embed::XStorage xStorage,
+[in] 
::com::sun::star::io::XStream xStream);
 };
 
 } ; } ; } ; } ;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index dcfaad0af773..37ea37bf8992 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -101,7 +101,12 @@ private:
 chooseCertificatesImpl(std::map& rProperties, const 
UserAction eAction,
const CertificateKind 
certificateKind=CertificateKind_NONE);
 
-public:
+bool signWithCertificateImpl(
+css::uno::Reference const& xCertificate,
+css::uno::Reference const& xStorage,
+css::uno::Reference const& xStream, 
DocumentSignatureMode eMode);
+
+ public:
 explicit DocumentDigitalSignatures(
 const css::uno::Reference& rxCtx);
 
@@ -184,6 +189,16 @@ public:
 css::uno::Reference const & 
xStoragexStorage,
 css::uno::Reference const & 
xStream) override;
 
+sal_Bool SAL_CALL signPackageWithCertificate(
+css::uno::Reference 
const& xCertificate,
+css::uno::Reference const& 
xStoragexStorage,
+css::uno::Reference const& 
xStream) override;
+
+sal_Bool SAL_CALL signScriptingContentWithCertificate(
+css::uno::Reference 
const& xCertificate,
+css::uno::Reference const& 
xStoragexStorage,
+css::uno::Reference const& 
xStream) override;
+
 void SAL_CALL setParentWindow(const 
css::uno::Reference& rParentwindow) override
 {
 mxParentWindow = rParentwindow;
@@ -764,7 +779,35 @@ sal_Bool 
DocumentDigitalSignatures::signDocumentWithCertificate(
 css::uno::Reference const & xStorage,
 css::uno::Reference const & xStream)
 {
-DocumentSignatureManager aSignatureManager(mxCtx, 
DocumentSignatureMode::Content);
+return signWithCertificateImpl(xCertificate, xStorage, xStream, 
DocumentSignatureMode::Content);
+}
+
+sal_Bool DocumentDi

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

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |2 +-
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |8 

 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 4276577763c5537949995990771f295159acb157
Author: Michael Stahl 
AuthorDate: Tue Dec 1 20:05:32 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 15:41:21 2020 +0100

mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem plugins

They were already compiled in some way.

Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107027

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index c811473e11ce..3458089ce99e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -72,9 +72,9 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt 
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
-   , \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
+   , \

UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
) \
 ))
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index b34c3490661c..241e12db6581 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,11 +36,19 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
+   $(if $(filter WNT,$(OS)), \
+   extern struct st_mysql_client_plugin 
pvio_shmem_client_plugin\; \
+   extern struct st_mysql_client_plugin 
pvio_npipe_client_plugin\; \
+   ) \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
+   $(if $(filter WNT,$(OS)), \
+   (struct st_mysql_client_plugin 
*)\&pvio_shmem_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&pvio_npipe_client_plugin$(COMMA) \
+   ) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[dante (via logerrit)]

 starmath/source/mathmlimport.cxx |   35 ---
 1 file changed, 8 insertions(+), 27 deletions(-)

New commits:
commit e8c8af66c4bc63d9761508b4d24f5d1dd4050b79
Author: dante 
AuthorDate: Tue Dec 1 21:00:33 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 15:21:44 2020 +0100

Doubled code correction

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

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 085e4ce3e209..5fa4a96ad406 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1395,34 +1395,15 @@ void SmXMLOperatorContext_Impl::TCharacters(const 
OUString& rChars)
 SmToken bToken;
 if (bIsFenced)
 {
-if (bIsStretchy)
-{
-if (isPrefix)
-bToken
-= 
starmathdatabase::Identify_Prefix_SmXMLOperatorContext_Impl(aToken.cMathChar);
-else if (isInfix)
-bToken = SmToken(TMLINE, MS_VERTLINE, "mline", TG::NONE, 0);
-else if (isPostfix)
-bToken = 
starmathdatabase::Identify_Postfix_SmXMLOperatorContext_Impl(
-aToken.cMathChar);
-else
-bToken = 
starmathdatabase::Identify_PrefixPostfix_SmXMLOperatorContext_Impl(
-aToken.cMathChar);
-}
+if (isPrefix)
+bToken = 
starmathdatabase::Identify_Prefix_SmXMLOperatorContext_Impl(aToken.cMathChar);
+else if (isInfix)
+bToken = SmToken(TMLINE, MS_VERTLINE, "mline", TG::NONE, 0);
+else if (isPostfix)
+bToken = 
starmathdatabase::Identify_Postfix_SmXMLOperatorContext_Impl(aToken.cMathChar);
 else
-{
-if (isPrefix)
-bToken
-= 
starmathdatabase::Identify_Prefix_SmXMLOperatorContext_Impl(aToken.cMathChar);
-else if (isInfix)
-bToken = SmToken(TMLINE, MS_VERTLINE, "mline", TG::NONE, 0);
-else if (isPostfix)
-bToken = 
starmathdatabase::Identify_Postfix_SmXMLOperatorContext_Impl(
-aToken.cMathChar);
-else
-bToken = 
starmathdatabase::Identify_PrefixPostfix_SmXMLOperatorContext_Impl(
-aToken.cMathChar);
-}
+bToken = 
starmathdatabase::Identify_PrefixPostfix_SmXMLOperatorContext_Impl(
+aToken.cMathChar);
 }
 else
 bToken
___
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-4+backports' - shell/source

[Stephan Bergmann (via logerrit)]

 shell/source/unix/exec/shellexec.cxx |4 
 shell/source/win32/SysShExec.cxx |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1dc6340da19a1abcad11b3d919561c4780f3a30b
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 09:13:12 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 15:14:59 2020 +0100

Better handling of Java files

Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106520
Reviewed-by: Michael Stahl 
(cherry picked from commit ec5adc39cbea6d754ef68ab3d03fb16066b27e40)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107060
Tested-by: Michael Stahl 

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 3daea4a2b18a..ad171d70888f 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -150,6 +150,10 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+} else if (pathname.endsWithIgnoreAsciiCase(".class")
+   || pathname.endsWithIgnoreAsciiCase(".jar"))
+{
+dir = true;
 }
 }
 
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index ddc222fe71cf..c4170d2f9de5 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -420,7 +420,8 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 }
 if (!(checkExtension(ext, env)
   && checkExtension(
-  ext, 
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY")))
+  ext,
+  
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;.JAR")))
 {
 throw css::lang::IllegalArgumentException(
 "XSystemShellExecute.execute, cannot process <" + 
aCommand + ">", {}, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |1 -
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9a33f502329f1818d972c52e561b1b2158fc3029
Author: Michael Stahl 
AuthorDate: Tue Dec 1 19:58:23 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 15:11:47 2020 +0100

tdf#135202 mariadb-connector-c: enable native_password plugin

... and remove dialog authentication plugin; it quite uselessly defaults
to asking for a password on stdin, unless a function symbol is defined
by the library that links the connector static library.

There are more authentication plugins but no idea if those are needed.

Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107021

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 6de1738312a7..c811473e11ce 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -66,7 +66,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 2f679294f7c6..b34c3490661c 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -35,10 +35,12 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-e 's/@EXTERNAL_PLUGINS@/ \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
+   extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
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-4+backports' - external/redland

[Caolán McNamara (via logerrit)]

 external/redland/UnpackedTarball_raptor.mk 
   |1 
 
external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
 |   33 ++
 2 files changed, 34 insertions(+)

New commits:
commit ce9da7f3e75c5a29e53339645e1faf8d8687c74a
Author: Caolán McNamara 
AuthorDate: Mon Nov 23 14:33:06 2020 +
Commit: Michael Stahl 
CommitDate: Wed Dec 2 14:53:31 2020 +0100

CVE-2020-25713 raptor2: malformed input file can lead to a segfault

due to an out of bounds array access in
raptor_xml_writer_start_element_common

use a better fix than the initial suggestion

See:
https: //bugs.mageia.org/show_bug.cgi?id=27605
https: //www.openwall.com/lists/oss-security/2020/11/13/1
Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106249
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit 43433f42017014a472a253314a6ac58a6774dced)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107059
Tested-by: Michael Stahl 

diff --git a/external/redland/UnpackedTarball_raptor.mk 
b/external/redland/UnpackedTarball_raptor.mk
index 517b11a3d14f..fbdc8b6f5510 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
$(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \
external/redland/raptor/xml2-config.patch \

external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
 \
+   
external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
 \
external/redland/raptor/libtool.patch \
 ))
 
diff --git 
a/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
 
b/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
new file mode 100644
index ..1fb279df3e4d
--- /dev/null
+++ 
b/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
@@ -0,0 +1,33 @@
+From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Tue, 24 Nov 2020 10:30:20 +
+Subject: [PATCH] CVE-2020-25713 raptor2: malformed input file can lead to a
+ segfault
+
+due to an out of bounds array access in
+raptor_xml_writer_start_element_common
+
+See:
+https://bugs.mageia.org/show_bug.cgi?id=27605
+https://www.openwall.com/lists/oss-security/2020/11/13/1
+https://gerrit.libreoffice.org/c/core/+/106249
+---
+ src/raptor_xml_writer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 56993dc3..4426d38c 100644
+--- a/src/raptor_xml_writer.c
 b/src/raptor_xml_writer.c
+@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* 
xml_writer,
+   
+   /* check it wasn't an earlier declaration too */
+   for(j = 0; j < nspace_declarations_count; j++)
+-if(nspace_declarations[j].nspace == 
element->attributes[j]->nspace) {
++if(nspace_declarations[j].nspace == 
element->attributes[i]->nspace) {
+   declare_me = 0;
+   break;
+ }
+-- 
+2.28.0
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit fdcfed3d896ed100a9a96560b400e49974409e0b
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Dec 2 14:50:28 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Dec 2 14:50:28 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 845da7694bd6e444db9cea206ccd15bd21e97921
  - tdf#137720: Help files-Page Setup replaced with Page Properties

Change-Id: I131e80d08076fd2d7d198a65e4fb7cb77acc16f8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107029
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 256943b58853..845da7694bd6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 256943b5885310416bf7422e132dc94ce1d78f7f
+Subproject commit 845da7694bd6e444db9cea206ccd15bd21e97921
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ayhan Yalçınsoy (via logerrit)]

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

New commits:
commit 845da7694bd6e444db9cea206ccd15bd21e97921
Author: Ayhan Yalçınsoy 
AuthorDate: Wed Dec 2 13:40:58 2020 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Wed Dec 2 14:50:28 2020 +0100

tdf#137720: Help files-Page Setup replaced with Page Properties

Change-Id: I131e80d08076fd2d7d198a65e4fb7cb77acc16f8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107029
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/sdraw/01/page_properties.xhp 
b/source/text/sdraw/01/page_properties.xhp
index dab5c11e0..5388c8158 100644
--- a/source/text/sdraw/01/page_properties.xhp
+++ b/source/text/sdraw/01/page_properties.xhp
@@ -36,6 +36,6 @@
 
 
 
-To 
change the background of all of the pages in the active file, select a 
background, click OK and click Yes in the Page 
Setup dialog.
+To 
change the background of all of the pages in the active file, select a 
background, click OK and click Yes in the Page 
Properties dialog.
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sc/source/filter/xml/XMLTableHeaderFooterContext.cxx |   40 ++-
 sc/source/filter/xml/XMLTableHeaderFooterContext.hxx |   12 +
 2 files changed, 16 insertions(+), 36 deletions(-)

New commits:
commit d9e2e148e4fefbd796fd8e9d4d20f6e3fd9ebb29
Author: Noel 
AuthorDate: Wed Dec 2 11:10:31 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 2 14:42:23 2020 +0100

fastparser in XMLTableHeaderFooterContext

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

diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx 
b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 3d3d77d83627..3d2fc8c9ec72 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -96,7 +96,7 @@ XMLTableHeaderFooterContext::~XMLTableHeaderFooterContext()
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLTableHeaderFooterContext::createFastChildContext(
 sal_Int32 nElement,
-const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
/*xAttrList*/ )
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 if (xHeaderFooterContent.is())
 {
@@ -124,18 +124,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLTableHeaderFooterCo
 return new XMLHeaderFooterRegionContext( GetImport(), 
xTempTextCursor);
 }
 }
-return nullptr;
-}
-
-SvXMLImportContextRef XMLTableHeaderFooterContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList > & xAttrList )
-{
-SvXMLImportContext *pContext(nullptr);
 
-if ((nPrefix == XML_NAMESPACE_TEXT) &&
-IsXMLToken(rLocalName, XML_P))
+if ( nElement == XML_ELEMENT(TEXT, XML_P) )
 {
 if (!xTextCursor.is())
 {
@@ -149,14 +139,14 @@ SvXMLImportContextRef 
XMLTableHeaderFooterContext::CreateChildContext(
 bContainsCenter = true;
 }
 }
-pContext =
+return
 GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
-nPrefix,
-rLocalName,
+nElement,
 xAttrList);
 }
 
-return pContext;
+XMLOFF_WARN_UNKNOWN_ELEMENT("sc", nElement);
+return nullptr;
 }
 
 void XMLTableHeaderFooterContext::endFastElement(sal_Int32 )
@@ -201,23 +191,19 @@ 
XMLHeaderFooterRegionContext::~XMLHeaderFooterRegionContext()
 {
 }
 
-SvXMLImportContextRef XMLHeaderFooterRegionContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLHeaderFooterRegionContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 SvXMLImportContext *pContext(nullptr);
 
-if ((nPrefix == XML_NAMESPACE_TEXT) &&
-IsXMLToken(rLocalName, XML_P))
+if (nElement == XML_ELEMENT(TEXT, XML_P))
 {
-pContext =
-GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
-nPrefix,
-rLocalName,
+return GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
+nElement,
 xAttrList);
 }
-
+XMLOFF_WARN_UNKNOWN_ELEMENT("sc", nElement);
 return pContext;
 }
 
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx 
b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 2b2138ec0988..84db39a0e2f5 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -50,11 +50,6 @@ public:
 
 virtual ~XMLTableHeaderFooterContext() override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & 
xAttrList ) override;
-
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
 sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 
@@ -74,10 +69,9 @@ public:
 
 virtual ~XMLHeaderFooterRegionContext() override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-

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

[Caolán McNamara (via logerrit)]

 sc/source/core/data/postit.cxx |   11 ---
 svx/source/svdraw/svdotxat.cxx |7 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 49f0410cafcc2bd3b417427d3d17de8abb8ea3b4
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 09:09:45 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Dec 2 14:18:08 2020 +0100

Resolves: tdf#138549 use GetSpecialTextBoxShadow to identify ScPostIt

instead of a 'special' name which causes undo-related causes side effects

Change-Id: Id36b0b5360ddde3469721a7c837fe3942af08209
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106924
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 9c94bae963ef5019f6ca0394d076b1288969aa53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107024
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 7bb1b96eb2b4..bafd2e9e901b 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -382,17 +382,6 @@ void ScCaptionCreator::CreateCaption( bool bShown, bool 
bTailFront )
 *mrDoc.GetDrawLayer(), //  should ret a ref?
 aTextRect,
 aTailPos));
-
-// tdf#114956 a way to recognize that this SdrCaption is for a ScPostit in
-// SdrTextObj::AdjustTextFrameWidthAndHeight
-SdrModel& rModel = mxCaption->getSdrModelFromSdrObject();
-const bool bUndoEnabled = rModel.IsUndoEnabled();
-if (bUndoEnabled)
-rModel.EnableUndo(false);
-mxCaption->SetName("ScPostIt");
-if (bUndoEnabled)
-rModel.EnableUndo(true);
-
 // basic caption settings
 ScCaptionUtil::SetBasicCaptionSettings( *mxCaption, bShown );
 }
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 4b96bb04c12a..5ba5ec6a82cc 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -263,8 +263,12 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
 if (auto pRectObj = dynamic_cast(this)) { // this is a 
hack
 pRectObj->SetXPolyDirty();
 }
+bool bScPostIt = false;
 if (auto pCaptionObj = dynamic_cast(this)) { // this 
is a hack
 pCaptionObj->ImpRecalcTail();
+// tdf#114956, tdf#138549 use GetSpecialTextBoxShadow to recognize
+// that this SdrCaption is for a ScPostit
+bScPostIt = pCaptionObj->GetSpecialTextBoxShadow();
 }
 
 // to not slow down EditView visualization on Overlay (see
@@ -278,8 +282,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
 GetTextEditOutliner() &&
 GetTextEditOutliner()->hasEditViewCallbacks());
 
-// tdf#114956 always broadcast change for ScPostIts
-if (!bSuppressChangeWhenEditOnOverlay || GetName() == "ScPostIt")
+if (!bSuppressChangeWhenEditOnOverlay || bScPostIt)
 {
 SetChanged();
 BroadcastObjectChange();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/merge-app-bundles

[Tor Lillqvist (via logerrit)]

 bin/merge-app-bundles |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 6c905031ed279659edebca24d8929c733c9600b9
Author: Tor Lillqvist 
AuthorDate: Wed Dec 2 15:09:03 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 2 15:09:34 2020 +0200

Add copyright blurb

Change-Id: Icd77587590103eef44f7ec41fcba280b7ce2a473

diff --git a/bin/merge-app-bundles b/bin/merge-app-bundles
index a5cc2185a486..10c6e1d7b836 100755
--- a/bin/merge-app-bundles
+++ b/bin/merge-app-bundles
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# 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/.
+
 # Exit on errors
 set -e
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/merge-app-bundles

[Tor Lillqvist (via logerrit)]

 bin/merge-app-bundles |  137 ++
 1 file changed, 137 insertions(+)

New commits:
commit 6e5948d4bf57f74e82069e2c3cbf429cfe0136c7
Author: Tor Lillqvist 
AuthorDate: Wed Dec 2 15:02:30 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 2 14:07:59 2020 +0100

Add a script to merge two single-arch macOS app bundles into a universal app

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

diff --git a/bin/merge-app-bundles b/bin/merge-app-bundles
new file mode 100755
index ..a5cc2185a486
--- /dev/null
+++ b/bin/merge-app-bundles
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# Exit on errors
+set -e
+
+# Use of unset variable is an error
+set -u
+
+# If any part of a pipeline of commands fails, the whole pipeline fails
+set -o pipefail
+
+if [ `uname` != Darwin ]; then
+echo This is for macOS only >&2
+exit 1
+fi
+
+if [ $# != 3 ]; then
+echo Usage: $0 app-bundle-1 app-bundle-2 output-app-bundle
+exit 1
+fi
+
+if [ -d "$3" ]; then
+echo The directory $3 exists already
+exit 1
+fi
+
+if [ -f "$3" ]; then
+echo $3 exists and is a file
+exit 1
+fi
+
+if [ ! -d "$1" ]; then
+echo No such directory: $1
+exit 1
+fi
+
+if [ ! -d "$2" ]; then
+echo No such directory: $2
+exit 1
+fi
+
+ONE=$(cd "$1" && /bin/pwd)
+TWO=$(cd "$2" && /bin/pwd)
+mkdir "$3"
+OUT=$(cd "$3" && /bin/pwd)
+
+# Create all directories
+(
+cd "$ONE"
+find . -type d -print
+) |
+(
+cd "$OUT"
+while read dirname; do
+mkdir -p "$dirname"
+done
+)
+
+# Check which files in 1 exist in 2, and if they are executable, merge them 
into a fat copy. For
+# other files, just use one copy, assuming they are equivalent in most cases.
+(
+cd "$ONE"
+find . -type l -or -type f
+) |
+(
+cd "$TWO"
+while read fname; do
+if test -L "$fname"; then
+ln -s $(readlink "$fname") "$OUT/$fname"
+elif test -f "$fname"; then
+case "$fname" in
+*.so | \
+*.dylib | \
+*.dylib.* | \
+
*/Frameworks/LibreOfficePython.framework/Versions/*/LibreOfficePython | \
+
*/Frameworks/LibreOfficePython.framework/Versions/*/Resources/Python.app/Contents/MacOS/LibreOfficePython
 | \
+
*/Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter)
+lipo -create -output "$OUT/$fname" "$fname" "$ONE/$fname"
+;;
+# Ignore differences in these files. Let's hope it's just the 
timestamps.
+*.ot[tp] | \
+*.bau | \
+*.pyc | \
+*/_sysconfigdata_m_darwin_darwin.py | \
+*/Contents/Resources/firebird/security3.fdb | \
+*/Contents/Resources/autocorr/acor_*.dat | \
+*/Contents/Resources/resource/*/LC_MESSAGES/*.mo | \
+*/Contents/Resources/config/images_*.zip)
+cp "$fname" "$OUT/$fname"
+;;
+*)
+case $(file --brief "$fname") in
+Mach-O\ 64-bit\ executable\ *)
+lipo -create -output "$OUT/$fname" "$fname" 
"$ONE/$fname"
+;;
+*)
+cmp -s "$fname" "$ONE/$fname" ||
+echo "$fname differs and is not an 
executable!?" >&2
+cp "$fname" "$OUT/$fname"
+esac
+esac
+else
+# We ignore some files that can't be built for macOS on arm64 for 
now
+case "$fname" in
+
./Contents/Frameworks/LibreOfficePython.framework/Versions/3.7/lib/python*/lib-dynload/_ctypes.cpython-*m.so)
+;;
+*)
+echo "$fname does not exist in $TWO" >&2
+;;
+esac
+cp "$ONE/$fname" "$OUT/$fname"
+fi
+done
+)
+
+# Look for files in 2 that don't exist in 1
+(
+cd "$TWO"
+find . -type f -print
+) |
+(
+cd "$ONE"
+while read fname; do
+if test -f "$fname"; then
+:
+else
+echo "$fname does not exist in $ONE" >&2
+cp "$TWO/$fname" "$OUT/$fname"
+fi
+done
+)
+
+# Local Variables:
+# tab-width: 4
+# indent-tabs-mode: nil
+# fill-column: 100
+# End:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gülşah Köse (via logerrit)]

 oox/source/drawingml/lineproperties.cxx |4 ++--
 oox/source/export/drawingml.cxx |4 ++--
 sd/qa/unit/uiimpress.cxx|   14 --
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 5d80f679e1891f98ef964efa1166c90d001c5806
Author: Gülşah Köse 
AuthorDate: Mon Nov 30 13:29:19 2020 +0300
Commit: Gülşah Köse 
CommitDate: Wed Dec 2 14:06:46 2020 +0100

tdf#136957 Use bigger dots for better handling in presentation mode.

3 pt bigger dots are used. Human eye can't catch this
change so we will see same dots in edit mode and presentation mode.

Change-Id: I4a56406f4eb7a6832075a09a4d2f092bd689e9cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106855
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index 451da4c6aa26..87c502f96f6b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -470,9 +470,9 @@ void LineProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 // Cannot use -100 because that results in 0 length in some cases 
and
 // LibreOffice interprets 0 length as 100%.
 if (aLineDash.DotLen >= 100 || aLineDash.DashLen >= 100)
-aLineDash.Distance += 99;
+aLineDash.Distance += 96;
 if (aLineDash.DotLen >= 100)
-aLineDash.DotLen -= 99;
+aLineDash.DotLen -= 96;
 if (aLineDash.DashLen >= 100)
 aLineDash.DashLen -= 99;
 }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index eca53a92d5a8..f309e1541409 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -966,8 +966,8 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 sal_uInt32 nDistance = aLineDash.Distance;
 if (aLineCap != LineCap_BUTT && nDistance >= 99)
 {
-nDistance -= 99;
-nDotLen += 99;
+nDistance -= 96;
+nDotLen += 96;
 if (nDashLen > 0)
 nDashLen += 99;
 }
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index fbd23a24eda0..2b492be3fffd 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -375,9 +375,19 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf134053)
 // Because 0% is not possible as dash length (as of June 2020) 1% is used 
in the fix.
 // For that a larger delta is here allowed to the ideal value than needed 
for
 // rounding errors.
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance", 2117, fDistance, 12);
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dot length", 706, fDotLength, 12);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dash length", 2822, fDashLength, 12);
+
+// tdf#136957 (dotted lines are  disappearing in presentation mode)
+// Test value used as 2089 instead of 2117 for tdf#136957 workaround.
+// If this test fails as Expected: 2089 Actual:2117
+// plaese test tdf#136957 manually and use 2117 as test value again.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance", 2089, fDistance, 12);
+
+// tdf#136957 (dotted lines are  disappearing in presentation mode)
+// Test value used as 2854 instead of 2822 for tdf#136957 workaround.
+// If this test fails as Expected: 2854 Actual:2822
+// plaese test tdf#136957 manually and use 2822 as test value again.
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dash length", 2854, fDashLength, 12);
 }
 
 CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testSpellOnlineParameter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 13d0369cf6e5d3f010aa8ec3c1d234d8021bebac
Author: Tor Lillqvist 
AuthorDate: Wed Dec 2 12:44:25 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 2 13:28:22 2020 +0100

Bump version to 6.4-16

Change-Id: I8c11066b0d71bd9912f4985ab04deb9f87b69026
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107058
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 1570a0224b0f..8ff0fa75c812 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([Collabora Office],[6.4.10.15],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.16],[],[],[https://collaboraoffice.com/])
 
 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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 external/python3/ExternalProject_python3.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit be1ab2d81d100b3f1060ac61817d2a7cf61eb7a5
Author: Tor Lillqvist 
AuthorDate: Wed Dec 2 13:17:58 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 2 13:28:01 2020 +0100

Must use 'rm -f' as this step will be re-run in subsequent make invocations

Change-Id: I7645ab9ce8a478b87fdf77f9cb329dffc2eeef7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107057
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index f131ab3ad4f0..92772684ec87 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -181,10 +181,10 @@ $(call 
gb_ExternalProject_get_state_target,python3,removeunnecessarystuff) : $(c
rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
# Then the binary libraries
-   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_dbm.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_sqlite3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses_panel.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_dbm.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_sqlite3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses_panel.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_idlelib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_tkinter.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_test*.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   46 +
 1 file changed, 18 insertions(+), 28 deletions(-)

New commits:
commit f43d49310f7ef73027a7fb74ccaec4f89e60e9fe
Author: andreas kainz 
AuthorDate: Wed Sep 9 14:47:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Dec 2 13:20:41 2020 +0100

tdf#128135 update Pivot Table Layout to fit minimum height

Change-Id: I450625ccac06aec54371ede6bf9b50a221e1ba8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102319
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107053
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 4ecf7859557f..b4d106fb1c53 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -49,7 +49,7 @@
 0
 0
 dialog
-
+
   
 
 
@@ -128,7 +128,6 @@
 False
 True
 True
-6
 6
 
   
@@ -212,7 +211,7 @@
   
   
 1
-1
+0
   
 
 
@@ -289,7 +288,7 @@
   
   
 1
-2
+1
   
 
 
@@ -364,7 +363,7 @@
   
   
 0
-2
+1
   
 
 
@@ -442,12 +441,8 @@
   
 0
 0
-2
   
 
-
-  
-
   
   
 True
@@ -533,7 +528,7 @@
 
   
   
-True
+False
 True
 0
   
@@ -564,15 +559,15 @@
 False
 12
 6
-6
+3
 12
+True
 
   
 Ignore empty 
rows
 True
 True
 False
-True
 True
 0
 True
@@ -588,7 +583,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -604,7 +598,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -620,7 +613,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -636,7 +628,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -652,7 +643,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -693,7 +683,6 @@
 12
 6
 True
-True
 6
 12
 
@@ -701,7 +690,6 @@
 True
 False
 True
-True
 0
 none
 
@@ -715,9 +703,8 @@
 True
 False
 True
-True
-6
-12
+3
+6
 
   
 New 
sheet
@@ -825,7 +812,6 @@
 True
 False
 True
-True
  

[Libreoffice-commits] core.git: external/mariadb-connector-c

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |2 +-
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |8 

 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a
Author: Michael Stahl 
AuthorDate: Tue Dec 1 20:05:32 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 13:10:51 2020 +0100

mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem plugins

They were already compiled in some way.

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

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index c811473e11ce..3458089ce99e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -72,9 +72,9 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt 
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
-   , \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
+   , \

UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
) \
 ))
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index b34c3490661c..241e12db6581 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,11 +36,19 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
+   $(if $(filter WNT,$(OS)), \
+   extern struct st_mysql_client_plugin 
pvio_shmem_client_plugin\; \
+   extern struct st_mysql_client_plugin 
pvio_npipe_client_plugin\; \
+   ) \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
+   $(if $(filter WNT,$(OS)), \
+   (struct st_mysql_client_plugin 
*)\&pvio_shmem_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&pvio_npipe_client_plugin$(COMMA) \
+   ) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

[Stephan Bergmann (via logerrit)]

 offapi/com/sun/star/xml/sax/XFastParser.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 264b9ee8f2a22517a209791a86b4019ac12bcbaf
Author: Stephan Bergmann 
AuthorDate: Wed Dec 2 10:36:36 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 2 13:01:37 2020 +0100

Fix placement of @since tag

...following up on e3f8e1260ac42b680e79bf50b2645957916d34e0 "Corrections on
xfasatparser IDL file."

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

diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl 
b/offapi/com/sun/star/xml/sax/XFastParser.idl
index 853b886c75a1..9beefe4aa4d6 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -159,9 +159,9 @@ interface XFastParser: com::sun::star::uno::XInterface
 void setNamespaceHandler( [in] XFastNamespaceHandler Handler);
 
 /**
-  * @since LibreOffice 7.1
   * Simulate a DTD file.
   * Will allow to use customized entity references like ∞ .
+  * @since LibreOffice 7.1
   */
 void setCustomEntityNames( [in] sequence names, [in] 
sequence replacements);
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'distro/cib/libreoffice-6-4'

[Justin Luth (via logerrit)]

New branch 'distro/cib/libreoffice-6-4' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 editeng/source/xml/xmltxtimp.cxx |   22 ++
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 549760a68f457f406141c843e8a38a2ee0677c53
Author: Noel 
AuthorDate: Wed Dec 2 10:30:38 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 2 12:14:03 2020 +0100

fastparser in SvxXMLTextImportContext

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

diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index e04d2839d170..ff5a1e9b6131 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -52,7 +52,6 @@ class SvxXMLTextImportContext : public SvXMLImportContext
 public:
 SvxXMLTextImportContext( SvXMLImport& rImport, const uno::Reference< XText 
>& xText );
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, 
const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) 
override;
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
 sal_Int32 nElement,
 const uno::Reference< xml::sax::XFastAttributeList >& xAttrList) 
override;
@@ -70,7 +69,7 @@ SvxXMLTextImportContext::SvxXMLTextImportContext( 
SvXMLImport& rImport, const un
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
SvxXMLTextImportContext::createFastChildContext(
 sal_Int32 nElement,
-const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/)
+const uno::Reference< xml::sax::XFastAttributeList >& xAttrList)
 {
 SvXMLImportContext* pContext = nullptr;
 if(nElement == XML_ELEMENT(OFFICE, XML_BODY ))
@@ -82,25 +81,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SvxXMLTextImportContex
 pContext = new SvXMLStylesContext( GetImport() );
 GetImport().GetTextImport()->SetAutoStyles( 
static_cast(pContext) );
 }
-return pContext;
-}
-
-SvXMLImportContextRef SvxXMLTextImportContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& 
xAttrList )
-{
-SvXMLImportContext* pContext = nullptr;
-if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
-{
-// dealt with in createFastChildContext
-}
-else if( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, 
XML_AUTOMATIC_STYLES ) )
-{
-// dealt with in createFastChildContext
-}
 else
-{
-pContext = GetImport().GetTextImport()->CreateTextChildContext( 
GetImport(), nPrefix, rLocalName, xAttrList );
-}
-
+pContext = GetImport().GetTextImport()->CreateTextChildContext( 
GetImport(), nElement, xAttrList );
 return pContext;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/globalfilter/globalfilter.cxx  |2 +-
 sw/qa/extras/ooxmlexport/data/tdf138345_charStyleHighlight.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx  |9 
+
 sw/qa/extras/ww8export/ww8export3.cxx   |2 +-
 sw/source/core/unocore/unomap1.cxx  |2 +-
 sw/source/filter/ww8/ww8par6.cxx|4 
 writerfilter/source/dmapper/DomainMapper.cxx|8 
 7 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 20574b4023952c8fbfa728590f3bdcf603633cca
Author: Justin Luth 
AuthorDate: Thu Nov 19 22:13:04 2020 +0300
Commit: Miklos Vajna 
CommitDate: Wed Dec 2 12:13:48 2020 +0100

tdf#138345 ms formats Char highlight: no import into char-style

MS Word ignores w:highlight in character styles,
so don't import it.

RES_CHRATR_HIGHLIGHT only exists in LO in order
to support Microsoft's terrible idea of allowing
two different attributes to define char background colour.
So it should be safe to remove it from UNO.

Change-Id: Ia2ee0bd61ee59dfa864e946024c8184747aa2b40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106183
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index bb9521823783..732c0438da5b 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -613,7 +613,7 @@ void Test::testCharStyleHighlight()
 const sal_Int32 nBackColor(0xFFDBB6); //orange-y
 
 // Always export character style's background colour as shading, never 
as highlighting.
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(COL_TRANSPARENT), 
getProperty(xCharStyle,"CharHighlight"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), false, 
hasProperty(xCharStyle,"CharHighlight"));
 CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor, 
getProperty(xCharStyle,"CharBackColor"));
 }
 }
diff --git a/sw/qa/extras/ooxmlexport/data/tdf138345_charStyleHighlight.docx 
b/sw/qa/extras/ooxmlexport/data/tdf138345_charStyleHighlight.docx
new file mode 100644
index ..14c9aac9ffc7
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf138345_charStyleHighlight.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 1170bdc44d11..2b1b18aa85f9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -731,6 +731,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf137683_charHighlightTests, 
"tdf137683_charHighli
 CPPUNIT_ASSERT_EQUAL(static_cast(COL_AUTO), 
getProperty(xRun, "CharHighlight"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf138345_charStyleHighlight, 
"tdf138345_charStyleHighlight.docx")
+{
+// MS Word ignores the w:highlight setting in character styles. So shall 
we.
+// Without the fix, there would be an orange or yellow background on some 
words.
+const uno::Reference xRun(getRun(getParagraph(1), 2, 
"orange background"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(COL_TRANSPARENT), 
getProperty(xRun,"CharHighlight"));
+CPPUNIT_ASSERT_EQUAL(static_cast(COL_TRANSPARENT), 
getProperty(xRun,"CharBackColor"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx")
 {
 CPPUNIT_ASSERT_EQUAL(2, getPages());
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 5e0124e9aad4..14991fa89484 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -79,7 +79,7 @@ DECLARE_WW8EXPORT_TEST(testTdf138345_paraCharHighlight, 
"tdf138345_paraCharHighl
 
 xRun.set(getRun(getParagraph(9), 2), uno::UNO_QUERY_THROW);
 // Character style formatting must not contain a highlight setting at all.
-//CPPUNIT_ASSERT_EQUAL(static_cast(COL_AUTO), 
getProperty(xRun, "CharHighlight"));
+CPPUNIT_ASSERT_EQUAL(static_cast(COL_AUTO), 
getProperty(xRun, "CharHighlight"));
 CPPUNIT_ASSERT_EQUAL(static_cast(COL_AUTO), 
getProperty(xRun, "CharBackColor"));
 }
 
diff --git a/sw/source/core/unocore/unomap1.cxx 
b/sw/source/core/unocore/unomap1.cxx
index f9474dc92e27..d3fb8b909608 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -185,7 +185,7 @@ const SfxItemPropertyMapEntry*  
SwUnoPropertyMapProvider::GetCharStylePropertyMa
 { u"" UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  
cppu::UnoType::get()  ,   PROPERTY_NONE, 0},
 { u"" UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND,  
cppu::UnoType::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT  
 },
 { u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,
cppu::UnoType

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

[Tor Lillqvist (via logerrit)]

 external/python3/ExternalProject_python3.mk |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit f2ded8d748c5446891aa20da10c5e08bdf93674c
Author: Tor Lillqvist 
AuthorDate: Wed Dec 2 12:21:36 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 2 12:09:35 2020 +0100

Drop Python modules we don't want on macOS, too, like on other platforms

On macOS, for various reasons, we use a different aproach than on
other platforms to construct the bundled Python.

Instead of explicitly listing what to include (out of what Python
contains and builds) (in ExternalPackage_python3.mk), after Python is
built, we remove stuff we don't want (in ExternalProject_python3.mk)
and then include everything left in the LibreOfficePython.framework
(in GeneratedPackage_python3.mk).

This fixes a problem in App Store review: For some reason the review
said that the setcchar() function from the ncurses library, used by
Python's curses module, is non-public. No idea why the (automated)
review picked on that function. As far as I see from the ncurses
header in the SDK, that function is no less public than the other
ncurses functions that the Python module uses.

But oh well, we don't actually ship the curses module anyway on other
platforms, so just drop it on macOS, too. And while at it, drop the
other unwanted ones, too. And any binary shared libraries for them.

Change-Id: Idecaf10a6fb1c59e8711095927f5699b8d2ec98e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107055
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 6c958431cd97..f131ab3ad4f0 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 
100 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -167,10 +167,27 @@ $(call 
gb_ExternalProject_get_state_target,python3,executables) : $(call gb_Exte
@executable_path/../LibreOfficePython $$file ; done
touch $@
 
+# Remove modules (both Python and binary bits) of questionable usefulness that 
we don't ship on
+# other platforms either. See the "packages not shipped" comment in 
ExternalPackage_python3.mk.
+
 $(call gb_ExternalProject_get_state_target,python3,removeunnecessarystuff) : 
$(call gb_ExternalProject_get_state_target,python3,build)
$(call gb_Output_announce,python3 - remove the stuff we don't need to 
ship,build,CUS,5)
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/dbm
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/sqlite3
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/curses
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/idlelib
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/tkinter
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/turtledemo
rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
-
+   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
+   # Then the binary libraries
+   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_dbm.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_sqlite3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
+   rm 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_curses_panel.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSIO

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

[Luboš Luňák (via logerrit)]

 include/vcl/region.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e32cebc36be252d9a72c700d31b9dbbb11b58b91
Author: Luboš Luňák 
AuthorDate: Tue Dec 1 16:48:28 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 2 11:54:38 2020 +0100

make debug output for vcl::Region also print tools PolyPolygon

I implemented operator>> for tools PolyPolygon in 5553bb974a44721e,
so it can now be used here instead of printing "unimplemented".

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

diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 92dd9deb12df..e6c7448e36c1 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -148,7 +148,9 @@ inline std::basic_ostream & operator <<(
   << *rRegion.getB2DPolyPolygon()
   << ")";
 if (rRegion.getPolyPolygon())
-return stream << "unimplemented";
+return stream << "PolyPolygon("
+  << *rRegion.getPolyPolygon()
+  << ")";
 if (rRegion.getRegionBand())
 {   // inlined because RegionBand is private to vcl
 stream << "RegionBand(";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 72e6c8159d0e51d5ad73c52706d1412a11071c15
Author: Thorsten Behrens 
AuthorDate: Wed Dec 2 11:40:53 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 2 11:41:12 2020 +0100

Bump version to 6.1.7.20

Change-Id: I6d03755f4203d2ae71bc7c55ddb76038a04a7c89

diff --git a/configure.ac b/configure.ac
index e519d688b62a..1906280e583b 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.19],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.20],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8e0b1c81ffa16be8aae2231bcd3c02e8c01cf88
Author: Eike Rathke 
AuthorDate: Tue Dec 1 23:22:33 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 2 11:37:11 2020 +0100

Typo in rounded digit string, tdf#138360 follow-up

Change-Id: Ic436d3e9f0c93cb36c5e4377519f2aeb6b7fbd5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107034
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 10417742b3a2..e6f09f18030e 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -290,7 +290,7 @@ void doubleToString(typename T::String ** pResult,
 // Writing pDig up to decimals(-1,-2) then appending one digit from
 // pRou xor one or two digits from pSlot[].
 constexpr char pDig[] = "7976931348623157";
-constexpr char pRou[] = "8087931459623267"; // the only up-carry 
is 80
+constexpr char pRou[] = "8087931359623267"; // the only up-carry 
is 80
 static_assert(SAL_N_ELEMENTS(pDig) == SAL_N_ELEMENTS(pRou), "digit 
count mismatch");
 constexpr sal_Int32 nDig2 = RTL_CONSTASCII_LENGTH(pRou) - 2;
 sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH(pRou) + 8;  // + "-1.E+308"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1ad0ec4f10270eb44b558e6e8c6261d793fddb2f
Author: Eike Rathke 
AuthorDate: Tue Dec 1 19:08:26 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 2 11:36:33 2020 +0100

Related: tdf#138360 Rounding integers to decimals is futile

Change-Id: Ica25747a26d6c2637c46808d1b73aeeed6e1df37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107001
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 49aff144c72a5258cf2ca392a0cfb7a31fb86819)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107017

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 1d6cb88327f9..10417742b3a2 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1146,7 +1146,10 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 
 // Rounding to decimals between integer distance precision (gaps) does not
 // make sense, do not even try to multiply/divide and introduce inaccuracy.
-if (nDecPlaces >= 0 && fValue >= (static_cast(1) << 52))
+// For same reasons, do not attempt to round integers to decimals.
+if (nDecPlaces >= 0
+&& (fValue >= (static_cast(1) << 52)
+|| isRepresentableInteger(fValue)))
 return bSign ? -fValue : fValue;
 
 double fFac = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/pagemargincontrol.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e86ec6f77756045a4f8147f006018da93b70b159
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:15:00 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Dec 2 11:26:09 2020 +0100

tdf#138471 wrong adjustment used for spinbutton

resulting in one adjustment used by two spinbuttons

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

diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui 
b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 1360d9c4a90e..7002f61445c1 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -415,7 +415,7 @@
 True
 True
 True
-adjustment2
+adjustment3
 2
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcutl.cxx |8 
 include/formula/funcutl.hxx   |5 +
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit b0bc1899fc2cb93f8c4a7b52ffaee379d5fbbd8f
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:52:31 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Dec 2 11:23:04 2020 +0100

tdf#138427 focus set to wrong input box

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

diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 2cfc7deccec6..41dc1788e03d 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -350,6 +350,14 @@ bool RefEdit::KeyInput(const KeyEvent& rKEvt)
 return false;
 }
 
+void RefEdit::GrabFocus()
+{
+bool bHadFocus = xEntry->has_focus();
+xEntry->grab_focus();
+if (!bHadFocus && xEntry->has_focus())
+GetFocus(*xEntry);
+}
+
 IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void)
 {
 maGetFocusHdl.Call(*this);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 02cf585a771e..0a14e62db159 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -84,10 +84,7 @@ public:
 Modify(*xEntry);
 }
 
-void GrabFocus()
-{
-xEntry->grab_focus();
-}
+void GrabFocus();
 
 void SelectAll()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-4' - hardened_runtime.xcent.in

[Tor Lillqvist (via logerrit)]

 hardened_runtime.xcent.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 910acf47bb0c725c88d77d60dea29bc2d26b6783
Author: Tor Lillqvist 
AuthorDate: Wed Sep 23 10:34:40 2020 +0300
Commit: Christian Lohmaier 
CommitDate: Wed Dec 2 11:13:44 2020 +0100

tdf#135479: Seems we need the more broad entitlement for Java's sake

Sad, but OK.

This reverts part of 2c366aae9263dc4115b054fe74b90cabea61fa0b.

Change-Id: I6b74c871e3ec2408f833a5e2b652fd19cb7a2c0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103230
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 247a5304475b9a045a08cbb5e74aec4b99127511)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107023
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/hardened_runtime.xcent.in b/hardened_runtime.xcent.in
index 2bbcda34f18c..d270c93ec694 100644
--- a/hardened_runtime.xcent.in
+++ b/hardened_runtime.xcent.in
@@ -6,7 +6,7 @@
 com.apple.security.automation.apple-events
 
 
-com.apple.security.cs.allow-jit
+com.apple.security.cs.disable-executable-page-protection
 
 
 com.apple.security.cs.disable-library-validation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit c4d5e900759053180064dcb5973e0890ad684de1
Author: Seth Chaiklin 
AuthorDate: Wed Dec 2 11:07:55 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Dec 2 11:07:55 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 256943b5885310416bf7422e132dc94ce1d78f7f
  - tdf#138389 improve Y-M-D pattern and add two-digit year explanation

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

diff --git a/helpcontent2 b/helpcontent2
index be1839104c88..256943b58853 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit be1839104c885a769c6caf84feb83c272b68f763
+Subproject commit 256943b5885310416bf7422e132dc94ce1d78f7f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/optionen/0114.xhp |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 256943b5885310416bf7422e132dc94ce1d78f7f
Author: Seth Chaiklin 
AuthorDate: Wed Dec 2 10:39:01 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Wed Dec 2 11:07:55 2020 +0100

tdf#138389 improve Y-M-D pattern and add two-digit year explanation

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

diff --git a/source/text/shared/optionen/0114.xhp 
b/source/text/shared/optionen/0114.xhp
index ba8f0f384..49cc4ffd2 100644
--- a/source/text/shared/optionen/0114.xhp
+++ b/source/text/shared/optionen/0114.xhp
@@ -71,28 +71,29 @@
 
 Date acceptance patterns
   Specifies the date acceptance patterns for the current locale. Calc 
spreadsheet and Writer table cell input needs to match locale dependent date 
acceptance patterns before it is recognized as a valid date.
-  If you type 
numbers and characters that correspond to the defined date acceptance patterns 
in a table cell, and then move the cursor outside of the cell, %PRODUCTNAME 
will automatically recognize and convert the input to a date, and format it 
according to the locale setting. 
-  The initial 
pattern(s) in Date acceptance patterns are determined by the 
locale (set in Locale setting), but you can modify these default 
patterns, and add more patterns.  Use ; to separate each 
pattern. 
+  If you type 
numbers and characters that correspond to the defined date acceptance patterns 
in a table cell, and then move the cursor outside of the cell, %PRODUCTNAME 
will automatically recognize and convert the input to a date, and format it 
according to the locale setting.
+  The initial 
pattern(s) in Date acceptance patterns are determined by the 
locale (set in Locale setting), but you can modify these default 
patterns, and add more patterns.  Use ; to separate each 
pattern.
   Patterns can be 
composed according to the following rules:
 
  
-  A pattern must 
start with D, M, or Y, and include at 
least two items, with at least one separator between each one. 
+  A pattern must 
start with D, M, or Y, and include at 
least two items, with at least one separator between each one.
   A pattern may also 
include all three, in any order.
  
  
   Y means year, M means month, and 
D means day, regardless of which locale is set. Each can only be 
used once in a pattern.
  
  
-  . - : 
/ , can be used as separators between and 
after D, M, and Y.  
-  Any combination of 
separators can be used, and more than one separator can be used between 
D, M, and Y, but the input must match 
the separator pattern exactly for recognition. 
+  . - : 
/ , can be used as separators between and 
after D, M, and Y.
+  Any combination of 
separators can be used, and more than one separator can be used between 
D, M, and Y, but the input must match 
the separator pattern exactly for recognition.
  
  
   Patterns can 
combine different separators, and may include a trailing separator.
-  Examples of valid 
patterns are: D,Y ; Y-M ; M.D.Y  ; D-M/Y ;  M.D. 
+  Examples of valid 
patterns are: D,Y ; Y-M ; M.D.Y  ; D-M/Y ;  M.D.
  
 
   If you change the 
Locale setting, the date acceptance pattern will be reset to the 
new locale default, and any user-defined modifications or additions will be 
lost.
-  In addition to 
the patterns defined in the edit box, input matching the 
Y-M-D pattern is also recognized and converted automatically 
to a date, and since %PRODUCTNAME 3.5 is formatted as 
-MM-DD (ISO 8601).
+  In addition to 
the explicit patterns defined in the edit box, input matching the 
Y-M-D pattern is implicitly recognized and converted 
automatically to a date. Input that starts from 1 to 31 is not interpreted with 
this implicit Y-M-D pattern.  Since %PRODUCTNAME 3.5, this input is formatted 
as -MM-DD (ISO 8601).
+  For all patterns, 
two-digit year input is interpreted according to the setting in Tools - Options - General - Year (Two 
Digits).  
   Default languages for documents
   Specifies the languages 
for spelling, thesaurus and hyphenation.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mariadb-connector-c

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |1 -
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b746633b2b251695134e7f8c268a75e45cf97c82
Author: Michael Stahl 
AuthorDate: Tue Dec 1 19:58:23 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 2 10:40:22 2020 +0100

tdf#135202 mariadb-connector-c: enable native_password plugin

... and remove dialog authentication plugin; it quite uselessly defaults
to asking for a password on stdin, unless a function symbol is defined
by the library that links the connector static library.

There are more authentication plugins but no idea if those are needed.

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

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 6de1738312a7..c811473e11ce 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -66,7 +66,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
-   UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 2f679294f7c6..b34c3490661c 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -35,10 +35,12 @@ $(eval $(call 
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-e 's/@EXTERNAL_PLUGINS@/ \
extern struct st_mysql_client_plugin 
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin 
caching_sha2_password_client_plugin\; \
+   extern struct st_mysql_client_plugin 
mysql_native_password_client_plugin\; \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin 
*)\&caching_sha2_password_client_plugin$(COMMA) \
+   (struct st_mysql_client_plugin 
*)\&mysql_native_password_client_plugin$(COMMA) \
/' \
> libmariadb/ma_client_plugin.c \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx   |4 
 include/vcl/pdf/PDFBitmapType.hxx  |   26 ++
 svx/source/svdraw/svdpdf.cxx   |   21 ++---
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   12 ++--
 vcl/source/pdf/PDFiumLibrary.cxx   |   20 
 5 files changed, 66 insertions(+), 17 deletions(-)

New commits:
commit d8fe51f9a4d1669578c162d87a6e65125096d720
Author: Miklos Vajna 
AuthorDate: Wed Dec 2 09:08:49 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 2 10:14:27 2020 +0100

pdfium: add width/height/format wrappers for bitmap

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 497ef3e2d47e..6e952d4fc17b 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -85,6 +86,9 @@ public:
 void renderPageBitmap(PDFiumPage* pPage, int nStartX, int nStartY, int 
nSizeX, int nSizeY);
 ConstScanline getBuffer();
 int getStride();
+int getWidth();
+int getHeight();
+PDFBitmapType getFormat();
 };
 
 class VCL_DLLPUBLIC PDFiumAnnotation final
diff --git a/include/vcl/pdf/PDFBitmapType.hxx 
b/include/vcl/pdf/PDFBitmapType.hxx
new file mode 100644
index ..fe5921276e87
--- /dev/null
+++ b/include/vcl/pdf/PDFBitmapType.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+namespace vcl::pdf
+{
+enum class PDFBitmapType
+{
+Unknown = 0,
+Gray = 1,
+BGR = 2,
+BGRx = 3,
+BGRA = 4,
+};
+
+} // namespace vcl::pdf
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 47ea46c62801..6f2f1de42f72 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -883,35 +883,34 @@ void 
ImpSdrPdfImport::ImportImage(std::unique_ptr co
 return;
 }
 
-const int format = FPDFBitmap_GetFormat(bitmap->getPointer());
-if (format == FPDFBitmap_Unknown)
+const vcl::pdf::PDFBitmapType format = bitmap->getFormat();
+if (format == vcl::pdf::PDFBitmapType::Unknown)
 {
 SAL_WARN("sd.filter", "Failed to get IMAGE format");
 return;
 }
 
-const unsigned char* pBuf
-= static_cast(FPDFBitmap_GetBuffer(bitmap->getPointer()));
-const int nWidth = FPDFBitmap_GetWidth(bitmap->getPointer());
-const int nHeight = FPDFBitmap_GetHeight(bitmap->getPointer());
-const int nStride = FPDFBitmap_GetStride(bitmap->getPointer());
+const unsigned char* pBuf = bitmap->getBuffer();
+const int nWidth = bitmap->getWidth();
+const int nHeight = bitmap->getHeight();
+const int nStride = bitmap->getStride();
 BitmapEx aBitmap(Size(nWidth, nHeight), 24);
 
 switch (format)
 {
-case FPDFBitmap_BGR:
+case vcl::pdf::PDFBitmapType::BGR:
 ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N24BitTcBgr, nHeight, 
nStride);
 break;
-case FPDFBitmap_BGRx:
+case vcl::pdf::PDFBitmapType::BGRx:
 ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcRgba, nHeight, 
nStride);
 break;
-case FPDFBitmap_BGRA:
+case vcl::pdf::PDFBitmapType::BGRA:
 ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcBgra, nHeight, 
nStride);
 break;
 default:
 SAL_WARN("sd.filter", "Got IMAGE width: " << nWidth << ", height: 
" << nHeight
   << ", stride: " << 
nStride
-  << ", format: " << 
format);
+  << ", format: " << 
static_cast(format));
 break;
 }
 
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index eaf905986928..7af85573be40 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -1503,8 +1503,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf128630)
 
 std::unique_ptr pBitmap = 
pPageObject->getImageBitmap();
 CPPUNIT_ASSERT(pBitmap);
-int nWidth = FPDFBitmap_GetWidth(pBitmap->getPointer());
-int nHeight = FPDFBitmap_GetHeight(pBitmap->getPointer());
+int nWidth = pBitmap->getWidth();
+int nHeight = pBitmap->getHeight();
 // Without the accompanying fix

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

[Seth Chaiklin (via logerrit)]

 svx/uiconfig/ui/crashreportdlg.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea9863c0104bfa74e7542f850768c2c0ee63a577
Author: Seth Chaiklin 
AuthorDate: Wed Dec 2 01:41:36 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Dec 2 09:59:25 2020 +0100

Partially resolve: tdf#113286 Add https:// to URL in Crash Report

   Also:
 "Don't" --> "Do Not" in another button label

Change-Id: I320a2f3fbe1ad1d2ac3efff94c0195be15335a17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107018
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
Reviewed-by: Heiko Tietze 

diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index a4c6e6308c76..65b0931c280b 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,7 +5,7 @@
   
 The crash report was successfully uploaded.
 You can soon find the report at:
-crashreport.libreoffice.org/stats/crash_details/%CRASHID
+https://crashreport.libreoffice.org/stats/crash_details/%CRASHID
   
   
 Please check the report and if no bug 
report is connected to the crash report yet, open a new bug report at 
bugs.documentfoundation.org.
@@ -47,7 +47,7 @@ Thank you for your help in improving %PRODUCTNAME.
 
 
   
-Do_n’t Send
+Do _Not Send
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/inputopt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 358f2ce190dcebb185f18bc23953f99f81c3b940
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 10:14:19 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:46:14 2020 +0100

cid#1470370 Uninitialized scalar field

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

diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 380c4391f307..73b25c297203 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -51,6 +51,7 @@ void ScInputOptions::SetDefaults()
 bTextWysiwyg= false;
 bReplCellsWarn  = true;
 bLegacyCellSelection = false;
+bEnterPasteMode = false;
 }
 
 //  Config Item containing input options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcutl.cxx |8 
 include/formula/funcutl.hxx   |5 +
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 475f5cebe3f98f2247c6ad5ab55f60c40efe1c7b
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:52:31 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:45:41 2020 +0100

tdf#138427 focus set to wrong input box

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

diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 68d1ec3b4fc4..f64b6aff9bd5 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -350,6 +350,14 @@ bool RefEdit::KeyInput(const KeyEvent& rKEvt)
 return false;
 }
 
+void RefEdit::GrabFocus()
+{
+bool bHadFocus = xEntry->has_focus();
+xEntry->grab_focus();
+if (!bHadFocus && xEntry->has_focus())
+GetFocus(*xEntry);
+}
+
 IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void)
 {
 maGetFocusHdl.Call(*this);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 02cf585a771e..0a14e62db159 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -84,10 +84,7 @@ public:
 Modify(*xEntry);
 }
 
-void GrabFocus()
-{
-xEntry->grab_focus();
-}
+void GrabFocus();
 
 void SelectAll()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 formula/source/ui/dlg/funcutl.cxx |8 
 include/formula/funcutl.hxx   |5 +
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 0362d16527c2e33b9e0ab2d410b5f0a5b4cee91b
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:52:31 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:44:59 2020 +0100

tdf#138427 focus set to wrong input box

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

diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 68d1ec3b4fc4..f64b6aff9bd5 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -350,6 +350,14 @@ bool RefEdit::KeyInput(const KeyEvent& rKEvt)
 return false;
 }
 
+void RefEdit::GrabFocus()
+{
+bool bHadFocus = xEntry->has_focus();
+xEntry->grab_focus();
+if (!bHadFocus && xEntry->has_focus())
+GetFocus(*xEntry);
+}
+
 IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void)
 {
 maGetFocusHdl.Call(*this);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 5c729da03638..915152466174 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -84,10 +84,7 @@ public:
 Modify(*xEntry);
 }
 
-void GrabFocus()
-{
-xEntry->grab_focus();
-}
+void GrabFocus();
 
 void SelectAll()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/pagemargincontrol.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73cebb561737947511ff489891e61b1e1f8f7b0e
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:15:00 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:44:26 2020 +0100

tdf#138471 wrong adjustment used for spinbutton

resulting in one adjustment used by two spinbuttons

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

diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui 
b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 2916591479a4..f9df8c065ead 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -416,7 +416,7 @@
 True
 True
 True
-adjustment2
+adjustment3
 2
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/pagemargincontrol.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b99771a0bf090fd58b14d03dc998d3a9cf201719
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:15:00 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:44:09 2020 +0100

tdf#138471 wrong adjustment used for spinbutton

resulting in one adjustment used by two spinbuttons

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

diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui 
b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 2916591479a4..f9df8c065ead 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -416,7 +416,7 @@
 True
 True
 True
-adjustment2
+adjustment3
 2
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/notebookbar.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 06953be0e94216f29f25d5be7fc0fb24c616987a
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 14:32:49 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:43:16 2020 +0100

tab-fill used in widget that isn't a tab

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

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 3a5e5b195fba..6b19befa7417 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -12485,7 +12485,6 @@
   
   
 8
-False
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/formula

[Caolán McNamara (via logerrit)]

 include/formula/funcutl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa2e56307e8beaae6f56f20a554a0d3f2495499b
Author: Caolán McNamara 
AuthorDate: Tue Dec 1 15:45:02 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 2 09:42:54 2020 +0100

move the callbacks to be private

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

diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 02cf585a771e..5c729da03638 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -48,12 +48,12 @@ private:
 
 DECL_LINK( UpdateHdl, Timer*, void );
 
-protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 DECL_LINK(GetFocus, weld::Widget&, void);
 DECL_LINK(LoseFocus, weld::Widget&, void);
 DECL_LINK(Modify, weld::Entry&, void);
 
+protected:
 virtual bool KeyInput(const KeyEvent& rKEvt);
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx   |3 ++-
 include/vcl/pdf/PDFSegmentType.hxx |   25 +
 svx/source/svdraw/svdpdf.cxx   |   15 ---
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   10 +-
 vcl/source/pdf/PDFiumLibrary.cxx   |   14 +-
 5 files changed, 53 insertions(+), 14 deletions(-)

New commits:
commit 0e072c8225e747267eeb915ac88b33b7201df210
Author: Miklos Vajna 
AuthorDate: Tue Dec 1 21:02:54 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 2 09:07:51 2020 +0100

pdfium: introduce an enum class for path segment types

Towards not including fpdf_edit.h in PDFiumLibrary client code.

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 1fe0dd8d988a..497ef3e2d47e 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -135,7 +136,7 @@ public:
 FPDF_PATHSEGMENT getPointer() const { return mpPathSegment; }
 basegfx::B2DPoint getPoint() const;
 bool isClosed() const;
-int getType() const;
+PDFSegmentType getType() const;
 };
 
 class VCL_DLLPUBLIC PDFiumPageObject final
diff --git a/include/vcl/pdf/PDFSegmentType.hxx 
b/include/vcl/pdf/PDFSegmentType.hxx
new file mode 100644
index ..98f74482e6f3
--- /dev/null
+++ b/include/vcl/pdf/PDFSegmentType.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+namespace vcl::pdf
+{
+enum class PDFSegmentType
+{
+Unknown = -1,
+Lineto = 0,
+Bezierto = 1,
+Moveto = 2,
+};
+
+} // namespace vcl::pdf
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index db83863b001a..47ea46c62801 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -964,14 +964,14 @@ void 
ImpSdrPdfImport::ImportPath(std::unique_ptr con
 aB2DPoint.setX(aPoint.X());
 aB2DPoint.setY(aPoint.Y());
 
-const int nSegmentType = pPathSegment->getType();
-switch (nSegmentType)
+const vcl::pdf::PDFSegmentType eSegmentType = 
pPathSegment->getType();
+switch (eSegmentType)
 {
-case FPDF_SEGMENT_LINETO:
+case vcl::pdf::PDFSegmentType::Lineto:
 aPoly.append(aB2DPoint);
 break;
 
-case FPDF_SEGMENT_BEZIERTO:
+case vcl::pdf::PDFSegmentType::Bezierto:
 aBezier.emplace_back(aB2DPoint.getX(), aB2DPoint.getY());
 if (aBezier.size() == 3)
 {
@@ -980,7 +980,7 @@ void 
ImpSdrPdfImport::ImportPath(std::unique_ptr con
 }
 break;
 
-case FPDF_SEGMENT_MOVETO:
+case vcl::pdf::PDFSegmentType::Moveto:
 // New Poly.
 if (aPoly.count() > 0)
 {
@@ -991,9 +991,10 @@ void 
ImpSdrPdfImport::ImportPath(std::unique_ptr con
 aPoly.append(aB2DPoint);
 break;
 
-case FPDF_SEGMENT_UNKNOWN:
+case vcl::pdf::PDFSegmentType::Unknown:
 default:
-SAL_WARN("sd.filter", "Unknown path segment type in PDF: " 
<< nSegmentType);
+SAL_WARN("sd.filter", "Unknown path segment type in PDF: "
+  << 
static_cast(eSegmentType));
 break;
 }
 }
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 136c54aec41e..eaf905986928 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -861,35 +861,35 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf108963)
 CPPUNIT_ASSERT_EQUAL(5, nSegments);
 std::unique_ptr pSegment
 = pPdfPageObject->getPathSegment(0);
-CPPUNIT_ASSERT_EQUAL(FPDF_SEGMENT_MOVETO, pSegment->getType());
+CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFSegmentType::Moveto, 
pSegment->getType());
 basegfx::B2DPoint aPoint = pSegment->getPoint();
 CPPUNIT_ASSERT_EQUAL(245395, static_cast(round(aPoint.getX() 
* 1000)));
 CPPUNIT_ASSERT_EQUAL(244261, static_cast(round(aPoint.getY() 
* 1000)));