date:20200330

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

2020-03-30 Thread Julien Nabet (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dd4fcaad466dad6e55c3b53170e82ebcc3946a96
Author: Julien Nabet 
AuthorDate: Mon Mar 30 19:38:55 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Mar 31 08:45:28 2020 +0200

tdf#131712: fix crash on table with non null float field (mysql native)

See bt with infinite loop here:
http://bugs.documentfoundation.org/attachment.cgi?id=159161

Change-Id: Iaa4e998c640c414dec60a72d5977f8d6a6a8433f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91379
Tested-by: Jenkins
(cherry picked from commit 192ee96db3bc3544c388034b19fa7a9cd6e7537d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91387
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 6146ff6a9816..42d5de7574fd 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -334,6 +334,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
 case MYSQL_TYPE_FLOAT:
+return getFloat(nColumnIndex);
 case MYSQL_TYPE_DOUBLE:
 return getDouble(nColumnIndex);
 case MYSQL_TYPE_TIMESTAMP:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/ModelImpl.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 033b1d46653c30e44c1bbef5fff865db0f3c97d4
Author: Samuel Mehrbrodt 
AuthorDate: Tue Mar 31 07:59:55 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Mar 31 08:41:08 2020 +0200

Remove outdated comment

Macro signatures are evaluated since 
f2f93434f4795646255e5d8edd31fa08b8b2ffab

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

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 40e42691b052..137613f74f96 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1278,7 +1278,6 @@ Reference< XEmbeddedScripts > 
ODatabaseModelImpl::getEmbeddedDocumentScripts() c
 
 SignatureState ODatabaseModelImpl::getScriptingSignatureState()
 {
-// no support for signatures at the moment
 return m_nScriptingSignatureState;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Tamás Zolnai (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24be308681a84937dbd510009e266bacb16cf2fa
Author: Tamás Zolnai 
AuthorDate: Mon Mar 30 21:03:53 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Mar 31 08:32:26 2020 +0200

Revert "tdf#125268: Export LO character background as MSO shading by 
default."

This reverts commit 701238ea7d8a06fe7a90de15b7660b7c6d854f09.

Reason for revert: 

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 1307269765fb..f52ac45291de 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3973,7 +3973,7 @@
   Specifies if character background is exported as 
highlighting
   (and not as shading) when saving to Word document
 
-false
+true
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/sukapura/cmd/sc_dbviewreports.png|binary
 icon-themes/sukapura/dbaccess/res/reports_16.png |binary
 icon-themes/sukapura/links.txt   |   19 +--
 icon-themes/sukapura/res/basbrk.png  |binary
 icon-themes/sukapura/res/draw128.png |binary
 icon-themes/sukapura/res/lc06303.png |binary
 icon-themes/sukapura/res/sc06303.png |binary
 icon-themes/sukapura/res/sx03187.png |binary
 icon-themes/sukapura/res/sx03201.png |binary
 icon-themes/sukapura/sfx2/res/128x128_draw_doc-p.png |binary
 icon-themes/sukapura/svx/res/galdefl.png |binary
 icon-themes/sukapura/svx/res/galdefs.png |binary
 icon-themes/sukapura/svx/res/galnorl.png |binary
 icon-themes/sukapura/svx/res/galnors.png |binary
 icon-themes/sukapura/svx/res/galrdol.png |binary
 icon-themes/sukapura/svx/res/galrdos.png |binary
 icon-themes/sukapura_svg/cmd/sc_closedocs.svg|3 +-
 icon-themes/sukapura_svg/cmd/sc_dbviewreports.svg|5 ++-
 icon-themes/sukapura_svg/dbaccess/res/reports_16.svg |3 ++
 icon-themes/sukapura_svg/res/basbrk.svg  |9 +++
 icon-themes/sukapura_svg/res/draw128.svg |2 -
 icon-themes/sukapura_svg/res/lc06303.svg |1 
 icon-themes/sukapura_svg/res/sc06303.svg |1 
 icon-themes/sukapura_svg/res/sx03187.svg |3 ++
 icon-themes/sukapura_svg/res/sx03201.svg |   11 
 icon-themes/sukapura_svg/sfx2/res/128x128_draw_doc-p.svg |2 -
 icon-themes/sukapura_svg/svx/res/galdefl.svg |   14 ++-
 icon-themes/sukapura_svg/svx/res/galdefs.svg |   14 ++-
 icon-themes/sukapura_svg/svx/res/galnorl.svg |   14 ++-
 icon-themes/sukapura_svg/svx/res/galnors.svg |   14 ++-
 icon-themes/sukapura_svg/svx/res/galrdol.svg |   14 ++-
 icon-themes/sukapura_svg/svx/res/galrdos.svg |   14 ++-
 32 files changed, 120 insertions(+), 23 deletions(-)

New commits:
commit 6e6109d7d3eceea5d134aab770d9ecf8e0b8688e
Author: Rizal Muttaqin 
AuthorDate: Tue Mar 31 07:03:50 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Mar 31 06:16:00 2020 +0200

Sukapura: Update gallery folder icons, DB Query & Table icons

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

diff --git a/icon-themes/sukapura/cmd/sc_dbviewreports.png 
b/icon-themes/sukapura/cmd/sc_dbviewreports.png
index a898403f3e2c..f7da2ac217fa 100644
Binary files a/icon-themes/sukapura/cmd/sc_dbviewreports.png and 
b/icon-themes/sukapura/cmd/sc_dbviewreports.png differ
diff --git a/icon-themes/sukapura/dbaccess/res/reports_16.png 
b/icon-themes/sukapura/dbaccess/res/reports_16.png
new file mode 100644
index ..c73a23e3cd5f
Binary files /dev/null and b/icon-themes/sukapura/dbaccess/res/reports_16.png 
differ
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 50b32ebc272d..bb2c104d1773 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -1868,7 +1868,6 @@ dbaccess/res/one_left.png cmd/sc_prevrecord.png
 dbaccess/res/one_right.png cmd/sc_nextrecord.png
 dbaccess/res/queries_32.png cmd/32/dbviewqueries.png
 dbaccess/res/report_16.png cmd/sc_dbviewreports.png
-dbaccess/res/reports_16.png res/dialogfolder_16.png
 dbaccess/res/reports_32.png cmd/32/dbviewreports.png
 dbaccess/res/sc036.png cmd/sc_dbnewreport.png
 dbaccess/res/sc037.png cmd/sc_dbreportdelete.png
@@ -1904,7 +1903,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
 
 # fpicker
 # ==
-fpicker/res/fp011.png cmd/sc_firstpage.png
+fpicker/res/fp011.png res/lc06303.png
 fpicker/res/fp014.png res/fp015.png
 fpicker/res/fp016.png desktop/res/shared_16.png
 
@@ -1934,9 +1933,8 @@ reportdesign/res/sx12594.png cmd/sc_dbviewfunctions.png
 # res
 # ==
 res/adrbook.png cmd/sc_viewdatasourcebrowser.png
-res/basbrk.png cmd/sc_addwatch.png
 res/browse.png cmd/sc_browseview.png
-res/dir-clos.png cmd/sc_open.png
+res/dir-clos.png cmd/sc_closedocs.png
 res/dir-open.png cmd/sc_open.png
 res/extension_plus_26.png cmd/lc_insertplugin.png
 res/extension_plus_32.png cmd/32/insertplugin.png
@@ -1964,7 +1962,6 @@ res/lc05711.png cmd/lc_copy.png
 res/lc05961.png cmd/lc_recsearch.png
 res/lc06300.png cmd/lc_nextrecord.png
 res/lc06301.png cmd/lc_prevrecord.png
-res/lc06303.png cmd/lc_firstpage.png
 res/lc10711.png cmd/lc_removefiltersort.png
 res/lc10715.png cmd/lc_datafilterstandardfilter.png
 res/lc10716.png cmd/lc_datafilterautofilter.png
@@

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

2020-03-30 Thread Eike Rathke (via logerrit)

 include/formula/FormulaCompiler.hxx |3 +--
 sc/source/filter/excel/xestream.cxx |   21 ++---
 sc/source/filter/excel/xetable.cxx  |3 ++-
 sc/source/filter/inc/xestream.hxx   |4 +++-
 4 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit 456f093975ce4e4266eb12b62590eaaba6f2de88
Author: Eike Rathke 
AuthorDate: Tue Mar 31 01:14:36 2020 +0200
Commit: Eike Rathke 
CommitDate: Tue Mar 31 02:55:44 2020 +0200

Resolves: tdf#131372 Write "error cell" formula to OOXML

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

diff --git a/include/formula/FormulaCompiler.hxx 
b/include/formula/FormulaCompiler.hxx
index a2c6f6f3d9c0..185dd7a04ada 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -221,6 +221,7 @@ public:
 OpCode GetEnglishOpCode( const OUString& rName ) const;
 
 FormulaError GetErrorConstant( const OUString& rName ) const;
+void AppendErrorConstant( OUStringBuffer& rBuffer, FormulaError nError ) 
const;
 
 void EnableJumpCommandReorder( bool bEnable );
 void EnableStopOnError( bool bEnable );
@@ -305,8 +306,6 @@ protected:
 virtual void CreateStringFromIndex( OUStringBuffer& rBuffer, const 
FormulaToken* pToken ) const;
 virtual void LocalizeString( OUString& rName ) const;   // modify rName - 
input: exact name
 
-void AppendErrorConstant( OUStringBuffer& rBuffer, FormulaError nError ) 
const;
-
 bool   GetToken();
 OpCode NextToken();
 void PutCode( FormulaTokenRef& );
diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index c22773e1505a..51b11ebaf029 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -795,15 +795,30 @@ OUString XclXmlUtils::ToOUString( const ScfUInt16Vec& 
rBuf, sal_Int32 nStart, sa
 }
 
 OUString XclXmlUtils::ToOUString(
-sc::CompileFormulaContext& rCtx, const ScAddress& rAddress, const 
ScTokenArray* pTokenArray )
+sc::CompileFormulaContext& rCtx, const ScAddress& rAddress, const 
ScTokenArray* pTokenArray,
+FormulaError nErrCode )
 {
 ScCompiler aCompiler( rCtx, rAddress, 
const_cast(*pTokenArray));
 
 /* TODO: isn't this the same as passed in rCtx and thus superfluous? */
 aCompiler.SetGrammar(FormulaGrammar::GRAM_OOXML);
 
-OUStringBuffer aBuffer( pTokenArray->GetLen() * 5 );
-aCompiler.CreateStringFromTokenArray( aBuffer );
+sal_Int32 nLen = pTokenArray->GetLen();
+OUStringBuffer aBuffer( nLen ? (nLen * 5) : 8 );
+if (nLen)
+aCompiler.CreateStringFromTokenArray( aBuffer );
+else
+{
+if (nErrCode != FormulaError::NONE)
+aCompiler.AppendErrorConstant( aBuffer, nErrCode);
+else
+{
+// No code SHOULD be an "error cell", assert caller thought of that
+// and it really is.
+assert(!"No code and no error.");
+}
+}
+
 return aBuffer.makeStringAndClear();
 }
 
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 259ed5031c3f..bf2b66808aee 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1011,7 +1011,8 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
 (mxAddRec && mxAddRec->IsVolatile()) ) );
 }
 rWorksheet->writeEscaped( XclXmlUtils::ToOUString(
-rStrm.GetRoot().GetCompileFormulaContext(), 
mrScFmlaCell.aPos, mrScFmlaCell.GetCode()));
+rStrm.GetRoot().GetCompileFormulaContext(), 
mrScFmlaCell.aPos, mrScFmlaCell.GetCode(),
+mrScFmlaCell.GetErrCode()));
 rWorksheet->endElement( XML_f );
 }
 
diff --git a/sc/source/filter/inc/xestream.hxx 
b/sc/source/filter/inc/xestream.hxx
index 88cf614664b4..3aaebd7ce776 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "ftools.hxx"
 
 #include 
@@ -262,7 +263,8 @@ public:
 
 static OUString ToOUString( const char* s );
 static OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart 
= 0, sal_Int32 nLength = -1 );
-static OUString ToOUString( sc::CompileFormulaContext& rCtx, const 
ScAddress& rAddress, const ScTokenArray* pTokenArray );
+static OUString ToOUString( sc::CompileFormulaContext& rCtx, const 
ScAddress& rAddress,
+const ScTokenArray* pTokenArray, FormulaError nErrCode = 
FormulaError::NONE );
 static OUString ToOUString( const XclExpString& s );
 
 template 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Jan-Marek Glogowski (via logerrit)

 vcl/inc/qt5/Qt5Clipboard.hxx |6 ++
 vcl/qt5/Qt5Clipboard.cxx |   23 +++
 2 files changed, 25 insertions(+), 4 deletions(-)

New commits:
commit dbe45b7930dc027cf6d143dbb34390c469808e10
Author: Jan-Marek Glogowski 
AuthorDate: Wed Mar 25 18:33:29 2020 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Mar 31 02:56:36 2020 +0200

tdf#131533 Qt5 defer dropping clipboard ownership

This is maybe a Qt bug. Calling QClipboard::setMimeData from
Qt5Clipboard::setContents after a previous call to
QClipboard::clear results in a clipboard ownership failure.
In a terminal you'll see: "QXcbClipboard::setMimeData: Cannot set
X11 selection owner".

Calling Application::Reschedule() after the clear() doesn't help.

The result is a de-sync between the LO's clipboard state and the
real clipboard state, which will lead to a crash on LO shutdown.

I'm not sure this fix is correct. Maybe this could also be handled
by some X11 flush operation. But it's the only working solution I
could find: don't clear, if LO re-claims the ownership later.

I tried to reproduce the ownership error by modifying the Qt
fridgemagnets example, adding some QClipboard::clear and
QClipboard::setMimeData calls to the drop handling, but couldn't
reproduce. Maybe the dynamic Qt5MimeData object is also involved.

Change-Id: I32b6575a78a4b10a2e2b7b189303ab3a40dc69ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90990
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 313081c0703c66918e95640c74cd57312a1e8bba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90963

diff --git a/vcl/inc/qt5/Qt5Clipboard.hxx b/vcl/inc/qt5/Qt5Clipboard.hxx
index 122184b44942..b99534f59039 100644
--- a/vcl/inc/qt5/Qt5Clipboard.hxx
+++ b/vcl/inc/qt5/Qt5Clipboard.hxx
@@ -41,6 +41,8 @@ class Qt5Clipboard final
 // has to be set, if LO changes the QClipboard itself, so it won't 
instantly lose
 // ownership by it's self-triggered QClipboard::changed handler
 bool m_bOwnClipboardChange;
+// true, if LO really wants to give up clipboard ownership
+bool m_bDoClear;
 
 // if not empty, this holds the setContents provided XTransferable or a 
Qt5ClipboardTransferable
 css::uno::Reference m_aContents;
@@ -55,6 +57,10 @@ class Qt5Clipboard final
 
 private Q_SLOTS:
 void handleChanged(QClipboard::Mode mode);
