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

[Gokce Kuler (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ff4a65a15080b63ee13aa2818fb9700858e58eba
Author: Gokce Kuler 
AuthorDate: Sat Feb 13 00:50:33 2021 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Feb 17 09:06:29 2021 +0100

tdf#137406 removed Apply to Master button in Slide Master mode

Change-Id: Ic19c38a5e6e561cae45cd0a40cfe56d7002efe9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110835
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 9887674044e17c4925caa07f197d74233be810d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110870
Reviewed-by: Xisco Fauli 
(cherry picked from commit 18d22eaf191b854508f4f34b57e931c26d2f34db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110914
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx 
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index bb67585ce8eb..2cb3e1c84ddb 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define SHOW_NUMBERING 0
 #define SHOW_BULLET 1
@@ -204,6 +205,10 @@ 
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
 m_xApplyToMaster->hide();
 m_xSlideRB->set_label(SdResId(STR_PAGE_NAME));
 }
+// tdf#137406: Crash when clicking "Apply to Master" in Slide Master mode 
on Bullets and Numbering dialog
+EditMode aEditmode = 
static_cast<::sd::DrawViewShell*>(pView->GetViewShell())->GetEditMode();
+if (aDocumentType == DocumentType::Impress && aEditmode == 
EditMode::MasterPage)
+m_xApplyToMaster->hide();
 
 // End PageCreated
 
___
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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |   23 +--
 vcl/source/pdf/PDFiumLibrary.cxx |   34 ++
 2 files changed, 35 insertions(+), 22 deletions(-)

New commits:
commit dba40f311bc512c05ea59fbdfeb794ef44af72a6
Author: Miklos Vajna 
AuthorDate: Tue Feb 16 21:07:53 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:10:05 2021 +0100

pdfium: eliminate FPDF_SIGNATURE from public header

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 8a3e05b5b2d2..1c60e52d5f09 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -222,22 +222,17 @@ public:
 };
 
 /// Represents one digital signature, as exposed by PDFium.
-class VCL_DLLPUBLIC PDFiumSignature final
+class VCL_DLLPUBLIC PDFiumSignature
 {
-private:
-FPDF_SIGNATURE mpSignature;
-PDFiumSignature(const PDFiumSignature&) = delete;
-PDFiumSignature& operator=(const PDFiumSignature&) = delete;
-
 public:
-PDFiumSignature(FPDF_SIGNATURE pSignature);
-
-std::vector getByteRange();
-int getDocMDPPermission();
-std::vector getContents();
-OString getSubFilter();
-OUString getReason();
-css::util::DateTime getTime();
+virtual ~PDFiumSignature() = default;
+
+virtual std::vector getByteRange() = 0;
+virtual int getDocMDPPermission() = 0;
+virtual std::vector getContents() = 0;
+virtual OString getSubFilter() = 0;
+virtual OUString getReason() = 0;
+virtual css::util::DateTime getTime() = 0;
 };
 
 class VCL_DLLPUBLIC PDFiumDocument final
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 29d5bb8f3ba6..d183cd6f22c3 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -306,6 +306,24 @@ public:
 /// Returned rect is no longer upside down and is in mm100.
 basegfx::B2DRectangle getCharBox(int nIndex, double fPageHeight) override;
 };
+
+class PDFiumSignatureImpl final : public PDFiumSignature
+{
+private:
+FPDF_SIGNATURE mpSignature;
+PDFiumSignatureImpl(const PDFiumSignatureImpl&) = delete;
+PDFiumSignatureImpl& operator=(const PDFiumSignatureImpl&) = delete;
+
+public:
+PDFiumSignatureImpl(FPDF_SIGNATURE pSignature);
+
+std::vector getByteRange() override;
+int getDocMDPPermission() override;
+std::vector getContents() override;
+OString getSubFilter() override;
+OUString getReason() override;
+css::util::DateTime getTime() override;
+};
 }
 
 OUString convertPdfDateToISO8601(OUString const& rInput)
@@ -438,12 +456,12 @@ std::unique_ptr PDFium::createBitmap(int 
nWidth, int nHeight, int
 return pPDFiumBitmap;
 }
 
-PDFiumSignature::PDFiumSignature(FPDF_SIGNATURE pSignature)
+PDFiumSignatureImpl::PDFiumSignatureImpl(FPDF_SIGNATURE pSignature)
 : mpSignature(pSignature)
 {
 }
 
-std::vector PDFiumSignature::getByteRange()
+std::vector PDFiumSignatureImpl::getByteRange()
 {
 int nByteRangeLen = FPDFSignatureObj_GetByteRange(mpSignature, nullptr, 0);
 std::vector aByteRange(nByteRangeLen);
@@ -456,12 +474,12 @@ std::vector PDFiumSignature::getByteRange()
 return aByteRange;
 }
 
-int PDFiumSignature::getDocMDPPermission()
+int PDFiumSignatureImpl::getDocMDPPermission()
 {
 return FPDFSignatureObj_GetDocMDPPermission(mpSignature);
 }
 
-std::vector PDFiumSignature::getContents()
+std::vector PDFiumSignatureImpl::getContents()
 {
 int nContentsLen = FPDFSignatureObj_GetContents(mpSignature, nullptr, 0);
 std::vector aContents(nContentsLen);
@@ -474,7 +492,7 @@ std::vector PDFiumSignature::getContents()
 return aContents;
 }
 
-OString PDFiumSignature::getSubFilter()
+OString PDFiumSignatureImpl::getSubFilter()
 {
 int nSubFilterLen = FPDFSignatureObj_GetSubFilter(mpSignature, nullptr, 0);
 std::vector aSubFilterBuf(nSubFilterLen);
@@ -484,7 +502,7 @@ OString PDFiumSignature::getSubFilter()
 return aSubFilter;
 }
 
-OUString PDFiumSignature::getReason()
+OUString PDFiumSignatureImpl::getReason()
 {
 int nReasonLen = FPDFSignatureObj_GetReason(mpSignature, nullptr, 0);
 OUString aRet;
@@ -498,7 +516,7 @@ OUString PDFiumSignature::getReason()
 return aRet;
 }
 
-util::DateTime PDFiumSignature::getTime()
+util::DateTime PDFiumSignatureImpl::getTime()
 {
 util::DateTime aRet;
 int nTimeLen = FPDFSignatureObj_GetTime(mpSignature, nullptr, 0);
@@ -551,7 +569,7 @@ std::unique_ptr 
PDFiumDocument::getSignature(int nIndex)
 FPDF_SIGNATURE pSignature = FPDF_GetSignatureObject(mpPdfDocument, nIndex);
 if (pSignature)
 {
-pPDFiumSignature = std::make_unique(pSignature);
+pPDFiumSignature = std::make_unique(pSignature);
 }
 return pPDFiumSignature;
 }
__

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

[Stephan Bergmann (via logerrit)]

 shell/source/win32/SysShExec.cxx |   31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 2eb4c9dcd9189ac2480aa83d5397c91155391776
Author: Stephan Bergmann 
AuthorDate: Tue Feb 16 09:30:09 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Feb 17 09:10:44 2021 +0100

Improve checkExtension

Change-Id: Iff416a9c5930ad5903f7ee51a2abbc94d5f40800
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110970
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit f456c4dacf700e064e112ef068ff7edb04239754)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110923
Reviewed-by: Michael Stahl 
(cherry picked from commit 90294a92f15218bfd18986053dfeeaeaa99c2fd8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110927
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 660729339521..fde14e268c26 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -326,21 +326,28 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 }
 }
 pathname = o3tl::toU(path);
+// ShellExecuteExW appears to ignore trailing dots, so remove them:
+while (pathname.endsWith(".", &pathname)) {}
 auto const n = pathname.lastIndexOf('.');
 if (n > pathname.lastIndexOf('\\')) {
 auto const ext = pathname.copy(n + 1);
-OUString env;
-if (osl_getEnvironment(OUString("PATHEXT").pData, &env.pData) 
!= osl_Process_E_None)
-{
-SAL_INFO("shell", "osl_getEnvironment(PATHEXT) failed");
-}
-if (!(checkExtension(ext, env)
-  && checkExtension(
-  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);
+if (!ext.isEmpty()) {
+OUString env;
+if (osl_getEnvironment(OUString("PATHEXT").pData, 
&env.pData)
+!= osl_Process_E_None)
+{
+SAL_INFO("shell", "osl_getEnvironment(PATHEXT) 
failed");
+}
+if (!(checkExtension(ext, env)
+  && checkExtension(
+  ext,
+  
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.CLASS;"
+  ".JAR;.APPLICATION;.LNK;.SCR")))
+{
+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 'distro/collabora/cp-6.4' - sw/source

[Aron Budea (via logerrit)]

 sw/source/uibase/uno/unotxdoc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 934ed8d888abe231c014ce179e5256933b0562ed
Author: Aron Budea 
AuthorDate: Mon Feb 15 21:46:45 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:12:16 2021 +0100

Avoid crash in online on a document with comments

Crashed on a specific doc with the following backtrace:

Thread 1 "kitbroker_001" received signal SIGSEGV, Segmentation fault.
0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField
(this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
71  const SwPostItField* GetPostItField() const { return 
mpField; }

 0  0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField()
const (this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
 1  0x7f4807f0641b in SwXTextDocument::getPostIts(tools::JsonWriter&)
(this=0x557e1d985a10, rJsonWriter=...)
at /.../libreoffice/sw/source/uibase/uno/unotxdoc.cxx:3337
 2  0x7f4823216534 in getPostIts(LibreOfficeKitDocument*)
(pThis=0x557e1d93c890)
at /.../libreoffice/desktop/source/lib/init.cxx:3425
...

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

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index a3f165c1ff61..6eeec4395f04 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3345,6 +3345,11 @@ OUString SwXTextDocument::getPostIts()
 {
 sw::annotation::SwAnnotationWin* pWin = sidebarItem->pPostIt.get();
 
+if (!pWin)
+{
+continue;
+}
+
 const SwPostItField* pField = pWin->GetPostItField();
 const SwRect& aRect = pWin->GetAnchorRect();
 tools::Rectangle aSVRect(aRect.Pos().getX(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 cui/source/dialogs/cuigaldlg.cxx |2 +-
 cui/source/options/optjava.cxx   |4 ++--
 cui/source/options/optpath.cxx   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fbad0809aee60df4a3cae8f6f2a11f2bd6446b87
Author: Noel 
AuthorDate: Wed Feb 17 08:47:20 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 09:12:42 2021 +0100

loplugin:referencecasting in cui

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

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index aa2ccd0767c1..186a63096d65 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -825,7 +825,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl, 
weld::Button&, void)
 
 css::uno::Reference< XAsynchronousExecutableDialog > xAsyncDlg( 
xFolderPicker, UNO_QUERY );
 if ( xAsyncDlg.is() )
-xAsyncDlg->startExecuteModal( xDialogListener.get() );
+xAsyncDlg->startExecuteModal( xDialogListener );
 else
 {
 if( xFolderPicker->execute() == RET_OK )
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index e6af34320fe7..81bb4e30450a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -161,7 +161,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, 
weld::Button&, void)
 
 Reference< XAsynchronousExecutableDialog > xAsyncDlg( xFolderPicker, 
UNO_QUERY );
 if ( xAsyncDlg.is() )
-xAsyncDlg->startExecuteModal( xDialogListener.get() );
+xAsyncDlg->startExecuteModal( xDialogListener );
 else if ( xFolderPicker.is() && xFolderPicker->execute() == 
ExecutableDialogResults::OK )
 AddFolder( xFolderPicker->getDirectory() );
 }
@@ -261,7 +261,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl, 
void*, void)
 {
 Reference< XAsynchronousExecutableDialog > xAsyncDlg( xFolderPicker, 
UNO_QUERY );
 if ( xAsyncDlg.is() )
-xAsyncDlg->startExecuteModal( xDialogListener.get() );
+xAsyncDlg->startExecuteModal( xDialogListener );
 else if ( xFolderPicker.is() && xFolderPicker->execute() == 
ExecutableDialogResults::OK )
 AddFolder( xFolderPicker->getDirectory() );
 }
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 77432e0b7764..e1f638faa673 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -547,7 +547,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, 
weld::Button&, void)
 
 Reference< XAsynchronousExecutableDialog > xAsyncDlg( 
xFolderPicker, UNO_QUERY );
 if ( xAsyncDlg.is() )
-xAsyncDlg->startExecuteModal( xDialogListener.get() );
+xAsyncDlg->startExecuteModal( xDialogListener );
 else
 {
 short nRet = xFolderPicker->execute();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 cppuhelper/qa/weak/test_weak.cxx   |6 +++---
 cppuhelper/source/defaultbootstrap.cxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 44d308c5fb78c096d0a18ff3eb19171e2aeab118
Author: Noel 
AuthorDate: Wed Feb 17 08:47:31 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 09:12:56 2021 +0100

loplugin:referencecasting in cppuhelper

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

diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index e37131c9f543..4db360b40e3a 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -81,9 +81,9 @@ void Test::testReferenceDispose() {
 ::rtl::Reference< Reference > r1(new RuntimeExceptionReference);
 ::rtl::Reference< Reference > r2(new Reference);
 ::rtl::Reference< Reference > r3(new DisposedExceptionReference);
-a->addReference(r1.get());
-a->addReference(r2.get());
-a->addReference(r3.get());
+a->addReference(r1);
+a->addReference(r2);
+a->addReference(r3);
 w.clear();
 CPPUNIT_ASSERT(r1->isDisposed());
 CPPUNIT_ASSERT(r2->isDisposed());
diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index bf518a0c1f5d..e48b3ea67bc1 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -92,7 +92,7 @@ cppu::defaultBootstrap_InitialComponentContext(OUString const 
& iniUri)
 css::uno::Reference< css::uno::XComponentContext > context(
 createComponentContext(context_values.data(), context_values.size()));
 smgr->setContext(context);
-cppu::installTypeDescriptionManager(tmgr.get());
+cppu::installTypeDescriptionManager(tmgr);
 return context;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 configmgr/source/access.cxx |8 
 configmgr/source/rootaccess.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 779e20ec8deadc80f244f2b76d086638c273c7ab
Author: Noel 
AuthorDate: Wed Feb 17 08:47:55 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 09:13:20 2021 +0100

loplugin:referencecasting in configmgr

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

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 619629f95c79..86e09cbae35f 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1230,7 +1230,7 @@ void Access::initDisposeBroadcaster(Broadcaster * 
broadcaster) {
 for (auto const& containerListener : containerListeners_)
 {
 broadcaster->addDisposeNotification(
-containerListener.get(),
+containerListener,
 css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
 }
 for (auto const& propertyChangeListener : propertyChangeListeners_)
@@ -1238,7 +1238,7 @@ void Access::initDisposeBroadcaster(Broadcaster * 
broadcaster) {
 for (auto const& propertyChangeListenerElement : 
propertyChangeListener.second)
 {
 broadcaster->addDisposeNotification(
-propertyChangeListenerElement.get(),
+propertyChangeListenerElement,
 css::lang::EventObject(
 static_cast< cppu::OWeakObject * >(this)));
 }
@@ -1248,7 +1248,7 @@ void Access::initDisposeBroadcaster(Broadcaster * 
broadcaster) {
 for (auto const& vetoableChangeListenerElement : 
vetoableChangeListener.second)
 {
 broadcaster->addDisposeNotification(
-vetoableChangeListenerElement.get(),
+vetoableChangeListenerElement,
 css::lang::EventObject(
 static_cast< cppu::OWeakObject * >(this)));
 }
@@ -1256,7 +1256,7 @@ void Access::initDisposeBroadcaster(Broadcaster * 
broadcaster) {
 for (auto const& propertiesChangeListener : propertiesChangeListeners_)
 {
 broadcaster->addDisposeNotification(
-propertiesChangeListener.get(),
+propertiesChangeListener,
 css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
 }
 //TODO: iterate over children w/ listeners (incl. unmodified ones):
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index a3804fa47d4d..985560d02177 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -267,7 +267,7 @@ void RootAccess::initDisposeBroadcaster(Broadcaster * 
broadcaster) {
 for (auto const& changesListener : changesListeners_)
 {
 broadcaster->addDisposeNotification(
-changesListener.get(),
+changesListener,
 css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
 }
 Access::initDisposeBroadcaster(broadcaster);
___
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' - oox/source sd/qa

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

 oox/source/drawingml/fillproperties.cxx |   84 
 oox/source/export/drawingml.cxx |   23 ++--
 sd/qa/unit/data/pptx/crop-position.pptx |binary
 sd/qa/unit/export-tests-ooxml1.cxx  |   29 +--
 sd/qa/unit/import-tests.cxx |   16 ++
 5 files changed, 121 insertions(+), 31 deletions(-)

New commits:
commit 363b2d374be736e713c4b8aa0f7b9fda8849335b
Author: Gülşah Köse 
AuthorDate: Mon Feb 1 17:03:33 2021 +0300
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:13:32 2021 +0100

tdf#134210 Import crop position of bitmap filled shape.

Change-Id: I6a62d68cd0f57e53934851a2f53dae05bf7d3730
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110262
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110964
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index f17a613b444e..5ac24b948f98 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -93,6 +93,30 @@ Reference< XGraphic > 
lclRotateGraphic(uno::Reference const &
 return aReturnGraphic.GetXGraphic();
 }
 
+void lclCalculateCropPercentage(uno::Reference const & 
xGraphic, geometry::IntegerRectangle2D &aFillRect)
+{
+::Graphic aGraphic(xGraphic);
+assert (aGraphic.GetType() == GraphicType::Bitmap);
+
+BitmapEx aBitmapEx(aGraphic.GetBitmapEx());
+
+sal_Int32 nScaledWidth = aBitmapEx.GetSizePixel().Width();
+sal_Int32 nScaledHeight = aBitmapEx.GetSizePixel().Height();
+
+sal_Int32 nOrigWidth = (nScaledWidth * (10 - aFillRect.X1 - 
aFillRect.X2)) / 10;
+sal_Int32 nOrigHeight = (nScaledHeight * (10 - aFillRect.Y1 - 
aFillRect.Y2)) / 10;
+
+sal_Int32 nLeftPercentage = nScaledWidth * aFillRect.X1 / nOrigWidth;
+sal_Int32 nRightPercentage = nScaledWidth * aFillRect.X2 / nOrigWidth;
+sal_Int32 nTopPercentage = nScaledHeight * aFillRect.Y1 / nOrigHeight;
+sal_Int32 nBottomPercentage = nScaledHeight * aFillRect.Y2 / nOrigHeight;
+
+aFillRect.X1 = -nLeftPercentage;
+aFillRect.X2 = -nRightPercentage;
+aFillRect.Y1 = -nTopPercentage;
+aFillRect.Y2 = -nBottomPercentage;
+}
+
 Reference< XGraphic > lclCropGraphic(uno::Reference const & 
xGraphic, geometry::IntegerRectangle2D aFillRect)
 {
 ::Graphic aGraphic(xGraphic);
@@ -109,8 +133,15 @@ Reference< XGraphic > 
lclCropGraphic(uno::Reference const & x
 sal_Int32 nBottomCorr = nOrigHeight * -1 * 
static_cast(aFillRect.Y2) / 10;
 nHeight += nBottomCorr;
 
-aBitmapEx.Scale(Size(aBitmapEx.GetSizePixel().Width(), nHeight));
-aBitmapEx.Crop(tools::Rectangle(Point(0, nTopCorr), 
Size(aBitmapEx.GetSizePixel().Width(), nOrigHeight)));
+sal_Int32 nOrigWidth = aBitmapEx.GetSizePixel().Width();
+sal_Int32 nWidth = nOrigWidth;
+sal_Int32 nLeftCorr  = nOrigWidth * -1 * static_cast(aFillRect.X1) 
/ 10;
+nWidth += nLeftCorr;
+sal_Int32 nRightCorr = nOrigWidth * -1 * static_cast(aFillRect.X2) 
/ 10;
+nWidth += nRightCorr;
+
+aBitmapEx.Scale(Size(nWidth, nHeight));
+aBitmapEx.Crop(tools::Rectangle(Point(nLeftCorr, nTopCorr), 
Size(nOrigWidth, nOrigHeight)));
 
 aReturnGraphic = ::Graphic(aBitmapEx);
 aReturnGraphic.setOriginURL(aGraphic.getOriginURL());
@@ -807,6 +838,36 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 nContrast = 0;
 }
 
+// cropping
+if ( maBlipProps.moClipRect.has() )
+{
+geometry::IntegerRectangle2D oClipRect( 
maBlipProps.moClipRect.get() );
+awt::Size aOriginalSize( rGraphicHelper.getOriginalSize( xGraphic 
) );
+if ( aOriginalSize.Width && aOriginalSize.Height )
+{
+text::GraphicCrop aGraphCrop( 0, 0, 0, 0 );
+if ( oClipRect.X1 )
+aGraphCrop.Left = rtl::math::round( ( static_cast< double 
>( aOriginalSize.Width ) * oClipRect.X1 ) / 10 );
+if ( oClipRect.Y1 )
+aGraphCrop.Top = rtl::math::round( ( static_cast< double 
>( aOriginalSize.Height ) * oClipRect.Y1 ) / 10 );
+if ( oClipRect.X2 )
+aGraphCrop.Right = rtl::math::round( ( static_cast< double 
>( aOriginalSize.Width ) * oClipRect.X2 ) / 10 );
+if ( oClipRect.Y2 )
+aGraphCrop.Bottom = rtl::math::round( ( static_cast< 
double >( aOriginalSize.Height ) * oClipRect.Y2 ) / 10 );
+rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop);
+}
+
+if(mbIsCustomShape)
+{
+geometry::IntegerRectangle2D aCropRect = oClipRect;
+lclCalculateCropPercentage(xGraphic, aCropRect);
+xGraphic = lclCropGraphic(xGraphic, aCropRect);
+
+ 

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

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

 oox/source/drawingml/fillproperties.cxx  |   19 +++
 sd/qa/unit/data/pptx/greysscale-graphic.pptx |binary
 sd/qa/unit/import-tests.cxx  |   16 
 3 files changed, 35 insertions(+)

New commits:
commit 11c5329669e7a908b43a3fe51a673e8d78740f8c
Author: Gülşah Köse 
AuthorDate: Mon Feb 8 13:30:39 2021 +0300
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:14:25 2021 +0100

tdf#134210 Handle greyscale effect on bitmap filled custom shapes.

Change-Id: Ia4a0828dad80e32cc0c7fe12227ffca717d62e03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110572
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110965
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 5ac24b948f98..bdd81e1d0434 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -172,6 +172,22 @@ Reference< XGraphic > 
lclMirrorGraphic(uno::Reference const &
 return aReturnGraphic.GetXGraphic();
 }
 
+Reference< XGraphic > lclGreysScaleGraphic(uno::Reference 
const & xGraphic)
+{
+::Graphic aGraphic(xGraphic);
+::Graphic aReturnGraphic;
+
+assert (aGraphic.GetType() == GraphicType::Bitmap);
+
+BitmapEx aBitmapEx(aGraphic.GetBitmapEx());
+aBitmapEx.Convert(BmpConversion::N8BitGreys);
+
+aReturnGraphic = ::Graphic(aBitmapEx);
+aReturnGraphic.setOriginURL(aGraphic.getOriginURL());
+
+return aReturnGraphic.GetXGraphic();
+}
+
 Reference< XGraphic > lclCheckAndApplyChangeColorTransform(const 
BlipFillProperties &aBlipProps, uno::Reference const & 
xGraphic,
const 
GraphicHelper& rGraphicHelper, const ::Color nPhClr)
 {
@@ -887,6 +903,9 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 if(bFlipH || bFlipV)
 xGraphic = lclMirrorGraphic(xGraphic, bFlipH, bFlipV );
 
+if(eColorMode == ColorMode_GREYS)
+xGraphic = lclGreysScaleGraphic( xGraphic );
+
 rPropMap.setProperty(PROP_FillBitmap, xGraphic);
 }
 else
diff --git a/sd/qa/unit/data/pptx/greysscale-graphic.pptx 
b/sd/qa/unit/data/pptx/greysscale-graphic.pptx
new file mode 100644
index ..547b60c10269
Binary files /dev/null and b/sd/qa/unit/data/pptx/greysscale-graphic.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index e0c725031f10..6b52466c2513 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -210,6 +210,7 @@ public:
 void testTdf119187();
 void testMirroredGraphic();
 void testCropPositionGraphic();
+void testGreysScaleGraphic();
 
 bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
@@ -338,6 +339,7 @@ public:
 CPPUNIT_TEST(testTdf119187);
 CPPUNIT_TEST(testMirroredGraphic);
 CPPUNIT_TEST(testCropPositionGraphic);
+CPPUNIT_TEST(testGreysScaleGraphic);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -3254,6 +3256,20 @@ void SdImportTest::testCropPositionGraphic()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testGreysScaleGraphic()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/greysscale-graphic.pptx"),
 PPTX);
+uno::Reference xShape(getShapeFromPage(0, 0, 
xDocShRef), uno::UNO_SET_THROW);
+CPPUNIT_ASSERT(xShape.is());
+uno::Reference xGraphic;
+xShape->getPropertyValue("FillBitmap") >>= xGraphic;
+CPPUNIT_ASSERT(xGraphic.is());
+Graphic aGraphic(xGraphic);
+BitmapEx aBitmap(aGraphic.GetBitmapEx());
+CPPUNIT_ASSERT_EQUAL( Color(3947580), aBitmap.GetPixelColor( 0, 0 ));
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 svx/source/table/tablelayouter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 52a666e3ee429c1041ab74b1c005cf484b7e0d6f
Author: Gülşah Köse 
AuthorDate: Wed Feb 10 08:49:28 2021 +0300
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:15:27 2021 +0100

tdf#139511 Correct calculation of minimum row height during resize.

Change-Id: Id47b5877d56850c80395897a83daae8e24f5c099
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110662
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit b6d53ce5359d4f41b9fece475339cdf63c5817e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110930
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index 3e7ff37c00ac..5ee25af7be86 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -794,7 +794,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& 
rArea, bool bFit )
 // Case 2: * Row has "Heigth" property
 // * Calculated minimum heigth is bigger than 
Height propery value and
 // * Row has not any text of any cell in edit 
mode in the row (means completely empty)
-if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 ) ||
+if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 && 
(bRowHasText || bRowHasCellInEditMode)) ||
 (nMinHeight > nRowPropHeight && nRowPropHeight > 0 && 
(!bRowHasText && !bRowHasCellInEditMode)))
 {
 nMinHeight = nRowPropHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adoption of mathml standards on starmath

[Miklos Vajna]

Hi Dante,

On Tue, Feb 16, 2021 at 10:09:23AM +0100, Dante Doménech 
 wrote:
> I've been working for a while in making starmath fully mathml compatible,
> but after my last try of implementing priority based parser hit a
> structural problem. So there's the point; in order to be able to guarantee
> backwards compatibility I need to add a new parser. If the document is old
> type (7.1) use old parser and if it's new type (7.2) use new parser.

You may rather want a feature / compat flag, so in case there is no good
migration between old-style and new-style then if you edit old-style
with 7.2, you want to keep that still as old-style.

> However I don't know the UNO api so well, is there a way to differentiate
> them?

Did you check if the existing mechanism Writer and Impress has would be
suitable for Math as well?

See sw/source/core/doc/DocumentSettingManager.cxx; there is also
sd/source/ui/docshell/docshel4.cxx, see the
SetAnchoredTextOverflowLegacy() call there.

Regards,

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

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

[Aron Budea (via logerrit)]

 sw/source/uibase/uno/unotxdoc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 10e16862684c71361119565ee4dc6bdf3e217197
Author: Aron Budea 
AuthorDate: Mon Feb 15 21:46:45 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 09:29:51 2021 +0100

Avoid crash in online on a document with comments

Crashed on a specific doc with the following backtrace:

Thread 1 "kitbroker_001" received signal SIGSEGV, Segmentation fault.
0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField
(this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
71  const SwPostItField* GetPostItField() const { return 
mpField; }

 0  0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField()
const (this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
 1  0x7f4807f0641b in SwXTextDocument::getPostIts(tools::JsonWriter&)
(this=0x557e1d985a10, rJsonWriter=...)
at /.../libreoffice/sw/source/uibase/uno/unotxdoc.cxx:3337
 2  0x7f4823216534 in getPostIts(LibreOfficeKitDocument*)
(pThis=0x557e1d93c890)
at /.../libreoffice/desktop/source/lib/init.cxx:3425
...

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

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index daa679684cb3..2ba12a2f6943 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3334,6 +3334,11 @@ void SwXTextDocument::getPostIts(tools::JsonWriter& 
rJsonWriter)
 {
 sw::annotation::SwAnnotationWin* pWin = sidebarItem->mpPostIt.get();
 
+if (!pWin)
+{
+continue;
+}
+
 const SwPostItField* pField = pWin->GetPostItField();
 const SwRect& aRect = pWin->GetAnchorRect();
 tools::Rectangle aSVRect(aRect.Pos().getX(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand (Allotropia) (via logerrit)]

 emfio/source/reader/mtftools.cxx |   20 +-
 include/vcl/font.hxx |3 ++
 vcl/inc/impfont.hxx  |   21 ++-
 vcl/source/filter/wmf/emfwr.cxx  |   27 ++--
 vcl/source/font/font.cxx |   43 +--
 5 files changed, 108 insertions(+), 6 deletions(-)

New commits:
commit 9d161857f1d4afcb772b477455797a2da0e47a9b
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Feb 16 18:20:32 2021 +0100
Commit: Armin Le Grand 
CommitDate: Wed Feb 17 09:31:09 2021 +0100

tdf#127471 correct EMF/WMF im/export for scaled font

If FontScaling is used, system-dependent data is held at
vcl::Font Width(). Already if not scaled, we have three
definitions: Width is zero, Width is equal to Height (unx)
or - on Windows - Width equals avgFontWidth.
If used it is W!=H where on unx Width equals Height multiplied
with the scale factor. On Windows, this is Width multiplied
with the only there existing avgFontWidth.
Unfortunately that is ex/imported (since ever) undetected
to EMF/WMF thus making EMF/WMF files containing FontScaling
system-dependent - on which system was LO running when
creating the file? The error can be seen when loading such
a EMF/WMF on the vice-versa system, the FontScale is very
ugly and wrong.
Since EMF/WMF *are* Windows-specific formats the Windows-like
definition is the correct one. This change makes all other
systems export that now, and adapt on import to their system-
specific definition (assuming coming from Windows).
As can be seen, the difficulty is that these adaptions are
necessary on non-Windows plattforms, but these do not have
that avgFontWidth available. Thus I made a deep-dive
investigation and multiple experiments to create a as
similar as possible value to apply the needed calculations.
For details and discussion refer to the bug description.

Change-Id: I983fb6d882e2e8fccf9c8460f01509201d8157f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111000
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index b05beeb2a9dc..6064ca937a16 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -277,8 +277,26 @@ namespace emfio
 
 // Convert height to positive
 aFontSize.setHeight( std::abs(aFontSize.Height()) );
-
 aFont.SetFontSize(aFontSize);
+
+// tdf#127471 adapt nFontWidth from Windows-like notation to
+// NormedFontScaling if used for text scaling
+#ifndef _WIN32
+const bool bFontScaledHorizontally(aFontSize.Width() != 0 && 
aFontSize.Width() != aFontSize.Height());
+
+if(bFontScaledHorizontally)
+{
+// tdf#127471 nFontWidth is the Windows FontScaling, need to 
convert to
+// Non-Windowslike notation relative to FontHeight.
+const tools::Long 
nAverageFontWidth(aFont.GetOrCalculateAverageFontWidth());
+
+if(nAverageFontWidth > 0)
+{
+const double 
fScaleFactor(static_cast(aFontSize.Height()) / 
static_cast(nAverageFontWidth));
+
aFont.SetAverageFontWidth(static_cast(static_cast(aFontSize.Width())
 * fScaleFactor));
+}
+}
+#endif
 };
 
 Color MtfTools::ReadColor()
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 2d437c5b3da0..3147f57aba14 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -113,6 +113,9 @@ public:
 voidSetAverageFontWidth( tools::Long nWidth );
 tools::LongGetAverageFontWidth() const;
 
+// tdf#127471 for corrections on EMF/WMF we need the AvgFontWidth in 
Windows-specific notation
+tools::Long GetOrCalculateAverageFontWidth() const;
+
 // Prefer LanguageTag over LanguageType
 voidSetLanguageTag( const LanguageTag & );
 const LanguageTag&  GetLanguageTag() const;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index ba1ea3683926..14a2189d3921 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -62,7 +62,18 @@ public:
 voidSetWidthType( const FontWidth eWidthType )  { 
meWidthType = eWidthType; }
 voidSetAlignment( const TextAlign eAlignment )  { 
meAlign = eAlignment; }
 voidSetCharSet( const rtl_TextEncoding eCharSet )   { 
meCharSet = eCharSet; }
-voidSetFontSize( const Size& rSize ) { 
maAverageFontSize = rSize; }
+voidSetFontSize( const Size& rSize )
+{
+#ifndef _WIN32
+if(rSize.Height() != maAverageFontSize.Height())
+{
+// reset evtl. buffered calculated AverageFontSize, it depends
+// on Font::Height
+mnCalculatedAverageFontWidth = 0;
+}
+#endif

[Libreoffice-commits] core.git: desktop/source filter/CppunitTest_filter_dxf_test.mk filter/Library_gie.mk filter/Module_filter.mk filter/qa filter/source include/vcl solenv/clang-format vcl/CppunitTe

[Tomaž Vajngerl (via logerrit)]

 desktop/source/lib/init.cxx  |3 
 filter/CppunitTest_filter_dxf_test.mk|   39 

 filter/Library_gie.mk|8 
 filter/Module_filter.mk  |1 
 filter/source/config/fragments/internalgraphicfilters/dxf_Import.xcu |   21 +-
 include/vcl/graphicfilter.hxx|5 
 solenv/clang-format/excludelist  |   32 +--
 vcl/CppunitTest_vcl_filters_test.mk  |1 
 vcl/Library_vcl.mk   |8 
 vcl/inc/filter/DxfReader.hxx |   26 +++
 vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx|   18 --
 vcl/source/filter/FilterConfigCache.cxx  |4 
 vcl/source/filter/graphicfilter.cxx  |   84 
+-
 vcl/source/filter/idxf/idxf.cxx  |6 
 vcl/workben/dxffuzzer.cxx|5 
 vcl/workben/fftester.cxx |   14 -
 16 files changed, 94 insertions(+), 181 deletions(-)

New commits:
commit d3476d27ab77160dcd737194fc13081ee297db16
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 11:35:38 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Feb 17 09:55:46 2021 +0100

Move DXF reader from filter module into VCL

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 95e76de18cdb..b400c24ab55c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -6276,9 +6276,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 InitVCL();
 }
 
-// pre-load all graphic libraries.
-GraphicFilter::GetGraphicFilter().preload();
-
 // pre-load all component libraries.
 if (!xContext.is())
 throw css::uno::DeploymentException("preInit: 
XComponentContext is not created");
diff --git a/filter/CppunitTest_filter_dxf_test.mk 
b/filter/CppunitTest_filter_dxf_test.mk
deleted file mode 100644
index 4a10c1845cef..
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- 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,filter_dxf_test))
-
-$(eval $(call gb_CppunitTest_use_external,filter_dxf_test,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,filter_dxf_test, \
-filter/qa/cppunit/filters-dxf-test \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
-   gie \
-   sal \
-   test \
-   tl \
-   unotest \
-   vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test))
-
-$(eval $(call gb_CppunitTest_use_ure,filter_dxf_test))
-$(eval $(call gb_CppunitTest_use_vcl,filter_dxf_test))
-
-$(eval $(call gb_CppunitTest_use_components,filter_dxf_test,\
-configmgr/source/configmgr \
-i18npool/util/i18npool \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,filter_dxf_test))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index e04eb08fda7f..b40da250a183 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -51,14 +51,6 @@ $(eval $(call gb_Library_use_libraries,gie,\
 $(eval $(call gb_Library_add_exception_objects,gie,\
 filter/source/graphicfilter/egif/egif \
 filter/source/graphicfilter/egif/giflzwc \
-filter/source/graphicfilter/idxf/dxf2mtf \
-filter/source/graphicfilter/idxf/dxfblkrd \
-filter/source/graphicfilter/idxf/dxfentrd \
-filter/source/graphicfilter/idxf/dxfgrprd \
-filter/source/graphicfilter/idxf/dxfreprd \
-filter/source/graphicfilter/idxf/dxftblrd \
-filter/source/graphicfilter/idxf/dxfvec \
-filter/source/graphicfilter/idxf/idxf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 607a5fc46d0c..2fb2e4c0c8e3 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
-CppunitTest_filter_dxf_test \
 CppunitTest_filter_svg \
 ))
 endif
diff --git 
a/filter/source/con

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

[Julien Nabet (via logerrit)]

 editeng/source/editeng/editview.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9b48f981807995d932ee36bd1f5b7972c72f871d
Author: Julien Nabet 
AuthorDate: Sun Feb 14 21:17:10 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Feb 17 10:29:30 2021 +0100

tdf#140414: fix Crash pressing Ctrl-K in input line in Calc

3  0x7ff38b819d73 in vcl::Window::GetPointerPosPixel() (this=0x0) at 
vcl/source/window/mouse.cxx:552
4  0x7ff3925fe7c1 in EditView::GetFieldUnderMousePointer(int&, int&) 
const (this=0x4c37160, nPara=@0x7ffd982b4f44: 0, nPos=@0x7ffd982b4f40: 
57752960) at editeng/source/editeng/editview.cxx:1325
5  0x7ff3925fe74a in EditView::GetFieldUnderMousePointer() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1315
6  0x7ff3925fec4c in EditView::GetFieldAtCursor() const 
(this=0x4c37160) at editeng/source/editeng/editview.cxx:1384
7  0x7ff377f6aa55 in ScEditShell::GetURLField() (this=0x37a31a0) at 
sc/source/ui/view/editsh.cxx:833

Change-Id: Ib369644f26eec4f37a34213f0b0113359a653098
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110860
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 35965e1e276a..8e7c62f224e6 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1273,7 +1273,10 @@ const SvxFieldItem* EditView::GetField( const Point& 
rPos, sal_Int32* pPara, sal
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, 
sal_Int32& nPos ) const
 {
-Point aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
+auto pWin = pImpEditView->GetWindow();
+if (!pWin)
+return nullptr;
+Point aPos = pWin->GetPointerPosPixel();
 aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
 return GetField( aPos, &nPara, &nPos );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: problem with link error in unit test

[Regina Henschel]

Hi Noel,

thank you for the help. It works now.

Kind regards
Regina

Noel Grandin schrieb am 16.02.2021 um 08:37:

On 2021/02/16 12:22 am, Regina Henschel wrote:

Hi Noel,

my local build on Windows 10 with VS2019 works, but gerrit_mac and 
gerrit_android_x86_64 complain.

https://gerrit.libreoffice.org/c/core/+/110959



Windows linking is a little more relaxed in this area, which is why 
problems tend to show up on unix systems.


In this case, you will need to add
    #include "scdllapi.h"
to pull in the definition of the SC_DLLPUBLIC  macro

Regards, Noel



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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - chart2/source include/sfx2 sc/source sd/source sfx2/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/sidebar/ChartAxisPanel.cxx |2 ++
 chart2/source/controller/sidebar/ChartElementsPanel.cxx |2 ++
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx |2 ++
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx   |2 ++
 chart2/source/controller/sidebar/ChartTypePanel.cxx |2 ++
 include/sfx2/sidebar/PanelLayout.hxx|2 ++
 sc/source/ui/formdlg/dwfunctr.cxx   |2 ++
 sc/source/ui/navipi/navipi.cxx  |2 ++
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |1 +
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx  |1 +
 sd/source/ui/animations/CustomAnimationPane.cxx |1 +
 sd/source/ui/dlg/navigatr.cxx   |2 ++
 sd/source/ui/sidebar/LayoutMenu.cxx |1 +
 sd/source/ui/sidebar/MasterPagesSelector.cxx|2 ++
 sd/source/ui/table/TableDesignPane.hxx  |7 +++
 sfx2/source/dialog/templdlg.cxx |1 +
 sfx2/source/sidebar/PanelLayout.cxx |9 +
 svx/source/gallery2/GalleryControl.cxx  |1 +
 svx/source/gallery2/galbrws1.cxx|   11 ---
 svx/source/gallery2/galbrws1.hxx|1 +
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx   |2 ++
 svx/source/sidebar/effect/EffectPropertyPanel.cxx   |2 ++
 svx/source/sidebar/inspector/InspectorTextPanel.cxx |1 +
 svx/source/sidebar/lists/ListsPropertyPanel.cxx |1 +
 svx/source/sidebar/media/MediaPlaybackPanel.cxx |2 ++
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |1 +
 svx/source/sidebar/shapes/DefaultShapesPanel.cxx|2 ++
 svx/source/sidebar/styles/StylesPropertyPanel.cxx   |1 +
 svx/source/sidebar/text/TextPropertyPanel.cxx   |2 ++
 sw/source/uibase/sidebar/StylePresetsPanel.cxx  |2 ++
 sw/source/uibase/sidebar/TableEditPanel.cxx |2 ++
 sw/source/uibase/sidebar/ThemePanel.cxx |2 ++
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx  |2 ++
 sw/source/uibase/utlui/navipi.cxx   |2 ++
 34 files changed, 75 insertions(+), 3 deletions(-)

New commits:
commit 97a1d170b5f45c6cf9fc2c56dc4526d0e3f8423a
Author: Caolán McNamara 
AuthorDate: Mon Feb 15 20:16:44 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Feb 17 10:59:40 2021 +0100

tdf#140387 grab focus to first panel widget on panel gaining focus

otherwise focus is getting lost in these currently mixed vcl+gtk widget
panels.

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

diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 63807f37c9ec..c1d9a4e62871 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -219,6 +219,8 @@ ChartAxisPanel::ChartAxisPanel(
 , mbModelValid(true)
 {
 Initialize();
+
+m_pInitialFocusWidget = mxCBShowLabel.get();
 }
 
 ChartAxisPanel::~ChartAxisPanel()
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 27b96dc74007..b14705cc8080 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -336,6 +336,8 @@ ChartElementsPanel::ChartElementsPanel(
 maTextSubTitle = mxTextSubTitle->get_label();
 
 Initialize();
+
+m_pInitialFocusWidget = mxCBTitle.get();
 }
 
 ChartElementsPanel::~ChartElementsPanel()
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx 
b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index cb768d34dd15..b435520c5968 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -249,6 +249,8 @@ ChartErrorBarPanel::ChartErrorBarPanel(
 , mbModelValid(true)
 {
 Initialize();
+
+m_pInitialFocusWidget = mxRBPosAndNeg.get();
 }
 
 ChartErrorBarPanel::~ChartErrorBarPanel()
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 8a0c0d787db3..727aabbc2458 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -297,6 +297,8 @@ ChartSeriesPanel::ChartSeriesPanel(
 , mbModelValid(true)
 {
 Initialize();
+
+m_pInitialFocusWidget = mxCBLabel.get();
 }
 
 ChartSeriesPanel::~ChartSeriesPanel()
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailView.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit da2ae86e2164d377869b07f7f90b7178b1963c6b
Author: Caolán McNamara 
AuthorDate: Thu Feb 11 15:27:08 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 17 11:13:28 2021 +0100

ignore row-activated with no active cursor position

to reproduce: under gen launch base wizard, "open an existing database
file", and use the "open" button, double click a .odb.

base launches on the 2nd button down, on mouse *release* base has
appeared and has a treeview under the mouse which gets button up and
triggers "onSelected" with the unexpected no-row selected case

https: 
//crashreport.libreoffice.org/stats/crash_details/a6282ff5-d0aa-4beb-9b44-6c5fd2ca0130
Change-Id: Ic4a5fa9fc8c9c6bb0e33c165559eda966b83e3ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110690
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx 
b/dbaccess/source/ui/app/AppDetailView.cxx
index 8570db552fe1..eba80dbfb4ec 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -70,11 +70,12 @@ void OTasksWindow::updateHelpText()
 IMPL_LINK(OTasksWindow, onSelected, weld::TreeView&, rTreeView, bool)
 {
 m_nCursorIndex = rTreeView.get_cursor_index();
-assert(m_nCursorIndex != -1 && "OTasksWindow::onSelected: invalid entry!");
-URL aCommand;
-aCommand.Complete = 
reinterpret_cast(rTreeView.get_id(m_nCursorIndex).toUInt64())->sUNOCommand;
-
getDetailView()->getBorderWin().getView()->getAppController().executeChecked( 
aCommand, Sequence< PropertyValue >() );
-
+if (m_nCursorIndex != -1)
+{
+URL aCommand;
+aCommand.Complete = 
reinterpret_cast(rTreeView.get_id(m_nCursorIndex).toUInt64())->sUNOCommand;
+
getDetailView()->getBorderWin().getView()->getAppController().executeChecked( 
aCommand, Sequence< PropertyValue >() );
+}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 connectivity/source/commontools/TTableHelper.cxx|4 ++--
 connectivity/source/commontools/parameters.cxx  |2 +-
 connectivity/source/commontools/paramwrapper.cxx|2 +-
 connectivity/source/cpool/ZPoolCollection.cxx   |2 +-
 connectivity/source/cpool/ZPooledConnection.cxx |2 +-
 connectivity/source/drivers/dbase/DTable.cxx|4 ++--
 connectivity/source/drivers/file/FPreparedStatement.cxx |8 
 connectivity/source/drivers/file/FResultSet.cxx |7 +++
 connectivity/source/drivers/file/FStatement.cxx |2 +-
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx   |2 +-
 connectivity/source/drivers/firebird/PreparedStatement.cxx  |2 +-
 connectivity/source/drivers/firebird/Statement.cxx  |2 +-
 connectivity/source/drivers/jdbc/JStatement.cxx |2 +-
 connectivity/source/drivers/jdbc/PreparedStatement.cxx  |2 +-
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |2 +-
 connectivity/source/drivers/mysqlc/mysqlc_statement.cxx |2 +-
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 +-
 connectivity/source/drivers/odbc/OStatement.cxx |2 +-
 connectivity/source/manager/mdrivermanager.cxx  |2 +-
 connectivity/source/sdbcx/VTable.cxx|4 ++--
 20 files changed, 28 insertions(+), 29 deletions(-)

New commits:
commit 6ec7f2b22bc9e31c330dcef229f7ecfe98724a5e
Author: Noel 
AuthorDate: Tue Feb 16 08:55:13 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 11:41:55 2021 +0100

loplugin:referencecasting in connectivity

Change-Id: I4b91c3e4a225323235ea37d77f0f96600bf412be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110969
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/connectivity/source/commontools/TTableHelper.cxx 
b/connectivity/source/commontools/TTableHelper.cxx
index 03724d669704..9c955a7e0104 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -181,7 +181,7 @@ void SAL_CALL OTableHelper::disposing()
 ::osl::MutexGuard aGuard(m_aMutex);
 if ( m_pImpl->m_xTablePropertyListener.is() )
 {
-
m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.get());
+m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener);
 m_pImpl->m_xTablePropertyListener->clear();
 m_pImpl->m_xTablePropertyListener.clear();
 }
@@ -387,7 +387,7 @@ void OTableHelper::refreshForeignKeys(::std::vector< 
OUString>& _rNames)
 {
 if ( !m_pImpl->m_xTablePropertyListener.is() )
 m_pImpl->m_xTablePropertyListener = new 
OTableContainerListener(this);
-
m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.get());
+
m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener);
 m_pImpl->m_xTablePropertyListener->add(sReferencedName);
 } // if ( m_pTables->hasByName(sReferencedName) )
 sOldFKName = sFkName;
diff --git a/connectivity/source/commontools/parameters.cxx 
b/connectivity/source/commontools/parameters.cxx
index 3eb116500e81..906dbc0d3f27 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -711,7 +711,7 @@ namespace dbtools
 ::comphelper::OInterfaceIteratorHelper2 aIter( 
m_aParameterListeners );
 Reference< XPropertySet > xProp = m_xComponent;
 OSL_ENSURE(xProp.is(),"Some already released my component!");
-DatabaseParameterEvent aEvent( xProp.get(), 
m_pOuterParameters.get() );
+DatabaseParameterEvent aEvent( xProp, m_pOuterParameters );
 
 _rClearForNotifies.clear();
 while ( aIter.hasMoreElements() && !bCanceled )
diff --git a/connectivity/source/commontools/paramwrapper.cxx 
b/connectivity/source/commontools/paramwrapper.cxx
index 17cb58cab220..0aca56b65123 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -313,7 +313,7 @@ namespace dbtools::param
 if ( ( _nIndex < 0 ) || ( _nIndex >= 
static_cast(m_aParameters.size()) ) )
 throw IndexOutOfBoundsException();
 
-return makeAny( Reference< XPropertySet >( m_aParameters[ _nIndex 
].get() ) );
+return makeAny( Reference< XPropertySet >( m_aParameters[ _nIndex ] ) 
);
 }
 
 
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx 
b/connectivity/source/cpool/ZPoolCollection.cxx
index 34d24b0be4f9..17215ece7510 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection

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

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf82616.py |   66 +
 1 file changed, 66 insertions(+)

New commits:
commit 5692bafd2f43c25e9ef52f3b1eda1ca3d8556bf1
Author: Xisco Fauli 
AuthorDate: Wed Feb 17 10:41:32 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 17 11:55:07 2021 +0100

tdf#82616: sd: Add UItest

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

diff --git a/sd/qa/uitest/impress_tests/tdf82616.py 
b/sd/qa/uitest/impress_tests/tdf82616.py
new file mode 100644
index ..d8c4cb1bdcfc
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf82616.py
@@ -0,0 +1,66 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import change_measurement_unit
+from uitest.framework import UITestCase
+
+class Tdf82616(UITestCase):
+
+def test_tdf82616(self):
+self.ui_test.create_doc_in_start_center("impress")
+
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+change_measurement_unit(self, 'Centimeter')
+
+xImpressDoc = self.xUITest.getTopFocusWindow()
+
+document = self.ui_test.get_component()
+self.assertEqual(1400, document.DrawPages[0].getByIndex(0).Position.X)
+self.assertEqual(628, document.DrawPages[0].getByIndex(0).Position.Y)
+self.assertEqual(1400, document.DrawPages[0].getByIndex(1).Position.X)
+self.assertEqual(3685, document.DrawPages[0].getByIndex(1).Position.Y)
+
+self.assertIsNone(document.CurrentSelection)
+
+xEditWin = xImpressDoc.getChild("impress_win")
+xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed 
Drawinglayer object 1"}))
+self.assertEqual("com.sun.star.drawing.SvxShapeCollection", 
document.CurrentSelection.getImplementationName())
+
+xEditWin.executeAction("SIDEBAR", mkPropertyValues({"PANEL": 
"PosSizePropertyPanel"}))
+
+xHorizontalPos = xImpressDoc.getChild("horizontalpos")
+self.ui_test.wait_until_property_is_updated(xHorizontalPos, "Value", 
"1.4")
+self.assertEqual("1.4", get_state_as_dict(xHorizontalPos)['Value'])
+
+xVerticalPos = xImpressDoc.getChild("verticalpos")
+self.ui_test.wait_until_property_is_updated(xVerticalPos, "Value", 
"3.69")
+self.assertEqual("3.69", get_state_as_dict(xVerticalPos)['Value'])
+
+xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer object 
1")
+xDrawinglayerObject.executeAction("MOVE", mkPropertyValues({"X": 
"-5000", "Y":"-1"}))
+
+self.assertEqual(1400, document.DrawPages[0].getByIndex(0).Position.X)
+self.assertEqual(628, document.DrawPages[0].getByIndex(0).Position.Y)
+self.assertEqual(-3600, document.DrawPages[0].getByIndex(1).Position.X)
+self.assertEqual(-6315, document.DrawPages[0].getByIndex(1).Position.Y)
+
+# Without the fix in place, this test would have failed with
+# AssertionError: '-3.6' != '0'
+self.ui_test.wait_until_property_is_updated(xHorizontalPos, "Value", 
"-3.6")
+self.assertEqual("-3.6", get_state_as_dict(xHorizontalPos)['Value'])
+
+self.ui_test.wait_until_property_is_updated(xVerticalPos, "Value", 
"-6.32")
+self.assertEqual("-6.32", get_state_as_dict(xVerticalPos)['Value'])
+
+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: sd/qa

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

 sd/qa/unit/data/pptx/tdf128213-shaperot.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   17 +
 2 files changed, 17 insertions(+)

New commits:
commit 185ed8d270da6d41b1860b7afd74351098da14a0
Author: Gülşah Köse 
AuthorDate: Wed Feb 17 09:54:18 2021 +0300
Commit: Gülşah Köse 
CommitDate: Wed Feb 17 11:57:49 2021 +0100

tdf#128213 Add unit test for text camera z rotation.

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

diff --git a/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx 
b/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx
new file mode 100644
index ..4e834bb7c563
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index faaf35f71347..9523d5718a46 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -207,6 +207,7 @@ public:
 void testShapeSoftEdgeEffect();
 void testShapeShadowBlurEffect();
 void testTdf119223();
+void testTdf128213ShapeRot();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -328,6 +329,7 @@ public:
 CPPUNIT_TEST(testShapeSoftEdgeEffect);
 CPPUNIT_TEST(testShapeShadowBlurEffect);
 CPPUNIT_TEST(testTdf119223);
+CPPUNIT_TEST(testTdf128213ShapeRot);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3084,6 +3086,21 @@ void SdOOXMLExportTest2::testTdf119223()
 "//p:cNvPr[@name='SomeGroup']");
 }
 
+void SdOOXMLExportTest2::testTdf128213ShapeRot()
+{
+auto xDocShRef
+= 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128213-shaperot.pptx"),
 PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, 
"ppt/slides/slide1.xml");
+
+assertXPath(pXmlDocRels, 
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:scene3d");
+assertXPath(pXmlDocRels, 
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:scene3d/a:camera/a:rot", 
"rev", "540");
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/filter/GraphicFormatDetector.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 93f7966140d71ac8a2489fa4cd5d88ba4d54620d
Author: Caolán McNamara 
AuthorDate: Tue Feb 16 20:27:40 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 17 12:18:29 2021 +0100

ofz#31021 Stack-buffer-overflow

 Conditional jump or move depends on uninitialised value(s)
at 0x483CB98: strlen (vg_replace_strmem.c:459)
by 0x49B4CA3: int rtl::str::getLength(char const*) 
(strtmpl.hxx:65)
by 0x49B7232: void rtl::str::newFromStr<_rtl_String>(_rtl_String**,
rtl::str::STRCODE_DATA<_rtl_String>::type const*) (strtmpl.hxx:1344)
by 0x49B470C: rtl_string_newFromStr (string.cxx:611)
by 0x6059266: rtl::OString::OString(char (&)
[18], rtl::libreoffice_internal::NonConstCharArrayDetector::Type) (string.hxx:275)
by 0x6058B5E: vcl::GraphicFormatDetector::checkTGA() 
(GraphicFormatDetector.cxx:525)

since...

commit 48d655fe12bc2c4c42d6c88b8a43fade1614ee2a
Date:   Mon Feb 15 16:25:56 2021 +0900

vcl: Detect TGA graphic by inspecting the file footer

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

diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index e5a1eb5f9a79..4a2117b6f5b9 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -522,8 +522,7 @@ bool GraphicFormatDetector::checkTGA()
 mrStream.SeekRel(-18);
 mrStream.ReadBytes(sFooterBytes, 18);
 
-OString aFooterString(sFooterBytes);
-if (aFooterString == "TRUEVISION-XFILE.")
+if (memcmp(sFooterBytes, "TRUEVISION-XFILE.", 
SAL_N_ELEMENTS(sFooterBytes)) == 0)
 {
 msDetectedFormat = "TGA";
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bayram Çiçek (via logerrit)]

 sax/source/tools/converter.cxx |  139 -
 1 file changed, 14 insertions(+), 125 deletions(-)

New commits:
commit bc817c2fb26ebbfcc7b6868fbcabb13772ddb90e
Author: Bayram Çiçek 
AuthorDate: Wed Feb 17 02:33:23 2021 +0300
Commit: Michael Stahl 
CommitDate: Wed Feb 17 12:33:05 2021 +0100

tdf#39593: reduce copy/paste in Converter::convertDuration

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

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 18731b45ac77..f4f6dccb8ddc 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -921,13 +921,10 @@ static std::string_view trim(std::string_view in) {
   return std::string_view(&*left, std::distance(left, right) + 1);
 }
 
-/** convert ISO "duration" string to double; negative durations allowed */
-bool Converter::convertDuration(double& rfTime,
-std::u16string_view rString)
+/** helper function of Converter::convertDuration */
+template
+static bool convertDurationHelper(double& rfTime, V pStr)
 {
-std::u16string_view aTrimmed = trim(rString);
-const sal_Unicode* pStr = aTrimmed.data();
-
 // negative time duration?
 bool bIsNegativeDuration = false;
 if ( '-' == (*pStr) )
@@ -1049,6 +1046,16 @@ bool Converter::convertDuration(double& rfTime,
 return bSuccess;
 }
 
+/** convert ISO "duration" string to double; negative durations allowed */
+bool Converter::convertDuration(double& rfTime,
+std::u16string_view rString)
+{
+std::u16string_view aTrimmed = trim(rString);
+const sal_Unicode* pStr = aTrimmed.data();
+
+return convertDurationHelper(rfTime, pStr);
+}
+
 /** convert ISO "duration" string to double; negative durations allowed */
 bool Converter::convertDuration(double& rfTime,
 std::string_view rString)
@@ -1056,125 +1063,7 @@ bool Converter::convertDuration(double& rfTime,
 std::string_view aTrimmed = trim(rString);
 const char* pStr = aTrimmed.data();
 
-// negative time duration?
-bool bIsNegativeDuration = false;
-if ( '-' == (*pStr) )
-{
-bIsNegativeDuration = true;
-pStr++;
-}
-
-if ( *pStr != 'P' && *pStr != 'p' )// duration must start with 
"P"
-return false;
-pStr++;
-
-OUStringBuffer sDoubleStr;
-bool bSuccess = true;
-bool bDone = false;
-bool bTimePart = false;
-bool bIsFraction = false;
-sal_Int32 nDays  = 0;
-sal_Int32 nHours = 0;
-sal_Int32 nMins  = 0;
-sal_Int32 nSecs  = 0;
-sal_Int32 nTemp = 0;
-
-while ( bSuccess && !bDone )
-{
-sal_Unicode c = *(pStr++);
-if ( !c )   // end
-bDone = true;
-else if ( '0' <= c && '9' >= c )
-{
-if ( nTemp >= SAL_MAX_INT32 / 10 )
-bSuccess = false;
-else
-{
-if ( !bIsFraction )
-{
-nTemp *= 10;
-nTemp += (c - u'0');
-}
-else
-{
-sDoubleStr.append(c);
-}
-}
-}
-else if ( bTimePart )
-{
-if ( c == 'H' || c == 'h' )
-{
-nHours = nTemp;
-nTemp = 0;
-}
-else if ( c == 'M' || c == 'm')
-{
-nMins = nTemp;
-nTemp = 0;
-}
-else if ( (c == ',') || (c == '.') )
-{
-nSecs = nTemp;
-nTemp = 0;
-bIsFraction = true;
-sDoubleStr = "0.";
-}
-else if ( c == 'S' || c == 's' )
-{
-if ( !bIsFraction )
-{
-nSecs = nTemp;
-nTemp = 0;
-sDoubleStr = "0.0";
-}
-}
-else
-bSuccess = false;   // invalid character
-}
-else
-{
-if ( c == 'T' || c == 't' )// "T" starts time part
-bTimePart = true;
-else if ( c == 'D' || c == 'd')
-{
-nDays = nTemp;
-nTemp = 0;
-}
-else if ( c == 'Y' || c == 'y' || c == 'M' || c == 'm' )
-{
-//! how many days is a year or month?
-
-OSL_FAIL( "years or months in duration: not implemented");
-bSuccess = false;
-}
-else
-bSuccess = false;   // invalid character
-}
-}
-
-if ( bSuccess )
-{
-if ( nDays )
-nHours +

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

[Andras Timar (via logerrit)]

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

New commits:
commit f7487b871b7ee13f98cd5821a09c08e599a879e6
Author: Andras Timar 
AuthorDate: Wed Feb 17 12:58:20 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 17 12:58:20 2021 +0100

On aarch64 platform deb package platform string should be arm64 actually

Change-Id: I0b4b04e4a6f5c474b3961e5223128e0c835b8c44

diff --git a/configure.ac b/configure.ac
index 6f4f8fa08b8b..89b40951374c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4497,6 +4497,7 @@ linux-gnu*)
 CPUNAME=AARCH64
 PLATFORMID=linux_aarch64
 RTL_ARCH=AARCH64
+EPM_FLAGS="-a arm64"
 ;;
 alpha)
 CPUNAME=AXP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/txmsrt.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8b4e5afda58dab0154cdde8e784f948ad5dce4c1
Author: Miklos Vajna 
AuthorDate: Wed Feb 17 10:52:48 2021 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 17 13:05:37 2021 +0100

sw: document SwTOXAuthority

Even if it derives from a "Tab", it's not a table, just a row in it.

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

diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 4c06c03c1d3f..ad021185e317 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -279,6 +279,7 @@ private:
 sal_uInt16 nLevel;
 };
 
+/// Represents one row in the bibliography table.
 struct SwTOXAuthority final : public SwTOXSortTabBase
 {
 private:
___
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/core/xmlimp.cxx|8 +++
 xmloff/source/draw/XMLShapePropertySetContext.cxx|2 -
 xmloff/source/draw/animationexport.cxx   |4 +--
 xmloff/source/draw/sdxmlexp.cxx  |4 +--
 xmloff/source/draw/shapeexport.cxx   |2 -
 xmloff/source/draw/shapeimport.cxx   |   20 +--
 xmloff/source/draw/ximp3dscene.cxx   |2 -
 xmloff/source/draw/ximpbody.cxx  |2 -
 xmloff/source/draw/ximpshap.cxx  |6 ++---
 xmloff/source/draw/ximpstyl.cxx  |6 ++---
 xmloff/source/forms/formcellbinding.cxx  |6 ++---
 xmloff/source/forms/layerexport.cxx  |4 +--
 xmloff/source/meta/xmlmetai.cxx  |2 -
 xmloff/source/script/xmlbasicscript.cxx  |2 -
 xmloff/source/style/xmlnumi.cxx  |2 -
 xmloff/source/style/xmltabi.cxx  |2 -
 xmloff/source/table/XMLTableExport.cxx   |8 +++
 xmloff/source/table/XMLTableImport.cxx   |   12 +--
 xmloff/source/text/XMLChangeElementImportContext.cxx |2 -
 xmloff/source/text/XMLChangeInfoContext.cxx  |2 -
 xmloff/source/text/XMLChangedRegionImportContext.cxx |2 -
 xmloff/source/text/XMLFootnoteImportContext.cxx  |2 -
 xmloff/source/text/XMLIndexSourceBaseContext.cxx |2 -
 xmloff/source/text/XMLIndexTOCContext.cxx|2 -
 xmloff/source/text/XMLTextColumnsContext.cxx |4 +--
 xmloff/source/text/XMLTextFrameContext.cxx   |   10 -
 xmloff/source/text/XMLTextMasterPageContext.cxx  |2 -
 xmloff/source/text/XMLTextShapeStyleContext.cxx  |2 -
 xmloff/source/text/txtfldi.cxx   |2 -
 xmloff/source/text/txtstyli.cxx  |2 -
 xmloff/source/transform/ChartPlotAreaOOoTContext.cxx |2 -
 xmloff/source/transform/DeepTContext.cxx |2 -
 xmloff/source/transform/FormPropOOoTContext.cxx  |2 -
 xmloff/source/transform/MergeElemTContext.cxx|4 +--
 xmloff/source/transform/MetaTContext.cxx |2 -
 xmloff/source/transform/StyleOASISTContext.cxx   |2 -
 36 files changed, 71 insertions(+), 71 deletions(-)

New commits:
commit 7943752b9e85c44460f3663560b086b6fc26f91e
Author: Noel 
AuthorDate: Wed Feb 17 10:18:02 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 13:15:11 2021 +0100

loplugin:referencecasting in xmloff

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

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 64dccb70abf5..33cca656fb1f 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -413,8 +413,8 @@ SvXMLImport::SvXMLImport(
 SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
 InitCtor_();
 mxParser = xml::sax::FastParser::create( xContext );
-setNamespaceHandler( maNamespaceHandler.get() );
-setTokenHandler( xTokenHandler.get()  );
+setNamespaceHandler( maNamespaceHandler );
+setTokenHandler( xTokenHandler  );
 if ( !bIsNSMapsInitialized )
 {
 initializeNamespaceMaps();
@@ -768,7 +768,7 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 
Element,
 maNamespaceAttrList->Clear();
 
 maNamespaceHandler->addNSDeclAttributes( maNamespaceAttrList );
-processNSAttributes( maNamespaceAttrList.get() );
+processNSAttributes( maNamespaceAttrList );
 
 SvXMLImportContextRef xContext;
 const bool bRootContext = maContexts.empty();
@@ -2197,7 +2197,7 @@ void SAL_CALL SvXMLLegacyToFastDocHandler::startElement( 
const OUString& rName,
 mxFastAttributes->add(nAttr, OUStringToOString(rAttrValue, 
RTL_TEXTENCODING_UTF8).getStr());
 }
 }
-mrImport->startFastElement( mnElement, mxFastAttributes.get() );
+mrImport->startFastElement( mnElement, mxFastAttributes );
 maDefaultNamespaces.push(nDefaultNamespace);
 }
 
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx 
b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 456dc215b9db..45c8ace61fc5 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -73,7 +73,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLShapePropertySetCon
 case CTF_NUMBERINGRULES:
 mnBulletIndex = rProp.mnIndex;
 mxBulletStyle = new SvxXMLListStyleContext( GetImport() );
-return mxBulletStyle.get();
+return mxBulletStyle;
 case CTF_TABSTOP:
 return new SvxXMLTabStopImportContext( GetImport(), nElement,
rProp,
diff --git a/x

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

[Marco Cecchetti (via logerrit)]

 filter/source/svg/svgwriter.cxx |   16 +++-
 filter/source/svg/svgwriter.hxx |1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 0cfd16cbb8e0ad712caf1fc05fba4797749ba106
Author: Marco Cecchetti 
AuthorDate: Mon Feb 15 17:57:00 2021 +0100
Commit: Marco Cecchetti 
CommitDate: Wed Feb 17 13:19:34 2021 +0100

filter: svg: text field: placeholder localization issue

The text content for a placeholder is localized,
so in case a French locale is used, the placeholder
for a PageNumber text field is  instead of
.

Change-Id: If1d31fee98d044775995b5b80567296f78d2a6c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110944
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
Reviewed-by: Marco Cecchetti 

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1d7b62153d94..39bd446a31b0 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -,6 +,7 @@ bool SVGTextWriter::nextTextPortion()
 #endif
 msPageCount = "";
 msDateTimeType = "";
+msTextFieldType = "";
 if( xPortionTextRange.is() )
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -1154,6 +1155,7 @@ bool SVGTextWriter::nextTextPortion()
 ++pNames;
 }
 
+msTextFieldType = sFieldName;
 #if OSL_DEBUG_LEVEL > 0
 sInfo += "text field type: " + sFieldName + "; 
content: " + xTextField->getPresentation( /* show command: */ false ) + "; ";
 #endif
@@ -1688,7 +1690,6 @@ void SVGTextWriter::implWriteTextPortion( const Point& 
rPos,
 if( mbIsPlaceholderShape )
 {
 mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" 
);
-mbIsPlaceholderShape = false;
 }
 
 addFontAttributes( /* isTexTContainer: */ false );
@@ -1721,6 +1722,19 @@ void SVGTextWriter::implWriteTextPortion( const Point& 
rPos,
 SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, 
aXMLElemTspan, mbIWS, mbIWS );
 mrExport.GetDocHandler()->characters( msDateTimeType );
 }
+else if( mbIsPlaceholderShape && rText.startsWith("<") && 
rText.endsWith(">") )
+{
+OUString sContent;
+if( msTextFieldType == "PageNumber" )
+sContent = "";
+else if( msTextFieldType == "PageName" )
+sContent = "";
+else
+sContent = rText;
+
+SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, 
aXMLElemTspan, mbIWS, mbIWS );
+mrExport.GetDocHandler()->characters( sContent );
+}
 else
 {
 SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, 
aXMLElemTspan, mbIWS, mbIWS );
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ba8037d1ea91..d7458d053120 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -252,6 +252,7 @@ class SVGTextWriter final
 OUStringmsHyperlinkIdList;
 OUStringmsPageCount;
 OUStringmsDateTimeType;
+OUStringmsTextFieldType;
 boolmbIsPlaceholderShape;
 static const bool   mbIWS = false;
 vcl::Font   maCurrentFont;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig

[Tünde Tóth (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 ++
 sc/inc/sc.hrc |3 
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   17 
 sc/source/ui/view/cellsh1.cxx |   38 
++
 sc/uiconfig/scalc/menubar/menubar.xml |1 
 6 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit f89f806c88a8374e1dfd1d09747801377b8c0f36
Author: Tünde Tóth 
AuthorDate: Mon Feb 15 13:45:54 2021 +0100
Commit: László Németh 
CommitDate: Wed Feb 17 13:20:54 2021 +0100

tdf#36466 calc UI: add option to Select Visible Cells Only

Implement "Select Visible Cells Only" option to deselect
the cells of the hidden rows in the actual selection.

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index e247c92524d0..919237963507 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -585,6 +585,14 @@
   1
 
   
+  
+
+  Select Visible Cells Only
+
+
+  1
+
+  
   
 
   C~onditional
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 4f7ed6980636..55be197e79c4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -603,7 +603,8 @@
 #define FID_DELETE_ALL_NOTES(SID_NEW_SLOTS+104)
 #define SID_SCATTR_CELLPROTECTION(SID_NEW_SLOTS+105)
 #define SID_SELECT_UNPROTECTED_CELLS (SID_NEW_SLOTS+106)
-#define SID_CURRENT_FORMULA_RANGE  (SID_NEW_SLOTS+107)
+#define SID_SELECT_VISIBLE_CELLS (SID_NEW_SLOTS+107)
+#define SID_CURRENT_FORMULA_RANGE(SID_NEW_SLOTS+108)
 // idl parameter
 
 #define SID_SORT_BYROW  (SC_PARAM_START)
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index de9f537de767..cbc20f2f8959 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -230,6 +230,7 @@ interface CellSelection
 SID_DEC_INDENT  [ ExecMethod = ExecuteEdit; 
StateMethod = GetState; ]
 SID_INC_INDENT  [ ExecMethod = ExecuteEdit; 
StateMethod = GetState; ]
 SID_SELECT_UNPROTECTED_CELLS[ ExecMethod = ExecuteEdit;]
+SID_SELECT_VISIBLE_CELLS[ ExecMethod = ExecuteEdit;]
 SID_CURRENT_FORMULA_RANGE   [ ExecMethod = ExecuteEdit;]
 
 SID_THESAURUS   [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 47b429465197..fae369fa24a8 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -4453,6 +4453,23 @@ SfxVoidItem SelectUnprotectedCells 
SID_SELECT_UNPROTECTED_CELLS
 GroupId = SfxGroupId::Edit;
 ]
 
+SfxVoidItem SelectVisibleCells SID_SELECT_VISIBLE_CELLS
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = FALSE,
+MenuConfig = TRUE,
+ToolBoxConfig = FALSE,
+GroupId = SfxGroupId::Edit;
+]
+
 SfxVoidItem CurrentFormulaRange SID_CURRENT_FORMULA_RANGE
 (SfxInt32Item StartCol FN_PARAM_1,SfxInt32Item StartRow 
FN_PARAM_2,SfxInt32Item EndCol FN_PARAM_3,SfxInt32Item EndRow FN_PARAM_4, 
SfxInt32Item Table FN_PARAM_5)
 [
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6b1c50b3e011..f529e34b6140 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2768,6 +2768,44 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 }
 break;
 
+case SID_SELECT_VISIBLE_CELLS:
+{
+ScViewData& rData = GetViewData();
+ScMarkData& rMark = rData.GetMarkData();
+ScDocument& rDoc = rData.GetDocument();
+
+rMark.MarkToMulti();
+
+ScRange aMultiArea;
+rMark.GetMultiMarkArea(aMultiArea);
+SCCOL nStartCol = aMultiArea.aStart.Col();
+SCROW nStartRow = aMultiArea.aStart.Row();
+SCCOL nEndCol = aMultiArea.aEnd.Col();
+SCROW nEndRow = aMultiArea.aEnd.Row();
+
+bool bChanged = false;
+for (const SCTAB& nTab : rMark)
+{
+for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
+{
+SCROW nLastRow = nRow;
+if (rDoc.RowHidden(nRow, nTab, nullptr, &nLastRow))
+{
+rMark.SetMultiMarkArea(
+  

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 36 commits - canvas/source chart2/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppuhelper/qa

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit a5d2a0ac3358f0f6e6f878aac39ec9618985d184
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Feb 17 21:23:34 2021 +0900

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

Change-Id: I3b89009324f21b54ccf00f16eb47f9967a6b4e1f

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..f2f0393caeee 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,19 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("TGA"), rFormatExtension);
 }

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

[vipbuoy (via logerrit)]

 basic/source/uno/namecont.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1775cd844bc5b45e1f40148051ad9cc2635413e0
Author: vipbuoy 
AuthorDate: Sun Feb 14 14:25:56 2021 +0530
Commit: Michael Stahl 
CommitDate: Wed Feb 17 13:24:30 2021 +0100

tdf#42982 updated RunTimeException with 2nd argument(pointer)

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

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index a2b0391f92da..806fbcf1a22d 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -291,7 +291,7 @@ void SAL_CALL NameContainer::addContainerListener( const 
Reference< XContainerLi
 {
 if( !xListener.is() )
 {
-throw RuntimeException("addContainerListener called with null 
xListener");
+throw RuntimeException("addContainerListener called with null 
xListener",static_cast< cppu::OWeakObject * >(this));
 }
 maContainerListeners.addInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -300,7 +300,7 @@ void SAL_CALL NameContainer::removeContainerListener( const 
Reference< XContaine
 {
 if( !xListener.is() )
 {
-throw RuntimeException("removeContainerListener called with null 
xListener");
+throw RuntimeException("removeContainerListener called with null 
xListener",static_cast< cppu::OWeakObject * >(this));
 }
 maContainerListeners.removeInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -310,7 +310,7 @@ void SAL_CALL NameContainer::addChangesListener( const 
Reference< XChangesListen
 {
 if( !xListener.is() )
 {
-throw RuntimeException("addChangesListener called with null 
xListener");
+throw RuntimeException("addChangesListener called with null 
xListener",static_cast< cppu::OWeakObject * >(this));
 }
 maChangesListeners.addInterface( Reference(xListener, 
UNO_QUERY) );
 }
@@ -319,7 +319,7 @@ void SAL_CALL NameContainer::removeChangesListener( const 
Reference< XChangesLis
 {
 if( !xListener.is() )
 {
-throw RuntimeException("removeChangesListener called with null 
xListener");
+throw RuntimeException("removeChangesListener called with null 
xListener",static_cast< cppu::OWeakObject * >(this));
 }
 maChangesListeners.removeInterface( Reference(xListener, 
UNO_QUERY) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03/sf_services.xhp |  264 +++
 source/text/sbasic/shared/03/sf_session.xhp  |   50 ++---
 source/text/sbasic/shared/03103700.xhp   |   34 +--
 source/text/sbasic/shared/03104200.xhp   |8 
 source/text/sbasic/shared/03131900.xhp   |2 
 5 files changed, 312 insertions(+), 46 deletions(-)

New commits:
commit ec6e0c930fd8a7ca5dc6a84a686602acff69234e
Author: Alain Romedenne 
AuthorDate: Tue Feb 16 10:45:07 2021 +0100
Commit: Alain Romedenne 
CommitDate: Wed Feb 17 13:29:42 2021 +0100

sf_services new help page

+ sf_session adjustments and links
  - Addition of Array formulae and Array function information

Change-Id: I03d64d863db90124cad75d13a66ade8d6abba126
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110921
Tested-by: Jenkins
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Rafael Lima 
Reviewed-by: Alain Romedenne 

diff --git a/source/text/sbasic/shared/03/sf_services.xhp 
b/source/text/sbasic/shared/03/sf_services.xhp
new file mode 100644
index 0..3dc040187
--- /dev/null
+++ b/source/text/sbasic/shared/03/sf_services.xhp
@@ -0,0 +1,264 @@
+
+
+
+
+
+  
+ScriptForge.Services service
+/text/sbasic/shared/03/sf_services.xhp
+  
+
+
+
+   
+  Services service
+   
+
+ScriptForge.Services 
service
+
+
+The ScriptForge library is built upon an extensible collection of 
so-called "Services".
+This collection is implemented as categories of Basic libraries or 
Python modules:
+
+
+   
+  the standard ScriptForge library shipped 
with %PRODUCTNAME
+   
+   
+  a number of "associated" libraries shipped with %PRODUCTNAME 
as well
+   
+   
+  any user/contributor LibreOffice extension wanting to fit into 
the same framework
+   
+
+
+
+A 
service is a collection of properties or methods which implement 
the service.
+For the author of a user 
script, a service may be either a module within a library, or an 
instance of a class module.
+An 
event manager is a script contained in a library which binds an 
event triggering a macro - usually defined by the Tools - 
Customize  menu - to the concerned service instance.
+As an example, if several 
documents trigger the same macro when they are loaded, it might be useful to 
know which document triggered the macro this time. That's where an event 
manager plays its role.
+
+The 
following methods make up the kernel of the ScriptForge 
framework:
+
+   
+  RegisterScriptServices
+  Called internally by ScriptForge to 
register for a library the list of services it implements.
+ Each library associated to Scriptforge or 
extending it must implement its own RegisterScriptServices 
method.
+   
+   
+  RegisterService
+  Called - as many times as there are services to register in 
the library - by RegisterScriptServices.
+   
+   
+  RegisterEventManager
+  Called to register a library event manager by 
RegisterScriptServices.
+   
+   
+  CreateScriptService
+  Called by user scripts to get an object giving access to the 
service given as argument.
+ All services should be invoked thru the 
CreateScriptService method.
+   
+
+Conventionally, the 
String, Array and 
Exception services may be invoked directly respectively as 
SF_String, SF_Array and 
SF_Exception.
+
+
+   
+ List of Methods in the Services 
Service
+   
+   
+   
+   
+ CreateScriptService
+   
+   
+   
+   
+ RegisterScriptServices
+ RegisterService
+   
+   
+   
+   
+ RegisterEventManager
+   
+   
+   
+
+
+  
+   CreateScriptService 
--
 
+  
+ Services service;CreateScriptService
+  
+  CreateScriptService
+
+   Gain access to one of the services of a library for the benefit of a 
user script.
+   The returned value is a Basic object or 
Nothing if an error occurred.
+
+
+   A service can be understood as either:
+
+  
+   
+  as a set of methods gathered in a Basic standard 
module
+   
+   
+  or a set of methods and properties gathered in a Basic class 
module.
+   
+  
+
+  
+   CreateScriptService(Service As String, [arg0, ...] 
As Variant) As Variant
+  
+
+ Service: The name of the service 
identified as "library.service".
+  The library is a Basic library that must exist in the GlobalScope. 
The default value is "ScriptForge".
+  The service is one of the services registered by the library via 
the RegisterScriptServices() method.
+  arg0, 
...: A list of arguments required by the invoked service.
+If the first argument refers to an event manager, then arg0 is 
mandatory and must be the UNO object representing the event

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit a981e1696e5b417bdc7c9a3c22f2f44fcb3c55ed
Author: Alain Romedenne 
AuthorDate: Wed Feb 17 13:29:42 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Feb 17 13:29:42 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to ec6e0c930fd8a7ca5dc6a84a686602acff69234e
  - sf_services new help page

+ sf_session adjustments and links
  - Addition of Array formulae and Array function information

Change-Id: I03d64d863db90124cad75d13a66ade8d6abba126
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110921
Tested-by: Jenkins
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Rafael Lima 
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index 097d1cc82b50..ec6e0c930fd8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 097d1cc82b507804eacc675156dd1bb3f6a92a4e
+Subproject commit ec6e0c930fd8a7ca5dc6a84a686602acff69234e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rafael Lima (via logerrit)]

 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx   |   12 -
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx  |6 ++--
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |   14 +--
 desktop/source/deployment/registry/package/dp_package.cxx|4 +--
 desktop/source/deployment/registry/script/dp_script.cxx  |2 -
 desktop/source/deployment/registry/sfwk/dp_sfwk.cxx  |2 -
 desktop/source/lib/init.cxx  |8 +++---
 helpcontent2 |2 -
 8 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit a90315573a96e0e72846c6d676ca59dd386bd3f5
Author: Rafael Lima 
AuthorDate: Wed Feb 17 13:32:10 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Feb 17 13:32:10 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 00cf8de0436b61d64c7c406de2106ee0c1949459
  - Create SF Filesystem Help page

Also in this patch:
- lib_ScriptForge.xhp: add links to table of contents
- sf_dialogcontrol.xhp: silence strings for translation

Change-Id: I9b69be483d93957cdc793d95f56f33a48e3f1c85
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110788
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index ec6e0c930fd8..00cf8de0436b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec6e0c930fd8a7ca5dc6a84a686602acff69234e
+Subproject commit 00cf8de0436b61d64c7c406de2106ee0c1949459
commit fd8bedb54a66bb62bfbfc48639f780b433d7defe
Author: Noel 
AuthorDate: Wed Feb 17 12:47:53 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 17 13:31:57 2021 +0100

loplugin:referencecasting in desktop

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

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx 
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d2fca9d95e03..95cb874f1ca9 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -844,7 +844,7 @@ void ExtensionCmdQueue::Thread::_addExtension( 
::rtl::Reference< ProgressCmdEnv
 uno::Any anyTitle;
 try
 {
-anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv.get(), 
m_xContext ).getPropertyValue( "Title" );
+anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv, m_xContext 
).getPropertyValue( "Title" );
 }
 catch ( const uno::Exception & )
 {
@@ -868,7 +868,7 @@ void ExtensionCmdQueue::Thread::_addExtension( 
::rtl::Reference< ProgressCmdEnv
 try
 {
 xExtMgr->addExtension(rPackageURL, uno::Sequence(),
-  rRepository, xAbortChannel, rCmdEnv.get() );
+  rRepository, xAbortChannel, rCmdEnv );
 }
 catch ( const ucb::CommandFailedException & )
 {
@@ -897,7 +897,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( 
::rtl::Reference< ProgressCmdE
 OUString id( dp_misc::getIdentifier( xPackage ) );
 try
 {
-xExtMgr->removeExtension( id, xPackage->getName(), 
xPackage->getRepositoryName(), xAbortChannel, rCmdEnv.get() );
+xExtMgr->removeExtension( id, xPackage->getName(), 
xPackage->getRepositoryName(), xAbortChannel, rCmdEnv );
 }
 catch ( const deployment::DeploymentException & )
 {}
@@ -985,7 +985,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( 
::rtl::Reference< ProgressCmdE
 
 try
 {
-xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv.get() );
+xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv );
 if ( m_pDialogHelper )
 m_pDialogHelper->updatePackageInfo( xPackage );
 }
@@ -1009,7 +1009,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( 
::rtl::Reference< ProgressCmd
 
 try
 {
-xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv.get() );
+xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv );
 if ( m_pDialogHelper )
 m_pDialogHelper->updatePackageInfo( xPackage );
 }
@@ -1033,7 +1033,7 @@ void ExtensionCmdQueue::Thread::_acceptLicense( 
::rtl::Reference< ProgressCmdEnv
 
 try
 {
-xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel, 
rCmdEnv.get() );
+xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel, rCmdEnv 
);
 if ( m_pDialogHelper )
 m_pDialogHelper->updatePackageInfo( xPackage );
 }
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index ed6ed79fd256..980e086ebc69 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/depl

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

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk |5 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp  |  112 +-
 source/text/sbasic/shared/03/sf_dialogcontrol.xhp |   30 
 source/text/sbasic/shared/03/sf_filesystem.xhp|  962 ++
 4 files changed, 1052 insertions(+), 57 deletions(-)

New commits:
commit 00cf8de0436b61d64c7c406de2106ee0c1949459
Author: Rafael Lima 
AuthorDate: Fri Feb 12 18:47:36 2021 +0100
Commit: Alain Romedenne 
CommitDate: Wed Feb 17 13:32:10 2021 +0100

Create SF Filesystem Help page

Also in this patch:
- lib_ScriptForge.xhp: add links to table of contents
- sf_dialogcontrol.xhp: silence strings for translation

Change-Id: I9b69be483d93957cdc793d95f56f33a48e3f1c85
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110788
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index d87b5eb2b..ea88a9d6f 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -82,12 +82,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_dialog \
 helpcontent2/source/text/sbasic/shared/03/sf_dialogcontrol \
 helpcontent2/source/text/sbasic/shared/03/sf_dictionary \
-helpcontent2/source/text/sbasic/shared/03/sf_exception \
-helpcontent2/source/text/sbasic/shared/03/sf_ui \
 helpcontent2/source/text/sbasic/shared/03/sf_document \
+helpcontent2/source/text/sbasic/shared/03/sf_exception \
+helpcontent2/source/text/sbasic/shared/03/sf_filesystem \
 helpcontent2/source/text/sbasic/shared/03/sf_session \
 helpcontent2/source/text/sbasic/shared/03/sf_string \
 helpcontent2/source/text/sbasic/shared/03/sf_timer \
+helpcontent2/source/text/sbasic/shared/03/sf_ui \
 helpcontent2/source/text/sbasic/shared/03/lib_schedule \
 helpcontent2/source/text/sbasic/shared/03/lib_template \
 helpcontent2/source/text/sbasic/shared/03/lib_wikieditor \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index c8f191265..c3cd4ff3f 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -29,71 +29,103 @@
   CreateScriptService("servicename"[, arg0, Arg1, 
...])
 
 Services from 
external libraries can be registered with the 
RegisterScriptServices(...) method in order to extend the 
set of available services.
-ScriptForge Basic 
library is available from %PRODUCTNAME 7.1 onwards.
-ScriptForge 
services are organized in the following categories:
+The ScriptForge Basic 
library is available from %PRODUCTNAME 7.1 onwards.
 
   
-%PRODUCTNAME Basic
-Document content
-User interface (UI)
-Utilities
+Services provided by the ScriptForge 
library
   
   
 
   
-Array
-Dictionary
-Exception
-FileSystem
-String
-TextStream
+  Array
+  Calc
+  Database
+  Dialog
+  DialogControl
   
 
 
   
-Document
-Calc
-Database
+  Dictionary
+  Document
+  Exception
+  FileSystem
   
 
 
   
-UI
-Dialog
-DialogControls
+  Localization (L10N)
+  Platform
+  Services
+  Session
   
 
 
   
-
-Localization (L10N)
-Platform
-Services
-Session
+  String
+  TextStream
+  Timer
+  UI
   
 
   
 
-
-
-
-
-
-
-
-FileSystem 
Service
-L10n class Service
-Platform Service
-Services class Service
-
-
-TextStream class Service
-
-
+
+
+  
+
+
+  
+
+
+  Database
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  Localization (L10N)
+
+
+  Platform
+
+
+  Services
+
+
+  
+
+
+  
+
+
+  TextStream class Service
+
+
+  
+
+
+  
+
 Restricted use for SF_Root, SF_Utils modules as well as internal 
methods
 Note: 
Other ScriptForge undescribed modules are reserved for 
internal use. Their content is subject to change without notice.
 
   All ScriptForge 
Basic routines or identifiers that are prefixed with an underscore character 
"_" are reserved for internal use. They are not meant be used in Basic 
macros.
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03/sf_dialogcontrol.

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

[Alain Romedenne (via logerrit)]

 AllLangHelp_sbasic.mk|1 +
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6a461bd0ac2ccb8b385f24d0698d29cad49084b7
Author: Alain Romedenne 
AuthorDate: Wed Feb 17 13:40:31 2021 +0100
Commit: Rafael Lima 
CommitDate: Wed Feb 17 13:52:08 2021 +0100

make file and Scriptforge link past patch #111036

Change-Id: Id827cf8e5fa35ad61d7130ea3247bd6395ab1401
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111037
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index ea88a9d6f..53af112a0 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_exception \
 helpcontent2/source/text/sbasic/shared/03/sf_filesystem \
 helpcontent2/source/text/sbasic/shared/03/sf_session \
+helpcontent2/source/text/sbasic/shared/03/sf_services \
 helpcontent2/source/text/sbasic/shared/03/sf_string \
 helpcontent2/source/text/sbasic/shared/03/sf_timer \
 helpcontent2/source/text/sbasic/shared/03/sf_ui \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index c3cd4ff3f..7ef2387b3 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -105,7 +105,7 @@
   Platform
 
 
-  Services
+  
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 6f8cfcfe04b3ccddb86f228dd95622eb24a05def
Author: Alain Romedenne 
AuthorDate: Wed Feb 17 13:52:08 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Feb 17 13:52:08 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6a461bd0ac2ccb8b385f24d0698d29cad49084b7
  - make file and Scriptforge link past patch #111036

Change-Id: Id827cf8e5fa35ad61d7130ea3247bd6395ab1401
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111037
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index 00cf8de0436b..6a461bd0ac2c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 00cf8de0436b61d64c7c406de2106ee0c1949459
+Subproject commit 6a461bd0ac2ccb8b385f24d0698d29cad49084b7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Stephan Bergmann (via logerrit)]

 config_host.mk.in  |1 
 configure.ac   |   49 +
 solenv/gbuild/platform/com_GCC_defs.mk |7 ++--
 3 files changed, 54 insertions(+), 3 deletions(-)

New commits:
commit 0e90358490fd90a2b45917dd4b076e97082e8fdf
Author: Stephan Bergmann 
AuthorDate: Wed Feb 17 08:21:50 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 17 14:17:12 2021 +0100

More targeted suppression of bogus GCC -Werror=stringop-overflow=

...given that 
"[8/9/10/11 Regression] -Wstringop-overflow false positive due to using 
MEM_REF
type of &MEM" is declared fixed now on GCC 11 trunk.

(Moving -Wno-stringop-overflow from gb_CFLAGS_WERROR to gb_CXXFLAGS_COMMON 
is
done for no other reason than to harmonize this with the code for the 
similar
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED.)

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

diff --git a/config_host.mk.in b/config_host.mk.in
index fb64c61e66f7..c6c9b7eae351 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -259,6 +259,7 @@ export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export 
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
+export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@
 export 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
diff --git a/configure.ac b/configure.ac
index 78bb7998e62c..c3e15f6397de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7343,6 +7343,55 @@ if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; 
then
 fi
 AC_SUBST([HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED])
 
+dnl Check for  
"[8/9/10/11 Regression]
+dnl -Wstringop-overflow false positive due to using MEM_REF type of &MEM" 
(fixed in GCC 11), which
+dnl hits us e.g. with GCC 10 and --enable-optimized at
+dnl
+dnl   In file included from include/rtl/string.hxx:49,
+dnlfrom include/rtl/ustring.hxx:43,
+dnlfrom include/osl/file.hxx:35,
+dnlfrom include/codemaker/global.hxx:28,
+dnlfrom include/codemaker/options.hxx:23,
+dnlfrom codemaker/source/commoncpp/commoncpp.cxx:24:
+dnl   In function ‘char* rtl::addDataHelper(char*, const char*, std::size_t)’,
+dnl   inlined from ‘static char* rtl::ToStringHelper::addData(char*, const char*) [with long unsigned int N = 3]’ at 
include/rtl/stringconcat.hxx:147:85,
+dnl   inlined from ‘char* rtl::OStringConcat::addData(char*) const 
[with T1 = const char [3]; T2 = rtl::OString]’ at 
include/rtl/stringconcat.hxx:226:103,
+dnl   inlined from ‘rtl::OStringBuffer& 
rtl::OStringBuffer::append(rtl::OStringConcat&&) [with T1 = const char 
[3]; T2 = rtl::OString]’ at include/rtl/strbuf.hxx:599:30,
+dnl   inlined from ‘rtl::OString codemaker::cpp::scopedCppName(const 
rtl::OString&, bool)’ at codemaker/source/commoncpp/commoncpp.cxx:53:55:
+dnl   include/rtl/stringconcat.hxx:78:15: error: writing 2 bytes into a region 
of size 1 [-Werror=stringop-overflow=]
+dnl  78 | memcpy( buffer, data, length );
+dnl | ~~^~~~
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=
+if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; then
+AC_MSG_CHECKING([whether $CXX_BASE might report false 
-Werror=stringop-overflow=])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 -Werror -Wstringop-overflow"
+if test "$ENABLE_OPTIMIZED" = TRUE; then
+CXXFLAGS="$CXXFLAGS -O2"
+else
+CXXFLAGS="$CXXFLAGS -O0"
+fi
+dnl Test code taken from 
:
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+void fill(char const * begin, char const * end, char c);
+struct q {
+char ids[4];
+char username[6];
+};
+void test(q & c) {
+fill(c.ids, c.ids + sizeof(c.ids), '\0');
+__builtin_strncpy(c.username, "root", sizeof(c.username));
+}
+]])], [AC_MSG_RESULT([no])], [
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=TRUE
+AC_MSG_RESULT([yes])
+])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+fi
+AC_SUBST([HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW])
+
 dnl ===
 dnl CPU Intrinsics support - SSE, AVX
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/so

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

[Stephan Bergmann (via logerrit)]

 sc/source/ui/inc/fuconcustomshape.hxx |2 +-
 sc/source/ui/inc/fuconstr.hxx |2 +-
 sc/source/ui/inc/fuconuno.hxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0c8bff4622d9a0b725e035652d1aaf286c87cbd8
Author: Stephan Bergmann 
AuthorDate: Wed Feb 17 10:59:02 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 17 14:25:27 2021 +0100

CppunitTest_sc_shapetest needs some more RTTI in UBSan builds now

...since 02e4f6c44295004f5c7201a7aa2744fd0518ba9d "tdf#134355 custom shapes 
are
never on layer 'controls' in Calc" and 
ae2e7a2a7f9fc56f0388b823a6e35111c4005619
"tdf#140252 unit test Controls in Calc are always on layer 'controls'":

> DynamicLibraryManagerException: "Failed to load dynamic library: 
workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: 
_ZTI11FuConstruct"

(due to e.g. the derived call to FuConstruct::MouseMove at
sc/qa/unit/scshapetest.cxx:239:17);

> DynamicLibraryManagerException: "Failed to load dynamic library: 
workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: 
_ZTI17FuConstUnoControl"

(due to e.g. the static_cast at sc/qa/unit/scshapetest.cxx:232:37);

> DynamicLibraryManagerException: "Failed to load dynamic library: 
workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: 
_ZTI18FuConstCustomShape"

(due to e.g. the static_cast at sc/qa/unit/scshapetest.cxx:279:38).

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

diff --git a/sc/source/ui/inc/fuconcustomshape.hxx 
b/sc/source/ui/inc/fuconcustomshape.hxx
index c9bad69b33c5..e39416befff6 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -22,7 +22,7 @@
 
 #include "fuconstr.hxx"
 
-class FuConstCustomShape : public FuConstruct
+class SAL_DLLPUBLIC_RTTI FuConstCustomShape : public FuConstruct
 {
 OUString aCustomShape;
 
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 7fa20b7c86d0..f5e366b29de7 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -25,7 +25,7 @@
 #include  // SC_DLLPUBLIC is needed for unittest
 
 /** Draw rectangle */
-class FuConstruct : public FuDraw
+class SAL_DLLPUBLIC_RTTI FuConstruct : public FuDraw
 {
 public:
 FuConstruct(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView,
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index 332cdc350034..01d9668de211 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -27,7 +27,7 @@
 enum class SdrInventor : sal_uInt32;
 
 /** Draw Control */
-class FuConstUnoControl final : public FuConstruct
+class SAL_DLLPUBLIC_RTTI FuConstUnoControl final : public FuConstruct
 {
 SdrInventor nInventor;
 SdrObjKind nIdentifier;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 
external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 |  175 ++
 external/python3/UnpackedTarball_python3.mk
|1 
 2 files changed, 176 insertions(+)

New commits:
commit a8416633ad80b307647b056909a357f9466d9e0f
Author: Michael Stahl 
AuthorDate: Wed Feb 17 12:24:08 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 17 14:30:53 2021 +0100

python3: add patch for CVE-2021-3177

Looks like Python 3.5 is EOL, so backport the patch.

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

diff --git 
a/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
new file mode 100644
index ..fdcc5cb65267
--- /dev/null
+++ 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
@@ -0,0 +1,175 @@
+From 34df10a9a16b38d54421eeeaf73ec89828563be7 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson 
+Date: Mon, 18 Jan 2021 15:11:46 -0600
+Subject: [PATCH] [3.6] closes bpo-42938: Replace snprintf with Python unicode
+ formatting in ctypes param reprs. (GH-24250)
+
+(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
+
+Co-authored-by: Benjamin Peterson 
+---
+ Lib/ctypes/test/test_parameters.py| 43 +++
+ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst  |  2 +
+ Modules/_ctypes/callproc.c| 55 +++
+ 3 files changed, 66 insertions(+), 34 deletions(-)
+ create mode 100644 
Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+
+diff --git a/Lib/ctypes/test/test_parameters.py 
b/Lib/ctypes/test/test_parameters.py
+index e4c25fd880..531894fdec 100644
+--- a/Lib/ctypes/test/test_parameters.py
 b/Lib/ctypes/test/test_parameters.py
+@@ -201,6 +201,49 @@ def __dict__(self):
+ self.assertRaises(ArgumentError, func, 99)
+ 
+ 
++def test_parameter_repr(self):
++from ctypes import (
++c_bool,
++c_char,
++c_wchar,
++c_byte,
++c_ubyte,
++c_short,
++c_ushort,
++c_int,
++c_uint,
++c_long,
++c_ulong,
++c_longlong,
++c_ulonglong,
++c_float,
++c_double,
++c_longdouble,
++c_char_p,
++c_wchar_p,
++c_void_p,
++)
++self.assertRegex(repr(c_bool.from_param(True)), r"^$")
++self.assertEqual(repr(c_char.from_param(97)), "")
++self.assertRegex(repr(c_wchar.from_param('a')), r"^$")
++self.assertEqual(repr(c_byte.from_param(98)), "")
++self.assertEqual(repr(c_ubyte.from_param(98)), "")
++self.assertEqual(repr(c_short.from_param(511)), "")
++self.assertEqual(repr(c_ushort.from_param(511)), "")
++self.assertRegex(repr(c_int.from_param(2)), r"^$")
++self.assertRegex(repr(c_uint.from_param(2)), r"^$")
++self.assertRegex(repr(c_long.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulong.from_param(2)), r"^$")
++self.assertRegex(repr(c_longlong.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulonglong.from_param(2)), r"^$")
++self.assertEqual(repr(c_float.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1e300)), "")
++self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$")
++self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$")
++self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$")
++self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$")
++
+ 
+ 
+ if __name__ == '__main__':
+diff --git 
a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst 
b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+new file mode 100644
+index 00..7df65a156f
+--- /dev/null
 b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+@@ -0,0 +1,2 @@
++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
++:class:`ctypes.c_longdouble` values.
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index 70e416b950..9fcf95f543 100644
+--- a/Modules/_ctypes/callproc.c
 b/Modules/_ctypes/callproc.c
+@@ -451,54 +451,43 @@ PyCArg_dealloc(PyCArgObject *self)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+-char buffer[256];
+ switch(self->tag) {
+ case 'b':
+ case 'B':
+-sprintf(buffer, "",
++return PyUnicode_FromFormat("",
+ self->tag, self->value.b);
+-break;
+ case 'h':

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

[Michael Stahl (via logerrit)]

 
external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 |  175 ++
 external/python3/UnpackedTarball_python3.mk
|1 
 2 files changed, 176 insertions(+)

New commits:
commit bbe35c2655b1f883d4656751d4783ad33297d7b2
Author: Michael Stahl 
AuthorDate: Wed Feb 17 12:24:08 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 17 14:31:34 2021 +0100

python3: add patch for CVE-2021-3177

Looks like Python 3.5 is EOL, so backport the patch.

Change-Id: I9ba397b3ed7e5f4ee4f78b144d822ce260ca9fb4

diff --git 
a/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
new file mode 100644
index ..fdcc5cb65267
--- /dev/null
+++ 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
@@ -0,0 +1,175 @@
+From 34df10a9a16b38d54421eeeaf73ec89828563be7 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson 
+Date: Mon, 18 Jan 2021 15:11:46 -0600
+Subject: [PATCH] [3.6] closes bpo-42938: Replace snprintf with Python unicode
+ formatting in ctypes param reprs. (GH-24250)
+
+(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
+
+Co-authored-by: Benjamin Peterson 
+---
+ Lib/ctypes/test/test_parameters.py| 43 +++
+ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst  |  2 +
+ Modules/_ctypes/callproc.c| 55 +++
+ 3 files changed, 66 insertions(+), 34 deletions(-)
+ create mode 100644 
Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+
+diff --git a/Lib/ctypes/test/test_parameters.py 
b/Lib/ctypes/test/test_parameters.py
+index e4c25fd880..531894fdec 100644
+--- a/Lib/ctypes/test/test_parameters.py
 b/Lib/ctypes/test/test_parameters.py
+@@ -201,6 +201,49 @@ def __dict__(self):
+ self.assertRaises(ArgumentError, func, 99)
+ 
+ 
++def test_parameter_repr(self):
++from ctypes import (
++c_bool,
++c_char,
++c_wchar,
++c_byte,
++c_ubyte,
++c_short,
++c_ushort,
++c_int,
++c_uint,
++c_long,
++c_ulong,
++c_longlong,
++c_ulonglong,
++c_float,
++c_double,
++c_longdouble,
++c_char_p,
++c_wchar_p,
++c_void_p,
++)
++self.assertRegex(repr(c_bool.from_param(True)), r"^$")
++self.assertEqual(repr(c_char.from_param(97)), "")
++self.assertRegex(repr(c_wchar.from_param('a')), r"^$")
++self.assertEqual(repr(c_byte.from_param(98)), "")
++self.assertEqual(repr(c_ubyte.from_param(98)), "")
++self.assertEqual(repr(c_short.from_param(511)), "")
++self.assertEqual(repr(c_ushort.from_param(511)), "")
++self.assertRegex(repr(c_int.from_param(2)), r"^$")
++self.assertRegex(repr(c_uint.from_param(2)), r"^$")
++self.assertRegex(repr(c_long.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulong.from_param(2)), r"^$")
++self.assertRegex(repr(c_longlong.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulonglong.from_param(2)), r"^$")
++self.assertEqual(repr(c_float.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1e300)), "")
++self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$")
++self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$")
++self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$")
++self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$")
++
+ 
+ 
+ if __name__ == '__main__':
+diff --git 
a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst 
b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+new file mode 100644
+index 00..7df65a156f
+--- /dev/null
 b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+@@ -0,0 +1,2 @@
++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
++:class:`ctypes.c_longdouble` values.
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index 70e416b950..9fcf95f543 100644
+--- a/Modules/_ctypes/callproc.c
 b/Modules/_ctypes/callproc.c
+@@ -451,54 +451,43 @@ PyCArg_dealloc(PyCArgObject *self)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+-char buffer[256];
+ switch(self->tag) {
+ case 'b':
+ case 'B':
+-sprintf(buffer, "",
++return PyUnicode_FromFormat("",
+ self->tag, self->value.b);
+-break;
+ case 'h':
+ case 'H':
+-sprintf(buffer, "",
++return PyUnicode_FromFormat("",
+ self->tag, self->value.h

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

[shubham656 (via logerrit)]

 basic/qa/cppunit/test_scanner.cxx |   77 ++
 basic/qa/vba_tests/typename.vb|   14 ++
 basic/qa/vba_tests/vartype.vb |   38 +++---
 3 files changed, 123 insertions(+), 6 deletions(-)

New commits:
commit 30ca77c43ba1c8f94d6f34eea763a3d3ca7e72f6
Author: shubham656 
AuthorDate: Tue Jan 26 21:33:53 2021 +0530
Commit: Andreas Heinisch 
CommitDate: Wed Feb 17 15:34:22 2021 +0100

tdf#130677 Write new tests for literals

Change-Id: I22607fdcaab840ca1512abf534712d36d4b5ee9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109964
Reviewed-by: Mike Kaganski 
Reviewed-by: Andreas Heinisch 
Tested-by: Jenkins

diff --git a/basic/qa/cppunit/test_scanner.cxx 
b/basic/qa/cppunit/test_scanner.cxx
index ed340755deba..5663c44d027e 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -1034,6 +1034,83 @@ void ScannerTest::testHexOctal()
 CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
 // ERRCODE_BASIC_MATH_OVERFLOW
 CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors));
+
+// maximum for Hex & = SbxLONG
+symbols = getSymbols("&H7FFF&");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+// minimum for Hex & = SbxLONG
+symbols = getSymbols("&H8000&");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+// overflow for Hex & = SbxLONG
+symbols = getSymbols("&H1&", errors);
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+// ERRCODE_BASIC_MATH_OVERFLOW
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors));
+
+// maximum for Octal & = SbxLONG
+symbols = getSymbols("&O177&");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+// minimum for Octal & = SbxLONG
+symbols = getSymbols("&O200&", errors);
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+// overflow for Octal & = SbxLONG
+symbols = getSymbols("&O400&", errors);
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+// ERRCODE_BASIC_MATH_OVERFLOW
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors));
+
+/* test for leading zeros */
+
+// &H000 = 65535
+symbols = getSymbols("&H000");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+// &O0123 = 83
+symbols = getSymbols("&O0123");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(83.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+
+symbols = getSymbols("&O777");
+CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2097151.0, symbols[0].number, 1E-12);
+CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
+CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
+CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
 }
 
 void ScannerTest::testTdf103104()
diff --git a/basic/qa/vba_tests/typename.vb b/basic/qa/vba_tests/typename.vb
index c8fa5330a8e8..4442cba55e98 100644
--- a/basic/qa/vba_tests/typename.vb
+++ b/basic/qa/vba_tests/typename.vb
@@ -25,6 +25,13 @@ Sub verify_testTypeName()
 Dim l1 As Long
 Dim s1 As String
 
+Dim TestIntSign%
+Dim TestLongSign&
+Dim TestSingleSign!
+Dim TestDoubleSign#
+Dim TestCurrSign

Inserting shapes in unittests

[Xisco Fauli]

Hello,

Is there any reason why inserting shapes doesn't work in CppUnittests ?
In UItests, it's possible to use the KeyModifier 8192 (KEY_MOD2 ), see
https://opengrok.libreoffice.org/xref/core/sw/qa/uitest/writer_tests7/tdf130629.py?r=f7c8535a,
however, if I do the same in a CppUnittest, nothing is inserted. see
https://gerrit.libreoffice.org/c/core/+/111072.

Any idea why this is happening ?

Cheers

-- 
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 05ebfae3eb198900e6ecbbff32b671b3b6e33426
Author: Christian Lohmaier 
AuthorDate: Wed Feb 17 15:52:04 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Feb 17 15:52:04 2021 +0100

Update git submodules

* Update translations from branch 'libreoffice-7-0'
  to 381c3480192e9c2f6331cdf0da4424dcdd15b8a9
  - update translations for 7.0.5 rc1

and force-fix errors using pocheck

Change-Id: I314290cd25631469a2b47add402af55244cd4bfd

diff --git a/translations b/translations
index d30c0b62a3b0..381c3480192e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d30c0b62a3b0456f3d40636ed273433eaa859947
+Subproject commit 381c3480192e9c2f6331cdf0da4424dcdd15b8a9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf106612.py |   45 
 1 file changed, 45 insertions(+)

New commits:
commit 7a56d57acf3bfe148afbd461089343a9603e162b
Author: Xisco Fauli 
AuthorDate: Wed Feb 17 12:56:58 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 17 16:14:46 2021 +0100

tdf#106612: sd: Add UItest

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

diff --git a/sd/qa/uitest/impress_tests/tdf106612.py 
b/sd/qa/uitest/impress_tests/tdf106612.py
new file mode 100644
index ..ac3b717820d7
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf106612.py
@@ -0,0 +1,45 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+
+class Tdf106612(UITestCase):
+
+   def test_tdf106612(self):
+self.ui_test.create_doc_in_start_center("impress")
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+xImpressDoc = self.xUITest.getTopFocusWindow()
+
+xEditWin = xImpressDoc.getChild("impress_win")
+
+self.xUITest.executeCommand(".uno:DuplicatePage")
+
+self.assertEqual("2", get_state_as_dict(xEditWin)["CurrentSlide"])
+
+xEditWin.executeAction("SIDEBAR", mkPropertyValues({"PANEL": 
"SdNavigatorPanel"}))
+
+xTree = xImpressDoc.getChild("tree")
+self.assertEqual(2, len(xTree.getChildren()))
+
+self.assertEqual("Slide 1", 
get_state_as_dict(xTree.getChild('0'))['Text'])
+self.assertEqual(2, len(xTree.getChild('0').getChildren()))
+
+self.assertEqual("Slide 2", 
get_state_as_dict(xTree.getChild('1'))['Text'])
+self.assertEqual(2, len(xTree.getChild('1').getChildren()))
+
+xTree.getChild('0').executeAction("DOUBLECLICK", tuple())
+
+# Without the fix in place, this test would have failed with
+# AssertionError: '1' != '2'
+self.assertEqual("1", get_state_as_dict(xEditWin)["CurrentSlide"])
+
+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: Branch 'distro/cib/libreoffice-6-4' - configure.ac download.lst external/python3

[Michael Stahl (via logerrit)]

 configure.ac   
|2 
 download.lst   
|4 
 
external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 |   59 --
 external/python3/python-3.3.0-darwin.patch.1   
|2 
 4 files changed, 4 insertions(+), 63 deletions(-)

New commits:
commit 576be77c00bf925b02405da3a13236526a8948b4
Author: Michael Stahl 
AuthorDate: Wed Feb 17 13:56:52 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 17 15:46:51 2021 +0100

python3: upgrade to release 3.7.10

Fixes CVE-2021-3177 plus these less important ones:
CVE-2021-23336 CVE-2020-27619 CVE-2020-14422 CVE-2020-26116
CVE-2019-20907 CVE-2020-8492 CVE-2019-18348

Change-Id: I8e83395bd3e871eb2ed030a03827b7d261c96049

diff --git a/configure.ac b/configure.ac
index 211ec987d05f..000ed8c340c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8798,7 +8798,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=7
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index bdbed280f3e0..702a921e929b 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
 export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
-export PYTHON_SHA256SUM := 
06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
-export PYTHON_TARBALL := Python-3.7.7.tar.xz
+export PYTHON_SHA256SUM := 
f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b
+export PYTHON_TARBALL := Python-3.7.10.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 
b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
deleted file mode 100644
index 489e5d0e89ee..
--- 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes 
-Date: Mon, 24 Sep 2018 14:38:31 +0200
-Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser
- (GH-9217) (GH-9512)
-
-The SAX parser no longer processes general external entities by default
-to increase security. Before, the parser created network connections
-to fetch remote files or loaded local files from the file system for DTD
-and entities.
-
-Signed-off-by: Christian Heimes 
-
-https://bugs.python.org/issue17239.
-(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45)
-
-Co-authored-by: Christian Heimes 
-
-
-
-https://bugs.python.org/issue17239

- Doc/library/xml.dom.pulldom.rst   | 14 +
- Doc/library/xml.rst   |  6 +-
- Doc/library/xml.sax.rst   |  8 +++
- Doc/whatsnew/3.6.rst  | 18 +-
- Lib/test/test_pulldom.py  |  7 +++
- Lib/test/test_sax.py  | 60 ++-
- Lib/test/test_xml_etree.py| 13 
- Lib/xml/sax/expatreader.py|  2 +-
- .../2018-09-11-18-30-55.bpo-17239.kOpwK2.rst  |  3 +
- 9 files changed, 125 insertions(+), 6 deletions(-)
- create mode 100644 
Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-
-diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
-index 421358fa5b..5066ffc2fa 100644
 a/Lib/xml/sax/expatreader.py
-+++ b/Lib/xml/sax/expatreader.py
-@@ -95,7 +95,7 @@ class ExpatParser(xmlreader.IncrementalParser, 
xmlreader.Locator):
- self._lex_handler_prop = None
- self._parsing = 0
- self._entity_stack = []
--self._external_ges = 1
-+self._external_ges = 0
- self._interning = None
- 
- # XMLReader methods
-diff --git 
a/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst 
b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-new file mode 100644
-index 00..8dd0fe8c1b
 /dev/null
-+++ b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-@@ -0,0 +1,3 @@
-+The xml.sax and xml.dom.minidom parsers no long

Re: Inserting shapes in unittests

[Xisco Fauli]

Nevermind. The problem was in the KeyModifier. it's KEY_MOD1 and not
KEY_MOD2.

On 17/2/21 15:49, Xisco Fauli wrote:
> Hello,
>
> Is there any reason why inserting shapes doesn't work in CppUnittests ?
> In UItests, it's possible to use the KeyModifier 8192 (KEY_MOD2 ), see
> https://opengrok.libreoffice.org/xref/core/sw/qa/uitest/writer_tests7/tdf130629.py?r=f7c8535a,
> however, if I do the same in a CppUnittest, nothing is inserted. see
> https://gerrit.libreoffice.org/c/core/+/111072.
>
> Any idea why this is happening ?
>
> Cheers
>
-- 
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0

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

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

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/toolbarmodedialog.ui  |6 --
 extras/source/toolbarmode/default.png |binary
 extras/source/toolbarmode/notebookbar.png |binary
 extras/source/toolbarmode/notebookbar_groupedbar_full.png |binary
 extras/source/toolbarmode/notebookbar_groups.png  |binary
 extras/source/toolbarmode/sidebar.png |binary
 6 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 43eda7e273048d4deebad3224e289cf6603fa42b
Author: Heiko Tietze 
AuthorDate: Mon Jan 18 13:58:04 2021 +0100
Commit: Heiko Tietze 
CommitDate: Wed Feb 17 16:34:36 2021 +0100

Resolves tdf#138051 - UI picker text blocks buttons

All images have a height of 125px now

Change-Id: I64bb9d51c7a5edb4f0cfd38ac48473f11755061d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109529
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 08b6d409b2b5228c14e8b94eddbb8987ec6e9c78)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110789
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Rizal Muttaqin 
Tested-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui 
b/cui/uiconfig/ui/toolbarmodedialog.ui
index dc88d3e18864..43496294fde9 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -311,21 +311,23 @@
 top
 
   
-436
+125
 True
 False
+center
 start
 True
 gtk-missing-image
   
   
 False
-True
+False
 0
   
 
 
   
+436
 100
 True
 True
diff --git a/extras/source/toolbarmode/default.png 
b/extras/source/toolbarmode/default.png
index 6dff7cf4d8ac..a65e1f951ba2 100644
Binary files a/extras/source/toolbarmode/default.png and 
b/extras/source/toolbarmode/default.png differ
diff --git a/extras/source/toolbarmode/notebookbar.png 
b/extras/source/toolbarmode/notebookbar.png
index 0637d42f3ca9..4683675ce783 100644
Binary files a/extras/source/toolbarmode/notebookbar.png and 
b/extras/source/toolbarmode/notebookbar.png differ
diff --git a/extras/source/toolbarmode/notebookbar_groupedbar_full.png 
b/extras/source/toolbarmode/notebookbar_groupedbar_full.png
index 08c24b0fa403..d915a9e00880 100644
Binary files a/extras/source/toolbarmode/notebookbar_groupedbar_full.png and 
b/extras/source/toolbarmode/notebookbar_groupedbar_full.png differ
diff --git a/extras/source/toolbarmode/notebookbar_groups.png 
b/extras/source/toolbarmode/notebookbar_groups.png
index fd7cf7f4007f..8102903d4509 100644
Binary files a/extras/source/toolbarmode/notebookbar_groups.png and 
b/extras/source/toolbarmode/notebookbar_groups.png differ
diff --git a/extras/source/toolbarmode/sidebar.png 
b/extras/source/toolbarmode/sidebar.png
index fae7904cba70..5523636023a6 100644
Binary files a/extras/source/toolbarmode/sidebar.png and 
b/extras/source/toolbarmode/sidebar.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Inserting shapes in unittests

[Regina Henschel]

Hi Xisco,

Xisco Fauli schrieb am 17.02.2021 um 15:49:

Hello,

Is there any reason why inserting shapes doesn't work in CppUnittests ?


I got shapes inserted in Calc in scshapetest.cxx. See around #225, #322, 
#277, #503, #686, #746. There are different methods used. But I don't 
know whether they will work in other modules.


Kind regards
Regina

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

[Libreoffice-commits] core.git: officecfg/registry svx/uiconfig sw/sdi sw/source sw/uiconfig

[Anshu (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 -
 svx/uiconfig/ui/sidebarparagraph.ui |   11 
+
 sw/sdi/_listsh.sdi  |7 
-
 sw/sdi/_textsh.sdi  |6 
+
 sw/source/uibase/shells/listsh.cxx  |   10 

 sw/source/uibase/shells/textsh1.cxx |5 
 sw/source/uibase/shells/txtnum.cxx  |   12 
++
 sw/uiconfig/swriter/menubar/menubar.xml |9 
---
 sw/uiconfig/swriter/toolbar/textobjectbar.xml   |1 
 9 files changed, 41 insertions(+), 22 deletions(-)

New commits:
commit c456f839a597f537f1c59becd7d0bb6c86248ef8
Author: Anshu 
AuthorDate: Wed Jan 6 15:04:16 2021 +0530
Commit: Heiko Tietze 
CommitDate: Wed Feb 17 16:36:13 2021 +0100

tdf#115965 tdf#92622 NoList default in menu,tool,sidebar

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7450d72396d9..55b894ca85ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1953,7 +1953,7 @@
   
   
 
-  Numbering Off
+  No List
 
 
   7
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 846dbe53a409..716b03d9c5a9 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -641,6 +641,17 @@
 icons
 False
 2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
 
   
 True
diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index a2835d575bf6..fc27094f7a24 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -39,13 +39,6 @@ interface BaseTextList
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
-FN_NUM_BULLET_OFF // status(final|play)
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
-]
-
 FN_NUM_BULLET_OUTLINE_DOWN  // status(final|play)
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index e0bcfff65360..4a201b62c7e1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -759,6 +759,12 @@ interface BaseText
 StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+FN_NUM_BULLET_OFF
+[
+ExecMethod = ExecEnterNum;
+StateMethod = GetState;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 FN_INSERT_FRAME // status(final|play)
 [
 ExecMethod = ExecInsert ;
diff --git a/sw/source/uibase/shells/listsh.cxx 
b/sw/source/uibase/shells/listsh.cxx
index 8220f6cd4ef1..cb37bfa08402 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -157,16 +157,6 @@ void SwListShell::Execute(SfxRequest &rReq)
 rReq.Done();
 break;
 
-case FN_NUM_BULLET_OFF:
-{
-rReq.Ignore();
-SfxRequest aReq( GetView().GetViewFrame(), FN_NUM_BULLET_ON );
-aReq.AppendItem( SfxBoolItem( FN_PARAM_1, false ) );
-aReq.Done();
-rSh.DelNumRules();
-break;
-}
-
 case FN_NUM_BULLET_OUTLINE_DOWN:
 if ( bOutline )
 lcl_OutlineUpDownWithSubPoints( rSh, false, false );
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index c191d4c90f86..9535ceef1fa9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2036,6 +2036,11 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 
rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON,rSh.SelectionHasBullet()));
 break;
 
+case FN_NUM_BULLET_OFF:
+
rSet.Put(SfxBoolItem(FN_NUM_BULLET_OFF,(!rSh.SelectionHasBullet() &&
+!rSh.SelectionHasNumber(;
+break;
+
 case FN_BUL_NUM_RULE_INDEX:
 case FN_NUM_NUM_RULE_INDEX:
 case FN_OUTLINE_RULE_INDEX:
diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index 3feff416724b..8f8ca2429513 100644
--- a/sw

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

[Tamás Zolnai (via logerrit)]

 sd/source/ui/view/drawview.cxx |7 ++-
 svx/source/svdraw/svdedxv.cxx  |1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7db8c3d36db3ed727ade2609b7c1017cc813a560
Author: Tamás Zolnai 
AuthorDate: Wed Feb 17 15:53:08 2021 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 17 17:14:15 2021 +0100

Better fix for tdf#125824: switch page only for the current view.

First workaround was avoiding undoing:
9dca7c2fac5c6b83a6910aa61b1a2a316f36d948

Second workaround was forcing all views to exit text editing:
e6c7a018a0cfee395ce2886d41c908a2447ef5cc

Instead of these solutions, we allow to continue text editing
in other views. What we do is avoiding jumping to the object
location in all views while undoing. In theory, the two views
/ windows should be able to edit the document's different parts
independently. So one view should not jump to the location where
the other view edits something / does an undo.

It works both with multi-window and Collabora Online's collaborative
editing.

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

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 2c1a4e676c33..883d6d35b0b4 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -424,8 +424,13 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& 
rHint)
 // switch to that page when it's not a master page
 if(SdrHintKind::SwitchToPage == eHintKind)
 {
-const SdrPage* pPage = static_cast(rHint).GetPage();
+// We switch page only in the current view, which triggered this 
event
+// and keep other views ontouched.
+SfxViewShell* pViewShell = SfxViewShell::Current();
+if(pViewShell && pViewShell != 
&mpDrawViewShell->GetViewShellBase())
+return;
 
+const SdrPage* pPage = static_cast(rHint).GetPage();
 if(pPage && !pPage->IsMasterPage())
 {
 if(mpDrawViewShell->GetActualPage() != pPage)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 17c5f57f672d..43ea7336af56 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1522,7 +1522,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 const bool bUndo = IsUndoEnabled();
 if (bUndo)
 {
-EndTextEditAllViews();
 OUString aObjName(pTEObj->TakeObjNameSingul());
 BegUndo(SvxResId(STR_UndoObjSetText), aObjName);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 translations|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8805448f44624a5981ba252f060dcb9dee07abc3
Author: Seth Chaiklin 
AuthorDate: Tue Feb 16 15:06:09 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Wed Feb 17 17:20:35 2021 +0100

tdf#140058 "Bullets and Numbering" -> "List" in Text context menu

   This change has following consequences for UI:
  - context menus for Text | Bullets and Numbering and
Table | Bullets and Numbering will now appear as
Text | List
  - right-click in text will now show "List..." under
"Character" and "Paragraph", instead of
"Bullets and Numbering" and will open a menu where
it is possible to select default lists, list styles
and modify an existing list.

   The entry is singular because it is a context menu, and
   only one list can be modified.

Change-Id: I941ebf01a005cf1c422e73611067bbc90d63e616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110928
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 55b894ca85ea..1d1204391755 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1708,7 +1708,7 @@
   
   
 
-  ~Bullets and Numbering...
+  ~List...
 
 
   7
commit 34e68982f806d11adb8d253ae2af0723e9abf190
Author: Christian Lohmaier 
AuthorDate: Wed Feb 17 17:20:27 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Feb 17 17:20:27 2021 +0100

Update git submodules

* Update translations from branch 'master'
  to 71f0c6a4724fa28a2a2d72b0547aa0370c287fcf
  - update translations for master

and force-fix errors using pocheck

Change-Id: Iaf573f747484376b8aeb1854bc5342507a27d92d

diff --git a/translations b/translations
index 418be5d6b01b..71f0c6a4724f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 418be5d6b01b00babc6dc695e2a768f554c7dedc
+Subproject commit 71f0c6a4724fa28a2a2d72b0547aa0370c287fcf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 4 commits - download.lst external/openssl external/poppler external/postgresql external/python3 RepositoryExternal.mk sdext/source

[Martin Whitaker (via logerrit)]

 RepositoryExternal.mk |5 
 download.lst  |8 
 external/openssl/ExternalPackage_openssl.mk   |4 
 external/openssl/ExternalProject_openssl.mk   |   15 -
 external/openssl/UnpackedTarball_openssl.mk   |   10 -
 external/openssl/openssl-1.0.1h-win64.patch.1 |   47 -
 external/openssl/openssl-3650-masm.patch.1|   35 ---
 external/openssl/openssl-fixbuild.patch.1 |   23 --
 external/openssl/openssl-no-multilib.patch.0  |   38 
 external/openssl/openssllnx.patch |   23 --
 external/openssl/opensslsol.patch |   20 --
 external/openssl/opensslwnt.patch |  167 --
 external/openssl/opensslwnt_safeseh.patch |   23 --
 external/poppler/StaticLibrary_poppler.mk |   22 ++
 external/poppler/poppler-config.patch.1   |   72 ++-
 external/postgresql/ExternalProject_postgresql.mk |2 
 external/python3/ExternalProject_python3.mk   |3 
 external/python3/python-3.5.4-ssl.patch.1 |2 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 
 19 files changed, 103 insertions(+), 420 deletions(-)

New commits:
commit 1551ec1828a2cb5c9a700aafc0fcf7b23221ef2b
Author: Martin Whitaker 
AuthorDate: Fri May 8 21:47:25 2020 +0200
Commit: Vasily Melenchuk 
CommitDate: Wed Feb 17 17:23:53 2021 +0300

tdf#131353: Fix build with poppler 0.86.0

Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789
Tested-by: René Engelhard 
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 36bab70cc6ad..94e771b9e8dc 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
 if (!(pAction && pAction->getKind() == actionURI))
 return;
 
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+const char* pURI = static_cast(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
 const char* pURI = static_cast(pAction)->getURI()->c_str();
 #else
 const char* pURI = static_cast(pAction)->getURI()->getCString();
commit 44cf833302395c52f24d4c5a5727bb9efa228056
Author: Michael Stahl 
AuthorDate: Wed Jan 6 19:30:07 2021 +0100
Commit: Vasily Melenchuk 
CommitDate: Wed Feb 17 12:12:51 2021 +0300

poppler: upgrade to release 21.01.0

Fixes CVE-2020-27778 and changelogs mention lots of fuzzing fixes.

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

diff --git a/download.lst b/download.lst
index 03a59bb6af25..ab52c4e2c1c0 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
 export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
-export POPPLER_SHA256SUM := 
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
-export POPPLER_TARBALL := poppler-0.82.0.tar.xz
+export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
+export POPPLER_TARBALL := poppler-21.01.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
 export PYTHON_SHA256SUM := 
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index 8bf9f528ee9e..3cc0a95e3617 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -35,6 +35,23 @@ endif
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc))
 
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,poppler,\
+   UnpackedTarball/poppler/poppler/CourierWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/CourierBoldWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/CourierBoldObliqueWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/CourierObliqueWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/HelveticaWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/HelveticaBoldWidths.pregenerated \
+   UnpackedTarball/poppler/poppler/HelveticaBoldObliqueWidths.pregenerated 
\
+   UnpackedTarball/poppler/poppler/HelveticaObliqueWidths.pregenerated \
+   UnpackedTarb

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - configure.ac download.lst external/python3

[Michael Stahl (via logerrit)]

 configure.ac   
|2 
 download.lst   
|4 
 
external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 |   59 --
 external/python3/python-3.3.0-darwin.patch.1   
|2 
 4 files changed, 4 insertions(+), 63 deletions(-)

New commits:
commit 470819d59a595abd6eb89f98c675ac3141f7728c
Author: Michael Stahl 
AuthorDate: Wed Feb 17 13:56:52 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 17 19:18:29 2021 +0100

python3: upgrade to release 3.7.10

Fixes CVE-2021-3177 plus these less important ones:
CVE-2021-23336 CVE-2020-27619 CVE-2020-14422 CVE-2020-26116
CVE-2019-20907 CVE-2020-8492 CVE-2019-18348

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

diff --git a/configure.ac b/configure.ac
index 0b7415549198..a8056fdeaa6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8789,7 +8789,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=7
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index bdbed280f3e0..702a921e929b 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
 export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
-export PYTHON_SHA256SUM := 
06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
-export PYTHON_TARBALL := Python-3.7.7.tar.xz
+export PYTHON_SHA256SUM := 
f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b
+export PYTHON_TARBALL := Python-3.7.10.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 
b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
deleted file mode 100644
index 489e5d0e89ee..
--- 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes 
-Date: Mon, 24 Sep 2018 14:38:31 +0200
-Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser
- (GH-9217) (GH-9512)
-
-The SAX parser no longer processes general external entities by default
-to increase security. Before, the parser created network connections
-to fetch remote files or loaded local files from the file system for DTD
-and entities.
-
-Signed-off-by: Christian Heimes 
-
-https://bugs.python.org/issue17239.
-(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45)
-
-Co-authored-by: Christian Heimes 
-
-
-
-https://bugs.python.org/issue17239

- Doc/library/xml.dom.pulldom.rst   | 14 +
- Doc/library/xml.rst   |  6 +-
- Doc/library/xml.sax.rst   |  8 +++
- Doc/whatsnew/3.6.rst  | 18 +-
- Lib/test/test_pulldom.py  |  7 +++
- Lib/test/test_sax.py  | 60 ++-
- Lib/test/test_xml_etree.py| 13 
- Lib/xml/sax/expatreader.py|  2 +-
- .../2018-09-11-18-30-55.bpo-17239.kOpwK2.rst  |  3 +
- 9 files changed, 125 insertions(+), 6 deletions(-)
- create mode 100644 
Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-
-diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
-index 421358fa5b..5066ffc2fa 100644
 a/Lib/xml/sax/expatreader.py
-+++ b/Lib/xml/sax/expatreader.py
-@@ -95,7 +95,7 @@ class ExpatParser(xmlreader.IncrementalParser, 
xmlreader.Locator):
- self._lex_handler_prop = None
- self._parsing = 0
- self._entity_stack = []
--self._external_ges = 1
-+self._external_ges = 0
- self._interning = None
- 
- # XMLReader methods
-diff --git 
a/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst 
b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-new file mode 100644
-index 00..8dd0fe8c1b
 /dev/null
-+++ b/Misc/NE

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   32 +++
 sw/qa/uitest/writer_tests7/tdf130629.py |   43 
 2 files changed, 32 insertions(+), 43 deletions(-)

New commits:
commit 48aac3c1d06994d17f20dbdc2ad8add722192ec3
Author: Xisco Fauli 
AuthorDate: Wed Feb 17 16:25:34 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 17 20:07:50 2021 +0100

tdf#130629: sw: Move UItest to CppUnitTest

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

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index e4ccc62e6f17..7bb002b03ae9 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1636,6 +1636,38 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135014)
 assertXPath(pXmlStyles, 
"/w:styles/w:style[@w:styleId='NewNumberingStyle']/w:qFormat", 1);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130629)
+{
+mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({ { "KeyModifier", 
uno::makeAny(KEY_MOD1) } }));
+
+dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+
+// Undo twice
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+// Shape toolbar is active, use ESC before inserting a new shape
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_ESCAPE);
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133358)
 {
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
diff --git a/sw/qa/uitest/writer_tests7/tdf130629.py 
b/sw/qa/uitest/writer_tests7/tdf130629.py
deleted file mode 100644
index e4cf7942d8c3..
--- a/sw/qa/uitest/writer_tests7/tdf130629.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# 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/.
-#
-from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict
-from libreoffice.uno.propertyvalue import mkPropertyValues
-
-class tdf130629(UITestCase):
-
-def test_tdf130629(self):
-
-self.ui_test.create_doc_in_start_center("writer")
-
-document = self.ui_test.get_component()
-self.assertEqual(0, document.DrawPage.getCount())
-
-# Insert shape while pressing CTRL
-self.xUITest.executeCommandWithParameters(".uno:BasicShapes.diamond", 
mkPropertyValues({"KeyModifier": 8192}))
-
-self.assertEqual(1, document.DrawPage.getCount())
-
-# Undo twice
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Undo")
-
-self.assertEqual(0, document.DrawPage.getCount())
-
-# Shape toolbar is active, use esc before inserting a new shape
-xWriterDoc = self.xUITest.getTopFocusWindow()
-xWriterEdit = xWriterDoc.getChild("writer_edit")
-xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "ESC"}))
-
-# Without the fix in place, this test would have crashed here
-self.xUITest.executeCommandWithParameters(".uno:BasicShapes.diamond", 
mkPropertyValues({"KeyModifier": 8192}))
-
-self.assertEqual(1, document.DrawPage.getCount())
-
-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

Minutes from the UX/design meeting 2020-Feb-17

[Heiko Tietze]

Present: Heiko
Comments: Mike

Tickets/Topic

 * Editing a FONTWORK is difficult
   + https://bugs.documentfoundation.org/show_bug.cgi?id=51138
   + a) hide the fontwork design
   + b) grey-out/watermark the design
 + preferred over a)
   + c) temporarily revert stretching and rotation effects
 + might work with limited features of MSO but unclear
   with all the options we have
   + d) edit the content in a separate dialog
 + sounds like the simplest solution
   => preference: b) - d) (any work)

 * UI: Add footnotes and endnotes to context menu when right
   clicking footnote in document area
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139716
   + no urgent need to contextually edit F&E at the variable field
   + apparently there is no special context for fields so this
 change implies quite some effort
   => WF

 * Unnecessary dialog box when attempting to sort single-column (or row) data
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139019
   + convenience and safety feature, WF (Mike)
   + unclear use case
   => WF

 * Already used terms in Find & Replace window to be accessible from input 
search
   + https://bugs.documentfoundation.org/show_bug.cgi?id=140119
   + expand the list after character has been entered (Bogdan)
   + technically similar request in bug 133494
   + no objection
   => expand the list if number of results are <20 (and shrink further on type)

 * HYPERLINK DIALOG: Add folder as target
   + https://bugs.documentfoundation.org/show_bug.cgi?id=140377
   + better document the workaround than adding more UI controls (Heiko)
   => forward to documentation



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

[Libreoffice-commits] help.git: Changes to 'libreoffice-7-0-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-5' available with the following commits:
commit bd98f5c46055e77638fc575faa454b86521ee919
Author: Christian Lohmaier 
Date:   Wed Feb 17 20:52:55 2021 +0100

Branch libreoffice-7-0-5

This is 'libreoffice-7-0-5' - the stable branch for the 7.0.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic1c68186f4108fa898006bdc62b6087a1323df77

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-0-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-5' available with the following commits:
commit 34cd7f8a06b3fb1f1eabfee45ca87f799499c831
Author: Christian Lohmaier 
Date:   Wed Feb 17 20:52:55 2021 +0100

Branch libreoffice-7-0-5

This is 'libreoffice-7-0-5' - the stable branch for the 7.0.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I96317f1cb8068c032f13041948dc1920b2fec02e

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-0-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-5' available with the following commits:
commit 47a68f12c0765c37ec2d3b4c53652a4b7aeea9cf
Author: Christian Lohmaier 
Date:   Wed Feb 17 20:52:55 2021 +0100

Branch libreoffice-7-0-5

This is 'libreoffice-7-0-5' - the stable branch for the 7.0.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I083c0fcc252707057c287a981ce9e84ba3a82ecb

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-7-0-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-5' available with the following commits:
commit 2e9be42aa29aeebd059bcdd6f82ff53e9bff4060
Author: Christian Lohmaier 
Date:   Wed Feb 17 20:53:31 2021 +0100

Branch libreoffice-7-0-5

This is 'libreoffice-7-0-5' - the stable branch for the 7.0.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.0.x release,
please use the 'libreoffice-7-0' branch.

If you want to build something cool, unstable, and risky, use master.

___
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' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 84dc428851e978604fc6e9add4151bf96d63fddf
Author: Christian Lohmaier 
AuthorDate: Wed Feb 17 20:56:34 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Feb 17 20:56:34 2021 +0100

bump product version to 7.0.6.0.0+

Change-Id: I833cdcda1ef1c84f5d059f182d135fb09df85f4b

diff --git a/configure.ac b/configure.ac
index 2bc63657d7f7..c5050c18a8d8 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],[7.0.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.6.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
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-5' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 854a677eaec2b0d39c8cc8d49dc076936e362008
Author: Christian Lohmaier 
AuthorDate: Wed Feb 17 21:01:30 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Feb 17 21:01:30 2021 +0100

bump product version to 7.0.5.1.0+

Change-Id: I4089958be9fc70ad326085f347ad017b962e545f

diff --git a/configure.ac b/configure.ac
index 2bc63657d7f7..8300864f394c 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],[7.0.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.5.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.0.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.5.1' created by Christian Lohmaier 
 at 2021-02-17 20:01 +

Tag libreoffice-7.0.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmAtdgQACgkQ9DSh76/u
rqOzohAAxtUHkKJSjMpyhSrGramXSImKyEPXP/MRuWaAQqnMqP0BQ4fvX9Cc+InH
l5s3W2JBYyGJ9R7D7ZuyS6fc02YtTqOy2pm8WHdiC+cvqI+khJtJi/xuRnnCQN82
KxmlQzz7GwmXHyhP0tKjiNaO87ryd0kxtoq/Fj4IDEJ4+p1aSKhybil6Am8po76/
pVqdYbgxCdTozGfeSQxjHcYtlXA6OOQsCvGEfkohVbF+FUjqJAd6Rbvq896ZJ5W6
Ort05lVswIg8eOxN1omrfNchUN1tBatHVrZ6pMfSCOzPIRnP/XOZN4pDQa72b5Yg
3HvIeFCy/qNxUGe1mcIDYMd4xIWcMJlk1er9RW3qbCwqX+YIOw22NiZSUMJuzmvT
fbNAry1CPhbnOp2I9YjRvMuT32KH7OWM1z3qly2DdxKdnHSKRwMTLA94VmpnWc3J
sFwkRiRYjOzai7p81VeyCzyVzcEHikYLW7k9AHTIbwy8F6L/0i4dU9bmsBXzdZ2z
8uLnfIZY3SJRCmXx/zl0Z1EVUOmrg/BzivVYJpdY2s3zkeiWsXJy7OF6Jd8DbLGa
7oPdvbWjnXqQ+BUlnNGsTZfhz9498/FXkcg47/DN2Ysk8FojNiONYO0O1y0YKKar
sTIbEGBoDCPx26lwkcR6bacN+Jz4nXp8/XUow/qcE2m/K85vLcE=
=3+FF
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-1318:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.0.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.5.1' created by Christian Lohmaier 
 at 2021-02-17 20:01 +

Tag libreoffice-7.0.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmAtdgAACgkQ9DSh76/u
rqPFvRAArAbsPJlm/7QE1UQJCbx4B7SjpaMTEJXBRIvExo7LJjnFNQmPZ/NgzDvP
nnp6L+iMoTCZEk7E9YWhtZJ41Ved96MEjgZSpcqwXyppygO/hQeDd9P8F/+46bp4
sa8HbwcIi4tUzuS3hhHzRdW8VWUxwRVim5BhBmhjsAj63XsHOiG+6xfVriOZB+Xt
ds0npJABtnbk8Ik7jv7mwVI7vQlWXo46wXh3Uq55dzC8rNi243nCMtCyp5ggktm+
c7ykWOyxxIIXkvz20kVmcd6Mjqdyz/9Js5QTYoiiCqhj++U5tk9707WIFeSTSZCH
LYj7HXPMX/0ezPh3tY1xNh4TM0LSv5sDvwI00m7iET/+6QBtUAbqIH13Th+S/++5
XJIKn6YB+ksoxgjRhtxf+tEWargDgsQluMv9gXL0uqgJ3/hB2yBMFb/vMKruLWp9
OOpJUkR14a4kXO85LOrFRBwwv14TruRh8UIXaK1ZfFH/v1POw54si7Fe9bFmmvgX
oscLnS3Aj4+58E8uCrafJRlQKDuoYTUd/DPd7czeYlcOP7Smp3W+2PRa7tiKkvt7
QunsH7NfcUepFcATtDxYykiSIv5rV8iyaMirsk03jEFMY4DUxYYchux8subPDPEw
x/SrxemrnJZcHQQFyUJPuvjBSHOvi+FjnsRBcpl8t/uKxM/D/SE=
=q3iY
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.0.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.5.1' created by Christian Lohmaier 
 at 2021-02-17 20:01 +

Tag libreoffice-7.0.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmAtdgQACgkQ9DSh76/u
rqOyBw/8CRvBbx5RWv1VrN1NTzPFN7gqKVGB7JaBHG+13DDl3PmwpbZqr1TAOL+t
QoBvLFsJZ3kdabDFHGGY+HzbMmyqO5FKIHA+G7WuTElHENWhZO1mcme+HaFB9c2K
SldEXlHPOItiP8xYt/6cqf3T+nTRoRWVdBajMtdMKLKOj1UChZCM8mxnu0JGREy8
iDssJIHs3u1g9wUfVBXu3dd0SNBQdATvEgVIdUAbVxxWGC1i9ndzAzn6Kdp6tK5j
RJM7MNNSiqFISccy2/cKkX2MBhY5+aBKLueNqZos62t4BsGzyqBVCMuoP4aAsWqr
5jVffoeMFfcOS9xgRaWLD4lL0fiOyNg1mQfdhodUZ3wjSh1Y8QibqcATeWUqUQpL
oRl+1HemFRBqwKzDc8wWvY87G29Wny87Vv4TTs0sMRGI2BWmJIjbuHY99k1vH030
EGvBM/LLwbaUTsCOjtDmJt5QSM1W8gHqBY8aklwd+Nue2v5OvkbGB9qOPN0vGgmu
3VqVshmiwVaWLMiEPsUDYx7/J7ASbIHR9PMxjVR1SKq6qGtflreA3asAPEoovWv9
HWsvDEe/aSAFMxhVlQrngh+Y4pwxvDKZyHkbM+WRfgdAjc50ARsma+TurvnVibsK
i8xlTnEzpQx0je2ioE0kP3hNJJJwCYaeTBxxuYMnClmd22vR1MU=
=8Q5p
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-78:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.0.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.5.1' created by Christian Lohmaier 
 at 2021-02-17 20:01 +

Tag libreoffice-7.0.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmAtdgQACgkQ9DSh76/u
rqNnNw/7BRiBFFfCScgbR/8xkIkFcpN1yVPQ+O0Ey7W8gQVk+sFFRkiTs5lTPNqQ
XOYW6duF4zaMcyejVrhMWBM1qnSQlu4+Nh3RhGcXRvvoDnW8Ff9WPMhFoU8KIWle
4yS3sISlGyr0ERxyPx81ao2OoFh8WxmwA+8ZAX7xAE2mQVeqQ3EBARhv62hN6nqU
T5iTRCZYnlvM7MBhAjuodAU4Zh2FOeQzDYu++c368eRb4oVEhtnEPd+vf5xtOFBH
LXRML6GJG4E2Ly5XF+1T0jH96QuPnvgbWAgJ7ukT4eDGfRwWlrOUVo7Rlk+/8CD6
NcroDIjrODHfTUnP7DEGCbx0XNgOtTlYeFSIIs43s8zT5lY7uGixTPJ3cQYm/aAC
qYopEXvrnVbxyMynVka8ptclJkAlOXjoVn0f14gvSxUg+ZdUG0ymbNrIj0bdtxbE
Q+emUNgxzHQiOfIwpWCQJ2X8DTm4if1KZjh9RDnKOXqSMhsGU5mvBeAvAguQ0WhH
oTsjCVkC6Y80/H48UqrmdFodeVF2XhEeWC08u063zhifEUYM2fnk5hLxFQoqUzQs
mE44i+rrZZJWZM+DXwyl3evMM5VKUIPep3WJkzzh3kUcfmhkbEDaK/GCWIerfiQr
6FnHCW5PDH69pL91j53fAfjCZOHVKu55XCeX8Vs3CNM7BEcxUYc=
=Njiv
-END PGP SIGNATURE-

Changes since libreoffice-7-0-branch-point-24:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - external/python3

[Michael Stahl (via logerrit)]

 
external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 |  175 ++
 external/python3/UnpackedTarball_python3.mk
|1 
 2 files changed, 176 insertions(+)

New commits:
commit 3144a3907f299d4f24d43633fee49ff78a106bfe
Author: Michael Stahl 
AuthorDate: Wed Feb 17 12:24:08 2021 +0100
Commit: Vasily Melenchuk 
CommitDate: Wed Feb 17 19:46:39 2021 +0300

python3: add patch for CVE-2021-3177

Looks like Python 3.5 is EOL, so backport the patch.

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

diff --git 
a/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
new file mode 100644
index ..fdcc5cb65267
--- /dev/null
+++ 
b/external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
@@ -0,0 +1,175 @@
+From 34df10a9a16b38d54421eeeaf73ec89828563be7 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson 
+Date: Mon, 18 Jan 2021 15:11:46 -0600
+Subject: [PATCH] [3.6] closes bpo-42938: Replace snprintf with Python unicode
+ formatting in ctypes param reprs. (GH-24250)
+
+(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
+
+Co-authored-by: Benjamin Peterson 
+---
+ Lib/ctypes/test/test_parameters.py| 43 +++
+ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst  |  2 +
+ Modules/_ctypes/callproc.c| 55 +++
+ 3 files changed, 66 insertions(+), 34 deletions(-)
+ create mode 100644 
Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+
+diff --git a/Lib/ctypes/test/test_parameters.py 
b/Lib/ctypes/test/test_parameters.py
+index e4c25fd880..531894fdec 100644
+--- a/Lib/ctypes/test/test_parameters.py
 b/Lib/ctypes/test/test_parameters.py
+@@ -201,6 +201,49 @@ def __dict__(self):
+ self.assertRaises(ArgumentError, func, 99)
+ 
+ 
++def test_parameter_repr(self):
++from ctypes import (
++c_bool,
++c_char,
++c_wchar,
++c_byte,
++c_ubyte,
++c_short,
++c_ushort,
++c_int,
++c_uint,
++c_long,
++c_ulong,
++c_longlong,
++c_ulonglong,
++c_float,
++c_double,
++c_longdouble,
++c_char_p,
++c_wchar_p,
++c_void_p,
++)
++self.assertRegex(repr(c_bool.from_param(True)), r"^$")
++self.assertEqual(repr(c_char.from_param(97)), "")
++self.assertRegex(repr(c_wchar.from_param('a')), r"^$")
++self.assertEqual(repr(c_byte.from_param(98)), "")
++self.assertEqual(repr(c_ubyte.from_param(98)), "")
++self.assertEqual(repr(c_short.from_param(511)), "")
++self.assertEqual(repr(c_ushort.from_param(511)), "")
++self.assertRegex(repr(c_int.from_param(2)), r"^$")
++self.assertRegex(repr(c_uint.from_param(2)), r"^$")
++self.assertRegex(repr(c_long.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulong.from_param(2)), r"^$")
++self.assertRegex(repr(c_longlong.from_param(2)), r"^$")
++self.assertRegex(repr(c_ulonglong.from_param(2)), r"^$")
++self.assertEqual(repr(c_float.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1.5)), "")
++self.assertEqual(repr(c_double.from_param(1e300)), "")
++self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$")
++self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$")
++self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$")
++self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$")
++
+ 
+ 
+ if __name__ == '__main__':
+diff --git 
a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst 
b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+new file mode 100644
+index 00..7df65a156f
+--- /dev/null
 b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+@@ -0,0 +1,2 @@
++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
++:class:`ctypes.c_longdouble` values.
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index 70e416b950..9fcf95f543 100644
+--- a/Modules/_ctypes/callproc.c
 b/Modules/_ctypes/callproc.c
+@@ -451,54 +451,43 @@ PyCArg_dealloc(PyCArgObject *self)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+-char buffer[256];
+ switch(self->tag) {
+ case 'b':
+ case 'B':
+-sprintf(buffer, "",
++return PyUnicode_FromFormat("",
+ self->tag, self->value.b);
+-break;
+ case 'h

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/brwview.cxx   |   38 +++
 dbaccess/source/ui/control/dbtreelistbox.cxx |2 +
 dbaccess/source/ui/inc/brwview.hxx   |1 
 dbaccess/source/ui/inc/dbtreelistbox.hxx |3 ++
 dbaccess/uiconfig/ui/dbtreelist.ui   |   38 +++
 5 files changed, 49 insertions(+), 33 deletions(-)

New commits:
commit 48d27dc08012b5f0e9adf2053a8d73479bed5938
Author: Caolán McNamara 
AuthorDate: Wed Feb 17 14:27:06 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 17 21:55:16 2021 +0100

move statusbar into DBTreeListBox container

and convert to weld::Label

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

diff --git a/dbaccess/source/ui/browser/brwview.cxx 
b/dbaccess/source/ui/browser/brwview.cxx
index b0e3e516511c..4aa7c4c5abb9 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -71,7 +70,6 @@ UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent,
 ,m_pTreeView(nullptr)
 ,m_pSplitter(nullptr)
 ,m_pVclControl(nullptr)
-,m_pStatus(nullptr)
 {
 
 }
@@ -124,8 +122,6 @@ void UnoDataBrowserView::dispose()
 m_pSplitter.disposeAndClear();
 setTreeView(nullptr);
 
-m_pStatus.disposeAndClear();
-
 try
 {
 ::comphelper::disposeComponent(m_xGrid);
@@ -167,10 +163,11 @@ void UnoDataBrowserView::showStatus( const OUString& 
_rStatus )
 hideStatus();
 else
 {
-if (!m_pStatus)
-m_pStatus = VclPtr::Create(this);
-m_pStatus->SetText(_rStatus);
-m_pStatus->Show();
+if (!m_pTreeView)
+return;
+weld::Label& rLabel = m_pTreeView->GetStatusBar();
+rLabel.set_label(_rStatus);
+rLabel.show();
 Resize();
 PaintImmediately();
 }
@@ -178,10 +175,15 @@ void UnoDataBrowserView::showStatus( const OUString& 
_rStatus )
 
 void UnoDataBrowserView::hideStatus()
 {
-if (!m_pStatus || !m_pStatus->IsVisible())
+if (!m_pTreeView)
+return;
+weld::Label& rLabel = m_pTreeView->GetStatusBar();
+if (!rLabel.get_visible())
+{
 // nothing to do
 return;
-m_pStatus->Hide();
+}
+rLabel.hide();
 Resize();
 PaintImmediately();
 }
@@ -211,20 +213,12 @@ void 
UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground)
 Point   aTreeViewPos( aPlaygroundPos );
 SizeaTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() );
 
-// the status pos and size
-if (m_pStatus && m_pStatus->IsVisible())
-{
-Size aStatusSize(aPlaygroundPos.X(), GetTextHeight() + 2);
-aStatusSize = LogicToPixel(aStatusSize, 
MapMode(MapUnit::MapAppFont));
-aStatusSize.setWidth( aTreeViewSize.Width() - 2 - 2 );
-
-Point aStatusPos( aPlaygroundPos.X() + 2, aTreeViewPos.Y() + 
aTreeViewSize.Height() - aStatusSize.Height() );
-m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize );
-aTreeViewSize.AdjustHeight( -(aStatusSize.Height()) );
-}
-
 // set the size of treelistbox
 m_pTreeView->SetPosSizePixel( aTreeViewPos, aTreeViewSize );
+// Call this to trigger InterimItemWindow::Layout immediately, and
+// not later on idle so the statusbar will be shown to explain
+// a long delay on opening databases
+m_pTreeView->Resize();
 
 //set the size of the splitter
 m_pSplitter->SetPosSizePixel( aSplitPos, Size( aSplitSize.Width(), 
aPlaygroundSize.Height() ) );
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 132a659a776f..4c415007709c 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -56,6 +56,7 @@ using namespace ::com::sun::star::view;
 InterimDBTreeListBox::InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType)
 : InterimItemWindow(pParent, "dbaccess/ui/dbtreelist.ui", "DBTreeList")
 , TreeListBox(m_xBuilder->weld_tree_view("treeview"), bSQLType)
+, m_xStatusBar(m_xBuilder->weld_label("statusbar"))
 {
 InitControlBase(&GetWidget());
 }
@@ -68,6 +69,7 @@ InterimDBTreeListBox::~InterimDBTreeListBox()
 void InterimDBTreeListBox::dispose()
 {
 implStopSelectionTimer();
+m_xStatusBar.reset();
 m_xTreeView.reset();
 InterimItemWindow::dispose();
 }
diff --git a/dbaccess/source/ui/inc/brwview.hxx 
b/dbaccess/source/ui/inc/brwview.hxx
index 2d8b4f879dc3..0933861b8cf3 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -44,7 +44,6 @@ namespace dbaui
 VclPtr   m_pTreeView;
 VclPtr 

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

[Caolán McNamara (via logerrit)]

 svx/source/form/navigatortree.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 62cbe2b0e3505ac0e9a0c927b94ffbe31fec93d5
Author: Caolán McNamara 
AuthorDate: Thu Feb 11 13:11:54 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 17 22:12:07 2021 +0100

tdf#140274 set an initial minimum size

Change-Id: I93f0ac3d63b4864a0a5d98370407f9444b58b75c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110687
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit dc19de67d6c7f30157b7196773589bba30d9e02f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110869
Reviewed-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index 310a1dd1b507..6dee1b1dc000 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -146,6 +146,7 @@ namespace svxform
 ,m_bEditing( false )
 {
 m_xTreeView->set_help_id(HID_FORM_NAVIGATOR);
+m_xTreeView->set_size_request(200, 200);
 
 m_xTreeView->set_selection_mode(SelectionMode::Multiple);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Local LO build on Raspberry pi 4b doesn't launch

[julien2412]

sberg wrote
> Looks like there's some issue with running the Python interpreter 
> in-process.  And you apparently have some extension using old-style, 
> active registration of a Python component, which triggers the issue when 
> starting soffice.  If you do not want to debug the issue with the Python 
> interpreter, I would suggest you make sure you do not have any 
> extensions involving Python (likely one of your --enable-ext-* 
> configuration options).

Thank you for your feedback.
So I disabled these in my autogen.input:
#--enable-ext-nlpsolver
#--enable-ext-ct2n
#--enable-ext-numbertext
#--enable-ext-wiki-publisher
and startcenter launches.

I tried launching Writer but got another bt:
bt.txt

  

Do you think about another item in my autogen.input that I should disable
because of an old-style 
active registration of a Python component?

Julien




--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Local LO build on Raspberry pi 4b doesn't launch

[julien2412]

Another bt this time without Python (with gtk3 rendering so all the
accessibility stuff), I'll try with gen rendering.
bt2.txt

  



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/data/tdf105301.ods   |binary
 sc/qa/uitest/sort/tdf105301.py|   42 ++
 sc/source/ui/dbgui/sortkeydlg.cxx |7 ++
 3 files changed, 49 insertions(+)

New commits:
commit fb1aa71ca3f7bec3fa6a10c4c3dec37987b213a2
Author: Xisco Fauli 
AuthorDate: Wed Feb 17 21:48:26 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Feb 17 23:43:19 2021 +0100

tdf#105301: sc: Add UItest

Also add a way to distinguish the different sort keys.
Similar to d4ca173f2babde53c1d20f10e335244b092c5c97

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

diff --git a/sc/qa/uitest/data/tdf105301.ods b/sc/qa/uitest/data/tdf105301.ods
new file mode 100644
index ..58f2fe759e06
Binary files /dev/null and b/sc/qa/uitest/data/tdf105301.ods differ
diff --git a/sc/qa/uitest/sort/tdf105301.py b/sc/qa/uitest/sort/tdf105301.py
new file mode 100644
index ..71ec6372c762
--- /dev/null
+++ b/sc/qa/uitest/sort/tdf105301.py
@@ -0,0 +1,42 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.common import select_pos
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf105301(UITestCase):
+
+def test_tdf105301(self):
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf105301.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:R9"}))
+
+self.ui_test.execute_dialog_through_command(".uno:DataSort")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+self.assertEqual("Column B", 
get_state_as_dict(xDialog.getChild("sortlb"))['DisplayText'])
+self.assertEqual("Column C", 
get_state_as_dict(xDialog.getChild("sortlb2"))['DisplayText'])
+self.assertEqual("Column D", 
get_state_as_dict(xDialog.getChild("sortlb3"))['DisplayText'])
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 'Column E' != '- undefined -'
+self.assertEqual("Column E", 
get_state_as_dict(xDialog.getChild("sortlb4"))['DisplayText'])
+self.assertEqual("Column F", 
get_state_as_dict(xDialog.getChild("sortlb5"))['DisplayText'])
+self.assertEqual("Column G", 
get_state_as_dict(xDialog.getChild("sortlb6"))['DisplayText'])
+self.assertEqual("- undefined -", 
get_state_as_dict(xDialog.getChild("sortlb7"))['DisplayText'])
+
+xOk = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOk)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx 
b/sc/source/ui/dbgui/sortkeydlg.cxx
index a5cf6e8f4e66..cee1f54e0607 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -57,6 +57,13 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
  OUString::number( nItemNumber );
 pSortKeyItem->m_xFrame->set_label(aLine);
 
+// for ui-testing. Distinguish the sort keys
+if ( m_aSortKeyItems.size() > 0 )
+{
+pSortKeyItem->m_xLbSort->set_buildable_name(
+pSortKeyItem->m_xLbSort->get_buildable_name() + 
OString::number(m_aSortKeyItems.size() + 1));
+}
+
 m_aSortKeyItems.push_back(std::unique_ptr(pSortKeyItem));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang filter/Library_gie.mk filter/Module_filter.mk filter/source include/vcl Repository.mk solenv/clang-format sw/CppunitTest_sw_ooxmlexport5.mk sw/Cpp

[Tomaž Vajngerl (via logerrit)]

 Repository.mk|1 
 compilerplugins/clang/constparams.cxx|3 
 filter/Library_gie.mk|   56 
--
 filter/Module_filter.mk  |1 
 filter/source/config/fragments/internalgraphicfilters/gif_Export.xcu |   21 +--
 include/vcl/graphicfilter.hxx|1 
 solenv/clang-format/excludelist  |6 -
 sw/CppunitTest_sw_ooxmlexport5.mk|4 
 sw/CppunitTest_sw_ooxmlimport2.mk|4 
 sw/CppunitTest_sw_ww8export2.mk  |4 
 vcl/CppunitTest_vcl_graphic_test.mk  |3 
 vcl/Library_vcl.mk   |2 
 vcl/commonfuzzer.mk  |1 
 vcl/inc/filter/GifWriter.hxx |   28 
+
 vcl/source/filter/FilterConfigCache.cxx  |   13 +-
 vcl/source/filter/egif/egif.cxx  |4 
 vcl/source/filter/graphicfilter.cxx  |   47 
+---
 17 files changed, 64 insertions(+), 135 deletions(-)

New commits:
commit 2270a58d7b25e683449c180576b7647f8d5256f4
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 12:30:25 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 04:12:27 2021 +0100

Move GIF writer from filter module into VCL

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

diff --git a/Repository.mk b/Repository.mk
index b207902fe1a5..930ae5bfdc94 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -369,7 +369,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
i18nsearch \
-gie \
hyphen \
 icg \
$(if $(ENABLE_JAVA),jdbc) \
diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index 95c8184009d7..c72ccc9dd488 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -189,9 +189,6 @@ bool ConstParams::CheckTraverseFunctionDecl(FunctionDecl * 
functionDecl)
 || name.startswith("Read_F_")
 // UNO component entry points
 || name.endswith("component_getFactory")
-|| name == "egiGraphicExport"
-|| name == "etiGraphicExport"
-|| name == "epsGraphicExport"
 // callback for some external code?
 || name == "ScAddInAsyncCallBack"
 // used as function pointers
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
deleted file mode 100644
index b40da250a183..
--- a/filter/Library_gie.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,gie))
-
-$(eval $(call gb_Library_set_include,gie,\
-$$(INCLUDE) \
--I$(SRCDIR)/filter/inc \
-))
-
-$(eval $(call gb_Library_use_external,gie,boost_headers))
-
-$(eval $(call gb_Library_use_sdk_api,gie))
-
-$(eval $(call gb_Library_use_custom_headers,gie,\
-   officecfg/registry \
-))
-
-$(eval $(call gb_Library_use_common_precompiled_header,gie))
-
-$(eval $(call gb_Library_use_libraries,gie,\
-basegfx \
-comphelper \
-i18nlangtag \
-svt \
-vcl \
-utl \
-tl \
-tk \
-cppu \
-sal \
-salhelper \
-))
-
-$(eval $(call gb_Library_add_exception_objects,gie,\
-filter/source/graphicfilter/egif/egif \
-filter/source/graphicfilter/egif/giflzwc \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 2fb2e4c0c8e3..42a82bacf5c0 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Mod

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 31 commits - basic/qa basic/source compilerplugins/clang config_host.mk.in configure.ac dbaccess/source dbaccess/uiconfig desktop/so

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit a5150752835f196a075a87f4cd5083eb99c95da6
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 12:16:09 2021 +0900

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

Change-Id: I3b89009324f21b54ccf00f16eb47f9967a6b4e1f

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..f2f0393caeee 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,19 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("TGA"), rFormatExtension);
 }

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/filter/FilterConfigCache.cxx |   50 --
 vcl/source/filter/FilterConfigCache.hxx |4 
 vcl/source/filter/graphicfilter.cxx |  158 
 3 files changed, 2 insertions(+), 210 deletions(-)

New commits:
commit 6b8595417fcd2c998c481e865da0c30a223dda10
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 15 17:49:34 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 07:07:44 2021 +0100

vcl: clean-up code used for loading of external graphic filters

All graphic filters have been moved into vcl, so there is no need
to load an external library that contained graphic filters, so
this code can be removed.

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

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 411d44a5801d..482b8fed2ca0 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -55,39 +55,18 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL
 IMP_EPS, EXP_EPS, nullptr
 };
 
-const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] =
-{
-   nullptr
-};
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
-bIsPixelFormat = bIsInternalFilter = false;
+bIsPixelFormat = false;
 sFilterName = rUserDataEntry;
 const char** pPtr;
-for ( pPtr = InternalPixelFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
+for ( pPtr = InternalPixelFilterNameList; *pPtr; pPtr++ )
 {
 if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
 {
-bIsInternalFilter = true;
 bIsPixelFormat = true;
 }
 }
-for ( pPtr = InternalVectorFilterNameList; *pPtr && !bIsInternalFilter; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsInternalFilter = true;
-}
-if ( !bIsInternalFilter )
-{
-for ( pPtr = ExternalPixelFilterNameList; *pPtr && !bIsPixelFormat; 
pPtr++ )
-{
-if ( sFilterName.equalsIgnoreAsciiCaseAscii( *pPtr ) )
-bIsPixelFormat = true;
-}
-sExternalFilterName = sFilterName;
-sFilterName = SVLIBRARY("gie");
-}
 }
 
 OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
@@ -400,21 +379,6 @@ OUString FilterConfigCache::GetImportFilterTypeName( 
sal_uInt16 nFormat )
 return OUString();
 }
 
-OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool 
bExport)
-{
-if (bExport)
-{
-if (nFormat < aExport.size())
-return aExport[nFormat].sExternalFilterName;
-}
-else
-{
-if (nFormat < aImport.size())
-return aImport[nFormat].sExternalFilterName;
-}
-return OUString();
-}
-
 OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 
nEntry)
 {
 OUString aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
@@ -423,11 +387,6 @@ OUString FilterConfigCache::GetImportWildcard(sal_uInt16 
nFormat, sal_Int32 nEnt
 return aWildcard;
 }
 
-bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter;
-}
-
 OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
 {
 if( nFormat < aExport.size() )
@@ -526,11 +485,6 @@ OUString FilterConfigCache::GetExportWildcard( sal_uInt16 
nFormat, sal_Int32 nEn
 return aWildcard;
 }
 
-bool FilterConfigCache::IsExportInternalFilter( sal_uInt16 nFormat )
-{
-return (nFormat < aExport.size()) && aExport[ nFormat ].bIsInternalFilter;
-}
-
 bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat )
 {
 return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat;
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 4860bbc6f38b..e6b0258bf803 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -32,7 +32,6 @@ class FilterConfigCache
 OUString sType;
 std::vector< OUString > lExtensionList;
 OUString sUIName;
-OUString sExternalFilterName;
 
 OUString sMediaType;
 OUString sFilterType;
@@ -41,7 +40,6 @@ class FilterConfigCache
 
 // user data
 OUStringsFilterName;
-boolbIsInternalFilter   : 1;
 boolbIsPixelFormat  : 1;
 
 voidCreateFilterName( const OUString& rUserDataEntry );
@@ -49,7 +47,6 @@ class FilterConfigCache
 
 static const char* InternalPixelFilterNameList[];
 static const char* InternalVectorFilterNameList[];
-static const char* ExternalPixelFilterNameList[];
 

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

[Tomaž Vajngerl (via logerrit)]

 vcl/inc/graphic/GraphicFormatDetector.hxx|2 -
 vcl/qa/cppunit/GraphicFormatDetectorTest.cxx |   32 ++--
 vcl/source/filter/graphicfilter.cxx  |   43 ---
 3 files changed, 30 insertions(+), 47 deletions(-)

New commits:
commit c3e3bed2db816bf2c929f9c3bde76b2af57a4d76
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 09:16:55 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 07:08:06 2021 +0100

vcl: condense the description and rename the peek format function

remove "Imp" from ImpPeekGraphicFormat function name and condense
the description of the function.

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

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index e914ee64a3ca..b38561f790c3 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool ImpPeekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
 
 namespace vcl
 {
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index f4f4698b28a9..1fb2fe0cb4ee 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(ImpPeekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
 CPPUNIT_ASSERT_EQUAL(OUStrin

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

[Tomaž Vajngerl (via logerrit)]

 vcl/inc/graphic/GraphicFormatDetector.hxx|   13 +
 vcl/qa/cppunit/GraphicFormatDetectorTest.cxx |   32 +--
 vcl/source/filter/GraphicFormatDetector.cxx  |  249 +
 vcl/source/filter/graphicfilter.cxx  |  268 ---
 4 files changed, 278 insertions(+), 284 deletions(-)

New commits:
commit 68db2610c2911d6f7f2c9f2ed85fa359743c6947
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 07:10:08 2021 +0100

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

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

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..f2f0393caeee 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,19 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 14 commits - drawinglayer/CppunitTest_drawinglayer_border.mk drawinglayer/inc drawinglayer/Library_drawinglayercore.mk drawinglayer/

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 38a2b994a83014ec192bc073fe6021fd495e763e
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 16 10:35:11 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 18 15:09:51 2021 +0900

vcl: move def. of peekGraphicFormat into GraphicFormatDetector

Change-Id: I3b89009324f21b54ccf00f16eb47f9967a6b4e1f

diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx 
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index b38561f790c3..f2f0393caeee 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -23,10 +23,19 @@
 #include 
 #include 
 
-VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
-
 namespace vcl
 {
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *   true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& 
rFormatExtension, bool bTest);
+
 class VCL_DLLPUBLIC GraphicFormatDetector
 {
 public:
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx 
b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
index 1fb2fe0cb4ee..264a0e8cd48d 100644
--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@@ -83,7 +83,7 @@ void GraphicFormatDetectorTest::testDetectMET()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("MET"), rFormatExtension);
 }
 
@@ -98,7 +98,7 @@ void GraphicFormatDetectorTest::testDetectBMP()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("BMP"), rFormatExtension);
 }
 
@@ -113,7 +113,7 @@ void GraphicFormatDetectorTest::testDetectWMF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("WMF"), rFormatExtension);
 }
 
@@ -128,7 +128,7 @@ void GraphicFormatDetectorTest::testDetectPCX()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PCX"), rFormatExtension);
 }
 
@@ -143,7 +143,7 @@ void GraphicFormatDetectorTest::testDetectJPG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("JPG"), rFormatExtension);
 }
 
@@ -158,7 +158,7 @@ void GraphicFormatDetectorTest::testDetectPNG()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PNG"), rFormatExtension);
 }
 
@@ -173,7 +173,7 @@ void GraphicFormatDetectorTest::testDetectGIF()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("GIF"), rFormatExtension);
 }
 
@@ -188,7 +188,7 @@ void GraphicFormatDetectorTest::testDetectPSD()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension;
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("PSD"), rFormatExtension);
 }
 
@@ -203,7 +203,7 @@ void GraphicFormatDetectorTest::testDetectTGA()
 aFileStream.Seek(aDetector.mnStreamPosition);
 
 OUString rFormatExtension("TGA"); // detection is based on extension only
-CPPUNIT_ASSERT(peekGraphicFormat(aFileStream, rFormatExtension, false));
+CPPUNIT_ASSERT(vcl::peekGraphicFormat(aFileStream, rFormatExtension, 
false));
 CPPUNIT_ASSERT_EQUAL(OUString("TGA"), rFormatExtension);
 }

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

[Quan Nguyen (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a1c2a3353f2542703b6f82a14cd84c336a45991
Author: Quan Nguyen 
AuthorDate: Tue Feb 9 10:35:31 2021 +0700
Commit: Heiko Tietze 
CommitDate: Thu Feb 18 08:10:06 2021 +0100

tdf#57667 Add to autocorrect button should fix the wrong word when clicked

Add ChangeHdl to ExtClickHdl if handle m_xAutoCorrPB in SpellDialog

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index bdb46b8bae29..5ad37af93487 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -441,6 +441,8 @@ IMPL_LINK( SpellDialog, ExtClickHdl, weld::Button&, rBtn, 
void )
 SvxPrepareAutoCorrect( sWrong, sCurrentErrorText );
 LanguageType eLang = GetSelectedLang_Impl();
 rParent.AddAutoCorrection( sWrong, sCurrentErrorText, eLang );
+//correct the word immediately
+ChangeHdl(*m_xAutoCorrPB);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sax/qa/cppunit/parser.cxx|2 +-
 sax/qa/cppunit/xmlimport.cxx |8 
 sax/source/expatwrap/sax_expat.cxx   |2 +-
 sax/source/fastparser/fastparser.cxx |5 ++---
 sax/source/fastparser/legacyfastparser.cxx   |   10 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx  |6 +++---
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx |2 +-
 xmlscript/source/xmllib_imexp/xmllib_export.cxx  |6 +++---
 xmlscript/source/xmllib_imexp/xmllib_import.cxx  |2 +-
 9 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit d8326e80c6f5a6d393c1d18479c31c81ca1d9239
Author: Noel 
AuthorDate: Wed Feb 17 18:24:47 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 08:16:49 2021 +0100

loplugin:referencecasting in sax

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

diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index b0997bab3abe..261091fe8769 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -67,7 +67,7 @@ void ParserTest::setUp()
 test::BootstrapFixture::setUp();
 mxTokenHandler.set( new DummyTokenHandler() );
 mxParser.set( new sax_fastparser::FastSaxParser() );
-mxParser->setTokenHandler( mxTokenHandler.get() );
+mxParser->setTokenHandler( mxTokenHandler );
 }
 
 uno::Reference< io::XInputStream > ParserTest::createStream(const OString& 
sInput)
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 459dcd09bd27..3da498ecded4 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -350,10 +350,10 @@ void XMLImportTest::setUp()
 Reference< XComponentContext > xContext = 
comphelper::getProcessComponentContext();
 m_xDocumentHandler.set( new TestDocumentHandler() );
 m_xParser = Parser::create( xContext );
-m_xParser->setDocumentHandler( m_xDocumentHandler.get() );
+m_xParser->setDocumentHandler( m_xDocumentHandler );
 m_xLegacyFastParser.set( 
xContext->getServiceManager()->createInstanceWithContext
 ( "com.sun.star.xml.sax.LegacyFastParser", xContext ), 
UNO_QUERY );
-m_xLegacyFastParser->setDocumentHandler( m_xDocumentHandler.get() );
+m_xLegacyFastParser->setDocumentHandler( m_xDocumentHandler );
 
 Reference< XFastTokenHandler > xTokenHandler;
 xTokenHandler.set( new DummyTokenHandler );
@@ -438,14 +438,14 @@ void XMLImportTest::testIllegalNamespaceUse()
 {
 rtl::Reference< NSDocumentHandler > m_xNSDocumentHandler;
 m_xNSDocumentHandler.set( new NSDocumentHandler() );
-m_xParser->setDocumentHandler( m_xNSDocumentHandler.get() );
+m_xParser->setDocumentHandler( m_xNSDocumentHandler );
 InputSource source;
 source.sSystemId= "internal";
 
 source.aInputStream = createStreamFromFile( m_sDirPath + "multiplepfx.xml" 
);
 m_xParser->parseStream(source);
 
-m_xLegacyFastParser->setDocumentHandler( m_xNSDocumentHandler.get() );
+m_xLegacyFastParser->setDocumentHandler( m_xNSDocumentHandler );
 source.aInputStream = createStreamFromFile( m_sDirPath + "multiplepfx.xml" 
);
 m_xLegacyFastParser->parseStream(source);
 }
diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 885d9757dc43..6017dc354001 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -718,7 +718,7 @@ void SaxExpatParser_Impl::callbackStartElement( void 
*pvThis ,
 CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
 pImpl ,
 rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) ,
-pImpl->rAttrList.get() ) );
+pImpl->rAttrList ) );
 }
 
 void SaxExpatParser_Impl::callbackEndElement( void *pvThis , const XML_Char 
*pwName  )
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index e225f17a1621..f35e56e8ab7f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -433,7 +433,7 @@ void Entity::startElement( Event const *pEvent )
 
 try
 {
-Reference< XFastAttributeList > xAttr( pEvent->mxAttributes.get() );
+Reference< XFastAttributeList > xAttr( pEvent->mxAttributes );
 Reference< XFastContextHandler > xContext;
 
 if ( mxNamespaceHandler.is() )
@@ -834,8 +834,7 @@ void FastSaxParserImpl::parseStream(const InputSource& 
rStructSource)
 // start the document
 if( rEntity.mxDocumentHandler.is() )
 {
-Reference< XLocator > xLoc( mxDocumentLocator.get() );
-rEntity.mxDocumentHandler->setDocumentLocator( xLoc );
+rEntity.mxDocumentHandler->setDocumentLocator( mxDocumentLocator );
 rEntity.mxDocumentHandler->startDocument();
 }
 
diff --git a/sa

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

[Noel (via logerrit)]

 xmlsecurity/source/framework/signaturecreatorimpl.cxx  |2 
 xmlsecurity/source/framework/signatureverifierimpl.cxx |2 
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |6 -
 xmlsecurity/source/helper/ooxmlsecexporter.cxx |   66 -
 xmlsecurity/source/helper/xsecctl.cxx  |4 -
 xmlsecurity/source/helper/xsecsign.cxx |6 -
 xmlsecurity/source/xmlsec/nss/ciphercontext.cxx|2 
 7 files changed, 43 insertions(+), 45 deletions(-)

New commits:
commit 9cc2b07ff5e610258aad2ec2b72e6b1ea15fd5e2
Author: Noel 
AuthorDate: Wed Feb 17 18:23:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 08:17:13 2021 +0100

loplugin:referencecasting in xmlsecurity

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

diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx 
b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index a3d8cd45814e..bba7b9eb3933 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -73,7 +73,7 @@ void SignatureCreatorImpl::startEngine(const 
rtl::Reference 
xResultTemplate;
 try
 {
-xResultTemplate = 
m_xXMLSignature->generate(css::uno::Reference(xSignatureTemplate.get()),
 m_xSecurityEnvironment);
+xResultTemplate = 
m_xXMLSignature->generate(css::uno::Reference(xSignatureTemplate),
 m_xSecurityEnvironment);
 m_nStatus = xResultTemplate->getStatus();
 }
 catch( css::uno::Exception& )
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx 
b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 4daf8d203c6a..c00086adee9b 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -64,7 +64,7 @@ void SignatureVerifierImpl::startEngine( const 
rtl::Reference 
xResultTemplate;
 try
 {
-xResultTemplate = 
m_xXMLSignature->validate(css::uno::Reference(xSignatureTemplate.get()),
 m_xXMLSecurityContext);
+xResultTemplate = 
m_xXMLSignature->validate(css::uno::Reference(xSignatureTemplate),
 m_xXMLSecurityContext);
 m_nStatus = xResultTemplate->getStatus();
 }
 catch( css::uno::Exception& )
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 5ff74dcd325c..2784298acf8c 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -494,7 +494,7 @@ void DocumentSignatureHelper::writeDigestMethod(
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
 pAttributeList->AddAttribute("Algorithm", ALGO_XMLDSIGSHA256);
-xDocumentHandler->startElement("DigestMethod", 
uno::Reference(pAttributeList.get()));
+xDocumentHandler->startElement("DigestMethod", 
uno::Reference(pAttributeList));
 xDocumentHandler->endElement("DigestMethod");
 }
 
@@ -506,7 +506,7 @@ void DocumentSignatureHelper::writeSignedProperties(
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
 pAttributeList->AddAttribute("Id", "idSignedProperties");
-xDocumentHandler->startElement("xd:SignedProperties", 
uno::Reference(pAttributeList.get()));
+xDocumentHandler->startElement("xd:SignedProperties", 
uno::Reference(pAttributeList));
 }
 
 xDocumentHandler->startElement("xd:SignedSignatureProperties", 
uno::Reference(new SvXMLAttributeList()));
@@ -548,7 +548,7 @@ void DocumentSignatureHelper::writeSignedProperties(
 "xmlns:loext", 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0");
 xDocumentHandler->startElement(
 "loext:SignatureLine",
-Reference(pAttributeList.get()));
+Reference(pAttributeList));
 
 {
 // Write SignatureLineId element
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index f09c388686aa..43a89811619b 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -123,8 +123,8 @@ void OOXMLSecExporter::Impl::writeCanonicalizationMethod()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
 pAttributeList->AddAttribute("Algorithm", ALGO_C14N);
-m_xDocumentHandler->startElement(
-"CanonicalizationMethod", 
uno::Reference(pAttributeList.get()));
+m_xDocumentHandler->startElement("CanonicalizationMethod",
+ 
uno::Reference(pAttributeList));
 m_xDocumentHandler->endElement("CanonicalizationMethod");
 }
 
@@ -132,8 +132,8 @@ void 
OOXMLSecExporter::Impl::writeCanonicalizationTransform()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList())

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

[Noel Grandin (via logerrit)]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 +-
 connectivity/source/drivers/odbc/OStatement.cxx |4 ++--
 connectivity/source/inc/odbc/OPreparedStatement.hxx |2 +-
 connectivity/source/inc/odbc/OStatement.hxx |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e981d8f787764bafc64105159960f7a41440cd3d
Author: Noel Grandin 
AuthorDate: Wed Feb 17 15:54:30 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 08:17:31 2021 +0100

createResulSet -> createResultSet

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

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 724e481ddc9b..b404549ce495 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -914,7 +914,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 
_parameterIndex)
 }
 }
 
-OResultSet* OPreparedStatement::createResulSet()
+OResultSet* OPreparedStatement::createResultSet()
 {
 OResultSet* pReturn = new OResultSet(m_aStatementHandle,this);
 pReturn->setMetaData(getMetaData());
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx 
b/connectivity/source/drivers/odbc/OStatement.cxx
index 33b4af624de9..2ff607be5aa9 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -387,7 +387,7 @@ Reference< XResultSet > OStatement_Base::getResultSet(bool 
checkCount)
 if (numCols > 0)
 {
 OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-pRs = createResulSet();
+pRs = createResultSet();
 pRs->construct();
 
 // Save a copy of our last result set
@@ -1063,7 +1063,7 @@ void SAL_CALL OStatement::release() throw()
 OStatement_BASE2::release();
 }
 
-OResultSet* OStatement_Base::createResulSet()
+OResultSet* OStatement_Base::createResultSet()
 {
 return new OResultSet(m_aStatementHandle,this);
 }
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx 
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 288ce319acb9..1197c1be8544 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -82,7 +82,7 @@ namespace connectivity::odbc
 /**
 creates the driver specific resultset (factory)
 */
-virtual OResultSet* createResulSet() override;
+virtual OResultSet* createResultSet() override;
 
 virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 
nHandle,
const 
css::uno::Any& rValue) override;
diff --git a/connectivity/source/inc/odbc/OStatement.hxx 
b/connectivity/source/inc/odbc/OStatement.hxx
index 1b7b3a569434..e0d1bde55587 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -127,7 +127,7 @@ namespace connectivity::odbc
 /**
 creates the driver specific resultset (factory)
 */
-virtual OResultSet* createResulSet();
+virtual OResultSet* createResultSet();
 
 /// @throws css::sdbc::SQLException
 /// @throws css::uno::RuntimeException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 writerperfect/qa/unit/DrawingImportTest.cxx |4 ++--
 writerperfect/qa/unit/PresentationImportTest.cxx|4 ++--
 writerperfect/qa/unit/SpreadsheetImportTest.cxx |4 ++--
 writerperfect/qa/unit/TextImportTest.cxx|4 ++--
 writerperfect/qa/unit/wpftimport.cxx|2 +-
 writerperfect/source/writer/EPUBPackage.cxx |3 +--
 writerperfect/source/writer/exp/XMLTextFrameContext.cxx |2 +-
 writerperfect/source/writer/exp/xmlfmt.cxx  |2 +-
 writerperfect/source/writer/exp/xmlimp.cxx  |3 +--
 9 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 1491b0003a03064a3cec30fc71c35d46eb6970b2
Author: Noel 
AuthorDate: Wed Feb 17 18:23:05 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 18 08:17:57 2021 +0100

loplugin:referencecasting in writerperfect

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

diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx 
b/writerperfect/qa/unit/DrawingImportTest.cxx
index 6fb1f98ef6b2..8af2ec8d62b7 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -123,8 +123,8 @@ void DrawingImportTest::test()
 using namespace css;
 
 rtl::Reference xFilter{ new 
DrawingImportFilter(m_xContext) };
-writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(),
-"private:factory/sdraw", 
m_xDesktop, m_xContext);
+writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter, 
"private:factory/sdraw",
+m_xDesktop, m_xContext);
 
 uno::Reference xDoc(aLoader.getDocument(), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xDoc.is());
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx 
b/writerperfect/qa/unit/PresentationImportTest.cxx
index e1414dec5b85..0c29c72695df 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -123,8 +123,8 @@ void PresentationImportTest::test()
 using namespace css;
 
 rtl::Reference xFilter{ new 
PresentationImportFilter(m_xContext) };
-writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(),
-"private:factory/simpress", 
m_xDesktop, m_xContext);
+writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter, 
"private:factory/simpress",
+m_xDesktop, m_xContext);
 
 uno::Reference xDoc(aLoader.getDocument(), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xDoc.is());
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx 
b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index caf5d4de94ec..3c5de090ce1c 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -117,8 +117,8 @@ void SpreadsheetImportTest::test()
 using namespace css;
 
 rtl::Reference xFilter{ new 
SpreadsheetImportFilter(m_xContext) };
-writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(),
-"private:factory/scalc", 
m_xDesktop, m_xContext);
+writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter, 
"private:factory/scalc",
+m_xDesktop, m_xContext);
 
 uno::Reference xDoc(aLoader.getDocument(), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xDoc.is());