+void handleClearClipboard();
+
+signals:
+void clearClipboard();
 
 public:
 // factory function to construct only valid Qt5Clipboard objects by name
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index cadedbfd327e..8720cfe44310 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -30,11 +30,16 @@ Qt5Clipboard::Qt5Clipboard(const OUString& aModeString, 
const QClipboard::Mode a
 , m_aClipboardName(aModeString)
 , m_aClipboardMode(aMode)
 , m_bOwnClipboardChange(false)
+, m_bDoClear(false)
 {
 assert(isSupported(m_aClipboardMode));
 // DirectConnection guarantees the changed slot runs in the same thread as 
the QClipboard
 connect(QApplication::clipboard(), &QClipboard::changed, this, 
&Qt5Clipboard::handleChanged,
 Qt::DirectConnection);
+
+// explicitly queue an event, so we can eventually ignore it
+connect(this, &Qt5Clipboard::clearClipboard, this, 
&Qt5Clipboard::handleClearClipboard,
+Qt::QueuedConnection);
 }
 
 css::uno::Reference Qt5Clipboard::create(const OUString& 
aModeString)
@@ -98,6 +103,13 @@ css::uno::Reference 
Qt5Clipboard::getContents(
 return m_aContents;
 }
 
+void Qt5Clipboard::handleClearClipboard()
+{
+if (!m_bDoClear)
+return;
+QApplication::clipboard()->clear(m_aClipboardMode);
+}
+
 void Qt5Clipboard::setContents(
 const css::uno::Reference& xTrans,
 const css::uno::Reference& 
xClipboardOwner)
@@ -110,15 +122,18 @@ void Qt5Clipboard::setContents(
 m_aContents = xTrans;
 m_aOwner = xClipboardOwner;
 
-m_bOwnClipboardChange = true;
-if (m_aContents.is())
+m_bDoClear = !m_aContents.is();
+if (!m_bDoClear)
+{
+m_bOwnClipboardChange = true;
 QApplication::clipboard()->setMimeData(new Qt5MimeData(m_aContents), 
m_aClipboardMode);
+m_bOwnClipboardChange = false;
+}
 else
 {
 assert(!m_aOwner.is());
-QApplication::clipboard()->clear(m_aClipboardMode);
+Q_EMIT clearClipboard();
 }
-m_bOwnClipboardChange = false;
 
 aGuard.clear();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/elementary icon-themes/elementary_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/cmd/32/dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/32/dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/32/dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/32/dbnewtableautopilot.png  |binary
 icon-themes/elementary/cmd/lc_dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/lc_dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/lc_dbnewtableautopilot.png  |binary
 icon-themes/elementary/cmd/sc_dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/sc_dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/sc_dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/sc_dbnewtableautopilot.png  |binary
 icon-themes/elementary/links.txt   |   12 
 icon-themes/elementary_svg/cmd/32/dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/32/dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/32/dbnewreportautopilot.svg |1 +
 icon-themes/elementary_svg/cmd/32/dbnewtableautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewreportautopilot.svg |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewtableautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_autooutline.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_dbnewreportautopilot.svg |5 +
 icon-themes/elementary_svg/cmd/sc_dbnewtableautopilot.svg  |1 +
 icon-themes/sifr/links.txt |6 +++---
 icon-themes/sifr/res/sx03187.png   |binary
 icon-themes/sifr/res/sx03201.png   |binary
 icon-themes/sifr_dark/links.txt|6 +++---
 icon-themes/sifr_dark/res/sx03187.png  |binary
 icon-themes/sifr_dark/res/sx03201.png  |binary
 icon-themes/sifr_dark_svg/res/sx03187.svg  |1 +
 icon-themes/sifr_dark_svg/res/sx03201.svg  |1 +
 icon-themes/sifr_svg/res/sx03187.svg   |1 +
 icon-themes/sifr_svg/res/sx03201.svg   |1 +
 36 files changed, 27 insertions(+), 19 deletions(-)

New commits:
commit c3a721eb602301be8ff87be6ade579209dd086fc
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 23:19:38 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Mar 31 02:28:41 2020 +0200

elementary & Sifr updates

- elementary: Add dedicated New DB Table/Query/Form/Report Wizard
- Sifr: - Update Query and Table folder

Change-Id: I159872a65c1643a892bedacea3bef63adccf9c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91378
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 66914f5c15d940831049ddf8434b585652b2cb06)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91389

diff --git a/icon-themes/elementary/cmd/32/dbnewformautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewformautopilot.png
new file mode 100644
index ..8692a0498a8c
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewformautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png
new file mode 100644
index ..2b0c7b70693a
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewreportautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewreportautopilot.png
new file mode 100644
index ..fab2b3952d25
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewreportautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewtableautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewtableautopilot.png
new file mode 100644
index ..3256b89a4024
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewtableautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewformautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewformautopilot.png
new file mode 100644
index ..ca1e669ebea1
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_dbnewformautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png
new file mode 100644
index ..e8415334fb8c
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewreportautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewreportautopilot.png
new file mode 100644
index ..7d

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

2020-03-30 Thread Michael Stahl (via logerrit)

 sw/source/filter/ww8/docxattributeoutput.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 1577d2900302e7c74559f0c5dbb5a22e95933432
Author: Michael Stahl 
AuthorDate: Fri Mar 27 13:49:09 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Mar 31 02:10:41 2020 +0200

sw: DOCX export: ignore linked image with invalid URL

Word 2013 refuses to open DOCX files with image urls that contain %5C
(encoded '\') in path or query (fragment is not a problem).

Just don't export such images, they won't work anyway.

Change-Id: Iae918791beb8532e76b4f29d49eba6fe0eda8aa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91204
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 65284c03757f70478f04aedd4ed7f4062a7c5516)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91179
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 99aad24c3da2..a88cb7ce30ab 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4833,6 +4833,16 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 OUString aFileName;
 pGrfNode->GetFileFilterNms( &aFileName, nullptr );
 
+sal_Int32 const nFragment(aFileName.indexOf('#'));
+sal_Int32 const nForbiddenU(aFileName.indexOf("%5C"));
+sal_Int32 const nForbiddenL(aFileName.indexOf("%5c"));
+if (   (nForbiddenU != -1 && (nFragment == -1 || nForbiddenU < 
nFragment))
+|| (nForbiddenL != -1 && (nFragment == -1 || nForbiddenL < 
nFragment)))
+{
+SAL_WARN("sw.ww8", "DocxAttributeOutput::FlyFrameGraphic: ignoring 
image with invalid link URL");
+return;
+}
+
 // TODO Convert the file name to relative for better interoperability
 
 aRelId = m_rExport.AddRelation(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/cmd/32/dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/32/dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/32/dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/32/dbnewtableautopilot.png  |binary
 icon-themes/elementary/cmd/lc_dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/lc_dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/lc_dbnewtableautopilot.png  |binary
 icon-themes/elementary/cmd/sc_dbnewformautopilot.png   |binary
 icon-themes/elementary/cmd/sc_dbnewqueryautopilot.png  |binary
 icon-themes/elementary/cmd/sc_dbnewreportautopilot.png |binary
 icon-themes/elementary/cmd/sc_dbnewtableautopilot.png  |binary
 icon-themes/elementary/links.txt   |   12 
 icon-themes/elementary_svg/cmd/32/dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/32/dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/32/dbnewreportautopilot.svg |1 +
 icon-themes/elementary_svg/cmd/32/dbnewtableautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewreportautopilot.svg |1 +
 icon-themes/elementary_svg/cmd/lc_dbnewtableautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_autooutline.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_dbnewformautopilot.svg   |1 +
 icon-themes/elementary_svg/cmd/sc_dbnewqueryautopilot.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_dbnewreportautopilot.svg |5 +
 icon-themes/elementary_svg/cmd/sc_dbnewtableautopilot.svg  |1 +
 icon-themes/sifr/links.txt |6 +++---
 icon-themes/sifr/res/sx03187.png   |binary
 icon-themes/sifr/res/sx03201.png   |binary
 icon-themes/sifr_dark/links.txt|6 +++---
 icon-themes/sifr_dark/res/sx03187.png  |binary
 icon-themes/sifr_dark/res/sx03201.png  |binary
 icon-themes/sifr_dark_svg/res/sx03187.svg  |1 +
 icon-themes/sifr_dark_svg/res/sx03201.svg  |1 +
 icon-themes/sifr_svg/res/sx03187.svg   |1 +
 icon-themes/sifr_svg/res/sx03201.svg   |1 +
 36 files changed, 27 insertions(+), 19 deletions(-)

New commits:
commit 66914f5c15d940831049ddf8434b585652b2cb06
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 23:19:38 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 23:52:31 2020 +0200

elementary & Sifr updates

- elementary: Add dedicated New DB Table/Query/Form/Report Wizard
- Sifr: - Update Query and Table folder

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

diff --git a/icon-themes/elementary/cmd/32/dbnewformautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewformautopilot.png
new file mode 100644
index ..8692a0498a8c
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewformautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png
new file mode 100644
index ..2b0c7b70693a
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewqueryautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewreportautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewreportautopilot.png
new file mode 100644
index ..fab2b3952d25
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewreportautopilot.png differ
diff --git a/icon-themes/elementary/cmd/32/dbnewtableautopilot.png 
b/icon-themes/elementary/cmd/32/dbnewtableautopilot.png
new file mode 100644
index ..3256b89a4024
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/dbnewtableautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewformautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewformautopilot.png
new file mode 100644
index ..ca1e669ebea1
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_dbnewformautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png
new file mode 100644
index ..e8415334fb8c
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_dbnewqueryautopilot.png differ
diff --git a/icon-themes/elementary/cmd/lc_dbnewreportautopilot.png 
b/icon-themes/elementary/cmd/lc_dbnewreportautopilot.png
new file mode 100644
index ..7d883b717ec3
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_dbnewreportautopilot.png differ
diff --git a/icon-themes/elementa

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

2020-03-30 Thread Caolán McNamara (via logerrit)

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

New commits:
commit f8e2fe46fa7cd2df90853b0aca31cfda49a06d3d
Author: Caolán McNamara 
AuthorDate: Tue Mar 24 14:51:09 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 30 21:56:54 2020 +0200

selecting multiple slides and using "print..." doesn't set selection as 
range

start impress, copy the default slide a few times, select more than
one slide and use "print..."

"slides" is selected, but just the first selected slide is shown in the 
range

since...

commit 76e22667625ce8d16dfaa8617a199b774e987a70
Date:   Thu Jun 14 23:29:34 2018 -0300

Configures page range in print dialog

where

aPageRange = aBuf.getStr()

was removed, but if that line is removed then the surrounding loop
of "for (auto pPage: *pPageSelection)" just accumulates text
in the OUStringBuffer to then discard it and no longer makes sense

perhaps this was an oversight rather than a planned change.

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

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 30fe413e5d83..5faa56a82140 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -616,6 +616,7 @@ namespace {
 else
 aBuf.append(',');
 aBuf.append(OUString::number(pPage->GetPageNum() / 2 + 
1));
+aPageRange = aBuf.getStr();
 }
 nPrintRange = 1;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread mert (via logerrit)

 loleaflet/src/control/Toolbar.js  |2 ++
 loleaflet/src/layer/tile/TileLayer.js |7 +++
 loleaflet/src/map/handler/Map.TouchGesture.js |6 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit c4f9e4bda711489548d8d7610f9dfea61d84ce47
Author: mert 
AuthorDate: Mon Mar 30 12:03:12 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Mar 30 21:51:48 2020 +0200

mobile: fix hyperlink on selected text

Insert hyperlink dialog does not have the selected text in the Text field.
So when you select something and want to make it a hyperlink,
you have to type the text again.
Also fixed tapping on hyperlink popup changes cursor position making editing
the link unable to edit

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

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index e6316188a..d1e4bdafd 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -442,6 +442,8 @@ L.Map.include({
link = this.hyperlinkUnderCursor.link;
} else if (this._clip && this._clip._selectionType == 'text') {
text = 
this.extractContent(this._clip._selectionContent);
+   } else if (this._docLayer._selectedTextContent) {
+   text = 
this.extractContent(this._docLayer._selectedTextContent);
}
 
vex.dialog.open({
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6ce377988..5245d085f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -194,6 +194,7 @@ L.TileLayer = L.GridLayer.extend({
this._editorId = -1;
this._followUser = false;
this._followEditor = false;
+   this._selectedTextContent = '';
},
 
onAdd: function (map) {
@@ -619,6 +620,9 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('textselectioncontent:')) {
if (this._map._clip)

this._map._clip.setTextSelectionHTML(textMsg.substr(22));
+   else
+   // hack for ios and android to get selected 
text into hyperlink insertion dialog
+   this._selectedTextContent = textMsg.substr(22);
}
else if (textMsg.startsWith('textselectionend:')) {
this._onTextSelectionEndMsg(textMsg);
@@ -1991,6 +1995,8 @@ L.TileLayer = L.GridLayer.extend({
this._onUpdateCellCursor();
if (this._map._clip)
this._map._clip.clearSelection();
+   else
+   this._selectedTextContent = '';
},
 
containsSelection: function (latlng) {
@@ -3081,6 +3087,7 @@ L.TileLayer = L.GridLayer.extend({
else {
this._textSelectionStart = null;
this._textSelectionEnd = null;
+   this._selectedTextContent = '';
for (key in this._selectionHandles) {

this._map.removeLayer(this._selectionHandles[key]);
this._selectionHandles[key].isDragged = false;
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index cf0041d53..95c2eb25e 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -302,8 +302,12 @@ L.Map.TouchGesture = L.Handler.extend({
 
// clicked a hyperlink popup - not really designed for this.
if (this._map.hyperlinkPopup && e.target &&
-   this._map.hyperlinkPopup._contentNode == 
e.target.parentNode)
+   this._map.hyperlinkPopup._contentNode == 
e.target.parentNode) {
this._map.fire('hyperlinkclicked', {url: 
e.target.href});
+   // not forward mouse events to core if the user tap on 
a hyperlink popup box
+   // for instance on Writer that causes the text cursor 
to be moved
+   return;
+   }
 
this._map.fire('closepopups');
this._map.fire('closemobilewizard');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-03-30 Thread Steve Fanning (via logerrit)

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

New commits:
commit a3e3b156fb609849e2d75264557cc31d62aecce1
Author: Steve Fanning 
AuthorDate: Mon Mar 30 16:30:35 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Mar 30 21:30:35 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2c5b14255f07ae7eba4618555a1c2011dacf
  - tdf#131360 Adjust number of function parameters

fix for AGGREGATE, GCD_EXCEL2003, LCM_EXCEL2003
MULTINOMIAL, RAWSUBTRACT, SUMIFS, AVERAGEIFS, COUNTIFS,
MAXIFS, MINIFS, IFS, SWITCH

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

diff --git a/helpcontent2 b/helpcontent2
index 623fc3fb5692..2c5b14255f07 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 623fc3fb5692577ea4fe3c01ea4b909df1d6d536
+Subproject commit 2c5b14255f07ae7eba4618555a1c2011dacf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060106.xhp  |   24 ++--
 source/text/scalc/01/ex_data_stat_func.xhp |3 ++-
 source/text/scalc/01/func_aggregate.xhp|   19 ---
 source/text/scalc/01/func_countifs.xhp |4 ++--
 source/text/scalc/01/func_ifs.xhp  |3 ++-
 source/text/scalc/01/func_rawsubtract.xhp  |   12 +++-
 source/text/scalc/01/func_switch.xhp   |4 +++-
 7 files changed, 30 insertions(+), 39 deletions(-)

New commits:
commit 2c5b14255f07ae7eba4618555a1c2011dacf
Author: Steve Fanning 
AuthorDate: Mon Mar 30 11:56:38 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Mar 30 21:30:35 2020 +0200

tdf#131360 Adjust number of function parameters

fix for AGGREGATE, GCD_EXCEL2003, LCM_EXCEL2003
MULTINOMIAL, RAWSUBTRACT, SUMIFS, AVERAGEIFS, COUNTIFS,
MAXIFS, MINIFS, IFS, SWITCH

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

diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 94bef6036..a34aba2f3 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -515,17 +515,13 @@
 
   GCD_EXCEL2003 function
 
-
 
-
 GCD_EXCEL2003
 The result is the greatest common divisor of a list of 
numbers.
 
-
 
-GCD_EXCEL2003(Number(s))
-Number(s) is a list of up to 30 
numbers.
-
+GCD_EXCEL2003()
+
 
 =GCD_EXCEL2003(5;15;25) returns 5.
 
@@ -554,17 +550,13 @@
 
   LCM_EXCEL2003 function
 
-
 
-
 LCM_EXCEL2003
 The result is the lowest common multiple of a list of 
numbers.
 
-
 
-LCM_EXCEL2003(Number(s))
-Number(s) is a list of up to 30 
numbers.
-
+LCM_EXCEL2003()
+
 
 =LCM_EXCEL2003(5;15;25) returns 75.
 
@@ -817,16 +809,12 @@
 
   MULTINOMIAL function
 
-
 
-
 MULTINOMIAL
 Returns the factorial of the sum of the 
arguments divided by the product of the factorials of the 
arguments.
-
 
-MULTINOMIAL(Number(s))
-Number(s) is a list of up to 30 
numbers.
-
+MULTINOMIAL()
+
 
 =MULTINOMIAL(F11:H11) returns 1260, if F11 to H11 contain 
the values 2, 3 and 4. This corresponds to the formula =(2+3+4)! / 
(2!*3!*4!)
 
diff --git a/source/text/scalc/01/ex_data_stat_func.xhp 
b/source/text/scalc/01/ex_data_stat_func.xhp
index c43dd9089..8a4385738 100644
--- a/source/text/scalc/01/ex_data_stat_func.xhp
+++ b/source/text/scalc/01/ex_data_stat_func.xhp
@@ -121,7 +121,7 @@
 
 In all examples below, ranges for 
calculation contain the row #6, which is ignored because it contains 
text.
 
-Func_Range; Range1; Criterion1 [ ; Range2; 
Criterion2 [;...]])
+Func_Range; Range1; Criterion1[; Range2; 
Criterion2][; … ; [Range127; Criterion127]]
 
 The logical relation between criteria can 
be defined as logical AND (conjunction). In other words, if and only if all 
given criteria are met, a value from the corresponding cell of the given 
Func_Range is taken into calculation.
 
@@ -129,6 +129,7 @@
 Func_Range and Range1, Range2... 
must have the same size, otherwise the function returns err:502 - Invalid 
argument.
 
 
+Range1 – required argument. It is a range of 
cells, a name of a named range, or a label of a column or a row, to which the 
corresponding criterion is to be applied.
 Criterion1 – required argument. A string 
expression representing a logical condition or a cell reference to such string 
expression. The expression can contain text, numbers, regular expressions or 
wildcards (if enabled in calculation options).
 Range2 – Optional. Range2 and all the following 
mean the same as Range1.
 Criterion2 – Optional. Criterion2 and all the 
following mean the same as Criterion1.
diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
index ba8ce64ec..9e899b4d8 100644
--- a/source/text/scalc/01/func_aggregate.xhp
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -14,26 +14,23 @@
 /text/scalc/01/func_aggregate.xhp
   
 
-
 
-
-
 
 
 
   AGGREGATE function
 
-
-
 AGGREGATE 
function
 This function 
returns an aggregate result of the calculations in the range. You can use 
different aggregate functions listed below. The Aggregate function enables you 
to omit hidden rows, errors, SUBTOTAL and other AGGREGATE function results in 
the calculation.
 
 AGGREGATE 
function is applied to vertical ranges of data with activated AutoFilter. If 
AutoFilter is not activated, automatic recalculation of the function result 
does not work for newly hidden rows. It is not supposed to work with horizontal 
ranges, however it can be applied to them as well, but with limitations. In 
particular, the AGGREGATE function applied to a horizontal data range does not 
recognize hiding columns, however correctly omits errors and results of 
SUBTOTAL and other AGGREGATE functions embedded into the row. 
 
 
-AGGREGATE(Function; Option; Ref1 [; Ref2 [; …]])
+
+AGGREGATE(Function; Option; Number 1[; Numb

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.2-8'

2020-03-30 Thread Andras Timar (via logerrit)

Tag 'co-6.2-8' created by Andras Timar  at 
2020-03-30 19:13 +

co-6.2-8

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
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/co-6.2-8'

2020-03-30 Thread Pedro Silva (via logerrit)

Tag 'co-6.2-8' created by Andras Timar  at 
2020-03-30 19:13 +

co-6.2-8

Changes since co-6.2-2:
Pedro Silva (1):
  [cp] Update CSS for Search button

---
 help3xsl/default.css |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
___
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/co-6.2-8'

2020-03-30 Thread Gülşah Köse (via logerrit)

Tag 'co-6.2-8' created by Andras Timar  at 
2020-03-30 19:13 +

co-6.2-8

Changes since CODE-4.2.1-2-7:
---
 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/co-6.2-8'

2020-03-30 Thread Andras Timar (via logerrit)

Tag 'co-6.2-8' created by Andras Timar  at 
2020-03-30 19:13 +

co-6.2-8

Changes since CP-Android-iOS-4.2.0-1:
---
 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 'libreoffice-6-4' - connectivity/source

2020-03-30 Thread Julien Nabet (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9e72262b420bad1e54287e35463be55769063608
Author: Julien Nabet 
AuthorDate: Mon Mar 30 19:38:55 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Mar 30 21:09:11 2020 +0200

tdf#131712: fix crash on table with non null float field (mysql native)

See bt with infinite loop here:
http://bugs.documentfoundation.org/attachment.cgi?id=159161

Change-Id: Iaa4e998c640c414dec60a72d5977f8d6a6a8433f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91379
Tested-by: Jenkins
(cherry picked from commit 192ee96db3bc3544c388034b19fa7a9cd6e7537d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91386
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index ddaba5fc9e45..984914016a13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -330,6 +330,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
 case MYSQL_TYPE_FLOAT:
+return getFloat(nColumnIndex);
 case MYSQL_TYPE_DOUBLE:
 return getDouble(nColumnIndex);
 case MYSQL_TYPE_TIMESTAMP:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Gülşah Köse (via logerrit)

 slideshow/source/engine/effectrewinder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9e5eab8f736becc49f43b08a93d8c8690fc9b040
Author: Gülşah Köse 
AuthorDate: Mon Mar 30 16:20:32 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Mar 30 21:00:10 2020 +0200

tdf#131254 Follow-up Prevent extra eventqueue empty call.

When two advance timing set slides in a row, there is another
extra forceEmpty call that disables timing setting.
Follow up commit 80f386f787ad59936ead2022e6d932a6d441c6e9

Change-Id: I8e70ebf57328b51eab2baca9728a0f8e0561120c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91367
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 14a0727889699128f02ac0a79bdce0103c89bc01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91305
Tested-by: Andras Timar 

diff --git a/slideshow/source/engine/effectrewinder.cxx 
b/slideshow/source/engine/effectrewinder.cxx
index 1a1dc0636363..944374d1d6c8 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -173,7 +173,6 @@ bool EffectRewinder::rewind (
 
 // Abort (and skip over the rest of) any currently active animation.
 mrUserEventQueue.callSkipEffectEventHandler();
-mrEventQueue.forceEmpty();
 
 const int nSkipCount (mnMainSequenceEffectCount - 1);
 if (nSkipCount < 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Gülşah Köse (via logerrit)

 slideshow/source/engine/effectrewinder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0f792853b550994cd14e30b78043586fba1995eb
Author: Gülşah Köse 
AuthorDate: Mon Mar 30 16:20:32 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Mar 30 20:46:27 2020 +0200

tdf#131254 Follow-up Prevent extra eventqueue empty call.

When two advance timing set slides in a row, there is another
extra forceEmpty call that disables timing setting.
Follow up commit 80f386f787ad59936ead2022e6d932a6d441c6e9

Change-Id: I8e70ebf57328b51eab2baca9728a0f8e0561120c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91367
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 14a0727889699128f02ac0a79bdce0103c89bc01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91304

diff --git a/slideshow/source/engine/effectrewinder.cxx 
b/slideshow/source/engine/effectrewinder.cxx
index 1a1dc0636363..944374d1d6c8 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -173,7 +173,6 @@ bool EffectRewinder::rewind (
 
 // Abort (and skip over the rest of) any currently active animation.
 mrUserEventQueue.callSkipEffectEventHandler();
-mrEventQueue.forceEmpty();
 
 const int nSkipCount (mnMainSequenceEffectCount - 1);
 if (nSkipCount < 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Gülşah Köse (via logerrit)

 slideshow/source/engine/effectrewinder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 30b6e95acde4072fb2978f73127bad002214a3d4
Author: Gülşah Köse 
AuthorDate: Mon Mar 30 16:20:32 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Mar 30 20:46:07 2020 +0200

tdf#131254 Follow-up Prevent extra eventqueue empty call.

When two advance timing set slides in a row, there is another
extra forceEmpty call that disables timing setting.
Follow up commit 80f386f787ad59936ead2022e6d932a6d441c6e9

Change-Id: I8e70ebf57328b51eab2baca9728a0f8e0561120c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91367
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 14a0727889699128f02ac0a79bdce0103c89bc01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91303

diff --git a/slideshow/source/engine/effectrewinder.cxx 
b/slideshow/source/engine/effectrewinder.cxx
index 1a1dc0636363..944374d1d6c8 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -173,7 +173,6 @@ bool EffectRewinder::rewind (
 
 // Abort (and skip over the rest of) any currently active animation.
 mrUserEventQueue.callSkipEffectEventHandler();
-mrEventQueue.forceEmpty();
 
 const int nSkipCount (mnMainSequenceEffectCount - 1);
 if (nSkipCount < 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Julien Nabet (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 192ee96db3bc3544c388034b19fa7a9cd6e7537d
Author: Julien Nabet 
AuthorDate: Mon Mar 30 19:38:55 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Mar 30 20:22:24 2020 +0200

tdf#131712: fix crash on table with non null float field (mysql native)

See bt with infinite loop here:
http://bugs.documentfoundation.org/attachment.cgi?id=159161

Change-Id: Iaa4e998c640c414dec60a72d5977f8d6a6a8433f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91379
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index c26a84145a0c..93b31eb99604 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -325,6 +325,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
 case MYSQL_TYPE_FLOAT:
+return getFloat(nColumnIndex);
 case MYSQL_TYPE_DOUBLE:
 return getDouble(nColumnIndex);
 case MYSQL_TYPE_TIMESTAMP:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Miklos Vajna (via logerrit)

 sw/qa/core/layout/data/tables-move-backwards.odt |binary
 sw/qa/core/layout/layout.cxx |   26 +++
 sw/source/core/layout/layact.cxx |   12 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit e4da634b983052f300cd0e9b2bbaa60eb02c1b28
Author: Miklos Vajna 
AuthorDate: Mon Mar 30 17:53:51 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Mar 30 18:47:53 2020 +0200

sw: fix moving more than 20 table frames to a previous page

Steps to reproduce the problem:

- have some content on page1
- have more than 20 tables on page 2
- delete all content on page 1

The first 20 tables are moved to page 1 then the layout process stops as
the layout loop control aborts it:

warn:legacy.osl:8282:8282:sw/source/core/layout/layact.cxx:544: 
LoopControl_1 in SwLayAction::InternalAction

and the remaining tables stay on page 2, even if page 1 would have space
for them.

There are various other ways to trigger the same problem, e.g. have a
ToC, add lots of headings, update the ToC, undo.

Fix the problem by doing more work in SwLayAction::FormatLayout in a
single iteration: if a table frame is moved to a different parent we can
still format the table's next frame in the same iteration with a bit of
effort.

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

diff --git a/sw/qa/core/layout/data/tables-move-backwards.odt 
b/sw/qa/core/layout/data/tables-move-backwards.odt
new file mode 100644
index ..861dc4f4ad86
Binary files /dev/null and b/sw/qa/core/layout/data/tables-move-backwards.odt 
differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 7f8d885301d7..73e6114ff924 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -11,6 +11,8 @@
 
 #include 
 
+#include 
+
 static char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/";
 
 /// Covers sw/source/core/layout/ fixes.
@@ -92,6 +94,30 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, 
testTableFlyOverlapSpacing)
 CPPUNIT_ASSERT_LESS(nFlyBottom, nTableTop);
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTablesMoveBackwards)
+{
+// Load a document with 1 pages: empty content on first page, then 21 
tables on the second page.
+load(DATA_DIRECTORY, "tables-move-backwards.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+
+// Delete the content on the first page.
+pWrtShell->SttEndDoc(/*bStart=*/true);
+pWrtShell->EndPg(/*bSelect=*/true);
+pWrtShell->DelLeft();
+
+// Calc the layout and check the number of pages.
+pWrtShell->CalcLayout();
+xmlDocPtr pLayout = parseLayoutDump();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : 2
+// i.e. there was an unexpected 2nd page, as only 20 out of 21 tables were 
moved to the first
+// page.
+assertXPath(pLayout, "//page", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 2f15852b8ac3..c4c5dc92c225 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1354,6 +1354,7 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrame *pLa
 bool bTabChanged = false;
 while ( pLow && pLow->GetUpper() == pLay )
 {
+SwFrame* pNext = nullptr;
 if ( pLow->IsLayoutFrame() )
 {
 if ( pLow->IsTabFrame() )
@@ -1364,6 +1365,11 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrame *pLa
 }
 
 ++m_nTabLevel;
+
+// Remember what was the next of the lower. Formatting may 
move it to the previous
+// page, in which case it looses its next.
+pNext = pLow->GetNext();
+
 bTabChanged |= FormatLayoutTab( 
static_cast(pLow), bAddRect );
 --m_nTabLevel;
 }
@@ -1378,7 +1384,11 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrame *pLa
 
 if ( IsAgain() )
 return false;
-pLow = pLow->GetNext();
+if (!pNext)
+{
+pNext = pLow->GetNext();
+}
+pLow = pNext;
 }
 // add complete frame area as paint area, if frame
 // area has been already added and after formatting its lowers the frame 
area
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-comm

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

2020-03-30 Thread Pranam Lashkari (via logerrit)

Rebased ref, commits from common ancestor:
commit 287a4aaa7544cf8973a397db49131b8bc94faee2
Author: Pranam Lashkari 
AuthorDate: Sat Mar 28 06:02:05 2020 +0530
Commit: Andras Timar 
CommitDate: Mon Mar 30 18:44:49 2020 +0200

use "To Background" and "To Foreground" only in writer sidebar

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

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5af69633c30b..85bb026006a8 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -101,6 +101,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 get( mpFtFlip,"fliplabel" );
 get( mpFlipTbx,   "selectrotationtype" );
 get( mpBtnEditChart,   "btnEditChart" );
+get( mpTBxArrange, "shaperespectedtotext");
 Initialize();
 
 mpBindings->Update( SID_ATTR_METRIC );
@@ -131,6 +132,7 @@ void PosSizePropertyPanel::dispose()
 mpFtFlip.clear();
 mpFlipTbx.clear();
 mpBtnEditChart.clear();
+mpTBxArrange.clear();
 
 maTransfPosXControl.dispose();
 maTransfPosYControl.dispose();
@@ -268,12 +270,14 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowAngle = false;
 bool bShowFlip = false;
 bool bShowEditChart = false;
+bool bShowArrangeShape = false;
 
 switch (maContext.GetCombinedContext_DI())
 {
 case CombinedEnumContext(Application::WriterVariants, Context::Draw):
 bShowAngle = true;
 bShowFlip = true;
+bShowArrangeShape = true;
 break;
 
 case CombinedEnumContext(Application::WriterVariants, 
Context::Graphic):
@@ -333,6 +337,9 @@ void PosSizePropertyPanel::HandleContextChange(
 // Edit Chart
 mpBtnEditChart->Show(bShowEditChart);
 
+// Arrange with respect to text
+mpTBxArrange->Show(bShowArrangeShape);
+
 if (mxSidebar.is())
 mxSidebar->requestLayout();
 }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 8947f0f14a0f..74ac3fd8b88d 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -112,6 +112,9 @@ private:
 //edit charts button for online's mobile view
 VclPtr   mpBtnEditChart;
 
+// Arrange with respect to text
+VclPtr  mpTBxArrange;
+
 // Internal variables
 basegfx::B2DRange   maRect;
 basegfx::B2DRange   maWorkArea;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index 727c90c62580..5a5fc9a00a6c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -419,6 +419,27 @@
 True
   
 
+  
+  
+True
+False
+2
+  
+
+
+  
+True
+False
+True
+Arrange
+end
+False
+
+  
+True
+False
+  
+
 
   
 True
@@ -446,8 +467,8 @@
   
   
 True
-True
-1
+False
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 dev/null|binary
 icon-themes/elementary/cmd/lc_statusbarvisible.png  |binary
 icon-themes/elementary/cmd/sc_apply.png |binary
 icon-themes/elementary/cmd/sc_dbnewreport.png   |binary
 icon-themes/elementary/cmd/sc_dbnewviewsql.png  |binary
 icon-themes/elementary/cmd/sc_dbreportdelete.png|binary
 icon-themes/elementary/cmd/sc_dbreportedit.png  |binary
 icon-themes/elementary/cmd/sc_dbreportrename.png|binary
 icon-themes/elementary/cmd/sc_dbviewreports.png |binary
 icon-themes/elementary/cmd/sc_executereport.png |binary
 icon-themes/elementary/cmd/sc_optimizetable.png |binary
 icon-themes/elementary/cmd/sc_reportnavigator.png   |binary
 icon-themes/elementary/cmd/sc_sbaexecutesql.png |binary
 icon-themes/elementary/cmd/sc_setoptimalcolumnwidth.png |binary
 icon-themes/elementary/cmd/sc_setoptimalrowheight.png   |binary
 icon-themes/elementary/cmd/sc_sidebar.png   |binary
 icon-themes/elementary/cmd/sc_statusbarvisible.png  |binary
 icon-themes/elementary/cmd/sc_toolbarmode.png   |binary
 icon-themes/elementary/dbaccess/res/reports_16.png  |binary
 icon-themes/elementary/links.txt|2 +-
 icon-themes/elementary_svg/cmd/lc_statusbarvisible.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_apply.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_dbnewreport.svg   |4 +++-
 icon-themes/elementary_svg/cmd/sc_dbnewviewsql.svg  |5 +++--
 icon-themes/elementary_svg/cmd/sc_dbreportdelete.svg|4 ++--
 icon-themes/elementary_svg/cmd/sc_dbreportedit.svg  |4 +++-
 icon-themes/elementary_svg/cmd/sc_dbreportrename.svg|4 +++-
 icon-themes/elementary_svg/cmd/sc_dbviewreports.svg |4 +++-
 icon-themes/elementary_svg/cmd/sc_executereport.svg |4 +++-
 icon-themes/elementary_svg/cmd/sc_optimizetable.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_reportnavigator.svg   |5 +++--
 icon-themes/elementary_svg/cmd/sc_sbaexecutesql.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_setoptimalcolumnwidth.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_setoptimalrowheight.svg   |2 +-
 icon-themes/elementary_svg/cmd/sc_sidebar.svg   |2 +-
 icon-themes/elementary_svg/cmd/sc_statusbarvisible.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_toolbarmode.svg   |2 +-
 icon-themes/elementary_svg/dbaccess/res/report_16.svg   |1 -
 icon-themes/elementary_svg/dbaccess/res/reports_16.svg  |4 
 39 files changed, 37 insertions(+), 22 deletions(-)

New commits:
commit 054bdce4ae18e035856ad6df90228d353057885f
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 21:07:05 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 18:30:42 2020 +0200

elementary: update DB Reports icons and checklised icons

Change-Id: Icb98be1c5c5937de16e463393de8c6e323da64bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91368
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit cd5da1b3a59a05ef03f9aa65bddbdde74ac994f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91302

diff --git a/icon-themes/elementary/cmd/lc_statusbarvisible.png 
b/icon-themes/elementary/cmd/lc_statusbarvisible.png
index 215834bf1f9b..7ccb7ca9 100644
Binary files a/icon-themes/elementary/cmd/lc_statusbarvisible.png and 
b/icon-themes/elementary/cmd/lc_statusbarvisible.png differ
diff --git a/icon-themes/elementary/cmd/sc_apply.png 
b/icon-themes/elementary/cmd/sc_apply.png
index 3934700bf6a5..4fb14498eb0f 100644
Binary files a/icon-themes/elementary/cmd/sc_apply.png and 
b/icon-themes/elementary/cmd/sc_apply.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbnewreport.png 
b/icon-themes/elementary/cmd/sc_dbnewreport.png
index 316fb8d2985c..1df3b8daabb0 100644
Binary files a/icon-themes/elementary/cmd/sc_dbnewreport.png and 
b/icon-themes/elementary/cmd/sc_dbnewreport.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbnewviewsql.png 
b/icon-themes/elementary/cmd/sc_dbnewviewsql.png
index 86da68d5e4a7..a5c420e43890 100644
Binary files a/icon-themes/elementary/cmd/sc_dbnewviewsql.png and 
b/icon-themes/elementary/cmd/sc_dbnewviewsql.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbreportdelete.png 
b/icon-themes/elementary/cmd/sc_dbreportdelete.png
index 84529951bb1a..ac12e1551d42 100644
Binary files a/icon-themes/elementary/cmd/sc_dbreportdelete.png and 
b/icon-themes/elementary/cmd/sc_dbreportdelete.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbreportedit.png 
b/icon-themes/elementary/cmd/sc_dbreportedit.png
index d7b306734323..e5b852198881 100644
Binary files a/icon-themes/elementary/cmd/sc_dbreportedit.png and 
b/icon-themes/elementary/cmd/sc_dbrepo

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

2020-03-30 Thread Pranam Lashkari (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |6 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |3 ++
 svx/uiconfig/ui/sidebarpossize.ui   |   25 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit ee0b6f291ef605f44d466bd8b0ccec52d5c9c725
Author: Pranam Lashkari 
AuthorDate: Sat Mar 28 06:02:05 2020 +0530
Commit: Andras Timar 
CommitDate: Mon Mar 30 18:14:13 2020 +0200

use "To Background" and "To Foreground" only in writer sidebar

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

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5af69633c30b..1b018d06df9f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -101,6 +101,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 get( mpFtFlip,"fliplabel" );
 get( mpFlipTbx,   "selectrotationtype" );
 get( mpBtnEditChart,   "btnEditChart" );
+get( mArrang, "shaperespectedtotext");
 Initialize();
 
 mpBindings->Update( SID_ATTR_METRIC );
@@ -268,12 +269,14 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowAngle = false;
 bool bShowFlip = false;
 bool bShowEditChart = false;
+bool bShowArrangeShape = false;
 
 switch (maContext.GetCombinedContext_DI())
 {
 case CombinedEnumContext(Application::WriterVariants, Context::Draw):
 bShowAngle = true;
 bShowFlip = true;
+bShowArrangeShape = true;
 break;
 
 case CombinedEnumContext(Application::WriterVariants, 
Context::Graphic):
@@ -333,6 +336,9 @@ void PosSizePropertyPanel::HandleContextChange(
 // Edit Chart
 mpBtnEditChart->Show(bShowEditChart);
 
+// Arrange with respect to text
+mArrang->Show(bShowArrangeShape);
+
 if (mxSidebar.is())
 mxSidebar->requestLayout();
 }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 8947f0f14a0f..a9ba3f3c8ba6 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -112,6 +112,9 @@ private:
 //edit charts button for online's mobile view
 VclPtr   mpBtnEditChart;
 
+// Arrange with respect to text
+VclPtr  mArrang;
+
 // Internal variables
 basegfx::B2DRange   maRect;
 basegfx::B2DRange   maWorkArea;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index 727c90c62580..5a5fc9a00a6c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -419,6 +419,27 @@
 True
   
 
+  
+  
+True
+False
+2
+  
+
+
+  
+True
+False
+True
+Arrange
+end
+False
+
+  
+True
+False
+  
+
 
   
 True
@@ -446,8 +467,8 @@
   
   
 True
-True
-1
+False
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Gülşah Köse (via logerrit)

 slideshow/source/engine/effectrewinder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 14a0727889699128f02ac0a79bdce0103c89bc01
Author: Gülşah Köse 
AuthorDate: Mon Mar 30 16:20:32 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Mar 30 18:12:28 2020 +0200

tdf#131254 Follow-up Prevent extra eventqueue empty call.

When two advance timing set slides in a row, there is another
extra forceEmpty call that disables timing setting.
Follow up commit 80f386f787ad59936ead2022e6d932a6d441c6e9

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

diff --git a/slideshow/source/engine/effectrewinder.cxx 
b/slideshow/source/engine/effectrewinder.cxx
index 060e1dfd92ee..8319856c1154 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -171,7 +171,6 @@ bool EffectRewinder::rewind (
 
 // Abort (and skip over the rest of) any currently active animation.
 mrUserEventQueue.callSkipEffectEventHandler();
-mrEventQueue.forceEmpty();
 
 const int nSkipCount (mnMainSequenceEffectCount - 1);
 if (nSkipCount < 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Mike Kaganski (via logerrit)

 svx/source/sdr/attribute/sdrshadowtextattribute.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85ae85ee93c929785a4db6cf8dcd28c2a683f800
Author: Mike Kaganski 
AuthorDate: Mon Mar 30 17:44:04 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Mar 30 17:45:50 2020 +0200

tdf#101181 related: fix SdrShadowTextAttribute::operator==

This fixes rendering of glow after its radius becomes 0 once.

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

diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx 
b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
index 705981a62c16..b8f48cd1f57e 100644
--- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
@@ -65,7 +65,7 @@ namespace drawinglayer::attribute
 {
 return (getShadow() == rCandidate.getShadow()
 && getText() == rCandidate.getText()
-&& maGlow.isDefault());
+&& getGlow() == rCandidate.getGlow());
 }
 
 } // end of namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Michael Stahl (via logerrit)

 sw/source/core/doc/docbm.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 71ed878556422068041025668876fb3300c128df
Author: Michael Stahl 
AuthorDate: Mon Mar 30 16:26:41 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Mar 30 17:36:48 2020 +0200

crashtesting: null dereference of reexporting abi12570.odt to odt

FLY_AT_FLY shape is anchored on SwStartNode of fly section.

(regression from ef8427d12a63127a2eb867637699343d630545dd)

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

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 273cc6d23de1..423aeedae79b 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -562,10 +562,12 @@ namespace sw::mark
 }
 #endif
 if (   (!rPaM.GetPoint()->nNode.GetNode().IsTextNode()
-// huh, SwXTextRange puts one on table node?
-&& !rPaM.GetPoint()->nNode.GetNode().IsTableNode())
+&& (eType != MarkType::UNO_BOOKMARK
+// SwXTextRange can be on table node or plain start node 
(FLY_AT_FLY)
+|| !rPaM.GetPoint()->nNode.GetNode().IsStartNode()))
 || (!rPaM.GetMark()->nNode.GetNode().IsTextNode()
-&& !rPaM.GetMark()->nNode.GetNode().IsTableNode()))
+&& (eType != MarkType::UNO_BOOKMARK
+|| !rPaM.GetMark()->nNode.GetNode().IsStartNode(
 {
 SAL_WARN("sw.core", "MarkManager::makeMark(..)"
 " - refusing to create mark on non-textnode");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/sukapura/dbaccess/res/forms_16.png |binary
 icon-themes/sukapura/links.txt |1 -
 icon-themes/sukapura_svg/dbaccess/res/forms_16.svg |   13 +
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 637dc4e53fc7fe7bde00fd68bd850e9942da9fb3
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 17:01:20 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 17:33:10 2020 +0200

Sukapura: Fix for tdf#99185 identical Form Folder and Form

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

diff --git a/icon-themes/sukapura/dbaccess/res/forms_16.png 
b/icon-themes/sukapura/dbaccess/res/forms_16.png
new file mode 100644
index ..e8a5449af1f3
Binary files /dev/null and b/icon-themes/sukapura/dbaccess/res/forms_16.png 
differ
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 1a1939375511..50b32ebc272d 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -1857,7 +1857,6 @@ dbaccess/res/db.png cmd/sc_changedatabasefield.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 dbaccess/res/form_16.png cmd/sc_dbviewforms.png
-dbaccess/res/forms_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sukapura_svg/dbaccess/res/forms_16.svg 
b/icon-themes/sukapura_svg/dbaccess/res/forms_16.svg
new file mode 100644
index ..7d8e59175a70
--- /dev/null
+++ b/icon-themes/sukapura_svg/dbaccess/res/forms_16.svg
@@ -0,0 +1,13 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+
+
+
+
+
+
+
+
+
+ /&amp;amp;amp;amp;amp;amp;gt;
+ 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/elementary icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/links.txt|2 +-
 icon-themes/sifr/dbaccess/res/forms_16.png  |binary
 icon-themes/sifr/links.txt  |1 -
 icon-themes/sifr_dark/dbaccess/res/forms_16.png |binary
 icon-themes/sifr_dark/links.txt |1 -
 icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg |1 +
 icon-themes/sifr_svg/dbaccess/res/forms_16.svg  |1 +
 7 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6882fe9589d9ce41f0f87d256f3f8bde2da1c433
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 18:25:13 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 17:31:36 2020 +0200

Sifr & elementary: Fix for tdf#99185:identical Form Folder and Form

Change-Id: Ib26157e1b977d1b314f8e914cda3c27c7cc7aff3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91363
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit aa24771563425072c710e8c426323ed311437f13)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91301

diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 879500ccd53b..66eba6f2705c 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1843,7 +1843,7 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 
-dbaccess/res/forms_16.png dbaccess/res/form_16.png
+dbaccess/res/forms_16.png res/dialogfolder_16.png
 res/forms_32.png dbaccess/res/forms_32.png
 
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr/dbaccess/res/forms_16.png 
b/icon-themes/sifr/dbaccess/res/forms_16.png
new file mode 100644
index ..6bfc07c00c87
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/forms_16.png differ
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 43579901a8e6..6f7163b637e5 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1725,7 +1725,6 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 dbaccess/res/form_16.png cmd/sc_dbviewforms.png
-dbaccess/res/forms_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr_dark/dbaccess/res/forms_16.png 
b/icon-themes/sifr_dark/dbaccess/res/forms_16.png
new file mode 100644
index ..b2279bfc595e
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/forms_16.png 
differ
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 43579901a8e6..6f7163b637e5 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1725,7 +1725,6 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 dbaccess/res/form_16.png cmd/sc_dbviewforms.png
-dbaccess/res/forms_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg 
b/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg
new file mode 100644
index ..19c7624c78f5
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/dbaccess/res/forms_16.svg 
b/icon-themes/sifr_svg/dbaccess/res/forms_16.svg
new file mode 100644
index ..443dadcb2772
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/forms_16.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 dev/null|binary
 icon-themes/elementary/cmd/lc_statusbarvisible.png  |binary
 icon-themes/elementary/cmd/sc_apply.png |binary
 icon-themes/elementary/cmd/sc_dbnewreport.png   |binary
 icon-themes/elementary/cmd/sc_dbnewviewsql.png  |binary
 icon-themes/elementary/cmd/sc_dbreportdelete.png|binary
 icon-themes/elementary/cmd/sc_dbreportedit.png  |binary
 icon-themes/elementary/cmd/sc_dbreportrename.png|binary
 icon-themes/elementary/cmd/sc_dbviewreports.png |binary
 icon-themes/elementary/cmd/sc_executereport.png |binary
 icon-themes/elementary/cmd/sc_optimizetable.png |binary
 icon-themes/elementary/cmd/sc_reportnavigator.png   |binary
 icon-themes/elementary/cmd/sc_sbaexecutesql.png |binary
 icon-themes/elementary/cmd/sc_setoptimalcolumnwidth.png |binary
 icon-themes/elementary/cmd/sc_setoptimalrowheight.png   |binary
 icon-themes/elementary/cmd/sc_sidebar.png   |binary
 icon-themes/elementary/cmd/sc_statusbarvisible.png  |binary
 icon-themes/elementary/cmd/sc_toolbarmode.png   |binary
 icon-themes/elementary/dbaccess/res/reports_16.png  |binary
 icon-themes/elementary/links.txt|2 +-
 icon-themes/elementary_svg/cmd/lc_statusbarvisible.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_apply.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_dbnewreport.svg   |4 +++-
 icon-themes/elementary_svg/cmd/sc_dbnewviewsql.svg  |5 +++--
 icon-themes/elementary_svg/cmd/sc_dbreportdelete.svg|4 ++--
 icon-themes/elementary_svg/cmd/sc_dbreportedit.svg  |4 +++-
 icon-themes/elementary_svg/cmd/sc_dbreportrename.svg|4 +++-
 icon-themes/elementary_svg/cmd/sc_dbviewreports.svg |4 +++-
 icon-themes/elementary_svg/cmd/sc_executereport.svg |4 +++-
 icon-themes/elementary_svg/cmd/sc_optimizetable.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_reportnavigator.svg   |5 +++--
 icon-themes/elementary_svg/cmd/sc_sbaexecutesql.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_setoptimalcolumnwidth.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_setoptimalrowheight.svg   |2 +-
 icon-themes/elementary_svg/cmd/sc_sidebar.svg   |2 +-
 icon-themes/elementary_svg/cmd/sc_statusbarvisible.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_toolbarmode.svg   |2 +-
 icon-themes/elementary_svg/dbaccess/res/report_16.svg   |1 -
 icon-themes/elementary_svg/dbaccess/res/reports_16.svg  |4 
 39 files changed, 37 insertions(+), 22 deletions(-)

New commits:
commit cd5da1b3a59a05ef03f9aa65bddbdde74ac994f1
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 21:07:05 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 17:31:23 2020 +0200

elementary: update DB Reports icons and checklised icons

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

diff --git a/icon-themes/elementary/cmd/lc_statusbarvisible.png 
b/icon-themes/elementary/cmd/lc_statusbarvisible.png
index 215834bf1f9b..7ccb7ca9 100644
Binary files a/icon-themes/elementary/cmd/lc_statusbarvisible.png and 
b/icon-themes/elementary/cmd/lc_statusbarvisible.png differ
diff --git a/icon-themes/elementary/cmd/sc_apply.png 
b/icon-themes/elementary/cmd/sc_apply.png
index 3934700bf6a5..4fb14498eb0f 100644
Binary files a/icon-themes/elementary/cmd/sc_apply.png and 
b/icon-themes/elementary/cmd/sc_apply.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbnewreport.png 
b/icon-themes/elementary/cmd/sc_dbnewreport.png
index 316fb8d2985c..1df3b8daabb0 100644
Binary files a/icon-themes/elementary/cmd/sc_dbnewreport.png and 
b/icon-themes/elementary/cmd/sc_dbnewreport.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbnewviewsql.png 
b/icon-themes/elementary/cmd/sc_dbnewviewsql.png
index 86da68d5e4a7..a5c420e43890 100644
Binary files a/icon-themes/elementary/cmd/sc_dbnewviewsql.png and 
b/icon-themes/elementary/cmd/sc_dbnewviewsql.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbreportdelete.png 
b/icon-themes/elementary/cmd/sc_dbreportdelete.png
index 84529951bb1a..ac12e1551d42 100644
Binary files a/icon-themes/elementary/cmd/sc_dbreportdelete.png and 
b/icon-themes/elementary/cmd/sc_dbreportdelete.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbreportedit.png 
b/icon-themes/elementary/cmd/sc_dbreportedit.png
index d7b306734323..e5b852198881 100644
Binary files a/icon-themes/elementary/cmd/sc_dbreportedit.png and 
b/icon-themes/elementary/cmd/sc_dbreportedit.png differ
diff --git a/icon-themes/elementary/cmd/sc_dbreportrename.png 
b/icon-themes/elementary/cmd/sc_dbreportrename.png
inde

Re: [Libreoffice-qa] ESC meeting agenda: 2020-03-26 16:00 Berlin time

2020-03-30 Thread Tamás Zolnai

There is more false information on this list:

Heiko Tietze  ezt írta (időpont: 2020.
márc. 30., H, 16:15):

> On 25.03.20 16:20, Miklos Vajna wrote:
> > Prototype agenda...
>
>  * Wrong text highlight color when export document to doc/docx
>+ https://bugs.documentfoundation.org/show_bug.cgi?id=125268
>+ MSO allows "shading" with any color and "highlighting" with 15 colors
> only;
>  LibO highlighting corresponds to MSO's shading
>+
> http://zolnaitamas.blogspot.com/2015/03/word-compatible-text-highlighting-in.html
>+ Help: "Microsoft Office has two character attributes similar to
>  LibreOfficeDev character background. Select the appropriate attribute
>  (highlighting or shading) which you would like to use during export
>  to Microsoft Office file formats."
>+ Solution #1a: Use highlighting (WFM/NAB)
>  - LibO character background might get replaced => the issue in this
> ticket
>

Might -> probably. Converting colors to 15 color palette leads to color
change in most of the case.

>+ Solution #1b: Use shading
>  - not intuitive for MSO users (paragraph > theme colors),
>in particular on round trip
>

The problem here is when a user actually opens an MSO format in MSO and
tries to change the color and can't found the proper tool for that.

>  - default for the export until 5.0 but replaced with highlighting then
>(tools > options > load/save > char highlighting)

That is not entirely correct. Before my related change  DOC / DOCX export
used MSO shading, RTF export used MSO highlighting. So there was a mixed
usage of both.

 - changing defaults back and forth is not good
>  - improve help
>  - patch has been submitted by Tamaz (c26)
>+ Solution #2: Introduce shading in LibO
>  - unclear use case besides compatibility, confuses users (c34)
>  - could extend the palette widget (c45,46)
>

It's a very bad idea, mentioned by a random user, who can't see that
LibreOffice is not only a free clone of Microsoft Office.

>+ Solution #3: Special palette activated per compatibility flag
>  - another patch by Tamaz (c21)
>

It's not correct. You mixed here two suggestions. I added an MSO highlight
color palette, so the user can use those colors which are exported to MSO
highlight correctly.

There was another suggestion to display both highlight and shading palette
in LO, which might be implemented only related to an MSO compatibility
flag, since LO doesn't have two separate character background
implementations and so it does not make sense to display this color palette
for 'native' LO users.

>  - cripples LibreOffice while MSO may change at any time
>  - code needed as the new palette is offered now unconditionally
>+ Solution #4: analyze the document and warn the user when using a not
>  supported feature (if the file was opened as doc/x) or when saving
>  - might be a long list and need some time to compile
>
> > * QA update (Xisco)...
>

In general, I changed two things recently.
I changed the default behavior to save to MSO shading instead. It seems a
more serious issue to change the color on export, then the case when
somebody can't edit the text color in MSO later, because of MSO bad design
(e.g. duplicated text background feature)
I added an MSO highlight palette, which can be used to select MSO used
highlight colors. I added it unconditionally because it's a known feature
of LO that it tries to support MSO formats. As we do not hide MSO formats
in the save dialog why we should hide the feature to support MSO highlight
colors. I think it makes more sense to have an mso-highlight palette, then
having one called with 'libreoffice' for example. We have the 'standard'
color palette, then what 'libreoffice' means here and why it's limited to
around 30 colors. And there are other very useful palettes like tonal,
material, freecolour-hlc. Do anyone uses these? I mean normal users. I
think it makes more sense to have an MSO compatible highlight palette here,
then having the other mentioned above, because we know that there are lots
of LO users having a problem with MSO compatibility. The default color
palette is the 'standard', so adding a mso-highlight palette there, won't
bother those users who are not interested, because they just not select
that color palette.

But of course, everybody knows better how to solve this issue: the users,
the QA team and the design team, without actually knowing the context.

Best Regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-03-30 Thread Mike Kaganski (via logerrit)

 svx/source/sdr/contact/viewcontactofsdrobj.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit fdd5d52284a0bda2d3e237b3dc4cbdb20b0d4bcb
Author: Mike Kaganski 
AuthorDate: Mon Mar 30 15:02:09 2020 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 30 16:52:35 2020 +0200

Use dynamic_cast result

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

diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 2d7b73d1650c..6741c3bfe553 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -106,14 +106,12 @@ ViewContact* ViewContactOfSdrObj::GetParentContact() const
 void ViewContactOfSdrObj::ActionChanged()
 {
 // look for own changes
-if(dynamic_cast( &GetSdrObject() ) != nullptr)
+if (SdrTextObj* pTextObj = dynamic_cast(&GetSdrObject()))
 {
-SdrTextObj& rTextObj = static_cast(GetSdrObject());
-
-if(rTextObj.GetTextAniKind() != meRememberedAnimationKind)
+if (pTextObj->GetTextAniKind() != meRememberedAnimationKind)
 {
 // #i38135# now remember new type
-meRememberedAnimationKind = rTextObj.GetTextAniKind();
+meRememberedAnimationKind = pTextObj->GetTextAniKind();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Caolán McNamara (via logerrit)

 dbaccess/source/ui/control/FieldDescControl.cxx|   29 +
 dbaccess/source/ui/inc/FieldDescControl.hxx|6 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx |   24 -
 dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx |7 -
 4 files changed, 36 insertions(+), 30 deletions(-)

New commits:
commit e6573fa894a7ef1e83f9d7785a61fdcabfe24939
Author: Caolán McNamara 
AuthorDate: Mon Mar 30 13:13:48 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Mar 30 16:31:21 2020 +0200

tdf#131576 Fields not displayed as expected in Base's Table Wizard

this is similar to the problem of tdf#130623 "Base: Empty Field Properties"
so take that solution and move it down the the shared component

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

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 7324ff8fa98a..315b2998739a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -94,11 +94,38 @@ OFieldDescControl::OFieldDescControl(weld::Container* 
pPage, vcl::Window* pParen
 m_xVclContentArea = VclPtr::Create(this);
 m_xVclContentArea->Show();
 m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, 
"dbaccess/ui/fielddescpage.ui"));
+
+m_aLayoutIdle.SetPriority(TaskPriority::RESIZE);
+m_aLayoutIdle.SetInvokeHandler( LINK( this, OFieldDescControl, 
ImplHandleLayoutTimerHdl ) );
+m_aLayoutIdle.SetDebugName( "OFieldDescControl m_aLayoutIdle" );
 }
 
 m_xContainer = m_xBuilder->weld_container("FieldDescPage");
 }
 
+void OFieldDescControl::queue_resize(StateChangedType eReason)
+{
+TabPage::queue_resize(eReason);
+if (!m_xVclContentArea)
+return;
+if (m_aLayoutIdle.IsActive())
+return;
+m_aLayoutIdle.Start();
+}
+
+void OFieldDescControl::Resize()
+{
+TabPage::Resize();
+if (!m_xVclContentArea)
+return;
+queue_resize();
+}
+
+IMPL_LINK_NOARG(OFieldDescControl, ImplHandleLayoutTimerHdl, Timer*, void)
+{
+m_xVclContentArea->SetPosSizePixel(Point(0,0), GetSizePixel());
+}
+
 OFieldDescControl::~OFieldDescControl()
 {
 disposeOnce();
@@ -106,6 +133,8 @@ OFieldDescControl::~OFieldDescControl()
 
 void OFieldDescControl::dispose()
 {
+m_aLayoutIdle.Stop();
+
 if ( m_bAdded )
 
::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
 
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx 
b/dbaccess/source/ui/inc/FieldDescControl.hxx
index e57bc60b4c5b..0de625a646a3 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -67,6 +68,7 @@ namespace dbaui
 class OFieldDescControl : public TabPage
 {
 private:
+Idle m_aLayoutIdle;
 VclPtr m_xVclContentArea;
 std::unique_ptr m_xBuilder;
 std::unique_ptr m_xContainer;
@@ -116,6 +118,7 @@ namespace dbaui
 
 DECL_LINK(FormatClickHdl, weld::Button&, void);
 DECL_LINK(ChangeHdl, weld::ComboBox&, void);
+DECL_LINK(ImplHandleLayoutTimerHdl, Timer*, void);
 
 // used by ActivatePropertyField
 DECL_LINK( OnControlFocusLost, weld::Widget&, void );
@@ -183,6 +186,9 @@ namespace dbaui
 voidInit();
 virtual voidGetFocus() override;
 virtual voidLoseFocus() override;
+virtual voidResize() override;
+
+virtual void queue_resize(StateChangedType eReason = 
StateChangedType::Layout) override;
 
 virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> 
getMetaData() = 0;
 virtual css::uno::Reference< css::sdbc::XConnection> getConnection() = 
0;
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx 
b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index c39a3f6b9581..1a052c19007a 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -33,10 +33,6 @@ OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, 
OTableDesignHelpBar* p
 m_pFieldControl = VclPtr::Create(this,pHelp);
 m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL);
 m_pFieldControl->Show();
-
-maLayoutIdle.SetPriority(TaskPriority::RESIZE);
-maLayoutIdle.SetInvokeHandler( LINK( this, OFieldDescGenWin, 
ImplHandleLayoutTimerHdl ) );
-maLayoutIdle.SetDebugName( "OFieldDescGenWin maLayoutIdle" );
 }
 
 OFieldDescGenWin::~OFieldDescGenWin()
@@ -46,7 +42,6 @@ OFieldDescGenWin::~OFieldDescGenWin()
 
 void

Re: [Libreoffice-qa] ESC meeting agenda: 2020-03-26 16:00 Berlin time

2020-03-30 Thread Heiko Tietze

Guess the agenda is for Apr/02. The document is not yet available, still from 
last week.

On 25.03.20 16:20, Miklos Vajna wrote:
> Prototype agenda below...



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

Re: [Libreoffice-qa] ESC meeting agenda: 2020-03-26 16:00 Berlin time

2020-03-30 Thread Heiko Tietze

On 25.03.20 16:20, Miklos Vajna wrote:
> Prototype agenda...

 * Wrong text highlight color when export document to doc/docx
   + https://bugs.documentfoundation.org/show_bug.cgi?id=125268
   + MSO allows "shading" with any color and "highlighting" with 15 colors only;
 LibO highlighting corresponds to MSO's shading
   + 
http://zolnaitamas.blogspot.com/2015/03/word-compatible-text-highlighting-in.html
   + Help: "Microsoft Office has two character attributes similar to 
 LibreOfficeDev character background. Select the appropriate attribute 
 (highlighting or shading) which you would like to use during export 
 to Microsoft Office file formats."
   + Solution #1a: Use highlighting (WFM/NAB)
 - LibO character background might get replaced => the issue in this ticket
   + Solution #1b: Use shading
 - not intuitive for MSO users (paragraph > theme colors), 
   in particular on round trip
 - default for the export until 5.0 but replaced with highlighting then
   (tools > options > load/save > char highlighting)
 - changing defaults back and forth is not good
 - improve help
 - patch has been submitted by Tamaz (c26)
   + Solution #2: Introduce shading in LibO
 - unclear use case besides compatibility, confuses users (c34)
 - could extend the palette widget (c45,46)
   + Solution #3: Special palette activated per compatibility flag
 - another patch by Tamaz (c21)
 - cripples LibreOffice while MSO may change at any time
 - code needed as the new palette is offered now unconditionally
   + Solution #4: analyze the document and warn the user when using a not
 supported feature (if the file was opened as doc/x) or when saving
 - might be a long list and need some time to compile

> * QA update (Xisco)...



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

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

2020-03-30 Thread Michael Meeks (via logerrit)

 sc/source/ui/view/formatsh.cxx |   59 ++---
 svx/sdi/svx.sdi|2 -
 2 files changed, 33 insertions(+), 28 deletions(-)

New commits:
commit 204df13a29a9742e2c1a5c5d4e18a63e7616a347
Author: Michael Meeks 
AuthorDate: Mon Mar 30 11:26:50 2020 +0100
Commit: Michael Meeks 
CommitDate: Mon Mar 30 16:10:13 2020 +0200

FrameLineColor - add Color parameter, and share code for color params.

Change-Id: I50483228221e817eb1a1d049d3c1ddf55a9c91d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91364
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f6808252314a..f662bc8c3fce 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1642,6 +1642,27 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 
 }
 
+namespace
+{
+bool lcl_getColorFromStr(const SfxItemSet *pArgs, Color &rColor)
+{
+const SfxPoolItem* pColorStringItem = nullptr;
+
+if (pArgs && SfxItemState::SET == 
pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pColorStringItem) && 
pColorStringItem)
+{
+OUString sColor;
+sColor = static_cast(pColorStringItem)->GetValue();
+
+if (sColor == "transparent")
+rColor = COL_TRANSPARENT;
+else
+rColor = Color(sColor.toInt32(16));
+return true;
+}
+return false;
+}
+}
+
 void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 {
 ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
@@ -1785,16 +1806,9 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 case SID_ATTR_CHAR_COLOR:
 case SID_SCATTR_PROTECTION :
 {
-const SfxPoolItem* pColorStringItem = nullptr;
-if ( SfxItemState::SET == pNewAttrs->GetItemState( 
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
+Color aColor;
+if (lcl_getColorFromStr(pNewAttrs, aColor))
 {
-Color aColor;
-OUString sColor = static_cast(pColorStringItem)->GetValue();
-if ( sColor == "transparent" )
-aColor = Color( COL_TRANSPARENT );
-else
-aColor = Color( sColor.toInt32( 16 ) );
-
 SvxColorItem 
aColorItem(pTabViewShell->GetSelectionPattern()->
 GetItem( ATTR_FONT_COLOR ) );
 aColorItem.SetValue(aColor);
@@ -1870,18 +1884,20 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 case SID_FRAME_LINECOLOR:
 {
 ::editeng::SvxBorderLine*  pDefLine = 
pTabViewShell->GetDefaultFrameLine();
-const Color&rColor = pNewAttrs->Get( 
SID_FRAME_LINECOLOR ).GetValue();
+
+Color aColor;
+if (!lcl_getColorFromStr(pNewAttrs, aColor))
+aColor = pNewAttrs->Get( SID_FRAME_LINECOLOR 
).GetValue();
 
 // Update default line
 if ( pDefLine )
 {
-pDefLine->SetColor( rColor );
+pDefLine->SetColor( aColor );
 pTabViewShell->SetSelectionFrameLines( pDefLine, true 
);
 }
 else
 {
-::editeng::SvxBorderLine aDefLine( &rColor, 20,
-SvxBorderLineStyle::SOLID );
+::editeng::SvxBorderLine aDefLine( &aColor, 20, 
SvxBorderLineStyle::SOLID );
 pTabViewShell->SetDefaultFrameLine( &aDefLine );
 pTabViewShell->SetSelectionFrameLines( &aDefLine, 
false );
 }
@@ -1993,27 +2009,16 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 // ATTR_BACKGROUND (=SID_ATTR_BRUSH) has to be set to two IDs:
 case SID_BACKGROUND_COLOR:
 {
-const SfxPoolItem* pColorStringItem = nullptr;
 Color aColor;
 
-if ( SfxItemState::SET == pNewAttrs->GetItemState( 
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
-{
-OUString sColor = static_cast(pColorStringItem)->GetValue();
-if ( sColor == "transparent" )
-aColor = Color( COL_TRANSPARENT );
-else
-aColor = Color( sColor.toInt32( 16 ) );
-}
-else
+if (!lcl_getColorFromStr(pNewAttrs, aColor))
 {
 const SvxColorItem&  rNewColorItem = pNewAttrs->Get( 
SID_BACKGROUND_COLOR );

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

2020-03-30 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/mobile/writer/spellchecking_spec.js |8 -
 loleaflet/src/control/Control.JSDialogBuilder.js   |   42 
--
 loleaflet/src/core/LOUtil.js   |   18 +++-
 3 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit f57fb8a91df8ce3f9f158b45eb2fb861be3e5c30
Author: Tamás Zolnai 
AuthorDate: Fri Mar 27 14:33:43 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Mar 30 15:56:57 2020 +0200

mobile: add special icon names for spelling context menu items.

Change-Id: I9f5388a57f3f2079a0accbd8f43fc884a618af1f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91276
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js 
b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 6bd70282d..36df0e2c3 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -93,7 +93,7 @@ describe('Spell checking menu.', function() {
it('Check language status for selection.', function() {
openContextMenu();
 
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon')
.contains('Set Language for Selection')
.click();
 
@@ -105,7 +105,7 @@ describe('Spell checking menu.', function() {
it('Set None Language for selection.', function() {
openContextMenu();
 
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon')
.contains('Set Language for Selection')
.click();
 
@@ -123,7 +123,7 @@ describe('Spell checking menu.', function() {
it('Check language status for paragraph.', function() {
openContextMenu();
 
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon')
.contains('Set Language for Paragraph')
.click();
 
@@ -135,7 +135,7 @@ describe('Spell checking menu.', function() {
it('Set None Language for paragraph.', function() {
openContextMenu();
 
-   cy.get('.sub-menu-title')
+   cy.get('.menu-entry-with-icon')
.contains('Set Language for Paragraph')
.click();
 
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 1854e8e57..a7394813f 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -352,6 +352,32 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
},
 
+   _generateMenuIconName: function(commandName) {
+   // command has no parameter
+   if (commandName.indexOf('?') === -1)
+   return commandName.toLowerCase();
+
+   if (commandName.indexOf('SpellCheckIgnoreAll') !== -1)
+   return 'spellcheckignoreall';
+   if (commandName.indexOf('SpellCheckIgnore') !== -1)
+   return 'spellcheckignore';
+   if (commandName === 
'LanguageStatus?Language:string=Current_LANGUAGE_NONE')
+   return 'selectionlanugagenone';
+   if (commandName === 
'LanguageStatus?Language:string=Current_RESET_LANGUAGES')
+   return 'selectionlanugagedefault';
+   if (commandName === 
'LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE')
+   return 'paragraphlanugagenone';
+   if (commandName === 
'LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES')
+   return 'paragraphlanugagedefault';
+   if ((this.map.getDocType() === 'spreadsheet' || 
this.map.getDocType() === 'presentation') &&
+commandName.indexOf('LanguageStatus?Language:string=Paragraph_') 
!== -1)
+   return 'paragraphlanugagesuggestion';
+   if ((this.map.getDocType() === 'spreadsheet' || 
this.map.getDocType() === 'presentation') &&
+commandName.indexOf('LanguageStatus?Language:string=Current_') !== 
-1)
+   return 'selectionlanugagesuggestion';
+   return commandName.toLowerCase();
+   },
+
_explorableMenu: function(parentContainer, title, children, builder, 
customContent, dataid) {
dataid = dataid || 0;
var icon = null;
@@ -359,9 +385,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
$(sectionTitle).css('justify-content', 'space-between');
 
var commandName = dataid;
-   if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName)) {
-

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

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/elementary/links.txt|2 +-
 icon-themes/sifr/dbaccess/res/forms_16.png  |binary
 icon-themes/sifr/links.txt  |1 -
 icon-themes/sifr_dark/dbaccess/res/forms_16.png |binary
 icon-themes/sifr_dark/links.txt |1 -
 icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg |1 +
 icon-themes/sifr_svg/dbaccess/res/forms_16.svg  |1 +
 7 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aa24771563425072c710e8c426323ed311437f13
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 18:25:13 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 15:55:41 2020 +0200

Sifr & elementary: Fix for tdf#99185:identical Form Folder and Form

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

diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 879500ccd53b..66eba6f2705c 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1843,7 +1843,7 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 
-dbaccess/res/forms_16.png dbaccess/res/form_16.png
+dbaccess/res/forms_16.png res/dialogfolder_16.png
 res/forms_32.png dbaccess/res/forms_32.png
 
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr/dbaccess/res/forms_16.png 
b/icon-themes/sifr/dbaccess/res/forms_16.png
new file mode 100644
index ..6bfc07c00c87
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/forms_16.png differ
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 0663180232f4..8b252cd991dd 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1725,7 +1725,6 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 dbaccess/res/form_16.png cmd/sc_dbviewforms.png
-dbaccess/res/forms_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr_dark/dbaccess/res/forms_16.png 
b/icon-themes/sifr_dark/dbaccess/res/forms_16.png
new file mode 100644
index ..b2279bfc595e
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/forms_16.png 
differ
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 0663180232f4..8b252cd991dd 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1725,7 +1725,6 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 dbaccess/res/form_16.png cmd/sc_dbviewforms.png
-dbaccess/res/forms_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
diff --git a/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg 
b/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg
new file mode 100644
index ..19c7624c78f5
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/dbaccess/res/forms_16.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/dbaccess/res/forms_16.svg 
b/icon-themes/sifr_svg/dbaccess/res/forms_16.svg
new file mode 100644
index ..443dadcb2772
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/forms_16.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Michael Meeks (via logerrit)

 sc/source/ui/view/formatsh.cxx |   59 ++---
 svx/sdi/svx.sdi|2 -
 2 files changed, 33 insertions(+), 28 deletions(-)

New commits:
commit c9f7f23c82e427fce14479f7806cec29b2abddf9
Author: Michael Meeks 
AuthorDate: Mon Mar 30 11:26:50 2020 +0100
Commit: Michael Meeks 
CommitDate: Mon Mar 30 15:41:42 2020 +0200

FrameLineColor - add Color parameter, and share code for color params.

Change-Id: I50483228221e817eb1a1d049d3c1ddf55a9c91d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91354
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index a83db735127c..b06463c71f68 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1640,6 +1640,27 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 
 }
 
+namespace
+{
+bool lcl_getColorFromStr(const SfxItemSet *pArgs, Color &rColor)
+{
+const SfxPoolItem* pColorStringItem = nullptr;
+
+if (pArgs && SfxItemState::SET == 
pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pColorStringItem) && 
pColorStringItem)
+{
+OUString sColor;
+sColor = static_cast(pColorStringItem)->GetValue();
+
+if (sColor == "transparent")
+rColor = COL_TRANSPARENT;
+else
+rColor = Color(sColor.toInt32(16));
+return true;
+}
+return false;
+}
+}
+
 void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 {
 ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
@@ -1783,16 +1804,9 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 case SID_ATTR_CHAR_COLOR:
 case SID_SCATTR_PROTECTION :
 {
-const SfxPoolItem* pColorStringItem = nullptr;
-if ( SfxItemState::SET == pNewAttrs->GetItemState( 
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
+Color aColor;
+if (lcl_getColorFromStr(pNewAttrs, aColor))
 {
-Color aColor;
-OUString sColor = static_cast(pColorStringItem)->GetValue();
-if ( sColor == "transparent" )
-aColor = COL_TRANSPARENT;
-else
-aColor = Color( sColor.toInt32( 16 ) );
-
 SvxColorItem 
aColorItem(pTabViewShell->GetSelectionPattern()->
 GetItem( ATTR_FONT_COLOR ) );
 aColorItem.SetValue(aColor);
@@ -1868,18 +1882,20 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 case SID_FRAME_LINECOLOR:
 {
 ::editeng::SvxBorderLine*  pDefLine = 
pTabViewShell->GetDefaultFrameLine();
-const Color&rColor = pNewAttrs->Get( 
SID_FRAME_LINECOLOR ).GetValue();
+
+Color aColor;
+if (!lcl_getColorFromStr(pNewAttrs, aColor))
+aColor = pNewAttrs->Get( SID_FRAME_LINECOLOR 
).GetValue();
 
 // Update default line
 if ( pDefLine )
 {
-pDefLine->SetColor( rColor );
+pDefLine->SetColor( aColor );
 pTabViewShell->SetSelectionFrameLines( pDefLine, true 
);
 }
 else
 {
-::editeng::SvxBorderLine aDefLine( &rColor, 20,
-SvxBorderLineStyle::SOLID );
+::editeng::SvxBorderLine aDefLine( &aColor, 20, 
SvxBorderLineStyle::SOLID );
 pTabViewShell->SetDefaultFrameLine( &aDefLine );
 pTabViewShell->SetSelectionFrameLines( &aDefLine, 
false );
 }
@@ -1991,27 +2007,16 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 // ATTR_BACKGROUND (=SID_ATTR_BRUSH) has to be set to two IDs:
 case SID_BACKGROUND_COLOR:
 {
-const SfxPoolItem* pColorStringItem = nullptr;
 Color aColor;
 
-if ( SfxItemState::SET == pNewAttrs->GetItemState( 
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
-{
-OUString sColor = static_cast(pColorStringItem)->GetValue();
-if ( sColor == "transparent" )
-aColor = COL_TRANSPARENT;
-else
-aColor = Color( sColor.toInt32( 16 ) );
-}
-else
+if (!lcl_getColorFromStr(pNewAttrs, aColor))
 {
 const SvxColorItem&  rNewColorItem = pNewAttrs->Get( 
SID_BACKGROUND_COLOR );
 aColor = rNewColorItem

[Libreoffice-commits] core.git: helpcontent2

2020-03-30 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 06c23e206fb6fb3e96456742c227666b94edbb3e
Author: Olivier Hallot 
AuthorDate: Mon Mar 30 10:14:02 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Mar 30 15:14:02 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 623fc3fb5692577ea4fe3c01ea4b909df1d6d536
  - Remove empty heading.

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

diff --git a/helpcontent2 b/helpcontent2
index e22ee2eda641..623fc3fb5692 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e22ee2eda6415961d879f58407bf59604e46dbd3
+Subproject commit 623fc3fb5692577ea4fe3c01ea4b909df1d6d536
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Olivier Hallot (via logerrit)

 source/text/scalc/01/04060185.xhp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 623fc3fb5692577ea4fe3c01ea4b909df1d6d536
Author: Olivier Hallot 
AuthorDate: Mon Mar 30 10:11:12 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Mar 30 15:14:02 2020 +0200

Remove empty heading.

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

diff --git a/source/text/scalc/01/04060185.xhp 
b/source/text/scalc/01/04060185.xhp
index 38a0157d2..1243793dd 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -107,7 +107,6 @@
 =SKEW(A1:A50) calculates the value of 
skew for the data referenced.
   
 
-   

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

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

2020-03-30 Thread Caolán McNamara (via logerrit)

 wizards/com/sun/star/wizards/table/FieldFormatter.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9383980a9f07a352c62fc09b7bea3a24e2e46b48
Author: Caolán McNamara 
AuthorDate: Mon Mar 30 12:59:14 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Mar 30 15:03:22 2020 +0200

Related: tdf#131576 overlapping windows, move bottom one down a little

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

diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java 
b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index c3c38e7e2dae..75a1ade73a51 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -209,7 +209,7 @@ public class FieldFormatter implements XItemListener
 }, // PropertyNames.PROPERTY_HELPURL
 new Object[]
 {
-85, 158, 49, IFieldFormatStep, 
Short.valueOf(curtabindex++), 166, 50
+82, 158, 52, IFieldFormatStep, 
Short.valueOf(curtabindex++), 166, 50
 });  //, "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER"
 curTableDescriptor = _curTableDescriptor;
 Helper.setUnoPropertyValue(oColumnDescriptorModel, 
PropertyNames.ACTIVE_CONNECTION, _curTableDescriptor.DBConnection);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/vcl.macosx.component

2020-03-30 Thread Stephan Bergmann (via logerrit)

 vcl/vcl.macosx.component |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2596a381ced4349a226d4636bc9c657149e56ef0
Author: Stephan Bergmann 
AuthorDate: Mon Mar 30 13:18:02 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Mar 30 14:44:54 2020 +0200

org.libreoffice.uitest.UITest missing from vcl.macosx.component

...presumably by accident, while it is present in 
vcl.{unx,windows}.component.
(This is just one part of the puzzle of making uicheck work on macOS
eventually.)

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

diff --git a/vcl/vcl.macosx.component b/vcl/vcl.macosx.component
index 5ab7436d8def..3373b85f9345 100644
--- a/vcl/vcl.macosx.component
+++ b/vcl/vcl.macosx.component
@@ -34,4 +34,8 @@
   
 
   
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/macosx.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 04848b071afc31c6ac8ea4286bde8acd4f7cf110
Author: Stephan Bergmann 
AuthorDate: Mon Mar 30 13:12:31 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Mar 30 14:44:17 2020 +0200

Override gb_Package_get_target,python3 also for gb_UITest_DEPS on macOS

...same as gb_CppunitTest_PYTHONDEPS and gb_PythonTest_DEPS.  (This is just 
one
piece of the puzzle of making uicheck work on macOS eventually.)

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

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c06f40d66fc4..c743511207ce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -300,6 +300,10 @@ gb_PythonTest_PRECOMMAND := 
$(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_F
 endif
 gb_PythonTest_PRECOMMAND := 
$(gb_PythonTest_PRECOMMAND):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
 
+# UITest class
+
+gb_UITest_DEPS := $(call gb_GeneratedPackage_get_target,python3)
+
 # Module class
 
 define gb_Module_DEBUGRUNCOMMAND
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Caolán McNamara (via logerrit)

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72712ef89282376aee8b0c7f41dcd8969e582d49
Author: Caolán McNamara 
AuthorDate: Fri Mar 27 19:21:19 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 30 14:18:25 2020 +0200

spreadsheetml2ooo.xsl was not well formed xml

broken by...

commit 6909838e2966b3fd3c2de6b6db70d952cd8b3114
Date:   Thu Apr 25 18:08:33 2019 +0200

Fix typo

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

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 2f4830d0b9ed..d58509a6a982 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -8863,7 +8863,7 @@
 
 
 
-
+
 
 
 
___
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 vcl/source

2020-03-30 Thread Michael Weghorn (via logerrit)

 desktop/source/lib/lokinteractionhandler.cxx |4 
 vcl/source/filter/ipdf/pdfread.cxx   |1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1d8529c67692b119924bc5760372daa64fa4cb4a
Author: Michael Weghorn 
AuthorDate: Mon Mar 30 11:19:55 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon Mar 30 14:17:36 2020 +0200

lok: Avoid deadlock for password-protected doc with gtktiledviewer

Since commit 629bc69708a280b79f07b58adcda8593e22cf422
("LOK: hold the solar mutex consistently for document method calls.",
2016-10-19), the SolarMutex needs to be acquired in
'lo_setDocumentPassword'.

This caused a deadlock for gtktiledviewer when trying to open a
password-protected file, since the callback handler runs in a
different thread there.

Temporarily release the SolarMutex in
LOKInteractionHandler::handlePasswordRequest to prevent that
and make opening password-protected files with gtktiledviewer
work again.

Change-Id: I3ec8067c2b22aff5867eb0d526d399a18947fd48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91350
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/desktop/source/lib/lokinteractionhandler.cxx 
b/desktop/source/lib/lokinteractionhandler.cxx
index f749bd4397c2..3dfd602b261a 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -275,6 +276,9 @@ bool LOKInteractionHandler::handlePasswordRequest(const 
uno::SequencehasOptionalFeature(bIsRequestPasswordToModify ? 
LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY
 : 
LOK_FEATURE_DOCUMENT_PASSWORD))
 {
+// release SolarMutex, so the callback handler, which may run in 
another thread,
+// can acquire it in 'lo_setDocumentPassword'
+SolarMutexReleaser aReleaser;
 m_pLOKit->mpCallback(bIsRequestPasswordToModify ? 
LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY
 : 
LOK_CALLBACK_DOCUMENT_PASSWORD,
 sUrl.getStr(),
commit c664523d7b4523e9bb73b1e81e4c3faba5b47ee0
Author: Caolán McNamara 
AuthorDate: Mon Mar 30 12:10:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Mar 30 14:17:22 2020 +0200

stray fResolutionDPI left behind

from...

commit 489b18edd6dc87287f260ba87d95abcc95d87932
Date:   Sun Mar 29 16:30:19 2020 +0200

pdfium: fix setting the size of the document when opening PDF

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

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 8a90b0ab93ca..187bc459c2f9 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -305,7 +305,6 @@ size_t ImportPDFUnloaded(const OUString& rURL, 
std::vectorhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Tamás Zolnai (via logerrit)

 sw/source/uibase/lingu/olmenu.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d638fb21aa12bb02cafc64affef343cc6afa00d5
Author: Tamás Zolnai 
AuthorDate: Fri Mar 27 13:58:52 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Mar 30 14:03:52 2020 +0200

sw lok: add uno command for submenus in Spellchecking popup.

Change-Id: I1c7591379ecbce0099ed7d969e5dc83831e322b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91227
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 190e783379a00b1ba82d4a48e95e47449ce2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91356
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index 29f27bf0ca4f..d107e2901fb5 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -617,6 +617,7 @@ void SwSpellPopup::InitItemCommands(const 
css::uno::Sequence< OUString >& aSugge
 }
 
 PopupMenu *pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId);
+m_xPopupMenu->SetItemCommand(m_nLangSelectionMenuId, 
".uno:SetSelectionLanguageMenu");
 if(pMenu)
 {
 for (const auto& item : m_aLangTable_Text)
@@ -631,6 +632,7 @@ void SwSpellPopup::InitItemCommands(const 
css::uno::Sequence< OUString >& aSugge
 }
 
 pMenu = m_xPopupMenu->GetPopupMenu(m_nLangParaMenuId);
+m_xPopupMenu->SetItemCommand(m_nLangParaMenuId, 
".uno:SetParagraphLanguageMenu");
 if(pMenu)
 {
 for (const auto& item : m_aLangTable_Paragraph)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC Propsal: Styles Inspector

2020-03-30 Thread Regina Henschel


Hi Harshit Jain,

Please excuse, that you do not have got a response on this list. Your 
topic touches the user interface. Therefore I suggest, that you sent a 
mail to the design mailing list too.

https://wiki.documentfoundation.org/Design/Mailing_List

Besides that, I cannot help you further, because Writer is not my area.

Kind regards
Regina


Harshit Jain schrieb am 27-Mar-20 um 11:04:

Greetings,
Again requesting you all to please review my proposal so that I can make 
any final changes if needed.


On Wed, Mar 25, 2020 at 3:07 PM Harshit Jain 
mailto:harshitjain1371...@gmail.com>> wrote:


Greetings!
I am Harshit Jain, a senior undergraduate student pursuing
Electrical Engineering at the Indian Institute of Technology Delhi.
Being passionate about software development, I now want to start
contributing to open-source and GSoC is indeed a great opportunity
to embark upon this journey.
Upon going through the list of projects, I found the project
regarding implementing a Styles Inspector really interesting and
would like to work on this as a part of the GSoC project. I have
already drafted a proposal on the same and shared through the
official GSoC portal. I request you all to review my proposal and
give any suggestions which may be required in my proposal.
Link: https://1drv.ms/w/s!At4gk155x7NehSaCXzcJ67J13orQ?e=Kb24OW

As far as my contributions are concerned, I have just started
contributing easy patches to the libreoffice code and would like to
become more active and contribute more in the days to come. The
details of the patch submitted are as follows:
Status: Merged
Gerrit link: https://gerrit.libreoffice.org/c/core/+/90901
Bug link: https://bugs.documentfoundation.org/show_bug.cgi?id=124176

Again requesting you all to please review my proposal and suggest
any changes if needed.

Thanks,
Harshit Jain


Regards,
Harshit Jain


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



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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/links.txt|7 ---
 icon-themes/breeze/res/lx03145.png  |binary
 icon-themes/breeze/res/lx03245.png  |binary
 icon-themes/breeze/res/lx03246.png  |binary
 icon-themes/breeze/res/lx03247.png  |binary
 icon-themes/breeze/res/lx03248.png  |binary
 icon-themes/breeze/res/lx03249.png  |binary
 icon-themes/breeze/res/lx03250.png  |binary
 icon-themes/breeze/res/lx03251.png  |binary
 icon-themes/breeze/res/lx03252.png  |binary
 icon-themes/breeze/res/lx03253.png  |binary
 icon-themes/breeze/res/lx03254.png  |binary
 icon-themes/breeze/res/lx03255.png  |binary
 icon-themes/breeze_dark/links.txt   |7 ---
 icon-themes/breeze_dark/res/lx03145.png |binary
 icon-themes/breeze_dark/res/lx03245.png |binary
 icon-themes/breeze_dark/res/lx03246.png |binary
 icon-themes/breeze_dark/res/lx03247.png |binary
 icon-themes/breeze_dark/res/lx03248.png |binary
 icon-themes/breeze_dark/res/lx03249.png |binary
 icon-themes/breeze_dark/res/lx03250.png |binary
 icon-themes/breeze_dark/res/lx03251.png |binary
 icon-themes/breeze_dark/res/lx03252.png |binary
 icon-themes/breeze_dark/res/lx03253.png |binary
 icon-themes/breeze_dark/res/lx03254.png |binary
 icon-themes/breeze_dark/res/lx03255.png |binary
 icon-themes/breeze_dark_svg/res/lx03145.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03245.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03246.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03247.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03248.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03249.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03250.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03251.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03252.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03253.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03254.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03255.svg |2 +-
 icon-themes/breeze_svg/res/lx03145.svg  |1 +
 icon-themes/breeze_svg/res/lx03245.svg  |2 +-
 icon-themes/breeze_svg/res/lx03246.svg  |2 +-
 icon-themes/breeze_svg/res/lx03247.svg  |2 +-
 icon-themes/breeze_svg/res/lx03248.svg  |2 +-
 icon-themes/breeze_svg/res/lx03249.svg  |2 +-
 icon-themes/breeze_svg/res/lx03250.svg  |2 +-
 icon-themes/breeze_svg/res/lx03251.svg  |1 +
 icon-themes/breeze_svg/res/lx03252.svg  |1 +
 icon-themes/breeze_svg/res/lx03253.svg  |2 +-
 icon-themes/breeze_svg/res/lx03254.svg  |2 +-
 icon-themes/breeze_svg/res/lx03255.svg  |2 +-
 50 files changed, 24 insertions(+), 32 deletions(-)

New commits:
commit 386573724c98f0bfee3175ca5ec2964bcda639fd
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 15:54:39 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 13:33:02 2020 +0200

Breeze: Update MIME type icons in "New (CTRL+N)"

Change-Id: I84cc86937dafdbbd5fb346e16d546cf5cf6c5dcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91348
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 55c8ab7294e9e1651b94215d4ff14c7afcb7d733)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91297

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 465cd7df8467..903626018939 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -2117,13 +2117,6 @@ res/sx03228.png res/sx03217.png
 res/lx03165.png cmd/lc_save.png
 res/lx03189.png cmd/lc_open.png
 res/sc05501.png cmd/sc_open.png
-res/lx03245.png res/odb_32_8.png
-res/lx03246.png res/odg_32_8.png
-res/lx03247.png res/odf_32_8.png
-res/lx03248.png res/odm_32_8.png
-res/lx03249.png res/odp_32_8.png
-res/lx03250.png res/ods_32_8.png
-res/lx03251.png res/odt_32_8.png
 res/lx03256.png cmd/lc_insertplugin.png
 
 res/mainapp_16.png cmd/sc_showsinglepage.png
diff --git a/icon-themes/breeze/res/lx03145.png 
b/icon-themes/breeze/res/lx03145.png
new file mode 100644
index ..fa1f84e78d83
Binary files /dev/null and b/icon-themes/breeze/res/lx03145.png differ
diff --git a/icon-themes/breeze/res/lx03245.png 
b/icon-themes/breeze/res/lx03245.png
index 717cb6e360b8..1254c90abe82 100644
Binary files a/icon-themes/breeze/res/lx03245.png and 
b/icon-themes/breeze/res/lx03245.png differ
diff --git a/icon-themes/breeze/res/lx03246.png 
b/icon-themes/breeze/res/lx03246.png
index 717cb6e360b8..f7b5fafc0e67 100644
Binary files a/icon-themes/breeze/res/lx03246.png and 
b/icon-themes/breeze/res/lx03246.png differ
diff --git a/icon-themes/breeze/res/lx03247.png 
b/icon-themes/breeze/res/lx03247.png
index 717cb6e360b8..9a7e0c967aa5 100644
Binary files a/icon-themes/breeze/res/lx03247.png and 
b/icon-themes/breeze/res/lx03247.png differ
diff --git a/icon-themes/breeze/res/lx03248.png 
b/icon-themes/breeze/res/lx03248.png
index 13f2c153595b..0f07cc5e

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

2020-03-30 Thread Noel Grandin (via logerrit)

 sfx2/source/appl/fileobj.cxx |   33 +
 sfx2/source/appl/fileobj.hxx |4 +++-
 2 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 3db13a8b12b36679bdd6cdb243633a0eb39bad38
Author: Noel Grandin 
AuthorDate: Mon Mar 30 11:58:27 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 30 12:49:56 2020 +0200

convert to scoped enum in SvFileObject

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

diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 2f20bb84fc87..14b5d4caf9f2 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -40,14 +40,15 @@
 #include 
 #include 
 
-#define FILETYPE_TEXT   1
-#define FILETYPE_GRF2
-#define FILETYPE_OBJECT 3
+enum class SvFileObjectType
+{
+Text = 1, Graphic = 2, Object = 3
+};
 
 SvFileObject::SvFileObject()
 : nPostUserEventId(nullptr)
 , mxDelMed()
-, nType(FILETYPE_TEXT)
+, nType(SvFileObjectType::Text)
 , bLoadAgain(true)
 , bSynchron(false)
 , bLoadError(false)
@@ -76,7 +77,7 @@ bool SvFileObject::GetData( css::uno::Any & rData,
 SotClipboardFormatId nFmt = SotExchange::RegisterFormatMimeType( rMimeType 
);
 switch( nType )
 {
-case FILETYPE_TEXT:
+case SvFileObjectType::Text:
 if( SotClipboardFormatId::SIMPLE_FILE == nFmt )
 {
 // The media in the application must be opened to lookup the
@@ -86,7 +87,7 @@ bool SvFileObject::GetData( css::uno::Any & rData,
 }
 break;
 
-case FILETYPE_GRF:
+case SvFileObjectType::Graphic:
 if (SotClipboardFormatId::GDIMETAFILE == nFmt
  || SotClipboardFormatId::BITMAP == nFmt
  || SotClipboardFormatId::SVXB == nFmt)
@@ -94,7 +95,7 @@ bool SvFileObject::GetData( css::uno::Any & rData,
 rData <<= sFileNm;
 }
 break;
-case FILETYPE_OBJECT:
+case SvFileObjectType::Object:
 // TODO/LATER: possibility to insert a new object
 rData <<= sFileNm;
 break;
@@ -126,16 +127,16 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
 switch( pLink->GetObjType() )
 {
 case OBJECT_CLIENT_GRF:
-nType = FILETYPE_GRF;
+nType = SvFileObjectType::Graphic;
 bSynchron = pLink->IsSynchron();
 break;
 
 case OBJECT_CLIENT_FILE:
-nType = FILETYPE_TEXT;
+nType = SvFileObjectType::Text;
 break;
 
 case OBJECT_CLIENT_OLE:
-nType = FILETYPE_OBJECT;
+nType = SvFileObjectType::Object;
 // TODO/LATER: introduce own type to be used for exchanging
 break;
 
@@ -264,7 +265,7 @@ void SvFileObject::Edit(weld::Window* pParent, 
sfx2::SvBaseLink* pLink, const Li
 {
 case OBJECT_CLIENT_GRF:
 {
-nType = FILETYPE_GRF;   // If not set already
+nType = SvFileObjectType::Graphic;   // If not set already
 
 SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK), 
pParent);
 aDlg.EnableLink(false);
@@ -287,7 +288,7 @@ void SvFileObject::Edit(weld::Window* pParent, 
sfx2::SvBaseLink* pLink, const Li
 
 case OBJECT_CLIENT_OLE:
 {
-nType = FILETYPE_OBJECT; // if not set already
+nType = SvFileObjectType::Object; // if not set already
 
 ::sfx2::FileDialogHelper & rFileDlg =
 pLink->GetInsertFileDialog( OUString() );
@@ -298,7 +299,7 @@ void SvFileObject::Edit(weld::Window* pParent, 
sfx2::SvBaseLink* pLink, const Li
 
 case OBJECT_CLIENT_FILE:
 {
-nType = FILETYPE_TEXT; // if not set already
+nType = SvFileObjectType::Text; // if not set already
 
 OUString sFactory;
 SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
@@ -357,7 +358,7 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, 
sfx2::FileDialogHelper*, _pFileDlg, vo
 {
 OUString sFile;
 
-if ( FILETYPE_TEXT == nType || FILETYPE_OBJECT == nType )
+if ( SvFileObjectType::Text == nType || SvFileObjectType::Object == nType )
 {
 if ( _pFileDlg && _pFileDlg->GetError() == ERRCODE_NONE )
 {
@@ -380,13 +381,13 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, 
sfx2::FileDialogHelper*, _pFileDlg, vo
 */
 bool SvFileObject::IsPending() const
 {
-return FILETYPE_GRF == nType && !bLoadError && bWaitForData;
+return SvFileObjectType::Graphic == nType && !bLoadError && bWaitForData;
 }
 
 bool SvFileObject::IsDataComplete() const
 {
 bool bRet = false;
-if( FILETYPE_GRF != nType )
+if( SvFileObjectType::Graphic != nType )
 bRet = true;
 else if( !bLoadError && !bWaitForData )
 {
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index edcb56131214..7362f6b1a4d6 100644
--- a/sfx2/source/appl/fileo

[Libreoffice-commits] core.git: chart2/qa oox/inc oox/source schema/libreoffice

2020-03-30 Thread Tünde Tóth (via logerrit)

 chart2/qa/extras/chart2export.cxx   |   27 
 oox/inc/drawingml/chart/titlemodel.hxx  |2 
 oox/source/drawingml/chart/chartspacefragment.cxx   |2 
 oox/source/drawingml/chart/titlecontext.cxx |6 --
 oox/source/drawingml/chart/titleconverter.cxx   |3 +
 oox/source/drawingml/chart/titlemodel.cxx   |4 -
 oox/source/export/chartexport.cxx   |6 ++
 oox/source/token/properties.txt |1 
 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |9 
 9 files changed, 43 insertions(+), 17 deletions(-)

New commits:
commit ab40a7843a66d1fe276224db16ddaecd538df234
Author: Tünde Tóth 
AuthorDate: Tue Mar 17 15:25:56 2020 +0100
Commit: László Németh 
CommitDate: Mon Mar 30 12:45:57 2020 +0200

tdf#131370 chart: implement OOXML import/export of legend overlay feature

Follow-up of the following commits related to the new UNO property
Overlay for legends:

commit 9fab1ba8ddc59924c633aa17c65f7330a4762726
(tdf#75330 add a new overlay/no-overlay feature for the legend)

commit 65123d41f62597053bc3893ee4fb46868a6b1f2d
(tdf#75330 chart: implement ODF import/export of legend overlay feature)

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 323a026594d8..0570ca4697c6 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2597,16 +2597,27 @@ void Chart2ExportTest::testTdf126076()
 
 void Chart2ExportTest::testTdf75330()
 {
-mbSkipValidation = true;
 load("/chart2/qa/extras/data/ods/", "legend_overlay.ods");
 reload("calc8");
-uno::Reference< chart2::XChartDocument > xChart2Doc = 
getChartDocFromSheet(0, mxComponent);
-uno::Reference< chart::XChartDocument > xChartDoc (xChart2Doc, 
uno::UNO_QUERY);
-uno::Reference xLegend = xChartDoc->getLegend();
-Reference xPropertySet(xLegend, uno::UNO_QUERY_THROW);
-bool bOverlay = false;
-CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Overlay") >>= bOverlay);
-CPPUNIT_ASSERT(bOverlay);
+{
+uno::Reference xChart2Doc = 
getChartDocFromSheet(0, mxComponent);
+uno::Reference xChartDoc(xChart2Doc, 
uno::UNO_QUERY);
+uno::Reference xLegend = xChartDoc->getLegend();
+Reference xPropertySet(xLegend, 
uno::UNO_QUERY_THROW);
+bool bOverlay = false;
+CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Overlay") >>= bOverlay);
+CPPUNIT_ASSERT(bOverlay);
+}
+reload("Calc Office Open XML");
+{
+uno::Reference xChart2Doc = 
getChartDocFromSheet(0, mxComponent);
+uno::Reference xChartDoc(xChart2Doc, 
uno::UNO_QUERY);
+uno::Reference xLegend = xChartDoc->getLegend();
+Reference xPropertySet(xLegend, 
uno::UNO_QUERY_THROW);
+bool bOverlay = false;
+CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Overlay") >>= bOverlay);
+CPPUNIT_ASSERT(bOverlay);
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
diff --git a/oox/inc/drawingml/chart/titlemodel.hxx 
b/oox/inc/drawingml/chart/titlemodel.hxx
index c31b8d34ba73..4b693e2e60e0 100644
--- a/oox/inc/drawingml/chart/titlemodel.hxx
+++ b/oox/inc/drawingml/chart/titlemodel.hxx
@@ -80,7 +80,7 @@ struct LegendModel
 sal_Int32   mnPosition; /// Legend position.
 boolmbOverlay;  /// True = legend may overlay 
other objects.
 
-explicitLegendModel(bool bMSO2007Doc);
+explicitLegendModel();
 ~LegendModel();
 };
 
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx 
b/oox/source/drawingml/chart/chartspacefragment.cxx
index 4d5d9158567f..aa045d4a5079 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -98,7 +98,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( 
sal_Int32 nElement, const
 case C_TOKEN( floor ):
 return new WallFloorContext( *this, 
mrModel.mxFloor.create() );
 case C_TOKEN( legend ):
-return new LegendContext( *this, 
mrModel.mxLegend.create(bMSO2007Document) );
+return new LegendContext( *this, mrModel.mxLegend.create() 
);
 case C_TOKEN( plotArea ):
 return new PlotAreaContext( *this, 
mrModel.mxPlotArea.create() );
 case C_TOKEN( plotVisOnly ):
diff --git a/oox/source/drawingml/chart/titlecontext.cxx 
b/oox/source/drawingml/chart/titlecontext.cxx
index f62d8ced995f..35ba44cf60fc 100644
--- a/oox/source/drawingml/chart/titlecontext.c

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2020-03-30 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/links.txt|7 ---
 icon-themes/breeze/res/lx03145.png  |binary
 icon-themes/breeze/res/lx03245.png  |binary
 icon-themes/breeze/res/lx03246.png  |binary
 icon-themes/breeze/res/lx03247.png  |binary
 icon-themes/breeze/res/lx03248.png  |binary
 icon-themes/breeze/res/lx03249.png  |binary
 icon-themes/breeze/res/lx03250.png  |binary
 icon-themes/breeze/res/lx03251.png  |binary
 icon-themes/breeze/res/lx03252.png  |binary
 icon-themes/breeze/res/lx03253.png  |binary
 icon-themes/breeze/res/lx03254.png  |binary
 icon-themes/breeze/res/lx03255.png  |binary
 icon-themes/breeze_dark/links.txt   |7 ---
 icon-themes/breeze_dark/res/lx03145.png |binary
 icon-themes/breeze_dark/res/lx03245.png |binary
 icon-themes/breeze_dark/res/lx03246.png |binary
 icon-themes/breeze_dark/res/lx03247.png |binary
 icon-themes/breeze_dark/res/lx03248.png |binary
 icon-themes/breeze_dark/res/lx03249.png |binary
 icon-themes/breeze_dark/res/lx03250.png |binary
 icon-themes/breeze_dark/res/lx03251.png |binary
 icon-themes/breeze_dark/res/lx03252.png |binary
 icon-themes/breeze_dark/res/lx03253.png |binary
 icon-themes/breeze_dark/res/lx03254.png |binary
 icon-themes/breeze_dark/res/lx03255.png |binary
 icon-themes/breeze_dark_svg/res/lx03145.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03245.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03246.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03247.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03248.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03249.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03250.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03251.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03252.svg |1 +
 icon-themes/breeze_dark_svg/res/lx03253.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03254.svg |2 +-
 icon-themes/breeze_dark_svg/res/lx03255.svg |2 +-
 icon-themes/breeze_svg/res/lx03145.svg  |1 +
 icon-themes/breeze_svg/res/lx03245.svg  |2 +-
 icon-themes/breeze_svg/res/lx03246.svg  |2 +-
 icon-themes/breeze_svg/res/lx03247.svg  |2 +-
 icon-themes/breeze_svg/res/lx03248.svg  |2 +-
 icon-themes/breeze_svg/res/lx03249.svg  |2 +-
 icon-themes/breeze_svg/res/lx03250.svg  |2 +-
 icon-themes/breeze_svg/res/lx03251.svg  |1 +
 icon-themes/breeze_svg/res/lx03252.svg  |1 +
 icon-themes/breeze_svg/res/lx03253.svg  |2 +-
 icon-themes/breeze_svg/res/lx03254.svg  |2 +-
 icon-themes/breeze_svg/res/lx03255.svg  |2 +-
 50 files changed, 24 insertions(+), 32 deletions(-)

New commits:
commit 55c8ab7294e9e1651b94215d4ff14c7afcb7d733
Author: Rizal Muttaqin 
AuthorDate: Mon Mar 30 15:54:39 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Mar 30 12:23:57 2020 +0200

Breeze: Update MIME type icons in "New (CTRL+N)"

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

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 0ea0cb90efe0..52af6c5970e8 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -2117,13 +2117,6 @@ res/sx03228.png res/sx03217.png
 res/lx03165.png cmd/lc_save.png
 res/lx03189.png cmd/lc_open.png
 res/sc05501.png cmd/sc_open.png
-res/lx03245.png res/odb_32_8.png
-res/lx03246.png res/odg_32_8.png
-res/lx03247.png res/odf_32_8.png
-res/lx03248.png res/odm_32_8.png
-res/lx03249.png res/odp_32_8.png
-res/lx03250.png res/ods_32_8.png
-res/lx03251.png res/odt_32_8.png
 res/lx03256.png cmd/lc_insertplugin.png
 
 res/mainapp_16.png cmd/sc_showsinglepage.png
diff --git a/icon-themes/breeze/res/lx03145.png 
b/icon-themes/breeze/res/lx03145.png
new file mode 100644
index ..fa1f84e78d83
Binary files /dev/null and b/icon-themes/breeze/res/lx03145.png differ
diff --git a/icon-themes/breeze/res/lx03245.png 
b/icon-themes/breeze/res/lx03245.png
index 717cb6e360b8..1254c90abe82 100644
Binary files a/icon-themes/breeze/res/lx03245.png and 
b/icon-themes/breeze/res/lx03245.png differ
diff --git a/icon-themes/breeze/res/lx03246.png 
b/icon-themes/breeze/res/lx03246.png
index 717cb6e360b8..f7b5fafc0e67 100644
Binary files a/icon-themes/breeze/res/lx03246.png and 
b/icon-themes/breeze/res/lx03246.png differ
diff --git a/icon-themes/breeze/res/lx03247.png 
b/icon-themes/breeze/res/lx03247.png
index 717cb6e360b8..9a7e0c967aa5 100644
Binary files a/icon-themes/breeze/res/lx03247.png and 
b/icon-themes/breeze/res/lx03247.png differ
diff --git a/icon-themes/breeze/res/lx03248.png 
b/icon-themes/breeze/res/lx03248.png
index 13f2c153595b..0f07cc5ef4a4 100644
Binary files a/icon-themes/breeze/res/lx03248.png and 
b/icon-themes/breeze/res/lx03248.png differ
diff --git a/icon-themes/

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

2020-03-30 Thread Tor Lillqvist (via logerrit)

 loleaflet/src/control/Control.Toolbar.js |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 799fee972b61ecaf10fb70a5dc999dfa293838c5
Author: Tor Lillqvist 
AuthorDate: Mon Mar 30 12:42:54 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Mar 30 12:12:41 2020 +0200

Clarify meaning of the mobile and tablet properties in the toolItems 
elements

In particular, also here "mobile" actually means "mobile phone" and
not a mobile devie in general.

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

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index c09f4a427..059dc28e5 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -812,9 +812,6 @@ function hideTooltip(toolbar, id) {
 var stylesSelectValue;
 var fontsSelectValue;
 
-// mobile:false means hide it both for normal Online used from a mobile 
browser, and in a mobile app
-// mobilebrowser:false means hide it for normal Online used from a mobile 
browser, but don't hide it in a mobile app
-
 function createToolbar() {
 
if (window.mode.isMobile()) {
@@ -826,6 +823,11 @@ function createToolbar() {
}
 }
 
+// mobile:false means hide it both for normal Online used from a mobile phone 
browser, and in a mobile app on a mobile phone
+// mobilebrowser:false means hide it for normal Online used from a mobile 
browser, but don't hide it in a mobile app
+// tablet:true means show it in normal Online from a tablet browser, and in a 
mobile app on a tablet
+// tablet:false means hide it in normal Online used from a tablet browser, and 
in a mobile app on a tablet
+
 function initNormalToolbar() {
var toolItems = [
{type: 'button',  id: 'closemobile',  img: 'closemobile', 
desktop: false, mobile: false, tablet: true, hidden: true},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Stephan Bergmann (via logerrit)

 external/boost/UnpackedTarball_boost.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 11e6582b23b983fde4b04ece5b37c546bcd98a43
Author: Stephan Bergmann 
AuthorDate: Mon Mar 30 10:30:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Mar 30 11:59:31 2020 +0200

Mark external/boost/c++20-allocator.patch.0 as partially covered upstream

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

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index acb6d6af6b77..046f7e6da1b2 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -37,6 +37,8 @@ boost_patches += gcc9.patch.0
 
 boost_patches += msvc2017.patch.0
 
+# boost/format/alt_sstream_impl.hpp part covered by 

+# "Removed deprecated std::allocator":
 boost_patches += c++20-allocator.patch.0
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Johnny_M (via logerrit)

 editeng/source/misc/svxacorr.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1422466fcbd4f1dc716d5680e220f0a0538a9f35
Author: Johnny_M 
AuthorDate: Fri Mar 27 13:23:48 2020 +0100
Commit: Michael Weghorn 
CommitDate: Mon Mar 30 11:51:44 2020 +0200

Translate German variable names

Ende -> End

Change-Id: Idfcc563c461b604892f6a24c62677e8069bee28f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91208
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 6fffdb37f1b0..724902d31120 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1558,7 +1558,7 @@ OUString 
SvxAutoCorrect::GetPrevAutoCorrWord(SvxAutoCorrDoc const& rDoc, const O
 if( !nPos )
 return sRet;
 
-sal_Int32 nEnde = nPos;
+sal_Int32 nEnd = nPos;
 
 // it must be followed by a blank or tab!
 if( ( nPos < rTxt.getLength() &&
@@ -1576,20 +1576,20 @@ OUString 
SvxAutoCorrect::GetPrevAutoCorrWord(SvxAutoCorrDoc const& rDoc, const O
 --nCapLttrPos;  // Beginning of pargraph and no Blank!
 
 while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nCapLttrPos ]) )
-if( ++nCapLttrPos >= nEnde )
+if( ++nCapLttrPos >= nEnd )
 return sRet;
 
-if( 3 > nEnde - nCapLttrPos )
+if( 3 > nEnd - nCapLttrPos )
 return sRet;
 
 const LanguageType eLang = GetDocLanguage( rDoc, nCapLttrPos );
 
 CharClass& rCC = GetCharClass(eLang);
 
-if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnde ))
+if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnd ))
 return sRet;
 
-sRet = rTxt.copy( nCapLttrPos, nEnde - nCapLttrPos );
+sRet = rTxt.copy( nCapLttrPos, nEnd - nCapLttrPos );
 return sRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - wizards/com

2020-03-30 Thread Julien Nabet (via logerrit)

 wizards/com/sun/star/wizards/table/FieldFormatter.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15275106fec243bbe68ab8c124f1b5e8bcbcc2aa
Author: Julien Nabet 
AuthorDate: Fri Mar 27 22:28:28 2020 +0100
Commit: Lionel Elie Mamane 
CommitDate: Mon Mar 30 11:12:28 2020 +0200

tdf#131576: fix "Field information" in table wizard, step 2

Change-Id: I8a0dfa9f483f32bc5858e628ff4bb9cb79c9c6a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91236
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 70adbc53e88e5b99032d63065410716c54b4f96f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91286
Reviewed-by: Lionel Elie Mamane 

diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java 
b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index db401104a094..c3c38e7e2dae 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -73,7 +73,7 @@ public class FieldFormatter implements XItemListener
 },
 new Object[]
 {
-UIConsts.INTEGERS[8], sFieldNames, 91, 27, 
IFieldFormatStep, Short.valueOf(curtabindex++), 90
+UIConsts.INTEGERS[8], sFieldNames, 91, 27, 
IFieldFormatStep, Short.valueOf(curtabindex++), 67
 });
 
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Julien Nabet (via logerrit)

 svx/source/svdraw/svdpage.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit b74798941dccd8fbe05c472c868f6c9a9c9a3f4f
Author: Julien Nabet 
AuthorDate: Mon Mar 30 09:42:08 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Mar 30 10:48:09 2020 +0200

Simplify SdrObjList::GetObj (svx/svdpage)

Change-Id: Ia6f8398a7b4045d4b06558c51f2c815e78fbc1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91346
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index bf78c95c7288..734becaf3c7d 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -765,13 +765,7 @@ size_t SdrObjList::GetObjCount() const
 
 SdrObject* SdrObjList::GetObj(size_t nNum) const
 {
-if (nNum >= maList.size())
-{
-assert(nNumhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Oleg Shchelykalnov (via logerrit)

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

New commits:
commit 06789981b0ed4485f695ad87b332a1b6c3230365
Author: Oleg Shchelykalnov 
AuthorDate: Sat Mar 28 15:48:18 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 30 10:18:48 2020 +0200

tdf#131618 MailMerge: Don't require DataSourceName if ResultSet provided

Allows to use ResultSet instead of DataSourceName and DataCommand
options.

Change-Id: I654cdf3bc850ab1c1a29837e8aabdee410b30439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91277
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit a039725510f13c77591106b02f32f5899c37c007)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91290
Reviewed-by: Oleg Schelykalnov 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 8d11292d9e52..05216c55c08b 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -479,7 +479,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& 
rMergeDesc )
 if ( 
rMergeDesc.rDescriptor.has(svx::DataAccessDescriptorProperty::Connection) )
 rMergeDesc.rDescriptor[svx::DataAccessDescriptorProperty::Connection] 
>>= xConnection;
 
-if(aData.sDataSource.isEmpty() || aData.sCommand.isEmpty() || 
!xResSet.is())
+if((aData.sDataSource.isEmpty() || aData.sCommand.isEmpty()) && 
!xResSet.is())
 {
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to handle unexpected error dialogs in UITests?

2020-03-30 Thread Miklos Vajna

Hi Stephan,

On Thu, Mar 26, 2020 at 11:07:51AM +0100, Stephan Bergmann 
 wrote:
> The question is how UITests should avoid such deadlocks.  The behavior of
> ErrorHandler::HandleError (vcl/source/window/errinf.cxx) can be modified via
> ErrorRegistry::RegisterDisplay (vcl/source/window/errinf.cxx), to call a
> user-provided BasicDisplayErrorFunc instead of showing a VCL error dialog.
> But:
> 
> * There appears to be no UNO API to call ErrorRegistry::RegisterDisplay
> remotely from the UITest's Python code.
> 
> * There appears to be no way to only temporarily set
> ErrorRegistry::RegisterDisplay and then undo it again.  So it would be
> problematic for a UITest to do some tests (which explicitly want to test
> interaction with a VCL error dialog, say) without a set
> ErrorRegistry::RegisterDisplay, while doing all the its other tests with a
> set ErrorRegistry::RegisterDisplay (so as to avoid deadlocks caused by
> unexpected errors raising unexpected VCL error dialogs).

What if we add a new optional bool property to VCLXToolkit to fail early
without invoking the handler registered via
ErrorRegistry::RegisterDisplay()? The uitest setup code would enable
that by default, but a specific test could still disable it if wanted.

Regards,

Miklos


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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - configure.ac include/sfx2 officecfg/registry sfx2/source

2020-03-30 Thread Samuel Mehrbrodt (via logerrit)

 configure.ac   |2 -
 include/sfx2/viewsh.hxx|2 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +++
 sfx2/source/view/viewfrm.cxx   |   23 ++---
 sfx2/source/view/viewsh.cxx|8 
 5 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit eef5cd364f709ea9abe2286eb252ffcf0f344ed6
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 30 09:52:39 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 30 09:52:39 2020 +0200

Release 6.2.9.5

Change-Id: Ifec052fc5bd5a11ced8edccd8785da3c986f1d3e

diff --git a/configure.ac b/configure.ac
index 048e78059163..7120703cfeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.9.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.5],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit ac4acb66485c54746721201d0b107ccca63ab049
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 30 09:51:34 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 30 09:51:34 2020 +0200

Evaluate the AllowEditReadonlyDocs config option

Partial backport of a474e2267cdcb1707333acdea1353d883d58c801

Change-Id: I33fb8c526839a74d0e959c75ad6cb9e4d0614f5d

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f15e0fc670be..b1d29d0f09fa 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -278,6 +278,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags & 
SfxLoadedFlags::MAINDOCUMENT ))
 break;
 
+
+SfxViewShell* pViewSh = GetViewShell();
+if (pViewSh && pViewSh->isEditDocLocked())
+break;
+
 // Only change read-only UI and remove info bar when we succeed
 struct ReadOnlyUIGuard
 {
@@ -863,6 +868,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 const SfxShell *pFSh;
 if ( !pSh->HasName() ||
  !( pSh->Get_Impl()->nLoadedFlags &  
SfxLoadedFlags::MAINDOCUMENT ) ||
+ (GetViewShell() && GetViewShell()->isEditDocLocked()) ||
  ( pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
( !(pVSh = pSh->GetViewShell())  ||
  !(pFSh = pVSh->GetFormShell()) ||
@@ -1300,11 +1306,18 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 pInfoBar->addButton(xSignButton);
 }
 
-VclPtrInstance xBtn(&GetWindow());
-xBtn->SetText(SfxResId(STR_READONLY_EDIT));
-xBtn->SetSizePixel(xBtn->GetOptimalSize());
-xBtn->SetClickHdl(LINK(this, SfxViewFrame, 
SwitchReadOnlyHandler));
-pInfoBar->addButton(xBtn);
+bool showEditDocumentButton = true;
+if (m_xObjSh->GetViewShell() && 
m_xObjSh->GetViewShell()->isEditDocLocked())
+showEditDocumentButton = false;
+
+if (showEditDocumentButton)
+{
+VclPtrInstance xBtn(&GetWindow());
+xBtn->SetText(SfxResId(STR_READONLY_EDIT));
+xBtn->SetSizePixel(xBtn->GetOptimalSize());
+xBtn->SetClickHdl(LINK(this, SfxViewFrame, 
SwitchReadOnlyHandler));
+pInfoBar->addButton(xBtn);
+}
 }
 }
 
commit 22a9d3837f3552806e0a8d149962134928f00e74
Author: Samuel Mehrbrodt 
AuthorDate: Thu Mar 26 16:29:46 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 30 09:51:04 2020 +0200

tdf#101652 Add config option to prevent disabling readonly mode

There are various cases where people don't want users to
be able to turn off readonly mode, so add a config option for it.

Setting this option will remove the "Edit document" button from
the readonly infobar and also disable the "Edit mode" menu entry.

Change-Id: I7988da5b181455f778a6ab148e6bf32182c72618

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index cb185bb7b058..a88fe07c58dd 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -295,6 +295,8 @@ public:
 voidAddRemoveClipboardListener( const 
css::uno::Reference < css::datatransfer::clipboard::XClipboardLis

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

2020-03-30 Thread Miklos Vajna (via logerrit)

 sw/source/core/doc/doccomp.cxx |  228 -
 1 file changed, 114 insertions(+), 114 deletions(-)

New commits:
commit 525f75b78f96cf8fbf51498a52f16490ff307cee
Author: Miklos Vajna 
AuthorDate: Mon Mar 30 09:08:48 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Mar 30 09:48:12 2020 +0200

sw: prefix members of Compare::MovedData, CompareData, Hash and ...

... LgstCommonSubseq

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 57486d02849c..274e330abcca 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -82,17 +82,17 @@ public:
 class CompareData
 {
 protected:
-SwDoc& rDoc;
+SwDoc& m_rDoc;
 private:
-std::unique_ptr pIndex;
-std::unique_ptr pChangedFlag;
+std::unique_ptr m_pIndex;
+std::unique_ptr m_pChangedFlag;
 
-std::unique_ptr pInsRing, pDelRing;
+std::unique_ptr m_pInsertRing, m_pDelRing;
 
 static sal_uLong PrevIdx( const SwNode* pNd );
 static sal_uLong NextIdx( const SwNode* pNd );
 
-vector< SwCompareLine* > aLines;
+vector< SwCompareLine* > m_aLines;
 bool m_bRecordDiff;
 
 // Truncate beginning and end and add all others to the LinesArray
@@ -102,7 +102,7 @@ private:
 
 public:
 CompareData(SwDoc& rD, bool bRecordDiff)
-: rDoc( rD )
+: m_rDoc( rD )
 , m_bRecordDiff(bRecordDiff)
 {
 }
@@ -128,21 +128,21 @@ public:
 // Set non-ambiguous index for a line. Same lines have the same index, 
even in the other CompareData!
 void SetIndex( size_t nLine, size_t nIndex );
 size_t GetIndex( size_t nLine ) const
-{ return nLine < aLines.size() ? pIndex[ nLine ] : 0; }
+{ return nLine < m_aLines.size() ? m_pIndex[ nLine ] : 0; }
 
 // Set/get of a line has changed
 void SetChanged( size_t nLine, bool bFlag = true );
 bool GetChanged( size_t nLine ) const
 {
-return (pChangedFlag && nLine < aLines.size())
-&& pChangedFlag[ nLine ];
+return (m_pChangedFlag && nLine < m_aLines.size())
+&& m_pChangedFlag[ nLine ];
 }
 
-size_t GetLineCount() const { return aLines.size(); }
+size_t GetLineCount() const { return m_aLines.size(); }
 const SwCompareLine* GetLine( size_t nLine ) const
-{ return aLines[ nLine ]; }
+{ return m_aLines[ nLine ]; }
 void InsertLine( SwCompareLine* pLine )
-{ aLines.push_back( pLine ); }
+{ m_aLines.push_back( pLine ); }
 
 void SetRedlinesToDoc( bool bUseDocInfo );
 };
@@ -157,7 +157,7 @@ public:
 
 virtual const SwNode& GetEndOfContent() override
 {
-return rDoc.GetNodes().GetEndOfContent();
+return m_rDoc.GetNodes().GetEndOfContent();
 }
 };
 
@@ -188,16 +188,16 @@ class Hash
 : nNext( 0 ), nHash( 0 ), pLine(nullptr) {}
 };
 
-std::unique_ptr pHashArr;
-std::unique_ptr pDataArr;
-sal_uLong nCount, nPrime;
+std::unique_ptr m_pHashArr;
+std::unique_ptr m_pDataArr;
+sal_uLong m_nCount, m_nPrime;
 
 public:
 explicit Hash( sal_uLong nSize );
 
 void CalcHashValue( CompareData& rData );
 
-sal_uLong GetCount() const { return nCount; }
+sal_uLong GetCount() const { return m_nCount; }
 };
 
 class Compare
@@ -205,16 +205,16 @@ class Compare
 public:
 class MovedData
 {
-std::unique_ptr pIndex;
-std::unique_ptr pLineNum;
-sal_uLong nCount;
+std::unique_ptr m_pIndex;
+std::unique_ptr m_pLineNum;
+sal_uLong m_nCount;
 
 public:
 MovedData( CompareData& rData, const char* pDiscard );
 
-sal_uLong GetIndex( sal_uLong n ) const { return pIndex[ n ]; }
-sal_uLong GetLineNum( sal_uLong n ) const { return pLineNum[ n ]; }
-sal_uLong GetCount() const { return nCount; }
+sal_uLong GetIndex( sal_uLong n ) const { return m_pIndex[ n ]; }
+sal_uLong GetLineNum( sal_uLong n ) const { return m_pLineNum[ n ]; }
+sal_uLong GetCount() const { return m_nCount; }
 };
 
 private:
@@ -348,8 +348,8 @@ class LgstCommonSubseq: public CommonSubseq
 private:
 static const int CUTOFF = 1<<20; // Stop recursion at this value
 
-std::unique_ptr pL1, pL2;
-std::unique_ptr pBuff1, pBuff2;
+std::unique_ptr m_pL1, m_pL2;
+std::unique_ptr m_pBuff1, m_pBuff2;
 
 void FindL( int *pL, int nStt1, int nEnd1, int nStt2, int nEnd2  );
 int HirschbergLCS( int *pLcs1, int *pLcs2, int nStt1, int nEnd1,
@@ -387,40 +387,40 @@ public:
 
 CompareData::~CompareData()
 {
-if( pDelRing )
+if( m_pDelRing )
 {
-while( pDelRing->GetNext() != pDelRing.get() )
-delete pDelRing->GetNext();

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

2020-03-30 Thread Justin Luth (via logerrit)

 sw/qa/extras/ww8export/data/tdf80635_marginLeft.doc |binary
 sw/qa/extras/ww8export/data/tdf80635_pageLeft.doc   |binary
 sw/qa/extras/ww8export/ww8export2.cxx   |   22 +++-
 sw/source/filter/ww8/ww8par2.cxx|   17 ---
 4 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit ba989a99ea19ffd0aafeea01f9b737ea79fa952a
Author: Justin Luth 
AuthorDate: Fri Mar 27 08:09:29 2020 +0300
Commit: Miklos Vajna 
CommitDate: Mon Mar 30 09:37:35 2020 +0200

tdf#80635 ww8import:3 take float table orient to inlined table

Since SW has problems with floating tables, any unnecessarily
floated tables are converted to inline. However, the
positioning of the tables is mostly lost. So the choice is
either to refuse to inline a strangely positioned table
or else to transfer the positioning onto the inlined table.

For absolutely positioned flies, which are LEFT_AND_WIDTH,
pass the X position to the left margin.

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

diff --git a/sw/qa/extras/ww8export/data/tdf80635_marginLeft.doc 
b/sw/qa/extras/ww8export/data/tdf80635_marginLeft.doc
new file mode 100644
index ..ad70ff641076
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf80635_marginLeft.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf80635_pageLeft.doc 
b/sw/qa/extras/ww8export/data/tdf80635_pageLeft.doc
new file mode 100644
index ..16f32e3e3bca
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf80635_pageLeft.doc 
differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 4672b750baa3..42cc8237b873 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -259,7 +259,7 @@ DECLARE_WW8EXPORT_TEST(testTdf80635_pageRightRTL, 
"tdf80635_pageRightRTL.doc")
 uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
 uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTable, 
"HoriOrient"));
-//CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(3500), 
getProperty(xTable, "LeftMargin"), 100);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(3500), 
getProperty(xTable, "LeftMargin"), 100);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Did you fix me? Text probably should wrap 
here", 2, getPages() );
 // If so, replace test with the table set to a greater preferred width so 
that the text shouldn't wrap
 }
@@ -274,6 +274,26 @@ DECLARE_WW8EXPORT_TEST(testTdf80635_marginRTL, 
"tdf80635_marginRightRTL.doc")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::RIGHT, getProperty(xTable, "HoriOrient"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf80635_marginLeft, "tdf80635_marginLeft.doc")
+{
+// tdf#80635 - transfer the float orientation to the table.
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+// This was just the GetMinLeft of -199
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(-2950), 
getProperty(xTable, "LeftMargin"), 100);
+}
+
+DECLARE_WW8EXPORT_TEST(testTdf80635_pageLeft, "tdf80635_pageLeft.doc")
+{
+// tdf#80635 - transfer the float orientation to the table.
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+// This was just the GetMinLeft of -199
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(-2750), 
getProperty(xTable, "LeftMargin"), 100);
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf107773, "tdf107773.doc")
 {
 uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 775dae384f6d..3f3ff253a44e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2425,6 +2425,7 @@ void WW8TabDesc::CreateSwTable()
 
 // Because SW cannot handle multi-page floating frames,
 // _any unnecessary_ floating tables have been converted to inline.
+long nLeft = 0;
 if ( m_pIo->m_xSFlyPara && !m_pIo->m_xSFlyPara->pFlyFormat )
 {
 // Get the table orientation from the fly
@@ -2436,6 +2437,17 @@ void WW8TabDesc::CreateSwTable()
 m_eOri = text::HoriOrientation::LEFT_AND_WIDTH;
 else if ( m_pIo->m_xSFlyPara->eHAlign != text::HoriOrientation::NONE )
 m_eOri = m_pIo->m_xSFlyPara-

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

2020-03-30 Thread Samuel Mehrbrodt (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs  |6 +++
 sfx2/source/view/viewsh.cxx |3 +
 sw/inc/cmdid.h  |2 +
 sw/sdi/_viewsh.sdi  |7 +++
 sw/sdi/swriter.sdi  |   18 
++
 sw/source/uibase/uiview/view0.cxx   |   12 
++
 sw/uiconfig/sglobal/menubar/menubar.xml |2 -
 sw/uiconfig/swriter/menubar/menubar.xml |2 -
 sw/uiconfig/swxform/menubar/menubar.xml |2 -
 10 files changed, 59 insertions(+), 3 deletions(-)

New commits:
commit 79b578b7f8b5e3a80fcd0fd86e83d96d7c900bb1
Author: Samuel Mehrbrodt 
AuthorDate: Thu Mar 26 16:29:46 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 30 09:36:50 2020 +0200

tdf#101652 Add config option to prevent disabling readonly mode

There are various cases where people don't want users to
be able to turn off readonly mode, so add a config option for it.

Setting this option will remove the "Edit document" button from
the readonly infobar and also disable the "Edit mode" menu entry.

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f7e0329fd5a1..1307269765fb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5806,6 +5806,12 @@
   Number of saved searches in the Find and Replace dialog.
 
   
+  
+
+  Allow the user to edit read-only docs (via menu or 
Infobar)
+
+true
+  
 
 
   
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c26d0b6352b4..62c20909102c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -1783,6 +1784,8 @@ bool SfxViewShell::isEditDocLocked()
 Reference xModel = GetCurrentDocument();
 if (!xModel.is())
 return false;
+if (!officecfg::Office::Common::Misc::AllowEditReadonlyDocs::get())
+return true;
 comphelper::NamedValueCollection aArgs(xModel->getArgs());
 return aArgs.getOrDefault("LockEditDoc", false);
 }
commit 96def0ee391a99ddf042df820db1292b83d0c4fe
Author: shameempk 
AuthorDate: Wed Mar 11 12:01:28 2020 +
Commit: Miklos Vajna 
CommitDate: Mon Mar 30 09:36:37 2020 +0200

tdf#124686 HideWhiteSpace should be positive Show Whitespace

"Hide Whitespace" under View menu changes to "Show Whitespace". Functions 
and associated strings are renamed accordingly.

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 3a0839ab3c0b..9ca5e132d534 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2766,6 +2766,14 @@
   1
 
   
+  
+
+  Show Whitespac~e
+
+
+  1
+
+  
   
 
   So~rt...
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b43a852d38e4..6513bf5032a8 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -184,6 +184,8 @@
 #define FN_VIEW_HIDE_WHITESPACE (FN_VIEW + 59)  /* Hide header, footer, and 
pagebreak */
 #define FN_SHOW_INLINETOOLTIPS  (FN_VIEW + 60)  /* Show tooltips for tracked 
changes */
 #define FN_USE_HEADERFOOTERMENU (FN_VIEW + 61)  /* Show advanced header/footer 
menu */
+#define FN_VIEW_SHOW_WHITESPACE (FN_VIEW + 62)  /* Show header, footer, and 
pagebreak */
+
 
 // Region: Insert
 #define FN_INSERT_BOOKMARK  (FN_INSERT + 2 )  /* Bookmark */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index ad97fe844319..acef4c75f26a 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -811,6 +811,13 @@ interface BaseTextEditView
 Export = FALSE;
 ]
 
+FN_VIEW_SHOW_WHITESPACE
+[
+ExecMethod = ExecViewOptions ;
+StateMethod = StateViewOptions ;
+Export = FALSE;
+]
+
 SID_TOGGLE_NOTES
 [
 ExecMethod = ExecViewOptions ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 4634ad612069..

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

2020-03-30 Thread Julien Nabet (via logerrit)

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

New commits:
commit 8bbd58eca1ead1ec2360497e0d0d1d8125815f83
Author: Julien Nabet 
AuthorDate: Sun Mar 29 22:44:52 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 30 09:14:49 2020 +0200

Replace OSL_ASSERT by assert in GetObj (svx/svdpage)

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

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 10f7f2f36761..bf78c95c7288 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -767,7 +767,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const
 {
 if (nNum >= maList.size())
 {
-OSL_ASSERT(nNumhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-30 Thread Noel Grandin (via logerrit)

 basegfx/source/range/b2drangeclipper.cxx |2 +-
 basic/source/classes/sbunoobj.cxx|8 
 basic/source/runtime/dllmgr-x64.cxx  |   26 +-
 basic/source/runtime/dllmgr-x86.cxx  |   26 +-
 basic/source/uno/dlgcont.cxx |5 +++--
 5 files changed, 34 insertions(+), 33 deletions(-)

New commits:
commit 781ed42935e5250ca7bf2d51b2cce52cdb2836b8
Author: Noel Grandin 
AuthorDate: Sun Mar 29 19:39:13 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 30 09:13:37 2020 +0200

OSL_ASSERT->assert in basegfx

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

diff --git a/basegfx/source/range/b2drangeclipper.cxx 
b/basegfx/source/range/b2drangeclipper.cxx
index 796551832dc3..3fe16599c290 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -725,7 +725,7 @@ namespace basegfx
 if( nCurrPolyIdx == -1 )
 nCurrPolyIdx=first->getTargetPolygonIndex();
 
-OSL_ASSERT(nCurrPolyIdx != -1);
+assert(nCurrPolyIdx != -1);
 
 // second encounter of my rect -> second edge
 // encountered, done
commit 79b13b4d50549820684549ef77b2ec1c4def5b03
Author: Noel Grandin 
AuthorDate: Sun Mar 29 19:45:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 30 09:13:23 2020 +0200

OSL_ASSERT->assert in basic

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

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 4ba943acaf05..deef49e6af1c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -756,7 +756,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
 
 typelib_TypeDescription * pTD = nullptr;
 aType.getDescription( &pTD );
-OSL_ASSERT( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE );
+assert( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE );
 Type aElementType( 
reinterpret_cast(pTD)->pType );
 ::typelib_typedescription_release( pTD );
 
@@ -1320,7 +1320,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& 
rType, Property const * pUn
 OUString aClassName = xIdlTargetClass->getName();
 typelib_TypeDescription * pSeqTD = nullptr;
 typelib_typedescription_getByName( &pSeqTD, 
aClassName.pData );
-OSL_ASSERT( pSeqTD );
+assert( pSeqTD );
 Type aElemType( 
reinterpret_cast(pSeqTD)->pType );
 
 // convert all array member and register them
@@ -1361,7 +1361,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& 
rType, Property const * pUn
 {
 OUString aTypeName = aCurType.getTypeName();
 typelib_typedescription_getByName( &pSeqTD, 
aTypeName.pData );
-OSL_ASSERT( pSeqTD );
+assert( pSeqTD );
 if( pSeqTD->eTypeClass == typelib_TypeClass_SEQUENCE )
 {
 aCurType = Type( 
reinterpret_cast(pSeqTD)->pType );
@@ -4565,7 +4565,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, 
SbClassModuleObject* pP
 }
 while( pParentBasic == nullptr && pCurObject != nullptr );
 
-OSL_ASSERT( pParentBasic != nullptr );
+assert( pParentBasic != nullptr );
 registerComponentToBeDisposedForBasic( xComponent, 
pParentBasic );
 }
 
diff --git a/basic/source/runtime/dllmgr-x64.cxx 
b/basic/source/runtime/dllmgr-x64.cxx
index 00f3984f7216..0cc276192fbc 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -52,7 +52,7 @@ using namespace css;
Missing support for functions returning structs (see TODO in call()).
 
Missing support for additional data types (64 bit integers, Any, ...; would
-   trigger OSL_ASSERT(false) in various switches).
+   trigger assert(false) in various switches).
 
It is assumed that the variables passed into SbiDllMgr::Call to represent
the arguments and return value have types that exactly match the Declare
@@ -145,7 +145,7 @@ template< typename T > void add(
 }
 
 std::size_t alignment(SbxVariable const * variable) {
-OSL_ASSERT(variable != nullptr);
+assert(variable != nullptr);
 if ((variable->GetType() & SbxARRAY) == 0) {
 switch (variable->GetType()) {
 case SbxINTEGER:
@@ -171,7 +171,7 @@ std::size_t alignment(SbxVariable const *

Re: start calc if resolve fails

2020-03-30 Thread Stephan Bergmann


On 27/03/2020 19:58, Iain wrote:

If resolve fails through
resolver.resolve(
"uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" )
(or something similar)

Because there is no running office, how can I start a libreoffice process,
wait until its running and transfer control back to my program?


That's what many of LO's tests do.  Code is in 
unotest/source/cpp/officeconnection.cxx (C++) and 
unotest/source/java/org/openoffice/test/OfficeConnection.java (Java).


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

68 matches

Mail list logo