diff --git a/writerperfect/qa/unit/TextImportTest.cxx 
b/writerperfect/qa/unit/TextImportTest.cxx
index 0b482a75c9a3..c1ff7ad75ff2 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -111,8 +111,8 @@ void TextImportTest::test()
 using namespace css;
 
 rtl::Reference xFilter{ new TextImportFilter(m_xContext) 
};
-writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(),
-"private:factory/swriter", 
m_xDesktop, m_xContext);
+writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter, 
"private:factory/swriter",
+m_xDesktop, m_xContext);
 
 uno::Reference xDoc(aLoader.getDocument(), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xDoc.is());
diff --git a/writerperfect/qa/unit/wpftimport.cxx 
b/writerperfect/qa/unit/wpftimport.cxx
index fe3bfa02f9a6..5034f159e704 100644
--- a/writerperfect/qa/unit/wpftimport.cxx
+++ b/writerperfect/qa/unit/wpftimport.cxx
@@ -21,7 +21,7 @@ css::uno::Reference createDummyInput()
 {
 rtl::Reference xDummyInput(
 new comphelper::SequenceInputStream(css::uno::Sequence()));
-return xDummyInput.get();
+return xDummyInput;
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerperfect/source/writer/EPUBPa

Re: Crash test update: VectorGraphicData::ensureSequenceAndRange

[Tomaž Vajngerl]

Hi Caolan,

On Sun, Feb 14, 2021 at 6:21 AM Caolán McNamara  wrote:

> On Sat, 2021-02-13 at 09:19 +, crashtest wrote:
> > New crashtest update
>
> one of these crashes has relatively recently appeared and is
> reproducible for me:
>
> https://dev-builds.libreoffice.org/crashtest/beeed387732f95501b06b5462d450517422b18ba/backtraces/task1183-core.backtrace.txt
>
> $ wget https://bugs.documentfoundation.org/attachment.cgi?id=145182 -O
> tdf118346-1.odg
> $ ./instdir/program/soffice.bin --headless --convert-to odg:output.odg
> ./tdf118346-1.odg
>
> crashes in VectorGraphicData::ensureSequenceAndRange in some odd way
> during assigning to maSequence
>

Sorry, I missed this mail. I'll take a look.

Regards, Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice