date:20191017

[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source cppu/source i18npool/source idlc/source sc/qa scripting/source sw/qa unotools/source xmlhelp/source

2019-10-17 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/bufferadd.cxx |   13 +
 connectivity/source/drivers/postgresql/pq_connection.cxx|7 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx  |   48 +-
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |   38 +---
 connectivity/source/drivers/postgresql/pq_statement.cxx |   78 
+++---
 connectivity/source/drivers/postgresql/pq_tools.cxx |6 
 connectivity/source/drivers/postgresql/pq_xtables.cxx   |4 
 connectivity/source/drivers/postgresql/pq_xviews.cxx|9 -
 cppu/source/cppu/cppu_opt.cxx   |   16 --
 cppu/source/typelib/static_types.cxx|6 
 cppu/source/uno/lbenv.cxx   |8 -
 i18npool/source/localedata/LocaleNode.cxx   |4 
 idlc/source/options.cxx |8 -
 idlc/source/parser.y|7 
 sc/qa/unit/helper/csv_handler.hxx   |   21 --
 scripting/source/provider/MasterScriptProvider.cxx  |5 
 sw/qa/core/macros-test.cxx  |7 
 unotools/source/config/eventcfg.cxx |7 
 unotools/source/config/moduleoptions.cxx|7 
 unotools/source/config/syslocaleoptions.cxx |7 
 xmlhelp/source/treeview/tvread.cxx  |7 
 21 files changed, 91 insertions(+), 222 deletions(-)

New commits:
commit c8eaadb5d70f42723517bb028f363e37726be256
Author: Stephan Bergmann 
AuthorDate: Wed Oct 16 22:53:34 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 09:03:53 2019 +0200

Remaining loplugin:bufferadd

...that had been missing because the plugin didn't implement postRun, so it
didn't report anything when run as part of the shared plugin.  (But did 
report
the expected warnings when run as a standalone plugin during
CompilerTest_compilerplugins_clang.)

Most fixes are straightforward.  A noteworthy one is 
PreparedStatement::setBytes
in connectivity/source/drivers/postgresql/pq_preparedstatement.cxx:  The old
preallocation of a 20 character OStringBuffer might have prevented

  buf.append( reinterpret_cast(escapedString), len -1 );

from potentially throwing std::bad_alloc, which would have caused 
escapedString
to be leaked.  Even though that 20-character preallocation was likely just
random junk and not meant to address the potential leak, lets address it 
now.

Change-Id: Ib506332d061684a22a74e5e39e591539fd2c4900
Reviewed-on: https://gerrit.libreoffice.org/80925
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/bufferadd.cxx 
b/compilerplugins/clang/bufferadd.cxx
index a1c9738f0041..659b110403e3 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -56,11 +56,8 @@ public:
 return true;
 }
 
-virtual void run() override
+void postRun() override
 {
-if (!preRun())
-return;
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 for (auto const& pair : goodMap)
 if (!isa(pair.first) &&
 // reference types have slightly weird behaviour
@@ -72,6 +69,14 @@ public:
 << pair.first->getSourceRange();
 }
 
+virtual void run() override
+{
+if (!preRun())
+return;
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+postRun();
+}
+
 bool VisitStmt(Stmt const*);
 bool VisitCallExpr(CallExpr const*);
 bool VisitCXXConstructExpr(CXXConstructExpr const*);
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 0b5ea84bc6fa..56670cef1aa5 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -50,7 +50,6 @@
 #include "pq_xviews.hxx"
 #include "pq_xusers.hxx"
 
-#include 
 #include 
 #include 
 #include 
@@ -576,11 +575,7 @@ void Connection::initialize( const Sequence< Any >& 
aArguments )
 
 if (isLog(&m_settings, LogLevel::Info))
 {
-OUStringBuffer buf( 128 );
-buf.append( "connection to '" );
-buf.append( url );
-buf.append( "' successfully opened" );
-log(&m_settings, LogLevel::Info, buf.makeStringAndClear());
+log(&m_settings, LogLevel::Info, "connection to '" + url + "' 
successfully opened");
 }
 }
 
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 99d2f22b86b3..4002d2fc866a 100644
--- a/connectivity/source/drivers/postgresql/pq_da

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - solenv/clang-format sw/CppunitTest_sw_ooxmlexport14.mk sw/Module_sw.mk sw/qa writerfilter/source

2019-10-17 Thread Justin Luth (via logerrit)

 solenv/clang-format/blacklist   |1 
 sw/CppunitTest_sw_ooxmlexport14.mk  |   14 +++
 sw/Module_sw.mk |1 
 sw/qa/extras/ooxmlexport/data/tdf108350_noFontdefaults.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx  |   45 
 writerfilter/source/dmapper/StyleSheetTable.cxx |8 ++
 6 files changed, 69 insertions(+)

New commits:
commit 4d4e36173857e948b700c5796552724b23ee775f
Author: Justin Luth 
AuthorDate: Tue Oct 15 20:49:07 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Oct 17 09:06:09 2019 +0200

tdf#108350 writerfilter: restore TimesNewRoman as default font

Followup for LO 5.4 commit 6f2ad89b33d972f9642bb53eeb91f41df3b6b0e6
which set Calibri/11pt as default. That is true if there is
no style.xml file, or more specifically if there is no
DocDefaults rPrDefault node. But if that node exists, then
the age-old defaults are still valid.

Earlier in LO 4.3, the default templates changed to use
Liberation fonts by default. But in the same vein as using Calibri
(and depending on LO to fallback to Carlito), set Word's default
Times New Roman font and depend on LO to fallback to Liberation.
That will make it better for MSWord users who share the document
and who have less likelihood of knowing about Liberation/Carlito.

Note that 10pt fontsize was already added to m_pDefaultCharProps
earlier, so that part was already reset long ago.

Change-Id: I3ba8a529fe95b05fbe2889cf1ebdbabb25963e8b
Reviewed-on: https://gerrit.libreoffice.org/80854
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-on: https://gerrit.libreoffice.org/80927
Reviewed-by: Mike Kaganski 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 5f24a5461c4e..09e0c490d1f6 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -14924,6 +14924,7 @@ sw/qa/extras/ooxmlexport/ooxmlexport.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
diff --git a/sw/CppunitTest_sw_ooxmlexport14.mk 
b/sw/CppunitTest_sw_ooxmlexport14.mk
new file mode 100644
index ..b582b317c064
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlexport14.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call sw_ooxmlexport_test,14))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c6a0c5f4fa0f..b20207c117ef 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_ooxmlexport11 \
 CppunitTest_sw_ooxmlexport12 \
 CppunitTest_sw_ooxmlexport13 \
+CppunitTest_sw_ooxmlexport14 \
 CppunitTest_sw_ooxmlexport_template \
 CppunitTest_sw_ooxmlfieldexport \
 CppunitTest_sw_ooxmllinks \
diff --git a/sw/qa/extras/ooxmlexport/data/tdf108350_noFontdefaults.docx 
b/sw/qa/extras/ooxmlexport/data/tdf108350_noFontdefaults.docx
new file mode 100644
index ..ea81722799eb
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf108350_noFontdefaults.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
new file mode 100644
index ..b06b342c7071
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+class Test : public SwModelTestBase
+{
+public:
+Test() : SwModelTestBase("/sw/qa/extras/ooxmlexport/data/", "Office Open 
XML Text") {}
+
+protected:
+/**
+ * Blacklist handling
+ */
+bool mustTestImportOf(const char* filename) const override {
+// If the testcase is stored in some other format, it's pointless to 
test.
+return OString(filename).endsWith(".docx");
+}
+};
+
+
+DECLARE_OOXMLEXPORT_TEST(tes

[Libreoffice-commits] core.git: bridges/inc bridges/source comphelper/source connectivity/source embeddedobj/source embedserv/source extensions/source filter/source hwpfilter/source include/editeng in

2019-10-17 Thread Mike Kaganski (via logerrit)

 bridges/inc/cppinterfaceproxy.hxx |2 
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |1 
 comphelper/source/misc/docpasswordhelper.cxx  |6 --
 comphelper/source/misc/syntaxhighlight.cxx|4 -
 connectivity/source/drivers/dbase/DIndex.cxx  |1 
 connectivity/source/drivers/dbase/DTable.cxx  |5 -
 connectivity/source/drivers/dbase/dindexnode.cxx  |6 --
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx   |7 --
 connectivity/source/drivers/odbc/OConnection.cxx  |6 --
 connectivity/source/inc/dbase/DIndex.hxx  |2 
 connectivity/source/inc/dbase/DTable.hxx  |2 
 embeddedobj/source/msole/xdialogcreator.cxx   |4 -
 embedserv/source/embed/docholder.cxx  |9 
+--
 extensions/source/ole/windata.hxx |2 
 filter/source/msfilter/mscodec.cxx|   12 

 filter/source/msfilter/svdfppt.cxx|3 -
 hwpfilter/source/hbox.cxx |1 
 hwpfilter/source/hbox.h   |   11 
+--
 hwpfilter/source/hinfo.cxx|3 -
 hwpfilter/source/hinfo.h  |   24 
+++-
 hwpfilter/source/hwpread.cxx  |3 -
 include/editeng/numitem.hxx   |   12 
+---
 include/filter/msfilter/mscodec.hxx   |   14 
++--
 include/filter/msfilter/svdfppt.hxx   |6 +-
 include/tools/globname.hxx|4 -
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx  |2 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.cxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.hxx  |4 -
 lotuswordpro/source/filter/lwpsdwdrawheader.hxx   |   16 
+
 lotuswordpro/source/filter/xfilter/xfcolor.cxx|4 -
 oox/source/crypto/CryptTools.cxx  |6 --
 oox/source/export/vmlexport.cxx   |3 -
 opencl/source/openclwrapper.cxx   |3 -
 sal/osl/w32/file.cxx  |4 -
 sal/osl/w32/file_dirvol.cxx   |3 -
 sal/osl/w32/pipe.cxx  |9 
+--
 sal/osl/w32/procimpl.cxx  |4 -
 sal/osl/w32/profile.cxx   |4 -
 sc/source/filter/excel/xeroot.cxx |3 -
 sc/source/filter/inc/qprostyle.hxx|   10 
+--
 sc/source/filter/qpro/qprostyle.cxx   |8 --
 sd/source/ui/remotecontrol/BluetoothServer.cxx|6 --
 sd/source/ui/remotecontrol/DiscoveryService.cxx   |6 --
 sdext/source/pdfimport/pdfparse/pdfentries.cxx|   15 
+
 sfx2/source/appl/shutdowniconw32.cxx  |   12 
+---
 shell/source/win32/shlxthandler/ooofilt/propspec.cxx  |1 
 shell/source/win32/shlxthandler/ooofilt/propspec.hxx  |2 
 shell/source/win32/spsupp/COMOpenDocuments.cxx|3 -
 shell/source/win32/spsupp/spsuppHelper.cxx|3 -
 sot/source/sdstor/stgelem.cxx |4 -
 sot/source/sdstor/stgelem.hxx |8 +-
 sot/source/sdstor/stgole.cxx  |2 
 sot/source/sdstor/stgole.hxx  |4 -
 store/source/storcach.cxx |1 
 store/source/storcach.hxx |2 
 store/source/stordata.hxx |   10 
+--
 svl/source/crypto/cryptosign.cxx  |   11 
+--
 svx/source/dialog/imapwnd.cxx |1 
 svx/source/dialog/imapwnd.hxx |2 
 sw/inc/tblafmt.hxx|2 
 sw/source/core/doc/tblafmt.cxx|

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/stringadd.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 01d28b0b85f99590c0581e4bbf636bc9281e0571
Author: Noel Grandin 
AuthorDate: Wed Oct 16 20:20:26 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 09:55:21 2019 +0200

loplugin:stringadd fix condition

Change-Id: I7752c281b1b6dd0d26bd7d6c4a6896c663f4cbc3
Reviewed-on: https://gerrit.libreoffice.org/80921
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/stringadd.cxx 
b/compilerplugins/clang/stringadd.cxx
index 986b2f938c7d..1a9c7c90d152 100644
--- a/compilerplugins/clang/stringadd.cxx
+++ b/compilerplugins/clang/stringadd.cxx
@@ -264,7 +264,8 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
 {
 auto name = calleeMethodDecl->getName();
 if (callExpr->getNumArgs() > 0
-&& (name == "number" || name == "unacquired" || "boolean"))
+&& (name == "number" || name == "unacquired" || name == 
"boolean"
+|| name == "copy"))
 {
 auto tc = 
loplugin::TypeCheck(calleeMethodDecl->getParent());
 if (tc.Class("OUString") || tc.Class("OString"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - 2 commits - include/oox odk/examples odk/settings oox/source

2019-10-17 Thread Vasily Melenchuk (via logerrit)

 include/oox/crypto/DocumentEncryption.hxx|4 ++--
 odk/examples/cpp/complextoolbarcontrols/Makefile |6 +++---
 odk/settings/settings.mk |5 +
 oox/source/crypto/DocumentEncryption.cxx |2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 36d546b8279c88b609415029bd59991db51358ad
Author: Vasily Melenchuk 
AuthorDate: Thu Oct 17 11:09:21 2019 +0300
Commit: Vasily Melenchuk 
CommitDate: Thu Oct 17 11:09:21 2019 +0300

oox: fixed build error, more consts

Change-Id: I06b9885ca304c30d6160f43558b309539d4202c0

diff --git a/include/oox/crypto/DocumentEncryption.hxx 
b/include/oox/crypto/DocumentEncryption.hxx
index d33450a3b791..c99cadc972f4 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -33,14 +33,14 @@ private:
 css::uno::Reference< css::io::XStream > mxDocumentStream;
 oox::ole::OleStorage& mrOleStorage;
 css::uno::Reference< css::packages::XPackageEncryption > 
mxPackageEncryption;
-css::uno::Sequence< css::beans::NamedValue >& mMediaEncData;
+const css::uno::Sequence< css::beans::NamedValue >& mMediaEncData;
 css::uno::Reference< css::uno::XComponentContext > mxContext;
 
 public:
 DocumentEncryption(const css::uno::Reference< css::uno::XComponentContext 
>& rxContext,
 css::uno::Reference< css::io::XStream > const & xDocumentStream,
 oox::ole::OleStorage& rOleStorage,
-css::uno::Sequence< css::beans::NamedValue >& rMediaEncData);
+const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData);
 
 bool encrypt();
 
diff --git a/oox/source/crypto/DocumentEncryption.cxx 
b/oox/source/crypto/DocumentEncryption.cxx
index 2f0457911aed..70b7f2a3a4e9 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -28,7 +28,7 @@ using namespace css::beans;
 DocumentEncryption::DocumentEncryption(const Reference< XComponentContext >& 
rxContext,
Reference const & 
xDocumentStream,
oox::ole::OleStorage& rOleStorage,
-   Sequence& rMediaEncData)
+   const Sequence& 
rMediaEncData)
 : mxContext(rxContext)
 , mxDocumentStream(xDocumentStream)
 , mrOleStorage(rOleStorage)
commit a65d79e1ce391fefea0beef2fb172b3af39c8459
Author: Vasily Melenchuk 
AuthorDate: Tue Oct 15 15:07:10 2019 +0300
Commit: Vasily Melenchuk 
CommitDate: Thu Oct 17 00:25:37 2019 +0300

odk: fix for change directory in complextoolbarcontrols sample

On Windows classical "cd" command does not change drive automatically.
So if OO_SDK_OUT folder contained on another drive than SDK_HOME we
will receive confusing buid errors.

To avoid this for Windows configuration we should use "cd /d".

Change-Id: I22908d49fc915d3a834972357934349ba82bbec5

diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile 
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 446b06e50e15..ad75987cfab0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -142,10 +142,10 @@ $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) 
Addons.xcu ProtocolHandler.
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst 
/,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(subst 
/,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
-   cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) 
$(COMP_NAME).components description.xml
-   cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) 
$(UNOPKG_PLATFORM)/$(https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Jan-Marek Glogowski (via logerrit)

 sfx2/source/doc/objstor.cxx |   15 +-
 xmlsecurity/qa/unit/signing/signing.cxx |  181 
 2 files changed, 174 insertions(+), 22 deletions(-)

New commits:
commit 7b405877b0fa0145513ac0294ab51cf57e6108c6
Author: Jan-Marek Glogowski 
AuthorDate: Fri Oct 11 13:09:59 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Oct 17 10:52:45 2019 +0200

tdf#42316 handle saving to template filters

This extends the filter comparison from commit c3a1c83ff5af
("tdf#42316 preserve macro signature of templates").

The original patch just stripped "_template" from the source
filter to find equal document types, which just enables the
"template => document" case. This patch also strips the
"_template" from the target filter, which fixes the "document
or template => template" cases.

This also extends the signing save tests:
* OTT 1.2 => OTT 1.2 - preserve
* ODT 1.2 => OTT 1.2 - preserve
* OTT 1.0 => OTT 1.0 - preserve
* ODT 1.0 => OTT 1.0 - preserve
* OTT 1.0 => OTT 1.2 - drop

Change-Id: Ie297258a4d9f9aa4beb25786c6ba240b6f16f49b
Reviewed-on: https://gerrit.libreoffice.org/80654
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 4aa6e2cb2245eddab87fb451add94159a7604246)
Reviewed-on: https://gerrit.libreoffice.org/80910
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 651258d1fdec..b3092cd1cce8 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1091,6 +1091,15 @@ private:
 };
 }
 
+static OUString lcl_strip_template(const OUString &aString)
+{
+static const OUString sPostfix("_template");
+OUString sRes(aString);
+if (sRes.endsWith(sPostfix))
+sRes = sRes.copy(0, sRes.getLength() - sPostfix.getLength());
+return sRes;
+}
+
 bool SfxObjectShell::SaveTo_Impl
 (
  SfxMedium &rMedium, // Medium, in which it will be stored
@@ -1170,10 +1179,8 @@ bool SfxObjectShell::SaveTo_Impl
 
 // preserve only if the same filter has been used
 // for templates, strip the _template from the filter name for 
comparison
-OUString aMediumFilter = pMedium->GetFilter()->GetFilterName();
-if (aMediumFilter.endsWith("_template"))
-aMediumFilter = aMediumFilter.copy(0, 
aMediumFilter.getLength() - 9);
-bTryToPreserveScriptSignature = pMedium->GetFilter() && pFilter && 
aMediumFilter == pFilter->GetFilterName();
+const OUString aMediumFilter = 
lcl_strip_template(pMedium->GetFilter()->GetFilterName());
+bTryToPreserveScriptSignature = pMedium->GetFilter() && pFilter && 
aMediumFilter == lcl_strip_template(pFilter->GetFilterName());
 
 // signatures were specified in ODF 1.2 but were used since much 
longer.
 // LO will still correctly validate an old style signature on an 
ODF 1.2
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 5eeefc56b3c0..4225f92eacf5 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -996,7 +996,7 @@ SfxObjectShell* SigningTest::assertDocument(const 
::CppUnit::SourceLine aSrcLine
 }
 
 /// Test if a macro signature from a OTT 1.2 template is preserved for ODT 1.2
-CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12)
+CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF)
 {
 const OUString aURL(m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"tdf42316_odt12.ott");
 const OUString sLoadMessage = "loading failed: " + aURL;
@@ -1010,12 +1010,12 @@ CPPUNIT_TEST_FIXTURE(SigningTest, 
testPreserveMacroTemplateSignature12)
 // we are a template, and have a valid document and macro signature
 assertDocument(CPPUNIT_SOURCELINE(), "writer8_template", 
SignatureState::OK, SignatureState::OK,
ODFVER_012_TEXT);
-mxComponent->dispose();
 
 // create new document from template
 // we can't use createDoc / MacrosTest::loadFromDesktop, because 
ALWAYS_EXECUTE_NO_WARN
 // won't verify the signature for templates, so the resulting document 
won't be able to
 // preserve the templates signature.
+mxComponent->dispose();
 mxComponent = mxDesktop->loadComponentFromURL(
 aURL, "_default", 0,
 comphelper::InitPropertySequence(
@@ -1029,26 +1029,80 @@ CPPUNIT_TEST_FIXTURE(SigningTest, 
testPreserveMacroTemplateSignature12)
SignatureState::OK, ODFVER_012_TEXT);
 
 // save as new ODT document
-utl::TempFile aTempFileSaveAs;
-aTempFileSaveAs.EnableKillingFile();
+utl::TempFile aTempFileSaveAsODT;
+aTempFileSaveAsODT.EnableKillingFile();
 try
 {
 uno::Reference xDocStorable(mxComponent, 
uno::UNO_QUERY);
 uno::Sequence descSaveAs(
 comphelper::InitPropertySeque

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

2019-10-17 Thread Samuel Mehrbrodt (via logerrit)

 sw/source/core/text/inftxt.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c7c5f24f12c241cb72810abe596337e809138df0
Author: Samuel Mehrbrodt 
AuthorDate: Thu Oct 17 10:06:36 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Oct 17 11:07:56 2019 +0200

tdf#121657 Show warning when no hyphenation info available for current lang

Change-Id: I96114470d6151392e42e6938d92d4175022dbbe2
Reviewed-on: https://gerrit.libreoffice.org/80931
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 6556bb2757af..2b9f7dac8d74 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1452,6 +1452,13 @@ bool SwTextFormatInfo::IsHyphenate() const
 if (m_bInterHyph)
 SvxSpellWrapper::CheckHyphLang( xHyph, eTmp );
 
+if (!xHyph->hasLocale(g_pBreakIt->GetLocale(eTmp)))
+{
+// TODO: Add an infobar for this case, tdf#128191
+SAL_WARN("sw", "missing hyphenation package for locale: "
+   << g_pBreakIt->GetLocale(eTmp).Language);
+}
+
 return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) );
 }
 
___
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-3' - canvas/source

2019-10-17 Thread Jan-Marek Glogowski (via logerrit)

 canvas/source/tools/page.cxx|2 
 canvas/source/tools/surfacerect.hxx |   74 +++-
 2 files changed, 24 insertions(+), 52 deletions(-)

New commits:
commit 5ce21a11ef300603599e4623171c161974582a28
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 10 14:48:22 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Oct 17 11:16:24 2019 +0200

tdf#40534 correctly match page with memory slab

LO has a page manager to match system memory backbuffers with
graphics memory on DX accelerated Windows. Internally this uses
an other rectangle implementation, the SurfaceRect, which had
some great comments like:

// a size of [0,0] therefore denotes a one-by-one rectangle.

In commit 230dbe2e43f3ee2cd285f9cdfe0d57e1ca08b8fe ("#144866# Add
one pixel border around textures, a bunch of drivers clobber those
with dirt), the allocation was increased by a pixel border, but
this doesn't work correctly, because now an allocation of the
page size wouldn't fit anymore into a page, because the pages size
is decreased before comparison. In the end the mixup suffered from
hard to handle off-by-one problems.

This patch fixes the bug, but eventually SurfaceRect should be
replaced by an extended basegfx::B2IBox. But since B2IBox uses two
ranges, instead of a point and a size, it would need a lot of
conversations to I2Point and I2Size objects with the current
Page::insert algorithm.

Change-Id: Ia725b4f8ed4fb270f2eb3734e492062bc7f13793
Reviewed-on: https://gerrit.libreoffice.org/80628
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 194e7ce17ae7ca278c12d03bc25684b7437f9785)
Reviewed-on: https://gerrit.libreoffice.org/80669
Reviewed-by: Thorsten Behrens 
(cherry picked from commit edcb363f5eeefcc2ce28a2ab7a57d61b744466cd)
Reviewed-on: https://gerrit.libreoffice.org/80878
Reviewed-by: Michael Weghorn 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index 4d83851d806a..78f9cd3aa671 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.cxx
@@ -118,7 +118,7 @@ namespace canvas
 // the rectangle passed as argument has a valid
 // location if and only if there's no intersection
 // with existing areas.
-SurfaceRect 
aBoundary(mpRenderModule->getPageSize()-basegfx::B2IVector(1,1));
+SurfaceRect aBoundary(mpRenderModule->getPageSize());
 if( !r.inside(aBoundary) )
 return false;
 
diff --git a/canvas/source/tools/surfacerect.hxx 
b/canvas/source/tools/surfacerect.hxx
index e0cd0fc023ba..ec73342ea799 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.hxx
@@ -25,6 +25,16 @@
 
 namespace canvas
 {
+/**
+ * This implements some equivalent to basegfx::B2IBox, but instead of two
+ * BasicBox ranges, it uses a position and a size. maPos and maSize could
+ * be replaced by:
+ * - B2IPoint(getMinX(), getMinY()) and
+ * - B2ISize(getMaxX()-getMinX(), getMaxY()-getMinY())
+ *
+ * The current allocation algorithm uses size and pos a lot. Not sure how
+ * time-critical any of this code is and if that would be a problem.
+ */
 struct SurfaceRect
 {
 ::basegfx::B2IPoint maPos;
@@ -36,22 +46,12 @@ namespace canvas
 {
 }
 
-// coordinates contained in this rectangle are
-// constrained to the following rules:
-// 1) p.x >= pos.x
-// 2) p.x <= pos.x+size.x
-// 3) p.y >= pos.y
-// 4) p.y <= pos.y+size.y
-// in other words, 'size' means the number of pixels
-// this rectangle encloses plus one. for example with pos[0,0]
-// and size[512,512], p[512,512] would return inside.
-// a size of [0,0] therefore denotes a one-by-one rectangle.
 bool pointInside( sal_Int32 px, sal_Int32 py ) const
 {
 const sal_Int32 x1(maPos.getX());
 const sal_Int32 y1(maPos.getY());
-const sal_Int32 x2(maPos.getX()+maSize.getX());
-const sal_Int32 y2(maPos.getY()+maSize.getY());
+const sal_Int32 x2(x1 + maSize.getX());
+const sal_Int32 y2(y1 + maSize.getY());
 if(px  < x1) return false;
 if(px >= x2) return false;
 if(py  < y1) return false;
@@ -59,58 +59,30 @@ namespace canvas
 return true;
 }
 
-/// returns true if the horizontal line intersects the rect.
-bool hLineIntersect( sal_Int32 lx1, sal_Int32 lx2, sal_Int32 ly ) const
-{
-const sal_Int32 x1(maPos.getX());
-const sal_Int32 y1(maPos.getY());
-const sal_Int32 x2(maPos.getX()+maSize.getX());
-const sal_Int32 y2(maPos.getY()+maSize.getY());
-if(ly < y1) ret

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

2019-10-17 Thread Eike Rathke (via logerrit)

 editeng/source/misc/svxacorr.cxx |   14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit b9056d049049c3f1e7b9f6d787d4a25b431c8ceb
Author: Eike Rathke 
AuthorDate: Wed Oct 16 17:13:30 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Oct 17 11:29:50 2019 +0200

Resolves: tdf#127961 Add NBSP to quotation marks for all French except fr-CH

Change-Id: I71e8377bf44c2db5ef291d2990528ec16aaf3b44
Reviewed-on: https://gerrit.libreoffice.org/80909
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 8d7ec203956695475c5ce2c3e47a4aa012a48d39)
Reviewed-on: https://gerrit.libreoffice.org/80932
Reviewed-by: Michael Stahl 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7ac939811075..5857301170bd 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1195,12 +1195,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, 
sal_Int32 nInsPos,
 
 if( '\"' == cInsChar )
 {
-if( eLang.anyOf(
-LANGUAGE_FRENCH,
-LANGUAGE_FRENCH_BELGIAN,
-LANGUAGE_FRENCH_CANADIAN,
-LANGUAGE_FRENCH_SWISS,
-LANGUAGE_FRENCH_LUXEMBOURG))
+if (primary(eLang) == primary(LANGUAGE_FRENCH) && eLang != 
LANGUAGE_FRENCH_SWISS)
 {
 OUString s( cNonBreakingSpace ); // UNICODE code for no break space
 if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s ))
@@ -1240,12 +1235,7 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc const 
& rDoc, sal_Int32 nInsPo
 
 if( '\"' == cInsChar )
 {
-if( eLang.anyOf(
- LANGUAGE_FRENCH,
- LANGUAGE_FRENCH_BELGIAN,
- LANGUAGE_FRENCH_CANADIAN,
- LANGUAGE_FRENCH_SWISS,
- LANGUAGE_FRENCH_LUXEMBOURG))
+if (primary(eLang) == primary(LANGUAGE_FRENCH) && eLang != 
LANGUAGE_FRENCH_SWISS)
 {
 if( bSttQuote )
 sRet += " ";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Michael Weghorn (via logerrit)

 sd/source/ui/framework/factories/FullScreenPane.cxx |9 -
 sd/source/ui/presenter/PresenterHelper.cxx  |9 -
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 6855e41d308e14bc207d84953ff6df7e4c842434
Author: Michael Weghorn 
AuthorDate: Thu Oct 17 10:49:11 2019 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 17 11:53:14 2019 +0200

tdf#128166 sd: Fix canvas initialization args

Commit 5926b22b5dc33490d23d594b129eb8a70b94ffb0
("The SystemEnvData passed into the canvas factories appears to
be unused") removed previous arg at index 1, so adapt here, too.

This makes the presenter console shown again (tdf#128166).
A visible result of FullScreenPane::CreateCanvas passing wrong
args was that an Impress presentation shown in presentation mode
in dual screen using the qt5/kf5 VCL plugin wouldn't terminate
properly and crash Impress on close.

Change-Id: I3933864d4bb007cfdefb0a20378ff3d75ea6cd85
Reviewed-on: https://gerrit.libreoffice.org/80933
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx 
b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 652930c6ce86..46795e792187 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -189,14 +189,13 @@ Reference 
FullScreenPane::CreateCanvas()
 if (!pWindow)
 throw RuntimeException();
 
-Sequence aArg (5);
+Sequence aArg(4);
 
 // common: first any is VCL pointer to window (for VCL canvas)
 aArg[0] <<= reinterpret_cast(pWindow.get());
-aArg[1] = Any();
-aArg[2] <<= css::awt::Rectangle();
-aArg[3] <<= false;
-aArg[4] <<= mxWindow;
+aArg[1] <<= css::awt::Rectangle();
+aArg[2] <<= false;
+aArg[3] <<= mxWindow;
 
 Reference xFactory (
 mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx 
b/sd/source/ui/presenter/PresenterHelper.cxx
index 6d621b8af4a9..9e5e54cca907 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -139,14 +139,13 @@ Reference SAL_CALL 
PresenterHelper::createCanvas (
 if (!pWindow)
 throw RuntimeException();
 
-Sequence aArg (5);
+Sequence aArg(4);
 
 // common: first any is VCL pointer to window (for VCL canvas)
 aArg[0] <<= reinterpret_cast(pWindow.get());
-aArg[1] = Any();
-aArg[2] <<= css::awt::Rectangle();
-aArg[3] <<= false;
-aArg[4] <<= rxWindow;
+aArg[1] <<= css::awt::Rectangle();
+aArg[2] <<= false;
+aArg[3] <<= rxWindow;
 
 Reference xFactory (
 mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Heiko Tietze (via logerrit)

 cui/uiconfig/ui/tipofthedaydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dae96d4e629c5eccaacdc763cd390d341c16175d
Author: Heiko Tietze 
AuthorDate: Wed Oct 16 13:50:20 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 17 12:19:32 2019 +0200

Resolves tdf#127994 - Totd dialog get resized horizontally

Width request set to 350

Change-Id: Ib974417282c76b4cede1b4773159b1fa748ddbfb
Reviewed-on: https://gerrit.libreoffice.org/80887
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index a24a90107243..33515897ab94 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -136,6 +136,7 @@
 
 
   
+350
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css   |   33 +++
 loleaflet/src/control/Control.Menubar.js |4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit bab6017803eca2b6b31d7788ede26ec04294636d
Author: Pedro 
AuthorDate: Thu Oct 17 09:43:42 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:10:05 2019 +0200

Style mobilewizard.menuwizard and add css classes via JS to 
toolbar-hamburger

Change-Id: I8c455507aa79f4cbba6db56597b8fe350554515b
Reviewed-on: https://gerrit.libreoffice.org/80930
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index e69de29bb..7ca085dc6 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -0,0 +1,33 @@
+span.menu-entry-icon img {
+width: 24px;
+margin: 4px;
+}
+
+#mobile-wizard.menuwizard #mobile-wizard-content{
+  overflow: hidden !important;
+}
+
+#mobile-wizard.menuwizard{
+  top: 0px !important;
+  height: 100% !important;
+  z-index: 999 !important;
+}
+
+#mobile-wizard.menuwizard #mobile-wizard-back.close-button{
+  visibility: hidden !important;
+}
+
+#toolbar-hamburger.menuwizard-opened{
+  z-index: 1000 !important;
+  position: relative !important;
+  background-color: #dae6f3 !important;
+  padding-left: 8px !important;
+  border-radius: 0 0 0 100px !important;
+}
+
+#mobile-wizard.menuwizard #mobile-wizard-titlebar{
+  border: none !important;
+}
+span#main-menu-btn-icon {
+filter: none !important;
+}
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index c4baf137d..6375fed20 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -798,7 +798,7 @@ L.Control.Menubar = L.Control.extend({
window.mobileMenuWizard 
= true;
var menuData = 
self._map.menubar.generateFullMenuStructure();

self._map.fire('mobilewizard', menuData);
-   
$('#main-menu-btn-icon').css('filter', 'drop-shadow(0px 0px 4px #0b87e7)')
+   
$('#toolbar-hamburger').addClass('menuwizard-opened');
}
} else if (!L.Browser.mobile) {
$menu.show().slideUp(250, 
function() { $menu.css('display', ''); });
@@ -806,7 +806,7 @@ L.Control.Menubar = L.Control.extend({
} else {
window.mobileMenuWizard = false;

self._map.fire('closemobilewizard');
-   
$('#main-menu-btn-icon').css('filter', '')
+   
$('#toolbar-hamburger').removeClass('menuwizard-opened').addClass('menuwizard-closed');
}
});
// hide mobile menu beforeunload
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 403c1a5b41efded3422e69e5b1980f6fd69e9423
Author: Pedro 
AuthorDate: Wed Oct 16 14:35:38 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:11:54 2019 +0200

mobilewizard: avoid blurry icons by setting them to their size and adjust 
paddings

Change-Id: I8d9459ec3e10470f560fbcd76a381c2546a0cec4
Reviewed-on: https://gerrit.libreoffice.org/80890
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 7ca085dc6..1cc9d6743 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,6 +1,6 @@
 span.menu-entry-icon img {
-width: 24px;
-margin: 4px;
+width: 24px !important;
+margin: 4px !important;
 }
 
 #mobile-wizard.menuwizard #mobile-wizard-content{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/toolbar.css |2 -
 loleaflet/css/vex.css |   64 ++
 2 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 53683157303d57cfe288de836bea12254c93c907
Author: Pedro 
AuthorDate: Wed Oct 16 10:28:45 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:14:39 2019 +0200

Vex-dialog: styling and layout (and moved to its proper css file) (and 
tabify spaces)

Change-Id: Id6a13d34e00de5b7e2b6242c6325bd6524816eba
Reviewed-on: https://gerrit.libreoffice.org/80873
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 518e03791..47993bca2 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1336,4 +1336,4 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width 
*/
line-height: 21px;
margin-left: auto;
border-radius: 100px;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index e69de29bb..80c61e9f4 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -0,0 +1,64 @@
+@media (max-width: 767px), (max-device-height: 767px) {
+   .vex-dialog-message {
+   text-align: center;
+   font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif 
!important;
+   font-size: 1em !important;
+   font-weight: 600 !important;
+   }
+   .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input 
input[type="text"] {
+   border-radius: 4px !important;
+   background-color: #fff !important;
+   border: 1px solid #99 !important;
+   width: 100%;
+   width: -moz-available;
+   width: -webkit-fill-available;
+   width: fill-available;
+   }
+   .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input 
input[type="text"]:focus {
+   box-shadow: none !important;
+   border: 2px solid #0b87e7 !important;
+   }
+   .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input 
input[type="text"]:focus{
+   color: #0b87e7 !important;
+   }
+   .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input 
input[type="text"]:focus input{
+   color: #000 !important;
+   }
+   .vex-dialog-input {
+   font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif 
!important;
+   font-size: 0.8em;
+   }
+   .vex.vex-theme-plain .vex-content {
+   height: 100% !important;
+   max-width: 100% !important;
+   width: auto !important;
+   }
+   .vex.vex-theme-plain {
+   padding: 0px !important;
+   position: relative !important;
+   z-index: 1001 !important;
+   top: -42px !important;
+   }
+   .vex-open .vex-overlay {
+   z-index: 1000;
+   min-height: 100%;
+   position: absolute;
+   width: -webkit-fill-available;
+   top: 0;
+   background-color: white;
+   }
+   .vex.vex-theme-plain input {
+   font-size: 1.1em !important;
+   }
+   button.vex-dialog-button-primary.vex-dialog-button.vex-first {
+   border: 1px solid #0b87e7 !important;
+   border-radius: 4px !important;
+   background-color: #fff !important;
+   color: #0b87e7 !important;
+   }
+   button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
+   border-radius: 4px;
+   background-color: #fff !important;
+   border: 1px solid #aaa !important;
+   }
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2b1d14c835ac7e04cdc4d8c064b9136b10751463
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 13:31:35 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:32:07 2019 +0200

jsdialogs: make insert table working

Change-Id: I7f2c7b190bf8ff438ee606213ac7eb7e73e03382

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 1ec58c00b..245507f31 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -413,16 +413,16 @@ L.Control.JSDialogBuilder = L.Control.extend({
var minus = L.DomUtil.create('div', 'minus', controlsContainer);
minus.innerHTML = '-';
 
-   if (data.min)
+   if (data.min != undefined)
$(spinfield).attr('min', data.min);
 
-   if (data.max)
+   if (data.max != undefined)
$(spinfield).attr('max', data.max);
 
if (data.enabled == 'false')
$(spinfield).attr('disabled', 'disabled');
 
-   if (data.text)
+   if (data.text != undefined)
$(spinfield).attr('value', 
builder._cleanValueFromUnits(data.text));
else if (data.children && data.children.length)
$(spinfield).attr('value', 
builder._cleanValueFromUnits(data.children[0].text));
@@ -720,7 +720,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder._spinfieldControl(content, colsData, builder, 
function() { });
 
var buttonData = { text: _('Insert table') };
-   builder._pushbuttonControl(content, buttonData, builder, 
function() { });
+   builder._pushbuttonControl(content, buttonData, builder, 
function() {
+   var rowsCount = parseInt($('#rows > 
input.spinfield').get(0).value);
+   var colsCount = parseInt($('#cols > 
input.spinfield').get(0).value);
+   builder.map.sendUnoCommand('.uno:InsertTable?Columns=' 
+ colsCount + '&Rows=' + rowsCount);
+   });
 
builder._explorableMenu(parentContainer, title, data.children, 
builder, content);
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx sc/inc sc/qa sc/source sc/uiconfig solenv/sanitizers

2019-10-17 Thread Caolán McNamara (via logerrit)

 include/svx/txencbox.hxx|3 
 sc/inc/pch/precompiled_sc.hxx   |7 
 sc/inc/pch/precompiled_scfilt.hxx   |   17 
 sc/inc/pch/precompiled_scui.hxx |5 
 sc/inc/pch/precompiled_vbaobj.hxx   |   64 --
 sc/inc/scabstdlg.hxx|2 
 sc/qa/unit/screenshots/screenshots.cxx  |2 
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx |  304 --
 sc/source/ui/attrdlg/scdlgfact.cxx  |   28 -
 sc/source/ui/attrdlg/scdlgfact.hxx  |   14 
 sc/source/ui/dbgui/csvcontrol.cxx   |   34 -
 sc/source/ui/dbgui/csvgrid.cxx  |  197 +
 sc/source/ui/dbgui/csvruler.cxx |  115 ++---
 sc/source/ui/dbgui/csvtablebox.cxx  |  316 ++
 sc/source/ui/dbgui/scuiasciiopt.cxx |  429 
 sc/source/ui/inc/AccessibleCsvControl.hxx   |  147 ++
 sc/source/ui/inc/csvcontrol.hxx |   27 -
 sc/source/ui/inc/csvgrid.hxx|   36 -
 sc/source/ui/inc/csvruler.hxx   |   35 -
 sc/source/ui/inc/csvtablebox.hxx|   64 +-
 sc/source/ui/inc/scuiasciiopt.hxx   |   90 ++--
 sc/source/ui/unoobj/filtuno.cxx |3 
 sc/source/ui/view/cellsh2.cxx   |2 
 sc/source/ui/view/viewfun5.cxx  |2 
 sc/uiconfig/scalc/ui/textimportcsv.ui   |   73 +++
 solenv/sanitizers/ui/modules/scalc.suppr|1 
 26 files changed, 901 insertions(+), 1116 deletions(-)

New commits:
commit 1e97ca02773e2ba968606eed61d25d88f0d7e417
Author: Caolán McNamara 
AuthorDate: Mon Oct 14 11:05:07 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 13:38:03 2019 +0200

weld ScImportAsciiDlg

notably the csv control is always LTR even in RTL mode, but the surrounding
ScrollingWindow follows the environment direction, except the horizontal
scrolling widget itself must LTR scroll.

Change-Id: I72ee2b9dade73a11bcc4391e755fdb02886a884d
Reviewed-on: https://gerrit.libreoffice.org/80765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 2ed7ffa6bad9..9745dc3f84e2 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -132,7 +132,10 @@ public:
 rtl_TextEncodingGetSelectTextEncoding() const;
 
 void connect_changed(const Link& rLink) { 
m_xControl->connect_changed(rLink); }
+void set_sensitive(bool bSensitive) { 
m_xControl->set_sensitive(bSensitive); }
 void grab_focus() { m_xControl->grab_focus(); }
+int get_active() const { return m_xControl->get_active(); }
+void set_active(int nActive) { m_xControl->set_active(nActive); }
 void show() { m_xControl->show(); }
 void hide() { m_xControl->hide(); }
 };
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 747ed1b57eb4..902e2929f5c7 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-09-25 10:58:26 using:
+ Generated on 2019-10-15 16:58:12 using:
  ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include 
@@ -67,7 +68,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -102,7 +102,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -111,7 +110,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -399,7 +397,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/inc/pch/precompiled_scfilt.hxx 
b/sc/inc/pch/precompiled_scfilt.hxx
index 239ad1710773..e10d8f8e087b 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-05-12 16:57:02 using:
+ Generated on 2019-10-15 16:57:59 using:
  ./bin/update_pch sc scfilt --cutoff=4 --exclude:system --exclude:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -25,8 +25,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -46,11 +44,14 @@
 #include 
 #inc

[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source

2019-10-17 Thread Caolán McNamara (via logerrit)

 extras/source/glade/libreoffice-catalog.xml.in |   12 --
 include/svx/txencbox.hxx   |   44 
 solenv/bin/native-code.py  |2 
 svx/source/dialog/txencbox.cxx |  123 -
 4 files changed, 181 deletions(-)

New commits:
commit 9d04e52257ea85c16d21ca78bebb3fb13fe99c60
Author: Caolán McNamara 
AuthorDate: Mon Oct 14 11:08:09 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 13:38:25 2019 +0200

SvxTextEncodingBox is now unused

Change-Id: I0276d79cd713357d36d504e8501cd1b979e86c9c
Reviewed-on: https://gerrit.libreoffice.org/80766
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index c915344ed631..4ecc596ffec1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -74,18 +74,6 @@
   
 
 
-
-  
-
-  
-GParamBoolean
-  
-
-  
-
-
 
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 9745dc3f84e2..e5a7b250f1d2 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -19,54 +19,10 @@
 #ifndef INCLUDED_SVX_TXENCBOX_HXX
 #define INCLUDED_SVX_TXENCBOX_HXX
 
-#include 
 #include 
 #include 
 #include 
 
-class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
-{
-private:
-SVX_DLLPRIVATE sal_Int32EncodingToPos_Impl( 
rtl_TextEncoding nEnc ) const;
-
-public:
-SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits );
-virtual ~SvxTextEncodingBox() override;
-
-/** Fill with all known encodings but exclude those matching one or more
-given flags as defined in rtl/tencinfo.h
-
-  If nButIncludeInfoFlags is given, encodings are included even if 
they
- match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
- Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and 
UTF8
- with RTL_TEXTENCODING_INFO_MIME 
-
-@param bExcludeImportSubsets
-If , some specific encodings are not listed, as they are a
-subset of another encoding. This is the case for
-RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
-RTL_TEXTENCODING_MS_936, which are covered by
-RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
- whenever the box is used in import dialogs. */
-voidFillFromTextEncodingTable(
-bool bExcludeImportSubsets,
-sal_uInt32 nExcludeInfoFlags = 0,
-sal_uInt32 nButIncludeInfoFlags = 0
-);
-
-/** Fill with all known MIME encodings and select the best according to
-GetBestMimeEncoding
- */
-voidFillWithMimeAndSelectBest();
-
-voidInsertTextEncoding( const rtl_TextEncoding nEnc,
-const OUString& rEntry );
-
-voidSelectTextEncoding( const rtl_TextEncoding nEnc );
-
-rtl_TextEncodingGetSelectTextEncoding() const;
-};
-
 class SVX_DLLPUBLIC TextEncodingBox
 {
 private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ab2f87894b80..8f37e476d0e6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -508,8 +508,6 @@ custom_widgets = [
 'SvxLanguageBox',
 'SvxLightCtl3D',
 'SvxRelativeField',
-'SvxTextEncodingBox',
-'SvxTextEncodingBox',
 'SwNavHelpToolBox',
 'TableValueSet',
 'TemplateDefaultView',
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index ab64466281ae..017950da6425 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -26,7 +26,6 @@
 #if HAVE_FEATURE_DBCONNECTIVITY
 #include 
 #endif
-#include 
 #include 
 #include 
 #include 
@@ -37,93 +36,6 @@
 #include 
 #include 
 
-SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
-: ListBox( pParent, nBits )
-{
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void 
makeSvxTextEncodingBox(VclPtr & rRet, const VclPtr & 
pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- decltype(makeSvxTextEncodingBox)>);
-WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
-bool bDropdown = BuilderUtils::extractDropdown(rMap);
-if (bDropdown)
-nWinBits |= WB_DROPDOWN;
-OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-nWinBits |= WB_BORDER;
-VclPtrInstance pListBox(pParent, nWinBits);
-if (bDropdown)
-pListBox->EnableAutoSize(true);
-rRet = pListBox;
-}
-
-SvxTextEncodingBox::~SvxTextEncodingBox()
-{
-disposeOnce();
-}
-
-sal_Int32 SvxTextE

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 44b361762ae5d416b46a87011d11af1d14318d05
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 13:51:06 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:51:20 2019 +0200

jsdialog: fon't show missing icon for spinfield

but doesn't work for all cases

Change-Id: I54df981441a9a5f10b9c0f36f93fc84eff2b9a42

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 245507f31..e542cd98a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -395,9 +395,12 @@ L.Control.JSDialogBuilder = L.Control.extend({
var div = L.DomUtil.create('div', 'spinfieldcontainer', 
parentContainer);
div.id = data.id;
 
-   var image = L.DomUtil.create('img', 'spinfieldimage', div);
-   var icon = builder._createIconPath(data.id);
-   image.src = icon;
+   var commandName = data.id ? data.id.substring('.uno:'.length) : 
data.id;
+   if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName)) {
+   var image = L.DomUtil.create('img', 'spinfieldimage', 
div);
+   var icon = builder._createIconPath(data.id);
+   image.src = icon;
+   }
 
var spinfield = L.DomUtil.create('input', 'spinfield', div);
spinfield.type = 'number';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |5 +++--
 loleaflet/src/control/Control.Menubar.js |1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c99f5334fda4ff5b5b4a2ace8c97b6999d5d314d
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 14:02:26 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 14:02:26 2019 +0200

jsdialogs: insert table default values and close menu

Change-Id: I255f50121b67d72df70a54c690c9d4d8cbbbe872

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index e542cd98a..a4ed49168 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -717,8 +717,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var content = L.DomUtil.create('div', 'inserttablecontrols');
 
-   var rowsData = { min: 0, id: 'rows', label: _('Rows') };
-   var colsData = { min: 0, id: 'cols', label: _('Columns') };
+   var rowsData = { min: 0, id: 'rows', text: '2', label: 
_('Rows') };
+   var colsData = { min: 0, id: 'cols', text: '2', label: 
_('Columns') };
builder._spinfieldControl(content, rowsData, builder, 
function() { });
builder._spinfieldControl(content, colsData, builder, 
function() { });
 
@@ -727,6 +727,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var rowsCount = parseInt($('#rows > 
input.spinfield').get(0).value);
var colsCount = parseInt($('#cols > 
input.spinfield').get(0).value);
builder.map.sendUnoCommand('.uno:InsertTable?Columns=' 
+ colsCount + '&Rows=' + rowsCount);
+   builder.map.fire('closemobilewizard');
});
 
builder._explorableMenu(parentContainer, title, data.children, 
builder, content);
commit 5a9326bc8a3939eccb5a85caaa19fc1e7a502181
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 13:59:40 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 13:59:40 2019 +0200

jsdialogs: insert table also in impress

Change-Id: Ic54d289ca4fcd0f9b5e5183e9b64786fce2d88c3

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 6375fed20..a5fd375db 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -284,6 +284,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 
'presentation'), id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart', mobile: false},
+   {id: 'inserttable', type: 'action', name: 
_('Insert table'), desktop: false, tablet: false},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 
'inserthyperlink', type: 'action'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0aa65e790d91d47070d9e740f0f325ee7578e123
Author: Pedro 
AuthorDate: Thu Oct 17 14:04:07 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 14:07:07 2019 +0200

mobilewizard: content: hide img elements for when is not applicable

Change-Id: I9309dd17129d25c4da52638cf4539a7406caae7c
Reviewed-on: https://gerrit.libreoffice.org/80941
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 1cc9d6743..5be62f792 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -31,3 +31,7 @@ span.menu-entry-icon img {
 span#main-menu-btn-icon {
 filter: none !important;
 }
+
+   #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
+   display: none;
+   }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit ef76fda7adcc83b59d3a2127a2f7d9a31ece515f
Author: Pedro 
AuthorDate: Thu Oct 17 14:09:19 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 14:10:05 2019 +0200

No changes: Format code and tabify all spaces

Change-Id: Ia31324cb38a949949de86c9e66e9d1a6ad53745c
Reviewed-on: https://gerrit.libreoffice.org/80942
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 5be62f792..a16d2c2cf 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,37 +1,37 @@
 span.menu-entry-icon img {
-width: 24px !important;
-margin: 4px !important;
+   width: 24px !important;
+   margin: 4px !important;
 }
 
 #mobile-wizard.menuwizard #mobile-wizard-content{
-  overflow: hidden !important;
+   overflow: hidden !important;
 }
 
 #mobile-wizard.menuwizard{
-  top: 0px !important;
-  height: 100% !important;
-  z-index: 999 !important;
+   top: 0px !important;
+   height: 100% !important;
+   z-index: 999 !important;
 }
 
 #mobile-wizard.menuwizard #mobile-wizard-back.close-button{
-  visibility: hidden !important;
+   visibility: hidden !important;
 }
 
 #toolbar-hamburger.menuwizard-opened{
-  z-index: 1000 !important;
-  position: relative !important;
-  background-color: #dae6f3 !important;
-  padding-left: 8px !important;
-  border-radius: 0 0 0 100px !important;
+   z-index: 1000 !important;
+   position: relative !important;
+   background-color: #dae6f3 !important;
+   padding-left: 8px !important;
+   border-radius: 0 0 0 100px !important;
 }
 
 #mobile-wizard.menuwizard #mobile-wizard-titlebar{
-  border: none !important;
+   border: none !important;
 }
 span#main-menu-btn-icon {
-filter: none !important;
+   filter: none !important;
 }
 
-   #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
-   display: none;
-   }
+#leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
+   display: none;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Tamás Zolnai (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |2 
 loleaflet/src/control/Control.Menubar.js |  107 ---
 loleaflet/src/control/Control.Toolbar.js |2 
 3 files changed, 80 insertions(+), 31 deletions(-)

New commits:
commit 24569b5401566c3f1d59b129cea952001a171bfe
Author: Tamás Zolnai 
AuthorDate: Thu Oct 17 14:13:31 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Oct 17 14:20:38 2019 +0200

mobile-menu: Remove every occurance of mobile / desktop attribute.

Now we have separate menu structur for mobile and desktop.

Change-Id: Ibf690e78a4cf43516a6859eb580dfb52e1f5029b

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index a7137d9e7..8aa500195 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -99,8 +99,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertColumnBreak'},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 
'inserthyperlink', type: 'action'},
-   {name: _('Insert Shape'), id: 'insertshape', 
desktop: false, type: 'action' },
-   {uno: '.uno:InsertSymbol', mobile: false},
+   {uno: '.uno:InsertSymbol'},
{name: _UNO('.uno:FormattingMarkMenu', 'text'), 
type: 'menu', menu: [
{uno: '.uno:InsertNonBreakingSpace'},
{uno: '.uno:InsertHardHyphen'},
@@ -109,9 +108,9 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertZWNBSP'},
{uno: '.uno:InsertLRM'},
{uno: '.uno:InsertRLM'}]},
-{name: _UNO('.uno:IndexesMenu', 'text'), type: 
'menu', menu: [
+   {name: _UNO('.uno:IndexesMenu', 'text'), type: 
'menu', menu: [
{uno: '.uno:InsertIndexesEntry'},
-   {uno: '.uno:InsertAuthoritiesEntry', 
mobileapp: false},
+   {uno: '.uno:InsertAuthoritiesEntry'},
{uno: '.uno:InsertMultiIndex'}]},
]},
{name: _UNO('.uno:FormatMenu', 'text'), id: 'format', 
type: 'menu', menu: [
@@ -1322,10 +1321,6 @@ L.Control.Menubar = L.Control.extend({
$(aItem).data('id', menu[i].id);
}
 
-   if (menu[i].desktop == false && 
window.mode.isDesktop()) {
-   $(aItem).css('display', 'none');
-   }
-
if (menu[i].tablet == false && window.mode.isTablet()) {
$(aItem).css('display', 'none');
}
@@ -1397,7 +1392,7 @@ L.Control.Menubar = L.Control.extend({
var items = this.options['mobile' + docType];
 
for (var i = 0; i < items.length; i++) {
-   if (items[i].mobile !== false && 
this._checkItemVisibility(items[i]) === true) {
+   if (this._checkItemVisibility(items[i]) === true) {

topMenu.children.push(this._generateMenuStructure(items[i], docType, false));
}
}
@@ -1417,8 +1412,6 @@ L.Control.Menubar = L.Control.extend({
if (mainMenu) {
itemType = 'mainmenu';
} else {
-   if (item.mobile === false)
-   return undefined;
if (item.mobileapp == true && !window.ThisIsAMobileApp)
return undefined;
if (!item.menu) {
commit 86f9250b88afb2fa347a8040089e95543b39c910
Author: Tamás Zolnai 
AuthorDate: Thu Oct 17 14:10:13 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Oct 17 14:20:38 2019 +0200

mobile-menu: Create a separate menu structure also for insert menu

This is the only menu which is still shared.

Change-Id: I6ff15dc64501ad71920edb0ee74b6f8407960dfd

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index a5fd375db..a7137d9e7 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -74,10 +74,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), 
id: 'insertcom

Minutes from the UX/design meeting 2019-OCT-17

2019-10-17 Thread Heiko Tietze

Present: Heiko

Tickets

 * UI: Hyperlink dialog should remember last used view
   + https://bugs.documentfoundation.org/show_bug.cgi?id=90496
   + as a general guideline, store the tab position per session (Heiko)
   + user configuration (Thomas)
   => let's put it on the pile of 109265 and remembered the last tab

 * UI: Option to open all heading branches at once
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128058
   + use a context menu and * to expand all
   => Jim is working on it

 * Frames around dialog widgets
   + https://bugs.documentfoundation.org/show_bug.cgi?id=125508
   + GtkScrolledWindow uses decoration under Windows/macOS (Caolan)
   => apply Caolan's patch and see if that has drawbacks

 * FORMATTING feature request: error bars style => error box
   + https://bugs.documentfoundation.org/show_bug.cgi?id=90180
   + probably too early to discuss
   => postponed/discussion on BZ

 * WRITER TABLES: Sort warning needed or some form of protection
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128090
   + adopt the Calc workflow; in advance of the search criteria or afterwards
   + OP suggests to show a warning first, but then we could also allow 
 to extend the selection
   => add the confirmation box with Keep, Extend, [Cancel]

 * Remove placeholder names for accessible objects
   + https://bugs.documentfoundation.org/show_bug.cgi?id=81168
   => WF as names are needed for the Navigator




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

Re: [Libreoffice-commits] core.git: Rename OUStringLiteral1 to OUStringChar

2019-10-17 Thread Stephan Bergmann


FYI:

On 17/10/2019 07:30, Stephan Bergmann (via logerrit) wrote:

New commits:
commit 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16
Author: Stephan Bergmann 
AuthorDate: Wed Oct 16 15:06:23 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 07:28:49 2019 +0200

 Rename OUStringLiteral1 to OUStringChar
 
 It started out as a wrapper around character literals, but has by now become a

 wrapper around arbitrary single characters.  Besides updating the 
documentation,
 this change is a mechanical
 
   for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done
 
 Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f

 Reviewed-on: https://gerrit.libreoffice.org/80892
 Tested-by: Jenkins
 Reviewed-by: Stephan Bergmann 


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

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

2019-10-17 Thread Tamás Zolnai (via logerrit)

 loleaflet/src/control/Control.Menubar.js |   36 +++
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit bc28618d83e20480eb387e9d30556650c2a9f588
Author: Tamás Zolnai 
AuthorDate: Thu Oct 17 14:26:15 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Oct 17 14:26:54 2019 +0200

mobile-menu: Fix code identation

Change-Id: I0f4e897a1e7ca79a0b72cdc7d72a8b64b39f1dee

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8aa500195..a13a44116 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -611,19 +611,19 @@ L.Control.Menubar = L.Control.extend({
{id: 'inserttable', type: 'action', 
name: _('Insert table')},
{type: 'separator'},
{name: _UNO('.uno:InsertField', 
'text'), type: 'menu', menu: [
-{uno: '.uno:InsertPageNumberField'},
-{uno: '.uno:InsertPageCountField'},
-{uno: '.uno:InsertDateField'},
-{uno: '.uno:InsertTimeField'},
-{uno: '.uno:InsertTitleField'},
-{uno: '.uno:InsertAuthorField'},
-{uno: '.uno:InsertTopicField'}
+   {uno: 
'.uno:InsertPageNumberField'},
+   {uno: 
'.uno:InsertPageCountField'},
+   {uno: '.uno:InsertDateField'},
+   {uno: '.uno:InsertTimeField'},
+   {uno: '.uno:InsertTitleField'},
+   {uno: '.uno:InsertAuthorField'},
+   {uno: '.uno:InsertTopicField'}
]},
{name: 
_UNO('.uno:InsertHeaderFooterMenu', 'text'), type: 'menu', menu: [
-{name: _UNO('.uno:InsertPageHeader', 'text'), type: 
'menu', menu: [
-{name: _('All'), disabled: true, id: 
'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?'}]},
-{name: _UNO('.uno:InsertPageFooter', 'text'), type: 
'menu', menu: [
-{name: _('All'), disabled: true, id: 
'insertfooter', tag: '_ALL_', uno: '.uno:InsertPageFooter?'}]}
+   {name: 
_UNO('.uno:InsertPageHeader', 'text'), type: 'menu', menu: [
+   {name: _('All'), 
disabled: true, id: 'insertheader', tag: '_ALL_', uno: 
'.uno:InsertPageHeader?'}]},
+   {name: 
_UNO('.uno:InsertPageFooter', 'text'), type: 'menu', menu: [
+   {name: _('All'), 
disabled: true, id: 'insertfooter', tag: '_ALL_', uno: 
'.uno:InsertPageFooter?'}]}
]},
{uno: '.uno:InsertFootnote'},
{uno: '.uno:InsertEndnote'},
@@ -634,13 +634,13 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:HyperlinkDialog'), 
id: 'inserthyperlink', type: 'action'},
{name: _('Insert Shape'), id: 
'insertshape', type: 'action' },
{name: _UNO('.uno:FormattingMarkMenu', 
'text'), type: 'menu', menu: [
-{uno: '.uno:InsertNonBreakingSpace'},
-{uno: '.uno:InsertHardHyphen'},
-{uno: '.uno:InsertSoftHyphen'},
-{uno: '.uno:InsertZWSP'},
-{uno: '.uno:InsertZWNBSP'},
-{uno: '.uno:InsertLRM'},
-{uno: '.uno:InsertRLM'}]},
+   {uno: 
'.uno:InsertNonBreakingSpace'},
+   {uno: '.uno:InsertHardHyphen'},
+   {uno: '.uno:InsertSoftHyphen'},
+   {uno: '.uno:InsertZWSP'},
+   {uno: '.uno:InsertZWNBSP'},
+   {uno: '.uno:InsertLRM'},
+   {uno: '.uno:InsertRLM'}]},
]
},
spreadsheet : {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkinst.cxx |   45 +++
 1 file changed, 45 insertions(+)

New commits:
commit d1b8b1a22136228dd6c31a44c1d19840c27c0cf7
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 11:36:50 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 14:35:40 2019 +0200

Resolves: tdf#128129 add support for left/right expand/collapse

Change-Id: I6c8f11e1e2b4192933541e754a078c4d0ff58206
Reviewed-on: https://gerrit.libreoffice.org/80938
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f178acd4fc5a..79a5ce12d750 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7726,6 +7726,7 @@ private:
 gulong m_nPopupMenuSignalId;
 gulong m_nDragBeginSignalId;
 gulong m_nDragEndSignalId;
+gulong m_nKeyPressSignalId;
 ImplSVEvent* m_pChangeEvent;
 
 DECL_LINK(async_signal_changed, void*, void);
@@ -8104,6 +8105,48 @@ private:
 g_DragSource = nullptr;
 }
 
+gboolean signal_key_press(GdkEventKey* pEvent)
+{
+if (pEvent->keyval != GDK_KEY_Left && pEvent->keyval != GDK_KEY_Right)
+return false;
+
+GtkInstanceTreeIter aIter(nullptr);
+if (!get_cursor(&aIter))
+return false;
+
+if (pEvent->keyval == GDK_KEY_Right)
+{
+if (iter_has_child(aIter) && !get_row_expanded(aIter))
+{
+expand_row(aIter);
+return true;
+}
+return false;
+}
+
+if (iter_has_child(aIter) && get_row_expanded(aIter))
+{
+collapse_row(aIter);
+return true;
+}
+
+if (iter_parent(aIter))
+{
+unselect_all();
+set_cursor(aIter);
+select(aIter);
+return true;
+}
+
+return false;
+}
+
+static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer 
widget)
+{
+GtkInstanceTreeView* pThis = static_cast(widget);
+return pThis->signal_key_press(pEvent);
+}
+
 public:
 GtkInstanceTreeView(GtkTreeView* pTreeView, GtkInstanceBuilder* pBuilder, 
bool bTakeOwnership)
 : GtkInstanceContainer(GTK_CONTAINER(pTreeView), pBuilder, 
bTakeOwnership)
@@ -8121,6 +8164,7 @@ public:
 , m_nPopupMenuSignalId(g_signal_connect(pTreeView, "popup-menu", 
G_CALLBACK(signalPopupMenu), this))
 , m_nDragBeginSignalId(g_signal_connect(pTreeView, "drag-begin", 
G_CALLBACK(signalDragBegin), this))
 , m_nDragEndSignalId(g_signal_connect(pTreeView, "drag-end", 
G_CALLBACK(signalDragEnd), this))
+, m_nKeyPressSignalId(g_signal_connect(pTreeView, "key-press-event", 
G_CALLBACK(signalKeyPress), this))
 , m_pChangeEvent(nullptr)
 {
 m_pColumns = gtk_tree_view_get_columns(m_pTreeView);
@@ -9514,6 +9558,7 @@ public:
 {
 if (m_pChangeEvent)
 Application::RemoveUserEvent(m_pChangeEvent);
+g_signal_handler_disconnect(m_pTreeView, m_nKeyPressSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nDragEndSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nDragBeginSignalId);
 g_signal_handler_disconnect(m_pTreeView, m_nPopupMenuSignalId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source

2019-10-17 Thread Caolán McNamara (via logerrit)

 extras/source/glade/libreoffice-catalog.xml.in |4 -
 include/svx/langbox.hxx|   18 --
 solenv/bin/native-code.py  |1 
 svx/source/dialog/langbox.cxx  |   70 -
 4 files changed, 93 deletions(-)

New commits:
commit 6a902b238324d4d0c3c45819c2b23e6973d40a29
Author: Caolán McNamara 
AuthorDate: Mon Oct 14 11:22:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 14:35:57 2019 +0200

SvxLanguageBox is now unused

Change-Id: I5aafb53bb9885b8b0b43161f1afc79852b1d89a3
Reviewed-on: https://gerrit.libreoffice.org/80767
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 4ecc596ffec1..a370ccbf8041 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -136,10 +136,6 @@
 generic-name="PropertyControl" parent="GtkComboBoxText"
 icon-name="widget-gtk-comboboxtext"/>
 
-
-
 
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 9f93df3ea341..ad686bf39cd0 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -89,24 +89,6 @@ protected:
 SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData ) 
const = 0;
 };
 
-
-class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase
-{
-public:
-SvxLanguageBox( vcl::Window* pParent, WinBits nBits );
-
-private:
-SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString& 
rEntry, sal_Int32  nPos, bool bChecked ) override;
-
-SVX_DLLPRIVATE virtual void ImplClear() override;
-SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString& 
rEntry, sal_Int32 nPos ) override;
-SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, 
void* pData ) override;
-SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectedEntryPos() const 
override;
-SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) 
const override;
-SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, 
bool bSelect ) override;
-SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData ) 
const override;
-};
-
 class SVX_DLLPUBLIC LanguageBox
 {
 public:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8f37e476d0e6..eb3fc15740bb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -505,7 +505,6 @@ custom_widgets = [
 'SvxColorValueSet',
 'SvxFillAttrBox',
 'SvxFillTypeBox',
-'SvxLanguageBox',
 'SvxLightCtl3D',
 'SvxRelativeField',
 'SwNavHelpToolBox',
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index eb099005d2e6..8403b67fdbe9 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 using namespace ::com::sun::star::util;
@@ -65,10 +64,7 @@ OUString GetDicInfoStr( const OUString& rName, const 
LanguageType nLang, bool bN
 return aTmp;
 }
 
-
 //  misc local helper functions
-
-
 static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( Sequence< 
css::lang::Locale > const &rSeq )
 {
 sal_Int32 nCount = rSeq.getLength();
@@ -83,28 +79,12 @@ static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( 
Sequence< css::lang::
 return aLangs;
 }
 
-
 static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 
nLang )
 {
 return rLangSeq.hasElements()
 && std::find(rLangSeq.begin(), rLangSeq.end(), nLang) != 
rLangSeq.end();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr & 
rRet, const VclPtr & pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- decltype(makeSvxLanguageBox)>);
-WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
-bool bDropdown = BuilderUtils::extractDropdown(rMap);
-if (bDropdown)
-nBits |= WB_DROPDOWN;
-else
-nBits |= WB_BORDER;
-VclPtrInstance pLanguageBox(pParent, nBits);
-pLanguageBox->EnableAutoSize(true);
-rRet = pLanguageBox;
-}
-
 SvxLanguageBoxBase::SvxLanguageBoxBase()
 : m_bWithCheckmark(false)
 {
@@ -706,56 +686,6 @@ LanguageBox::LanguageBox(std::unique_ptr 
pControl)
 m_xControl->connect_changed(LINK(this, LanguageBox, ChangeHdl));
 }
 
-SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits )
-: ListBox( pParent, nBits )
-, SvxLanguageBoxBase()
-{
-// display entries sorted
-SetStyle( GetStyle() | WB_SORT );
-
-ImplLanguageBoxBaseInit();
-}
-
-sal_Int32 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, 
sal_Int32 nPos, bool bChecked )
-{
-return InsertEntry( rEntry, (bChecked ? m_aCheckedImage : 
m_

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source solenv/clang-format

2019-10-17 Thread Muhammet Kara (via logerrit)

 chart2/source/controller/dialogs/ChangingResource.cxx  |2 +-
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |2 +-
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx|2 +-
 chart2/source/controller/dialogs/dlg_DataSource.cxx|2 +-
 chart2/source/controller/dialogs/tp_ChartType.hxx  |4 ++--
 chart2/source/controller/dialogs/tp_DataSource.cxx |2 +-
 chart2/source/controller/dialogs/tp_RangeChooser.cxx   |2 +-
 chart2/source/inc/ChartTypeDialogController.hxx|2 +-
 solenv/clang-format/blacklist  |6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6f7034aa89c75b705b2e575493cbc82ab37d8299
Author: Muhammet Kara 
AuthorDate: Wed Oct 16 22:05:18 2019 +0300
Commit: Muhammet Kara 
CommitDate: Thu Oct 17 14:45:28 2019 +0200

chart2: Move some headers to inc

So that they will be accessible from
inside the sidebar dir.

Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff
Reviewed-on: https://gerrit.libreoffice.org/80922
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx 
b/chart2/source/controller/dialogs/ChangingResource.cxx
index 6e1ba1c67274..c50f274dadd4 100644
--- a/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ChangingResource.hxx"
+#include 
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 56a7a2173c88..3c34c96982f3 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ChartTypeDialogController.hxx"
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index c9da0b2227e7..60fbf69c289a 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -27,7 +27,7 @@
 #include "tp_RangeChooser.hxx"
 #include "tp_Wizard_TitlesAndObjects.hxx"
 #include "tp_DataSource.hxx"
-#include "ChartTypeTemplateProvider.hxx"
+#include 
 #include "DialogModel.hxx"
 
 #define CHART_WIZARD_PAGEWIDTH  250
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx 
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 86651bcfd6bd..fdbafd92b693 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -20,7 +20,7 @@
 #include 
 #include 
 #include 
-#include "ChartTypeTemplateProvider.hxx"
+#include 
 #include 
 #include 
 #include "DialogModel.hxx"
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx 
b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 4470ed60443d..22b354a22ad3 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -22,8 +22,8 @@
 
 #include 
 
-#include "ChartTypeDialogController.hxx"
-#include "ChartTypeTemplateProvider.hxx"
+#include 
+#include 
 #include 
 
 #include 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx 
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 758664428019..16c2d7f59222 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -21,7 +21,7 @@
 #include 
 #include 
 #include 
-#include "ChartTypeTemplateProvider.hxx"
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 130ab64df371..c809f757125d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -20,7 +20,7 @@
 #include "tp_RangeChooser.hxx"
 #include 
 #include 
-#include "ChartTypeTemplateProvider.hxx"
+#include 
 #include "DialogModel.hxx"
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx 
b/chart2/source/inc/ChangingResource.hxx
similarity index 100%
rename from chart2/source/controller/dialogs/ChangingResource.hxx
rename to chart2/source/inc/ChangingResource.hxx
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx 
b/chart2/source/inc/ChartTypeDialogController.hxx
similarity index 99%
rename from chart2/source/controller/dialogs/ChartTypeDialogController.hxx
rename to chart2/source/inc/ChartTypeDialogController.hxx
index 2985d31b10db..4a38768e9f77 100644
--- a/chart2/sour

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 include/sot/stg.hxx  |1 
 sot/source/sdstor/storage.cxx|   15 ++---
 sot/source/sdstor/ucbstorage.cxx |   42 ++-
 3 files changed, 6 insertions(+), 52 deletions(-)

New commits:
commit 6a8a73566c475c945e45e40e269765959d93164d
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 13:08:01 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 15:30:51 2019 +0200

ofz#18280 remove LinkedFile support

The code to create these "linked files" added by:

commit 6f2f7e3091504e8e58d9be603ed3739f6f2cd68e
Author: Mathias Bauer 
Date:   Fri Jul 6 14:03:59 2001 +

#89377#: new StorageMode for creating unpacked files

use of creating them then introduced in:

commit 53fe2691a3fb65110e7f5aee2919f7d8d559ff02
Author: Mathias Bauer 
Date:   Fri Jul 6 13:55:57 2001 +

#88062#: some optimizations

that use then commented out in:

commit 762dd2b15bfd201b2271b460efa72a5b68d6fb2a
Author: Kurt Zenker 
Date:   Mon Oct 4 19:53:11 2004 +

and the unused code to create them removed in:

commit 8a91528a3e03fe6e2923c33327b687ecf57adb0b
Author: Stephan Bergmann 
Date:   Thu May 7 10:37:27 2015 +0200

StorageMode::CreateUnpacked is never used

It seems to me that there is no need to keep support for reading them as 
they
seem to have been temporary files rather than something still existant

Change-Id: I783cae63dc078a7e843729d3ca13f45c18168f4c
Reviewed-on: https://gerrit.libreoffice.org/80943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index d692403b9a72..32bd476422f9 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -246,7 +246,6 @@ protected:
 virtual ~UCBStorage() override;
 public:
 static bool IsStorageFile( SvStream* );
-static OUString GetLinkedFile( SvStream& );
 
 UCBStorage( const ::ucbhelper::Content& 
rContent,
 const OUString& rName,
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 16d1a976b577..f15fb22dd9f1 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -318,18 +318,9 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, 
StreamMode nMode )
 
 if ( bIsUCBStorage )
 {
-if ( !(UCBStorage::GetLinkedFile( *m_pStorStm ).isEmpty()) )
-{
-// detect special unpacked storages
-m_pOwnStg = new UCBStorage( *m_pStorStm, true );
-m_bDelStm = true;
-}
-else
-{
-// UCBStorage always works directly on the UCB content, so 
discard the stream first
-DELETEZ( m_pStorStm );
-m_pOwnStg = new UCBStorage( m_aName, nMode, true, 
true/*bIsRoot*/ );
-}
+// UCBStorage always works directly on the UCB content, so 
discard the stream first
+DELETEZ( m_pStorStm );
+m_pOwnStg = new UCBStorage( m_aName, nMode, true, 
true/*bIsRoot*/ );
 }
 else
 {
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 5edae19704cb..5340f841454c 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1363,22 +1363,9 @@ sal_uLong UCBStorageStream::GetSize() const
 
 UCBStorage::UCBStorage( SvStream& rStrm, bool bDirect )
 {
-OUString aURL = GetLinkedFile( rStrm );
-if ( !aURL.isEmpty() )
-{
-StreamMode nMode = StreamMode::READ;
-if( rStrm.IsWritable() )
-nMode = StreamMode::READ | StreamMode::WRITE;
-
-::ucbhelper::Content aContent( aURL, Reference < XCommandEnvironment 
>(), comphelper::getProcessComponentContext() );
-pImp = new UCBStorage_Impl( aContent, aURL, nMode, this, bDirect, true 
);
-}
-else
-{
-// pImp must be initialized in the body, because otherwise the vtable 
of the stream is not initialized
-// to class UCBStorage !
-pImp = new UCBStorage_Impl( rStrm, this, bDirect );
-}
+// pImp must be initialized in the body, because otherwise the vtable of 
the stream is not initialized
+// to class UCBStorage !
+pImp = new UCBStorage_Impl( rStrm, this, bDirect );
 
 pImp->AddFirstRef();
 pImp->Init();
@@ -2870,27 +2857,4 @@ bool UCBStorage::IsStorageFile( SvStream* pFile )
 return bRet;
 }
 
-OUString UCBStorage::GetLinkedFile( SvStream &rStream )
-{
-OUString aString;
-sal_uInt64 nPos = rStream.Tell();
-if ( !rStream.TellEnd() )
-return aString;
-
-rStream.Seek(0);
-sal_uInt32 nB

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

2019-10-17 Thread Michael Stahl (via logerrit)

 sw/source/core/crsr/findattr.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9a5fd659873450a59309f71082a67fa9e74fcf47
Author: Michael Stahl 
AuthorDate: Mon Oct 14 14:56:48 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Oct 17 15:52:09 2019 +0200

tdf#128138 sw_redlinehide: fix infinite loop in FindAttrsImpl()

The code looked wrong previously, always assigning the end of the text
node regardless of direction, but it turns out the improvement caused an
infinite loop... let's just swap things after the loop, seems simpler
than adding another if at the assignments.

(regression from 4caef398af256be5f0c2a159129b528ee3702e5c)

Change-Id: I098f5265fa86d6a2511a80a02230899a7a303a88
Reviewed-on: https://gerrit.libreoffice.org/80774
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4e0241697371c40f4348bdfb6585a872d4cbcbf6)
Reviewed-on: https://gerrit.libreoffice.org/80876
Reviewed-by: Xisco Faulí 
Reviewed-by: Michael Weghorn 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index c77dc2065979..47c1f676ecb5 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1198,9 +1198,12 @@ static bool FindAttrsImpl(SwPaM & rSearchPam,
 }
 }
 
-// if backward search, switch point and mark
-if( bFound && !bSrchForward )
-rSearchPam.Exchange();
+// in search direction, mark precedes point, because the next iteration
+// starts at point
+if (bFound)
+{
+rSearchPam.Normalize(!bSrchForward);
+}
 
 return bFound;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Stephan Bergmann (via logerrit)

 sc/source/filter/qpro/qproform.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 2704b9e3783aae9d8372f2e3ad3253a2cb49ae87
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 14:52:16 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 15:53:08 2019 +0200

Don't use uninitialized memory when reading from the stream fails

Flathub arm builds (but not other arches) had often (but not always) failed 
when
processing sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 in
CppunitTest_sc_filters_test (e.g.,
:

> Test name: ScFiltersTest::testCVEs
> equality assertion failed
> - Expected: 1
> - Actual  : 0
> - file:///run/build/libreoffice/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2

)  Valgrind revealed that this was due to using unintialized memory when the
various maIn.Read... in QProToSc::Convert failed, starting with the use of
uninitialized nFmla[i] after

  maIn.ReadUChar( nFmla[i] );

At least make things deterministic by setting the relevant variables to 
zero.
(Another approach could be returning early with some ConvErr status.)

Change-Id: I4c06aa8da5f777170cdc7bbe3ca1d61b23d3f326
Reviewed-on: https://gerrit.libreoffice.org/80947
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/source/filter/qpro/qproform.cxx 
b/sc/source/filter/qpro/qproform.cxx
index 89904a27d49c..0d8bc41426f2 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -190,15 +190,14 @@ do { \
 
 ConvErr QProToSc::Convert( std::unique_ptr& pArray )
 {
-sal_uInt8 nFmla[ nBufSize ], nArg;
+sal_uInt8 nFmla[ nBufSize ];
 sal_uInt8 nArgArray[ nBufSize ] = {0};
 sal_Int8 nCol, nPage;
-sal_uInt16 nInt, nIntCount = 0, nStringCount = 0, nFloatCount = 0, 
nDLLCount = 0, nArgCount = 0;
+sal_uInt16 nIntCount = 0, nStringCount = 0, nFloatCount = 0, nDLLCount = 
0, nArgCount = 0;
 sal_uInt16 nIntArray[ nBufSize ] = {0};
 OUString sStringArray[ nBufSize ];
-sal_uInt16 nDummy, nDLLId;
 sal_uInt16 nDLLArray[ nBufSize ] = {0};
-sal_uInt16 nNote, nRef, nRelBits;
+sal_uInt16 nNote, nRelBits;
 TokenId nPush;
 ScComplexRefData aCRD;
 ScSingleRefData aSRD;
@@ -209,16 +208,19 @@ ConvErr QProToSc::Convert( std::unique_ptr& 
pArray )
 
 aCRD.InitFlags();
 aSRD.InitFlags();
+sal_uInt16 nRef = 0;
 maIn.ReadUInt16( nRef );
 
 if( nRef < nBufSize )
 {
 for( sal_uInt16 i=0; i < nRef; i++)
 {
+nFmla[i] = 0;
 maIn.ReadUChar( nFmla[i] );
 
 if( nFmla[ i ] == 0x05 )
 {
+sal_uInt16 nInt = 0;
 maIn.ReadUInt16( nInt );
 nIntArray[ nIntCount ] = nInt;
 SAFEDEC_OR_RET(nRef, 2, ConvErr::Count);
@@ -227,7 +229,7 @@ ConvErr QProToSc::Convert( std::unique_ptr& 
pArray )
 
 if( nFmla[ i ] == 0x00 )
 {
-double nFloat;
+double nFloat = 0;
 maIn.ReadDouble( nFloat );
 nFloatArray[ nFloatCount ] = nFloat;
 SAFEDEC_OR_RET(nRef, 8, ConvErr::Count);
@@ -236,6 +238,8 @@ ConvErr QProToSc::Convert( std::unique_ptr& 
pArray )
 
 if( nFmla[ i ] == 0x1a )
 {
+sal_uInt8 nArg = 0;
+sal_uInt16 nDummy, nDLLId = 0;
 maIn.ReadUChar( nArg ).ReadUInt16( nDummy ).ReadUInt16( nDLLId 
);
 nArgArray[ nArgCount ] = nArg;
 nDLLArray[ nDLLCount ] = nDLLId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Stephan Bergmann (via logerrit)

 sc/source/filter/excel/impop.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 556832332ce2e26ec727d6dffebefe53786f84cd
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 15:06:44 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 15:54:46 2019 +0200

Don't use uninitialized memory when reading from the stream fails

Valgrind'ing CppunitTest_sc_filters_test failed with

> Conditional jump or move depends on uninitialised value(s)
>at 0x21175CE0: XclRange::GetColCount() const 
(/sc/source/filter/inc/xladdress.hxx:73)
>by 0x2117048D: ImportExcel::ReadDimensions() 
(/sc/source/filter/excel/impop.cxx:248)
>by 0x21188E78: ImportExcel8::Read() 
(/sc/source/filter/excel/read.cxx:1108)
>by 0x21123C3F: ScFormatFilterPluginImpl::ScImportExcel(SfxMedium&, 
ScDocument*, EXCIMPFORMAT) (/sc/source/filter/excel/excel.cxx:137)
[...]

when loading sc/qa/unit/data/xls/pass/CVE-2006-3086-1.xls.

As there appears to be no error-handling concept in 
ImportExcel::ReadDimensions,
at least zero-initialize the relevant variables.

Change-Id: I11dbd2a1032ecc723f65a563ef022d7eb3c970ff
Reviewed-on: https://gerrit.libreoffice.org/80948
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 1bebd26143bf..03c6c73706f4 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -222,7 +222,7 @@ sal_uInt16 ImportExcel::ReadXFIndex( const ScAddress& 
rScPos, bool bBiff2 )
 
 void ImportExcel::ReadDimensions()
 {
-XclRange aXclUsedArea( ScAddress::UNINITIALIZED );
+XclRange aXclUsedArea;
 if( (maStrm.GetRecId() == EXC_ID2_DIMENSIONS) || (GetBiff() <= EXC_BIFF5) )
 {
 maStrm >> aXclUsedArea;
@@ -240,7 +240,7 @@ void ImportExcel::ReadDimensions()
 }
 else
 {
-sal_uInt32 nXclRow1, nXclRow2;
+sal_uInt32 nXclRow1 = 0, nXclRow2 = 0;
 nXclRow1 = maStrm.ReaduInt32();
 nXclRow2 = maStrm.ReaduInt32();
 aXclUsedArea.maFirst.mnCol = maStrm.ReaduInt16();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Tamás Zolnai (via logerrit)

 loleaflet/src/control/Control.Menubar.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f4569760748bbf110464977f081c4c86a296b3e8
Author: Tamás Zolnai 
AuthorDate: Thu Oct 17 15:56:55 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Oct 17 15:56:55 2019 +0200

mobile-menu: Fix copy-paste error.

Change-Id: I428d3fbd09c878ed0d6ab819babaf7b44bdf364d

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index a13a44116..1f7ab55f1 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -549,9 +549,9 @@ L.Control.Menubar = L.Control.extend({
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : 
_('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
-   {name: _('ODF spreadsheet (.ods)'), id: 
'downloadas-ods', type: 'action'},
-   {name: _('Excel 2003 Spreadsheet (.xls)'), id: 
'downloadas-xls', type: 'action'},
-   {name: _('Excel Spreadsheet (.xlsx)'), id: 
'downloadas-xlsx', type: 'action'}
+   {name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
+   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
+   {name: _('PowerPoint Presentation (.pptx)'), 
id: 'downloadas-pptx', type: 'action'},
]},
{name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 
'menu', menu: [
{uno: '.uno:Undo'},
___
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' - sc/source

2019-10-17 Thread Caolán McNamara (via logerrit)

 sc/source/ui/inc/namedlg.hxx  |1 -
 sc/source/ui/inc/namemgrtable.hxx |   17 +
 sc/source/ui/namedlg/namedlg.cxx  |   10 ++
 sc/source/ui/namedlg/namemgrtable.cxx |   13 +++--
 4 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit 8f79126d4fb7014a81c799db776991d4c2d06fa2
Author: Caolán McNamara 
AuthorDate: Mon Oct 14 19:40:47 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 16:03:07 2019 +0200

Resolves: tdf#128137 cursor jumping during edit, etc.

The mbNeedUpdate hackery to block changes caused by the
user was subverted by the async handling of the treeview selection.

a) add a call to wait and process outstanding async events within
the protected block

b) move the needupdate down to the range manager to block updates during
this block in CheckForFormulaString too

c) when updating the visible rows, also update the selected rows even if 
they
are not visible.

Change-Id: I4c67d6cd2780f55d5eab5f856f6fda21703b4977
Reviewed-on: https://gerrit.libreoffice.org/80797
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 09effbb234af..14149008dd90 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -46,7 +46,6 @@ private:
 ScDocument* mpDoc;
 const ScAddress maCursorPos;
 
-bool mbNeedUpdate;
 bool mbDataChanged;
 //ugly hack to call DefineNames from ManageNames
 bool mbCloseWithoutUndo;
diff --git a/sc/source/ui/inc/namemgrtable.hxx 
b/sc/source/ui/inc/namemgrtable.hxx
index 324ceef03657..d25a9e799d90 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -45,6 +45,8 @@ private:
 
 int m_nId;
 
+bool mbNeedUpdate;
+
 void GetLine(ScRangeNameLine& aLine, weld::TreeIter& rEntry);
 void Init();
 const ScRangeData* findRangeData(const ScRangeNameLine& rLine);
@@ -70,6 +72,21 @@ public:
 void GetCurrentLine(ScRangeNameLine& rLine);
 bool IsMultiSelection();
 std::vector GetSelectedEntries();
+
+void BlockUpdate()
+{
+mbNeedUpdate = false;
+}
+
+bool UpdatesBlocked() const
+{
+return !mbNeedUpdate;
+}
+
+void UnblockUpdate()
+{
+mbNeedUpdate = true;
+}
 };
 
 #endif
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index de92dedaa9be..cdb9e5b18077 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -33,6 +33,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -55,7 +56,6 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, 
weld::Window* pParen
 , mpViewData(ptrViewData)
 , mpDoc(ptrViewData->GetDocument())
 , maCursorPos(aCursorPos)
-, mbNeedUpdate(true)
 , mbDataChanged(false)
 , mbCloseWithoutUndo(false)
 
@@ -379,7 +379,7 @@ void ScNameDlg::NameModified()
 sal_uInt16 nIndex = (aNewScope != aOldScope ? 0 : pData->GetIndex());
 
 pOldRangeName->erase(*pData);
-mbNeedUpdate = false;
+m_xRangeManagerTable->BlockUpdate();
 m_xRangeManagerTable->DeleteSelectedEntries();
 ScRangeData::Type nType = ScRangeData::Type::Name;
 if ( m_xBtnRowHeader->get_active() ) nType |= 
ScRangeData::Type::RowHeader;
@@ -395,7 +395,9 @@ void ScNameDlg::NameModified()
 aLine.aExpression = aExpr;
 aLine.aScope = aNewScope;
 m_xRangeManagerTable->addEntry(aLine, true);
-mbNeedUpdate = true;
+// tdf#128137 process pending async row change events while 
UpdatesBlocked in place
+Application::Reschedule(true);
+m_xRangeManagerTable->UnblockUpdate();
 mbDataChanged = true;
 }
 }
@@ -403,7 +405,7 @@ void ScNameDlg::NameModified()
 void ScNameDlg::SelectionChanged()
 {
 //don't update if we have just modified due to user input
-if (!mbNeedUpdate)
+if (m_xRangeManagerTable->UpdatesBlocked())
 {
 return;
 }
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index 9c4895a11a40..3567e9a94c72 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -60,6 +60,7 @@ 
ScRangeManagerTable::ScRangeManagerTable(std::unique_ptr xTreeVi
 , m_RangeMap(rRangeMap)
 , maPos( rPos )
 , m_nId(0)
+, mbNeedUpdate(true)
 {
 auto nColWidth = m_xTreeView->get_size_request().Width() / 7;
 std::vector aWidths;
@@ -91,7 +92,10 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const 
ScRangeNameLine& rLi
 
 void ScRangeManagerTable::CheckForFormulaString()
 {
-m_xTreeView->visible_foreach([this](weld::TreeIter& rEntry){
+if (UpdatesBlocked())
+return;
+
+auto lambda = [this](weld::TreeIter& rEntry){
 OUS

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-3' - bridges/Library_cpp_uno.mk config_host.mk.in configure.ac

2019-10-17 Thread Stephan Bergmann (via logerrit)

 bridges/Library_cpp_uno.mk |9 -
 config_host.mk.in  |1 +
 configure.ac   |   11 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit d5e7b39f863ce697f7c29c08b5e59919bd9b3156
Author: Stephan Bergmann 
AuthorDate: Fri Oct 11 23:50:19 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 16:03:57 2019 +0200

aarch64 callVirtualFunction needs to be compiled w/o 
-fstack-clash-protection

At least when doing an aarch64 Flatpak build against 
org.freedesktop.Sdk//19.08,
which uses GCC 9.2.0 and passes in `CXXFLAGS=-O2 -g -pipe
-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions
-fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables
-fstack-clash-protection`, callVirtualMethod (in
bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx) would
decrement the stack pointer another 16 bytes after the

  stackargs = alloca(...);

and before the asm block, so in the called virtual function, arguments read 
from
the stack would read garbage (and CustomTarget_testtools/uno_test would fail
with SIGSEGV at

> #0  0xb733eb48 in rtl::OUString::operator= (this=0xf9c1ac30, 
str=...) at /run/build/libreoffice/include/rtl/ustring.hxx:453
> #1  0xb733a7bc in bridge_object::assign (rData=..., bBool=true, 
cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, 
nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, 
fDouble=3.141592635899, eEnum=-1698898192, rStr=..., xTest=..., rAny=...) 
at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:99
> #2  0xb733a87c in bridge_object::assign (rData=..., bBool=true, 
cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, 
nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, 
fDouble=3.141592635899, eEnum=-1698898192, rStr=..., xTest=..., rAny=..., 
rSequence=...) at 
/run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:115
> #3  0xb733ade4 in bridge_object::Test_Impl::setValues 
(this=0xf9c1abb0, bBool=1 '\001', cChar=64 u'@', nByte=17 '\021', 
nShort=4660, nUShort=65244, nLong=305419896, nULong=4275878552, nHyper=0, 
nUHyper=187651311381888, fFloat=17.0814991, fDouble=3.141592635899, 
eEnum=-1698898192, rStr=..., xTest=..., rAny=..., rSequence=..., rStruct=...) 
at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:548
> #4  0xb740bff4 in callVirtualFunction (function=281473755360772, 
gpr=0xd1ab1f28, fpr=0xd1ab1f68, stack=0xd1ab1d40, sp=8, 
ret=0xd1ab22c0) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:63
> #5  0xb740ca70 in (anonymous namespace)::call 
(proxy=0xf9c291c0, slot=..., returnType=0xf9c00770, count=17, 
parameters=0xf9c3a210, returnValue=0xd1ab22c0, 
arguments=0xd1ab2230, exception=0xd1ab2370) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:178
> #6  0xb740d4c4 in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch (pUnoI=0xf9c291c0, 
pMemberDescr=0xf9c55950, pReturn=0xd1ab22c0, pArgs=0xd1ab2230, 
ppException=0xd1ab2370) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:361
> #7  0xb740720c in (anonymous namespace)::call 
(proxy=0xf9c549c0, description=..., returnType=0xf9c00770, count=17, 
parameters=0xf9c3a210, gpr=0xd1ab2510, fpr=0xd1ab2550, 
stack=0xd1ab2590, indirectRet=0xb7d24790) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:120
> #8  0xb74079a0 in (anonymous namespace)::vtableCall 
(functionIndex=40, vtableOffset=0, gpr=0xd1ab2510, fpr=0xd1ab2550, 
stack=0xd1ab2590, indirectRet=0xb7d24790) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:291
> #9  0xb7407b00 in (anonymous namespace)::vtableSlotCall 
(gpr0=187651311618536, gpr1=1, gpr2=64, gpr3=17, gpr4=4660, gpr5=65244, 
gpr6=305419896, gpr7=4275878552, fpr0=5.4321266044931319e-315, 
fpr1=3.141592635899, fpr2=0, fpr3=4.0039072046065485, fpr4=0, 
fpr5=4.003911019303815, fpr6=8.9589789687541617e+102, 
fpr7=-4.4588500238274385e-308) at 
/run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:348
> #10 0xb739e60c in bridge_test::performTest (xContext=..., 
xLBT=..., noCurrentContext=false) at 
/run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:378
> #11 0xb73a3d58 in bridge_test::TestBridgeImpl::run 
(this=0xf9c18550, rArgs=...) at 
/run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:1162
> #12 0xd292a3ec in sal_main () at 
/run/build/libreoffice/cpputools/source/unoexe/unoexe.cxx:509
> #13 0xd29297a0 in main

[Libreoffice-commits] online.git: loleaflet/css loleaflet/images

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css |6 ++
 loleaflet/images/lc_downloadas-pdf.svg |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 27c935c516e5fb8ac10c85710bbffe6454227ea0
Author: Pedro 
AuthorDate: Thu Oct 17 15:20:39 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 16:05:14 2019 +0200

Hamburger menu: add missing downloadaspdf icon and disable other filetype 
icons

Change-Id: I78115ec3ad75d556140987b94015dafc1ddf5379
Reviewed-on: https://gerrit.libreoffice.org/80950
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index a16d2c2cf..d79dfb93b 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -35,3 +35,9 @@ span#main-menu-btn-icon {
 #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
display: none;
 }
+.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas"] {
+   visibility: hidden;
+}
+.ui-header.level-1.mobile-wizard.ui-widget 
img[src="images/lc_downloadas-pdf.svg"]{
+   visibility: visible;
+}
diff --git a/loleaflet/images/lc_downloadas-pdf.svg 
b/loleaflet/images/lc_downloadas-pdf.svg
new file mode 100644
index 0..9c0b9ebc3
--- /dev/null
+++ b/loleaflet/images/lc_downloadas-pdf.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk

2019-10-17 Thread Michael Weghorn (via logerrit)

 sd/CppunitTest_sd_uimpress.mk |3 ++-
 sd/Library_sd.mk  |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 24004cdf9e2582d429b8987a40eb82af6926013c
Author: Michael Weghorn 
AuthorDate: Thu Oct 17 14:18:20 2019 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 17 16:04:19 2019 +0200

gbuild: Treat 'DBUS_GLIB_CFLAGS' as includes, not defines

Since that variable holds the relevant includes, using
'gb_LinkTarget_set_include' makes sure that those
flags end up in the correct section, e.g. when generating
IDE integration using 'gbuild-to-ide'.

E.g. for the 'qtcreator-ide-integraton' make target, this
makes sure that they end up in the 'INCLUDES' section in
'sd/sd.pro' and not the 'DEFINES' section, which previously
led to an "error: macro name must be an identifier" being
shown when editing files underneath 'sd/' in Qt Creator with
the Clang Code Model plugin enabled, s.a. commit
4aa60490622cc10f8d3a31489c62a5622d240c83
("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines").

Corresponding entry in my config_host.mk.in on Debian
bullseye/testing:

export DBUS_GLIB_CFLAGS=$(gb_SPACE)-I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include

Change-Id: I9af9a58fdc05ce6648221c00a20859be777843f9
Reviewed-on: https://gerrit.libreoffice.org/80944
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 94229cc2c8e3..93426dfc3a55 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -80,7 +80,8 @@ $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
 ))
 
 ifneq ($(DBUS_HAVE_GLIB),)
-$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
+$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
+   $$(INCLUDE) \
$(DBUS_GLIB_CFLAGS) \
 ))
 $(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index e8afd204c308..410f3c782b29 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -110,7 +110,8 @@ $(eval $(call gb_Library_use_externals,sd,\
 ))
 
 ifneq ($(DBUS_HAVE_GLIB),)
-$(eval $(call gb_Library_add_defs,sd,\
+$(eval $(call gb_Library_set_include,sd,\
+   $$(INCLUDE) \
$(DBUS_GLIB_CFLAGS) \
 ))
 $(eval $(call gb_Library_add_libs,sd,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/images/lc_fullscreen-presentation.svg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df87bcbc46e20c285923d7a3199890f19e9cbaba
Author: Pedro 
AuthorDate: Thu Oct 17 14:39:51 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 16:07:38 2019 +0200

Hamburger menu: Impress: Use proper icon for Fullscreen Presentation instead

Change-Id: I5440d9994daa15465cbec676829e701442fb2074
Reviewed-on: https://gerrit.libreoffice.org/80946
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/images/lc_fullscreen-presentation.svg 
b/loleaflet/images/lc_fullscreen-presentation.svg
index a788d66a9..f7d561a22 100644
--- a/loleaflet/images/lc_fullscreen-presentation.svg
+++ b/loleaflet/images/lc_fullscreen-presentation.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+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: Branch 'feature/skia' - 3 commits - bin/update_pch config_host/config_skia.h.in external/skia vcl/skia

2019-10-17 Thread Luboš Luňák (via logerrit)

 bin/update_pch |   13 +++-
 config_host/config_skia.h.in   |   45 +
 external/skia/inc/pch/precompiled_skia.hxx |   24 ---
 vcl/skia/SkiaHelper.cxx|   11 +--
 4 files changed, 85 insertions(+), 8 deletions(-)

New commits:
commit f8218d8f35030b26b3be7aff47600b71702b2bf6
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 15:56:46 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:16:16 2019 +0200

update PCH for Skia

Change-Id: Iece4d90774890576bd3d84ed2218de56def96077

diff --git a/bin/update_pch b/bin/update_pch
index aaf97e4ccd4b..47d4da870e07 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -439,9 +439,20 @@ def filter_ignore(line, module):
 'dirent.h', # unix-specific
 'pthread.h',
 'unistd.h',
+'sys/stat.h',
 'ft2build.h',
 'fontconfig/fontconfig.h',
-'GL/glx.h'
+'GL/glx.h',
+'src/Transform_inl.h',
+'src/c/sk_c_from_to.h',
+'src/c/sk_types_priv.h',
+'src/core/SkBlitBWMaskTemplate.h',
+'src/sfnt/SkSFNTHeader.h',
+'src/opts/',
+'src/core/SkCubicSolver.h',
+'src/sksl/SkSLCPP.h',
+'src/gpu/vk/GrVkAMDMemoryAllocator.h',
+'src/gpu/GrUtil.h'
 ]
 
 for i in ignore_list:
diff --git a/external/skia/inc/pch/precompiled_skia.hxx 
b/external/skia/inc/pch/precompiled_skia.hxx
index 5f40d7a38273..3d87068fcaa9 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-09-26 11:31:14 using:
+ Generated on 2019-10-17 15:51:12 using:
  ./bin/update_pch external/skia skia --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -109,7 +109,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -227,8 +226,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -612,6 +612,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -642,13 +643,23 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -852,7 +863,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -947,7 +958,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -964,6 +974,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
commit 04df4cad3e235133d4e3704d0034977e806be0ed
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 12:56:31 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:16:11 2019 +0200

fix Skia enabling (disabling and it should not be enabled by default)

Change-Id: I96bd8565a2a311d556ca96d868feccaf00a9cfe3

diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 84291a3d1899..278d19bd8d52 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -18,6 +18,14 @@ bool SkiaHelper::isVCLSkiaEnabled() { return false; }
 
 #else
 
+static bool supportsVCLSkia()
+{
+static bool bDisableSkia = !!getenv("SAL_DISABLESKIA");
+bool bBlacklisted = false; // TODO isDeviceBlacklisted();
+
+return !bDisableSkia && !bBlacklisted;
+}
+
 bool SkiaHelper::isVCLSkiaEnabled()
 {
 /**
@@ -50,7 +58,7 @@ bool SkiaHelper::isVCLSkiaEnabled()
 "SAL_FORCESKIA"); // TODO SKIA || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
 
 bool bRet = false;
-bool bSupportsVCLSkia = true; // TODO SKIA supportsVCLOpenGL();
+bool bSupportsVCLSkia = supportsVCLSkia();
 // TODO SKIA always call supportsVCLOpenGL to de-zombie the glxtest child 
process on X11
 if (bForceSkia)
 {
@@ -63,7 +71,6 @@ bool SkiaHelper::isVCLSkiaEnabled()
 bEnable = bEnableSkiaEnv;
 
 // TODO SKIAif 
(officecfg::Office::Common::VCL::UseOpenGL::get())
-bEnable = true;
 
 // Force disable in safe mode
 if (Application::IsSafeModeEnabled())
commit 46b60cf079e4389a18639ca075cc21ec7b4b89f1
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 12:07:48 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:16:06 2019 +0200

use the same config file for skia build and using it

So that the setup is consistent.

Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac

diff --git a/confi

[Libreoffice-commits] core.git: Branch 'feature/skia' - 3 commits - bin/update_pch config_host/config_skia.h.in configure.ac external/skia RepositoryExternal.mk vcl/skia

2019-10-17 Thread Luboš Luňák (via logerrit)

Rebased ref, commits from common ancestor:
commit 62ab63e34774c444bb03d91c59fadbf952406688
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 15:56:46 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:17:56 2019 +0200

update PCH for Skia

Change-Id: Iece4d90774890576bd3d84ed2218de56def96077

diff --git a/bin/update_pch b/bin/update_pch
index aaf97e4ccd4b..47d4da870e07 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -439,9 +439,20 @@ def filter_ignore(line, module):
 'dirent.h', # unix-specific
 'pthread.h',
 'unistd.h',
+'sys/stat.h',
 'ft2build.h',
 'fontconfig/fontconfig.h',
-'GL/glx.h'
+'GL/glx.h',
+'src/Transform_inl.h',
+'src/c/sk_c_from_to.h',
+'src/c/sk_types_priv.h',
+'src/core/SkBlitBWMaskTemplate.h',
+'src/sfnt/SkSFNTHeader.h',
+'src/opts/',
+'src/core/SkCubicSolver.h',
+'src/sksl/SkSLCPP.h',
+'src/gpu/vk/GrVkAMDMemoryAllocator.h',
+'src/gpu/GrUtil.h'
 ]
 
 for i in ignore_list:
diff --git a/external/skia/inc/pch/precompiled_skia.hxx 
b/external/skia/inc/pch/precompiled_skia.hxx
index 5f40d7a38273..3d87068fcaa9 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-09-26 11:31:14 using:
+ Generated on 2019-10-17 15:51:12 using:
  ./bin/update_pch external/skia skia --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -109,7 +109,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -227,8 +226,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -612,6 +612,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -642,13 +643,23 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -852,7 +863,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -947,7 +958,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -964,6 +974,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
commit 74926d7515f197e225a91cd351ae7caf17b56a9e
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 12:56:31 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:17:55 2019 +0200

fix Skia enabling (disabling and it should not be enabled by default)

Change-Id: I96bd8565a2a311d556ca96d868feccaf00a9cfe3

diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 84291a3d1899..278d19bd8d52 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -18,6 +18,14 @@ bool SkiaHelper::isVCLSkiaEnabled() { return false; }
 
 #else
 
+static bool supportsVCLSkia()
+{
+static bool bDisableSkia = !!getenv("SAL_DISABLESKIA");
+bool bBlacklisted = false; // TODO isDeviceBlacklisted();
+
+return !bDisableSkia && !bBlacklisted;
+}
+
 bool SkiaHelper::isVCLSkiaEnabled()
 {
 /**
@@ -50,7 +58,7 @@ bool SkiaHelper::isVCLSkiaEnabled()
 "SAL_FORCESKIA"); // TODO SKIA || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
 
 bool bRet = false;
-bool bSupportsVCLSkia = true; // TODO SKIA supportsVCLOpenGL();
+bool bSupportsVCLSkia = supportsVCLSkia();
 // TODO SKIA always call supportsVCLOpenGL to de-zombie the glxtest child 
process on X11
 if (bForceSkia)
 {
@@ -63,7 +71,6 @@ bool SkiaHelper::isVCLSkiaEnabled()
 bEnable = bEnableSkiaEnv;
 
 // TODO SKIAif 
(officecfg::Office::Common::VCL::UseOpenGL::get())
-bEnable = true;
 
 // Force disable in safe mode
 if (Application::IsSafeModeEnabled())
commit b7ce49c66fc9dd181b1858d9b0ebad6c9654b4c2
Author: Luboš Luňák 
AuthorDate: Thu Oct 17 12:07:48 2019 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 17 16:17:48 2019 +0200

use the same config file for skia build and using it

So that the setup is consistent.

Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 73be1e7e09a8..049ab3dbe317 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -114,15 +114,20 @@ endif
 ifneq ($(ENABLE_SKIA),)
 define gb_LinkTarget__use_skia
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_Unpack

ESC meeting minutes: 2019-10-17

2019-10-17 Thread Stephan Bergmann


* Present:
 + Cloph, Ilmari, Sophie, Heiko, Eike, Caolan, Michael W., Xisco, 
Olivier,

   Michael S., Stephan


* Completed Action Items:

* Pending Action Items:
+ Collect summary / pictures for each GSoC project (Heiko)
  [ No updates from mentors yet; probably drop if there’s no input from
mentors! ]
  + draft: https://nextcloud.documentfoundation.org/s/XyMs94pqw5T44GW
  + still looking for input from everybody (except from Kendy and 
Heiko)

  + Propose new certified developers (Kendy, Stephan, Thorsten)

* Release Engineering update (Cloph)
+ 6.4 alpha: tagged yesterday, builds still running
  + branch-off is planned for mid-November
+ 6.3.3 status
  + notarization issues on macOS 10.15, not clear what the exact 
issue is

yet
+ 6.2.8 released today (last of the 8.2 line)
+ Remotes
   + Android remote: fresh release pending, incl. Building on newer SDK
+ Android viewer
   + Issue when opening any document? (Xisco)
 + Should be fixed (Cloph)
+ Online

* Documentation (Olivier)
+ New Help
   + Finishing touches for online Help & xapian (ohallot)
+ Helpcontent2
   + Housekeeping, after translation review (ohallot)
   + Untangling some complex help pages for macros (ohallot)
+ Google seasons of Doc
   + progressing
+ Guides
   + On going
+ OOo Developer Guide, not available in LO wiki (Ilmari)
   + Do we want to maintain it?
   + Definitively useful (Michael S.)
   + Ilmari happy to work on it to the side (esp. converting images
 to editable forms)
   + make that an EasyHack even? (Xisco)
   + more important to have a workflow how to do it than rather
 doing it quickly, as few will probably ever be updated
 (Michael S)
   + Even more useful OOo documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
230(230) (topicUI) bugs open, 235(235) (needsUXEval) needs to 
be evaluated by the UXteam

+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  9(2) 16(-4)43(-5)  99(-1)
 commented 79(2)278(13)   806(12)2007(45)
   removed  0(0)  0(0)  0(-1)  17(0)
  resolved  7(-2)36(2) 94(5)  190(5)
+ top 10 contributors:
  Heiko Tietze made 163 changes in 1 month, and 657 changes in 
1 year
  Foote, V Stuart made 75 changes in 1 month, and 342 changes 
in 1 year
  Dieter Praas made 58 changes in 1 month, and 245 changes in 1 
year
  Thomas Lendo made 41 changes in 1 month, and 319 changes in 1 
year
  Kainz, Andreas made 37 changes in 1 month, and 231 changes in 
1 year

  Xisco Faulí made 33 changes in 1 month, and 324 changes in 1 year
  Cor Nouws made 25 changes in 1 month, and 159 changes in 1 year
  *UNKNOWN* made 22 changes in 1 month, and 26 changes in 1 year
  Roman Kuznetsov made 20 changes in 1 month, and 274 changes 
in 1 year

  *UNKNOWN* made 15 changes in 1 month, and 15 changes in 1 year

+ New tickets with needsUXEval Oct/10-17

  * Better line/paragraph numbering
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128163
  * FORMATTING: Page Number field inserts without its proper 
character style

+ https://bugs.documentfoundation.org/show_bug.cgi?id=128146
  * allow each deck to keep its own width in the sidebar
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128180
  * Dash type should not respect draw:style="rect" item for draw:name
+ https://bugs.documentfoundation.org/show_bug.cgi?id=127509
  * [Sifr theme] Change Navigator's Update icon in Master document mode
(Writer)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=127976
  * file Open type menu has about 175 items, please organize
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128113
  => unconfirmed, in discussion, needinfo

   -> * Mouse pointer/cursor does not change its shape over selected text
+ https://bugs.documentfoundation.org/show_bug.cgi?id=127835
+ code pointers would be nice
  * Create Native Mac OS X Full Screen Mode
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128186
  * [Sifr theme] Create good icons for Set reminder, Header, Footer and
Headings level show icons in Navigator
+ https://bugs.documentfoundation.org/show_bug.cgi?id=127977
   -> * WRITER TABLES: Sort warning needed or some form of protection
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128090
+ new confirmation dialog like in Calc suggested
  * Frames around dialog widgets
+ https://bugs.documentfoundation.org/show_bug.cgi?id=125508
   -> * UI: Option to open all heading branches at once
+ https://bugs.documentfoundation.org/s

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 cui/source/tabpages/border.cxx |4 ++--
 cui/uiconfig/ui/borderpage.ui  |   40 
 2 files changed, 6 insertions(+), 38 deletions(-)

New commits:
commit da50f3e15e38474a51361bdddbc0951dec5674bf
Author: Caolán McNamara 
AuthorDate: Wed Oct 16 11:57:02 2019 +0100
Commit: Heiko Tietze 
CommitDate: Thu Oct 17 16:32:02 2019 +0200

tdf#125508 remove border frame from shadows and presets

Change-Id: I022f64188e49553bd7bef38cdd51620dfa0b90cd
Reviewed-on: https://gerrit.libreoffice.org/80883
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 57534beb059c..84bdcd8f92c1 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -245,7 +245,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, 
weld::DialogControlle
 , mbSync(true)
 , mbRemoveAdjacentCellBorders(false)
 , bIsCalcDoc(false)
-, m_xWndPresets(new 
SvtValueSet(m_xBuilder->weld_scrolled_window("presetswin")))
+, m_xWndPresets(new SvtValueSet(nullptr))
 , m_xWndPresetsWin(new weld::CustomWeld(*m_xBuilder, "presets", 
*m_xWndPresets))
 , m_xUserDefFT(m_xBuilder->weld_label("userdefft"))
 , m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel", 
m_aFrameSel))
@@ -263,7 +263,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, 
weld::DialogControlle
 , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottommf", 
FieldUnit::MM))
 , m_xSynchronizeCB(m_xBuilder->weld_check_button("sync"))
 , m_xShadowFrame(m_xBuilder->weld_container("shadow"))
-, m_xWndShadows(new 
SvtValueSet(m_xBuilder->weld_scrolled_window("shadowswin")))
+, m_xWndShadows(new SvtValueSet(nullptr))
 , m_xWndShadowsWin(new weld::CustomWeld(*m_xBuilder, "shadows", 
*m_xWndShadows))
 , m_xFtShadowSize(m_xBuilder->weld_label("distanceft"))
 , m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", 
FieldUnit::MM))
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 5cc25655f7ef..d81f70ae2fd8 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -122,26 +122,10 @@
   
 
 
-  
+  
 True
 True
-start
-never
-never
-in
-
-  
-True
-False
-
-  
-True
-True
-GDK_BUTTON_PRESS_MASK 
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | 
GDK_STRUCTURE_MASK
-  
-
-  
-
+GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | 
GDK_STRUCTURE_MASK
   
   
 0
@@ -522,26 +506,10 @@
 True
 6
 
-  
+  
 True
 True
-start
-never
-never
-in
-
-  
-True
-False
-
-  
-True
-False
-GDK_BUTTON_PRESS_MASK 
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | 
GDK_STRUCTURE_MASK
-  
-
-  
-
+GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | 
GDK_STRUCTURE_MASK
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.cxx  |   31 +
 compilerplugins/clang/virtualdead.py   |   76 ++
 compilerplugins/clang/virtualdead.results  |   29 -
 compilerplugins/clang/virtualdead.unusedparams.results |  450 +
 4 files changed, 543 insertions(+), 43 deletions(-)

New commits:
commit e8475b6343af23bc1ac2d722afd8df4d7615a7a8
Author: Noel Grandin 
AuthorDate: Thu Oct 17 11:05:43 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 16:51:07 2019 +0200

loplugin:virtualdead look for virtual methods where a param is unused

Change-Id: Ibadc2aa79a52082db16eff44c89ab30938838dd8
Reviewed-on: https://gerrit.libreoffice.org/80935
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.cxx 
b/compilerplugins/clang/virtualdead.cxx
index c2d804067d7b..330085b18781 100644
--- a/compilerplugins/clang/virtualdead.cxx
+++ b/compilerplugins/clang/virtualdead.cxx
@@ -43,9 +43,19 @@ bool operator<(const MyFuncInfo& lhs, const MyFuncInfo& rhs)
 {
 return std::tie(lhs.name, lhs.returnValue) < std::tie(rhs.name, 
rhs.returnValue);
 }
+struct MyParamInfo
+{
+std::string funcName;
+std::string paramBitField;
+};
+bool operator<(const MyParamInfo& lhs, const MyParamInfo& rhs)
+{
+return std::tie(lhs.funcName, lhs.paramBitField) < std::tie(rhs.funcName, 
rhs.paramBitField);
+}
 
 // try to limit the voluminous output a little
 static std::set definitionSet;
+static std::set paramUsedSet;
 
 class VirtualDead : public RecursiveASTVisitor, public 
loplugin::Plugin
 {
@@ -64,6 +74,8 @@ public:
 std::string output;
 for (const MyFuncInfo& s : definitionSet)
 output += "virtual:\t" + s.name + "\t" + s.sourceLocation + "\t" + 
s.returnValue + "\n";
+for (const MyParamInfo& s : paramUsedSet)
+output += "param:\t" + s.funcName + "\t" + s.paramBitField + "\n";
 std::ofstream myfile;
 myfile.open(WORKDIR "/loplugin.virtualdead.log", std::ios::app | 
std::ios::out);
 myfile << output;
@@ -77,7 +89,8 @@ public:
 private:
 std::string getCallValue(const Expr* arg);
 std::string toString(SourceLocation loc);
-void markSuperclassMethods(const CXXMethodDecl* methodDecl, std::string 
returnValue);
+void markSuperclassMethods(const CXXMethodDecl* methodDecl, const 
std::string& returnValue,
+   const std::string& paramBitField);
 };
 
 std::string niceName(const CXXMethodDecl* cxxMethodDecl)
@@ -142,18 +155,28 @@ bool VirtualDead::VisitCXXMethodDecl(const CXXMethodDecl* 
methodDecl)
 else
 returnValue = "empty";
 
-markSuperclassMethods(methodDecl, returnValue);
+std::string paramBitfield;
+for (auto it = methodDecl->param_begin(); it != methodDecl->param_end(); 
++it)
+{
+auto param = *it;
+paramBitfield += param->getName().empty() ? "0" : "1";
+}
+
+markSuperclassMethods(methodDecl, returnValue, paramBitfield);
 
 return true;
 }
 
-void VirtualDead::markSuperclassMethods(const CXXMethodDecl* methodDecl, 
std::string returnValue)
+void VirtualDead::markSuperclassMethods(const CXXMethodDecl* methodDecl,
+const std::string& returnValue,
+std::string const& paramBitField)
 {
 if (methodDecl->size_overridden_methods() == 0)
 {
 std::string aNiceName = niceName(methodDecl);
 definitionSet.insert(
 { aNiceName, 
toString(methodDecl->getCanonicalDecl()->getLocation()), returnValue });
+paramUsedSet.insert({ aNiceName, paramBitField });
 return;
 }
 
@@ -161,7 +184,7 @@ void VirtualDead::markSuperclassMethods(const 
CXXMethodDecl* methodDecl, std::st
  iter != methodDecl->end_overridden_methods(); ++iter)
 {
 const CXXMethodDecl* overriddenMethod = *iter;
-markSuperclassMethods(overriddenMethod, returnValue);
+markSuperclassMethods(overriddenMethod, returnValue, paramBitField);
 }
 }
 
diff --git a/compilerplugins/clang/virtualdead.py 
b/compilerplugins/clang/virtualdead.py
index 9f5ab39663d0..eccfbd4f76e3 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -5,6 +5,8 @@ import re
 import io
 
 callDict = dict() # callInfo tuple -> callValue
+definitionToSourceLocationMap = dict()
+paramSet = set() # paraminfo tuple
 
 # clang does not always use exactly the same numbers in the type-parameter 
vars it generates
 # so I need to substitute them to ensure we can match correctly.
@@ -17,13 +19,22 @@ with io.open("workdir/loplugin.virtualdead.log", "rb", 
buffering=1024*1024) as t
 for line in txt:
 try:
 tokens = line.strip().split("\t")
-nameAndParams = normalizeTypeParams(tokens[1])
-sourceLocation = tokens[2]
-returnValue = tokens[3]
-callInfo = (name

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.unusedparams.results |3 
 xmloff/inc/forms/property_handler.hxx  |5 
 xmloff/source/forms/elementexport.cxx  |   41 +--
 xmloff/source/forms/handler/vcl_date_handler.cxx   |6 -
 xmloff/source/forms/handler/vcl_date_handler.hxx   |1 
 xmloff/source/forms/handler/vcl_time_handler.cxx   |6 -
 xmloff/source/forms/handler/vcl_time_handler.hxx   |1 
 xmloff/source/forms/property_description.hxx   |   17 ---
 xmloff/source/forms/property_group.hxx |   36 --
 xmloff/source/forms/property_meta_data.cxx |   95 +
 xmloff/source/forms/property_meta_data.hxx |   10 -
 11 files changed, 19 insertions(+), 202 deletions(-)

New commits:
commit 18d8ba49dcddfc7b01751d278f404a7eaebe5591
Author: Noel Grandin 
AuthorDate: Thu Oct 17 12:10:56 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 16:53:59 2019 +0200

loplugin:virtualdead dead propertygroup functionality

ever since it was introduced in

commit d09dd8986436f17717443823ef18bd8552fdf408
Date:   Wed Sep 15 13:55:34 2010 +0200
dba34a: export/import min-/max-/default-/value for date/time as
XML-Schema conformant strings

looks like classic over-engineering

Change-Id: Ia4e4b65cfe92f522dee238a54a37db01f691750e
Reviewed-on: https://gerrit.libreoffice.org/80951
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 4a5fe58aa00c..32d5316d2374 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -445,6 +445,3 @@ writerfilter/source/dmapper/LoggedResources.hxx:93
 writerfilter/source/dmapper/LoggedResources.hxx:129
 void writerfilter::LoggedTable::lcl_entry(int,class tools::SvRef >,)
 01
-xmloff/inc/forms/property_handler.hxx:44
-class rtl::OUString xmloff::PropertyHandlerBase::getAttributeValue(const 
class std::__debug::map, class 
std::allocator > > &,)const
-0
diff --git a/xmloff/inc/forms/property_handler.hxx 
b/xmloff/inc/forms/property_handler.hxx
index a217266fc343..de5d42eb5337 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -38,11 +38,6 @@ namespace xmloff
 class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject
 {
 public:
-/** retrieves the XML attribute value for the given property values
-*/
-virtual OUString
-getAttributeValue( const PropertyValues& i_propertyValues ) const 
= 0;
-
 /** is a convenience method for XML attributes whose value comprises 
of only one UNO API property
 */
 virtual OUString
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 03c188de5da6..95e6cffadaf6 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -456,42 +456,17 @@ namespace xmloff
 continue;
 }
 
-OUString attributeValue;
-if ( propDescription->propertyGroup == NO_GROUP )
+// that's a property which has a direct mapping to an attribute
+if ( !shouldExportProperty( prop.Name ) )
+// TODO: in the future, we surely need a more 
sophisticated approach to this, involving the property
+// handler, or the property description
 {
-// that's a property which has a direct mapping to an 
attribute
-if ( !shouldExportProperty( prop.Name ) )
-// TODO: in the future, we surely need a more 
sophisticated approach to this, involving the property
-// handler, or the property description
-{
-exportedProperty( prop.Name );
-continue;
-}
-
-const Any propValue = m_xProps->getPropertyValue( 
prop.Name );
-attributeValue = handler->getAttributeValue( propValue );
+exportedProperty( prop.Name );
+continue;
 }
-else
-{
-// that's a property which is part of a group of 
properties, whose values, in their entity, comprise
-// a single attribute value
 
-// retrieve the descriptions of all other properties which 
add to the attribute value
-PropertyDescriptionList descriptions;
-metadata::getPropertyGroup( 
propDescription->propertyGroup, descriptions );
-
-// retrieve the values for all those properties
-PropertyVal

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

2019-10-17 Thread Eike Rathke (via logerrit)

 sc/qa/unit/subsequent_export-test.cxx |   16 +--
 svl/source/numbers/zforlist.cxx   |   46 +++---
 2 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit bd8b2a95e2c88cdab80c514c0d6364bad91d9177
Author: Eike Rathke 
AuthorDate: Wed Oct 16 18:47:40 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Oct 17 17:18:16 2019 +0200

Resolves: tdf#126773 Excel uses lowercase date and time format code keywords

... so do the same when exporting to prevent surprises with iOS
and OSX viewers or maybe other tools.

This made it necessary to adapt
ScExportTest::testExtendedLCIDXLSX() that checks calendar and date
relevant exported format strings.

Change-Id: I243d536e2a42562ec46375923facfa222ecbb29b
Reviewed-on: https://gerrit.libreoffice.org/80920
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 32dd92481c36..9ee5fd9a0e8c 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -4109,14 +4109,14 @@ void ScExportTest::testExtendedLCIDXLSX()
 xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, 
"xl/styles.xml", FORMAT_XLSX);
 CPPUNIT_ASSERT(pDoc);
 // Check export
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[2]", "formatCode", 
"[$-107041E]DD\\-MM\\-");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[3]", "formatCode", 
"[$-D07041E]DD\\-MM\\-");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[4]", "formatCode", 
"[$-1030411]DD\\-MM\\-EE");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[5]", "formatCode", 
"[$-1B030411]DD\\-MM\\-EE");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[6]", "formatCode", 
"[$-108040D]DD\\-MM\\-");
-//assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[7]", "formatCode", 
"[$-108040D]DD\\-MM\\-");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[7]", "formatCode", 
"[$-1060401]DD\\-MM\\-");
-assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[8]", "formatCode", 
"[$-2060401]DD\\-MM\\-");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[2]", "formatCode", 
"[$-107041E]dd\\-mm\\-");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[3]", "formatCode", 
"[$-D07041E]dd\\-mm\\-");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[4]", "formatCode", 
"[$-1030411]dd\\-mm\\-ee");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[5]", "formatCode", 
"[$-1B030411]dd\\-mm\\-ee");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[6]", "formatCode", 
"[$-108040D]dd\\-mm\\-");
+//assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[7]", "formatCode", 
"[$-108040D]dd\\-mm\\-");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[7]", "formatCode", 
"[$-1060401]dd\\-mm\\-");
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[8]", "formatCode", 
"[$-2060401]dd\\-mm\\-");
 
 // Check import
 ScDocument& rDoc = xDocSh->GetDocument();
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 053e195cd82a..7fc999501780 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -787,12 +787,50 @@ void SvNumberFormatter::FillKeywordTableForExcel( 
NfKeywordTable& rKeywords )
 
 // Replace upper case "GENERAL" with proper case "General".
 rKeywords[ NF_KEY_GENERAL ] = GetStandardName( LANGUAGE_ENGLISH_US );
+
+// Excel or OOXML do not specify format code keywords case sensitivity,
+// but given and writes them lower case. Using upper case even lead to an
+// odd misrepresentation in iOS viewer and OSX Quicklook viewer that
+// strangely use "D" and "DD" for "days since beginnning of year", which is
+// nowhere defined. See tdf#126773
+// Use lower case for all date and time keywords where known. See OOXML
+// ECMA-376-1:2016 18.8.31 numFmts (Number Formats)
+rKeywords[ NF_KEY_MI ]= "m";
+rKeywords[ NF_KEY_MMI ]   = "mm";
+rKeywords[ NF_KEY_M ] = "m";
+rKeywords[ NF_KEY_MM ]= "mm";
+rKeywords[ NF_KEY_MMM ]   = "mmm";
+rKeywords[ NF_KEY_ ]  = "";
+rKeywords[ NF_KEY_M ] = "m";
+rKeywords[ NF_KEY_H ] = "h";
+rKeywords[ NF_KEY_HH ]= "hh";
+rKeywords[ NF_KEY_S ] = "s";
+rKeywords[ NF_KEY_SS ]= "ss";
+/* XXX: not defined in OOXML: rKeywords[ NF_KEY_Q ] = "q"; */
+/* XXX: not defined in OOXML: rKeywords[ NF_KEY_QQ ]= "qq"; */
+rKeywords[ NF_KEY_D ] = "d";
+rKeywords[ NF_KEY_DD ]= "dd";
+rKeywords[ NF_KEY_DDD ]   = "ddd";
+rKeywords[ NF_KEY_ ]  = "";
+rKeywords[ NF_KEY_YY ]= "yy";
+rKeywords[ NF_KEY_ ]  = "";
+/* XXX: not defined in OOXML: rKeywords[ NF_KEY_AAA ]   = "aaa"; */
+/* XXX: not defined in OOXML: rKeywords[ NF_KEY_ ]

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

2019-10-17 Thread Pedro (via logerrit)

 loleaflet/css/loleaflet.css|2 +-
 loleaflet/css/mobilewizard.css |4 ++--
 loleaflet/css/vex.css  |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 43cede22cb2ff0886fc41ff6cee8351cc9eddcf1
Author: Pedro 
AuthorDate: Thu Oct 17 17:09:33 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 17:23:09 2019 +0200

Fix z-index: about dialog, hamburger menu were appearing under edit FAB

Change-Id: I9590494769ab9cd629137bfdcb9bdd2dca0bcfec
Reviewed-on: https://gerrit.libreoffice.org/80973
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 8d1b5b88f..7038f7a81 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -176,7 +176,7 @@ body {
background-color: #0b87e7;
border-radius: 50%;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 
0.19);
-   z-index: 2000;
+   z-index: 1001;
 }
 
 #mobile-edit-button-image {
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index d79dfb93b..0cea4beb3 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -10,7 +10,7 @@ span.menu-entry-icon img {
 #mobile-wizard.menuwizard{
top: 0px !important;
height: 100% !important;
-   z-index: 999 !important;
+   z-index: 1500 !important;
 }
 
 #mobile-wizard.menuwizard #mobile-wizard-back.close-button{
@@ -18,7 +18,7 @@ span.menu-entry-icon img {
 }
 
 #toolbar-hamburger.menuwizard-opened{
-   z-index: 1000 !important;
+   z-index: 1501 !important;
position: relative !important;
background-color: #dae6f3 !important;
padding-left: 8px !important;
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index 80c61e9f4..33c8484cc 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -36,11 +36,11 @@
.vex.vex-theme-plain {
padding: 0px !important;
position: relative !important;
-   z-index: 1001 !important;
+   z-index: 2001 !important;
top: -42px !important;
}
.vex-open .vex-overlay {
-   z-index: 1000;
+   z-index: 2000;
min-height: 100%;
position: absolute;
width: -webkit-fill-available;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Tamás Zolnai (via logerrit)

 loleaflet/src/control/Control.Menubar.js |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4eb945c388ca7b06830e5d43a617fa5577a633a7
Author: Tamás Zolnai 
AuthorDate: Thu Oct 17 17:23:23 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Oct 17 17:25:21 2019 +0200

mobile-menu: Fix wrong downloadas menu items.

Change-Id: I5d80de9f56ff586cf04e41ca9d9dacae6e87b5e5

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1f7ab55f1..2dec96511 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -503,9 +503,9 @@ L.Control.Menubar = L.Control.extend({
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : 
_('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
-   {name: _('ODF spreadsheet (.ods)'), id: 
'downloadas-ods', type: 'action'},
-   {name: _('Excel 2003 Spreadsheet (.xls)'), id: 
'downloadas-xls', type: 'action'},
-   {name: _('Excel Spreadsheet (.xlsx)'), id: 
'downloadas-xlsx', type: 'action'}
+   {name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
+   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
+   {name: _('PowerPoint Presentation (.pptx)'), 
id: 'downloadas-pptx', type: 'action'},
]},
{name: _UNO('.uno:EditMenu', 'presentation'), type: 
'menu', menu: [
{uno: '.uno:Undo'},
@@ -549,9 +549,9 @@ L.Control.Menubar = L.Control.extend({
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : 
_('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
-   {name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
-   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
-   {name: _('PowerPoint Presentation (.pptx)'), 
id: 'downloadas-pptx', type: 'action'},
+   {name: _('ODF spreadsheet (.ods)'), id: 
'downloadas-ods', type: 'action'},
+   {name: _('Excel 2003 Spreadsheet (.xls)'), id: 
'downloadas-xls', type: 'action'},
+   {name: _('Excel Spreadsheet (.xlsx)'), id: 
'downloadas-xlsx', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 
'menu', menu: [
{uno: '.uno:Undo'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 extras/source/glade/libreoffice-catalog.xml.in |3 ---
 solenv/bin/native-code.py  |1 -
 2 files changed, 4 deletions(-)

New commits:
commit 1d822ece4f99efa7518c62cf5dd2f616c4fed8de
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 13:59:08 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 18:10:50 2019 +0200

drop ScCsvTableBox

Change-Id: Id73eb4c941ac9bcf75c518cefba795de587edbd9
Reviewed-on: https://gerrit.libreoffice.org/80957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index a370ccbf8041..20ee6277219d 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -95,9 +95,6 @@
 
-
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index eb3fc15740bb..0b6b1f0a74f5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -490,7 +490,6 @@ custom_widgets = [
 'RecentDocsView',
 'RowEdit',
 'SameContentListBox',
-'ScCsvTableBox',
 'ScDataTableView',
 'SdPageObjsTLB',
 'SearchBox',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 cui/source/options/opthtml.cxx  |2 -
 cui/source/options/opthtml.hxx  |2 -
 include/svx/txencbox.hxx|   12 +--
 sc/source/ui/dbgui/scuiasciiopt.cxx |2 -
 sc/source/ui/dbgui/scuiimoptdlg.cxx |4 +--
 sc/source/ui/inc/scuiasciiopt.hxx   |4 +--
 sc/source/ui/inc/scuiimoptdlg.hxx   |8 +++
 svx/source/dialog/txencbox.cxx  |   38 ++--
 sw/source/ui/dialog/ascfldlg.cxx|2 -
 sw/source/uibase/inc/ascfldlg.hxx   |2 -
 10 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 73df133143daaff14c364468598bb250db6aecb1
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 12:43:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 18:11:09 2019 +0200

rename TextEncodingBox back to SvxTextEncodingBox

Change-Id: I466a56a3b3204f960b9c6ce2dac836879112f5ab
Reviewed-on: https://gerrit.libreoffice.org/80945
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index cfe4dc78473e..fca286ddbb7a 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -38,7 +38,7 @@ OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xStarBasicWarningCB(m_xBuilder->weld_check_button("starbasicwarning"))
 , m_xPrintExtensionCB(m_xBuilder->weld_check_button("printextension"))
 , m_xSaveGrfLocalCB(m_xBuilder->weld_check_button("savegrflocal"))
-, m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
+, m_xCharSetLB(new 
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
 {
 // replace placeholder with UI string from language list
 OUString aText(m_xNumbersEnglishUSCB->get_label());
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 96131571fcd9..0468518f1638 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -41,7 +41,7 @@ class OfaHtmlTabPage : public SfxTabPage
 std::unique_ptr m_xStarBasicWarningCB;
 std::unique_ptr m_xPrintExtensionCB;
 std::unique_ptr m_xSaveGrfLocalCB;
-std::unique_ptr m_xCharSetLB;
+std::unique_ptr m_xCharSetLB;
 
 DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
 
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index e5a7b250f1d2..66e2d633ee8c 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -23,15 +23,15 @@
 #include 
 #include 
 
-class SVX_DLLPUBLIC TextEncodingBox
+class SVX_DLLPUBLIC SvxTextEncodingBox
 {
 private:
 std::unique_ptr m_xControl;
 
 public:
-TextEncodingBox(std::unique_ptr pControl);
+SvxTextEncodingBox(std::unique_ptr pControl);
 
-~TextEncodingBox();
+~SvxTextEncodingBox();
 
 /** Fill with all known encodings but exclude those matching one or more
 given flags as defined in rtl/tencinfo.h
@@ -96,15 +96,15 @@ public:
 void hide() { m_xControl->hide(); }
 };
 
-class SVX_DLLPUBLIC TextEncodingTreeView
+class SVX_DLLPUBLIC SvxTextEncodingTreeView
 {
 private:
 std::unique_ptr m_xControl;
 
 public:
-TextEncodingTreeView(std::unique_ptr pControl);
+SvxTextEncodingTreeView(std::unique_ptr pControl);
 
-~TextEncodingTreeView();
+~SvxTextEncodingTreeView();
 
 /** Fill with all known encodings but exclude those matching one or more
 given flags as defined in rtl/tencinfo.h
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 96f69f03139c..24cc8f3d46eb 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -294,7 +294,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
const OUString& aDatNa
 , meCall(eCall)
 , mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
 , mxFtCharSet(m_xBuilder->weld_label("textcharset"))
-, mxLbCharSet(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
+, mxLbCharSet(new 
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
 , mxFtCustomLang(m_xBuilder->weld_label("textlanguage"))
 , mxLbCustomLang(new LanguageBox(m_xBuilder->weld_combo_box("language")))
 , mxFtRow(m_xBuilder->weld_label("textfromrow"))
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 03fce13e6fbc..2ddbd56c7afe 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -122,8 +122,8 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window* 
pParent, bool bAscii,
 , m_xCbQuoteAll(m_xBuilder->weld_check_button("quoteall"))
 , m_xCbFixed(m_xBuilder->weld_check_button("fixedwidth"))
 , m_xBtnOk(m_xBuilder->weld_button("ok"))
-, m_xLbCharset(new 
TextEncodingBox(m_xBuilder->weld_combo_box("charsetdropdown")))
-, m_xTvCharset(new 
TextEncodingTreeView(m_xBuilder->weld_tree_view("charsetlist")))
+, m_xLbCharset(new 
SvxTextEn

[Libreoffice-commits] core.git: codemaker/source compilerplugins/clang connectivity/source dbaccess/source include/rtl sc/source sfx2/source uui/source vcl/workben

2019-10-17 Thread Noel Grandin (via logerrit)

 codemaker/source/javamaker/javatype.cxx   |4 --
 compilerplugins/clang/bufferadd.cxx   |   21 --
 compilerplugins/clang/test/bufferadd.cxx  |   18 
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |   16 --
 dbaccess/source/core/recovery/settingsimport.cxx  |3 --
 include/rtl/strbuf.hxx|7 
 include/rtl/ustrbuf.hxx   |7 
 sc/source/core/data/documen4.cxx  |9 ++
 sc/source/filter/excel/xecontent.cxx  |4 +-
 sfx2/source/view/lokhelper.cxx|   10 +++---
 uui/source/iahndl.cxx |9 +-
 vcl/workben/svpclient.cxx |8 ++---
 12 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit 3ebbb150242cf049a9ddab7f498c63f3a44aa034
Author: Noel Grandin 
AuthorDate: Thu Oct 17 15:14:02 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 18:16:28 2019 +0200

loplugin:buffereadd find stuff involving adding *StringBuffer

and create conversion methods on *StringBuffer to make this work

Change-Id: I3cf5ee3e139826168894b46eff8ee4bcde00cb7e
Reviewed-on: https://gerrit.libreoffice.org/80949
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index 28d6081e8c8b..0616d8f08771 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -378,9 +378,7 @@ void MethodDescriptor::addTypeParameter(OUString const & 
name) {
 }
 
 OString MethodDescriptor::getDescriptor() const {
-OStringBuffer buf(m_descriptorStart);
-buf.append(m_descriptorEnd);
-return buf.makeStringAndClear();
+return rtl::OStringView(m_descriptorStart) + m_descriptorEnd;
 }
 
 
diff --git a/compilerplugins/clang/bufferadd.cxx 
b/compilerplugins/clang/bufferadd.cxx
index 659b110403e3..4346e9ca28b2 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -175,19 +175,6 @@ void BufferAdd::findBufferAssignOrAdd(const Stmt* 
parentStmt, Stmt const* stmt)
 auto cxxConstructExpr = 
dyn_cast(ignore(varDeclLHS->getInit()));
 if (cxxConstructExpr)
 {
-if (cxxConstructExpr->getNumArgs() == 0)
-{
-addToGoodMap(varDeclLHS, parentStmt);
-return;
-}
-auto tc2 = 
loplugin::TypeCheck(cxxConstructExpr->getArg(0)->getType());
-if (tc2.LvalueReference().Class("OUStringBuffer")
-|| tc2.LvalueReference().Class("OStringBuffer")
-|| tc2.Class("OUStringBuffer") || 
tc2.Class("OStringBuffer"))
-{
-badMap.insert(varDeclLHS);
-return;
-}
 addToGoodMap(varDeclLHS, parentStmt);
 return;
 }
@@ -286,10 +273,6 @@ bool BufferAdd::isMethodOkToMerge(CXXMemberCallExpr const* 
memberCall)
 auto methodDecl = memberCall->getMethodDecl();
 if (methodDecl->getNumParams() == 0)
 return true;
-auto tc2 = loplugin::TypeCheck(methodDecl->getParamDecl(0)->getType());
-if (tc2.LvalueReference().Class("OUStringBuffer")
-|| tc2.LvalueReference().Class("OStringBuffer"))
-return false;
 
 auto name = methodDecl->getName();
 if (name == "appendUninitialized" || name == "setLength" || name == 
"remove" || name == "insert"
@@ -338,9 +321,7 @@ bool BufferAdd::isSideEffectFree(Expr const* expr)
 if (auto calleeMethodDecl = 
dyn_cast_or_null(callExpr->getCalleeDecl()))
 if (calleeMethodDecl && calleeMethodDecl->getIdentifier())
 {
-auto name = calleeMethodDecl->getName();
-if (callExpr->getNumArgs() > 0
-&& (name == "number" || name == "unacquired" || name == 
"boolean"))
+if (callExpr->getNumArgs() > 0)
 {
 auto tc = 
loplugin::TypeCheck(calleeMethodDecl->getParent());
 if (tc.Class("OUString") || tc.Class("OString"))
diff --git a/compilerplugins/clang/test/bufferadd.cxx 
b/compilerplugins/clang/test/bufferadd.cxx
index 7d8d9a693b9f..a9f28b13b55a 100644
--- a/compilerplugins/clang/test/bufferadd.cxx
+++ b/compilerplugins/clang/test/bufferadd.cxx
@@ -46,6 +46,24 @@ void f4(sal_Unicode const* pPathBegin)
 v.append(pPathBegin, 12);
 v.append("");
 }
+void f5(OUStringBuffer& input)
+{
+// expected-error@+1 {{convert this append sequence into a *String + 
sequence [loplugin:bufferadd]}}
+OUStringBuffer v(input);
+v.append("");
+}
+str

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.unusedparams.results |3 ---
 writerfilter/source/dmapper/DomainMapper.cxx   |3 +--
 writerfilter/source/dmapper/DomainMapper.hxx   |2 +-
 writerfilter/source/dmapper/FontTable.cxx  |2 +-
 writerfilter/source/dmapper/FontTable.hxx  |2 +-
 writerfilter/source/dmapper/GraphicImport.cxx  |2 +-
 writerfilter/source/dmapper/GraphicImport.hxx  |2 +-
 writerfilter/source/dmapper/LoggedResources.cxx|4 +++-
 writerfilter/source/dmapper/LoggedResources.hxx|2 +-
 writerfilter/source/dmapper/NumberingManager.cxx   |3 +--
 writerfilter/source/dmapper/NumberingManager.hxx   |2 +-
 writerfilter/source/dmapper/SettingsTable.cxx  |2 +-
 writerfilter/source/dmapper/SettingsTable.hxx  |2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx|2 +-
 writerfilter/source/dmapper/StyleSheetTable.hxx|2 +-
 writerfilter/source/dmapper/ThemeTable.cxx |2 +-
 writerfilter/source/dmapper/ThemeTable.hxx |2 +-
 17 files changed, 18 insertions(+), 21 deletions(-)

New commits:
commit caf8bf17ff355d9edb1fe246c480d2f6340f77af
Author: Noel Grandin 
AuthorDate: Thu Oct 17 12:25:19 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 18:17:06 2019 +0200

loplugin:virtualdead unusedparam in LoggedTable::lcl_entry

Change-Id: I45c7330b3803f21165714c6140fac46a6592db9b
Reviewed-on: https://gerrit.libreoffice.org/80952
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 32d5316d2374..29f217ae7cae 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -442,6 +442,3 @@ writerfilter/inc/ooxml/OOXMLDocument.hxx:216
 writerfilter/source/dmapper/LoggedResources.hxx:93
 void writerfilter::LoggedStream::lcl_info(const class 
std::__cxx11::basic_string, class 
std::allocator > &,)
 0
-writerfilter/source/dmapper/LoggedResources.hxx:129
-void writerfilter::LoggedTable::lcl_entry(int,class tools::SvRef >,)
-01
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 60cd9202b813..e97c41508a8f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2833,8 +2833,7 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 }
 }
 
-void DomainMapper::lcl_entry(int /*pos*/,
- writerfilter::Reference::Pointer_t ref)
+void DomainMapper::lcl_entry(writerfilter::Reference::Pointer_t 
ref)
 {
 ref->resolve(*this);
 }
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index 72d46e44114e..19c8ebbd942f 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -160,7 +160,7 @@ private:
 virtual void lcl_sprm(Sprm & sprm) override;
 
 // Table
-virtual void lcl_entry(int pos, 
writerfilter::Reference::Pointer_t ref) override;
+virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) 
override;
 
 void finishParagraph(const bool bRemove = false);
 
diff --git a/writerfilter/source/dmapper/FontTable.cxx 
b/writerfilter/source/dmapper/FontTable.cxx
index 4e46878506cf..89bfaaa17c73 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -150,7 +150,7 @@ void FontTable::resolveSprm(Sprm & r_Sprm)
 pProperties->resolve(*this);
 }
 
-void FontTable::lcl_entry(int /*pos*/, 
writerfilter::Reference::Pointer_t ref)
+void FontTable::lcl_entry(writerfilter::Reference::Pointer_t ref)
 {
 //create a new font entry
 SAL_WARN_IF( m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current 
entry has to be NULL here" );
diff --git a/writerfilter/source/dmapper/FontTable.hxx 
b/writerfilter/source/dmapper/FontTable.hxx
index 052282b1f090..caf016bd6c18 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -60,7 +60,7 @@ class FontTable : public LoggedProperties, public LoggedTable
 void resolveSprm(Sprm & r_sprm);
 
 // Table
-virtual void lcl_entry(int pos, 
writerfilter::Reference::Pointer_t ref) override;
+virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) 
override;
 
 // Stream
 virtual void lcl_startSectionGroup() override;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index d207f609a4f0..0c44a6e8cdf0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1178,7 +1178,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
 }
 }
 
-void Graphi

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

2019-10-17 Thread Caolán McNamara (via logerrit)

 extras/source/glade/libreoffice-catalog.xml.in |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit deea9ba1d65fd96dd139934574c9ffb319dda709
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 14:00:09 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 18:18:46 2019 +0200

drop swuilo-AutoFmtPreview

Change-Id: Ib9a4d5ff89a4cfd8006d70fe3a1e193095150ee8
Reviewed-on: https://gerrit.libreoffice.org/80958
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 20ee6277219d..3bfa5fab2483 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -95,9 +95,6 @@
 
-
 
 https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread LibreOﬃciant (via logerrit)

 source/text/sbasic/shared/03103350.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad241365fec7fe88b83068c002be0667420e5550
Author: LibreOﬃciant 
AuthorDate: Thu Oct 17 13:12:37 2019 +0200
Commit: Olivier Hallot 
CommitDate: Thu Oct 17 18:40:21 2019 +0200

compatible.xhp page split is causing lost link in 03103350.xhp page

Change-Id: Id807bedacc0c71fed8e6f5cdae77814e478b2bdd
Reviewed-on: https://gerrit.libreoffice.org/80940
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03103350.xhp 
b/source/text/sbasic/shared/03103350.xhp
index 415024c34..c6d7e97b1 100644
--- a/source/text/sbasic/shared/03103350.xhp
+++ b/source/text/sbasic/shared/03103350.xhp
@@ -63,7 +63,7 @@
 VBA 
Properties
 VBA support in 
%PRODUCTNAME
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2019-10-17 Thread LibreOﬃciant (via logerrit)

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

New commits:
commit 09f194ac0f76c903f3c6748a4f37061e7529e842
Author: LibreOﬃciant 
AuthorDate: Thu Oct 17 13:12:37 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Oct 17 18:40:21 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - compatible.xhp page split is causing lost link in 03103350.xhp page

Change-Id: Id807bedacc0c71fed8e6f5cdae77814e478b2bdd
Reviewed-on: https://gerrit.libreoffice.org/80940
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 35cef5c72561..ad241365fec7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35cef5c7256129d3d21f31cc0903c977f8de9cf6
+Subproject commit ad241365fec7fe88b83068c002be0667420e5550
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 8e9a262f036fb9634cdcfdfbf12bbfd5c4f84650
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 17:50:39 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 18:42:01 2019 +0200

jsdialogs: send combobox selections

Change-Id: If81984e23e2e86ea00e916a015c48f866284d046

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index d171df0c7..4615a8698 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -35,6 +35,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._controlHandlers['edit'] = this._editControl;
this._controlHandlers['pushbutton'] = this._pushbuttonControl;
this._controlHandlers['combobox'] = this._comboboxControl;
+   this._controlHandlers['comboboxentry'] = this._comboboxEntry;
this._controlHandlers['listbox'] = this._comboboxControl;
this._controlHandlers['fixedtext'] = this._fixedtextControl;
this._controlHandlers['grid'] = this._containerHandler;
@@ -98,7 +99,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
if (objectType == 'toolbutton' && eventType == 'click') {
builder.map.sendUnoCommand(data);
-   } else {
+   } else if (object) {
+   console.log('dialogevent ' + window.sidebarId + ' ' + 
object.id);
builder.map._socket.sendMessage('dialogevent ' + 
window.sidebarId + ' ' + object.id);
}
},
@@ -503,7 +505,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var entries = [];
for (var index in data.entries) {
-   var entry = { type: 'fixedtext', text: 
data.entries[index], style: 'ui-combobox-text' };
+   var entry = { type: 'comboboxentry', text: 
data.entries[index], parent: data, style: 'ui-combobox-text' };
entries.push(entry);
}
 
@@ -514,6 +516,19 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
 
+   _comboboxEntry: function(parentContainer, data, builder) {
+   var fixedtext = L.DomUtil.create('p', 'mobile-wizard', 
parentContainer);
+   fixedtext.innerHTML = builder._cleanText(data.text);
+   fixedtext.parent = data.parent;
+
+   if (data.style && data.style.length)
+   L.DomUtil.addClass(fixedtext, data.style);
+
+   $(fixedtext).click(function () {
+   builder.callback('combobox', 'selected', 
fixedtext.parent, fixedtext.innerHTML, builder);
+   });
+   },
+
_fixedtextControl: function(parentContainer, data, builder) {
var fixedtext = L.DomUtil.create('p', 'mobile-wizard', 
parentContainer);
fixedtext.innerHTML = builder._cleanText(data.text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Andrea Gelmini (via logerrit)

 svl/source/numbers/zforlist.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 393a3413ea8e8b459465655820d21d7c39b31fbd
Author: Andrea Gelmini 
AuthorDate: Thu Oct 17 18:36:44 2019 +0200
Commit: Julien Nabet 
CommitDate: Thu Oct 17 18:44:27 2019 +0200

Fix typo

Change-Id: I179a20caf33e8e083e6e8f172d38f1201a0afd16
Reviewed-on: https://gerrit.libreoffice.org/80987
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7fc999501780..9a0660f74e24 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -791,7 +791,7 @@ void SvNumberFormatter::FillKeywordTableForExcel( 
NfKeywordTable& rKeywords )
 // Excel or OOXML do not specify format code keywords case sensitivity,
 // but given and writes them lower case. Using upper case even lead to an
 // odd misrepresentation in iOS viewer and OSX Quicklook viewer that
-// strangely use "D" and "DD" for "days since beginnning of year", which is
+// strangely use "D" and "DD" for "days since beginning of year", which is
 // nowhere defined. See tdf#126773
 // Use lower case for all date and time keywords where known. See OOXML
 // ECMA-376-1:2016 18.8.31 numFmts (Number Formats)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source ucb/source vcl/unx

2019-10-17 Thread Stephan Bergmann (via logerrit)

 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-application.cxx|   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx|   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx   |5 +
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx |   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx   |   11 +++
 libreofficekit/source/gtk/lokdocview.cxx|5 +
 ucb/source/ucp/gio/gio_mount.cxx|5 +
 vcl/unx/gtk3/gtk3gloactiongroup.cxx |   10 ++
 vcl/unx/gtk3/gtk3glomenu.cxx|5 +
 10 files changed, 85 insertions(+)

New commits:
commit 0b3db87249652351f5a859ded1a876329ab18261
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 12:05:49 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 18:58:21 2019 +0200

Silence Clang 10 trunk -Wdeprecated-volatile in GLib for now

See  "Avoid C++20
deprecated assignment to volatile" for a potential fix in GLib (but also 
see my
question at  "[c++20]
P1152R4: warn on any simple-assignment to a volatile lvalue" whether that 
Clang
warning is actually wanted here).

With glib2-devel-2.62.1-1.fc31.x86_64, the suppressed warnings looked like

> libreofficekit/source/gtk/lokdocview.cxx:327:1: error: use of result of 
assignment to object of volatile-qualified type 'volatile gsize' (aka 'volatile 
unsigned long') is deprecated [-Werror,-Wdeprecated-volatile]
> G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA,
> ^
> /usr/include/glib-2.0/gobject/gtype.h:1617:56: note: expanded from macro 
'G_DEFINE_TYPE_WITH_CODE'
> #define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)  
_G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} 
_G_DEFINE_TYPE_EXTENDED_END()
> ^
> /usr/include/glib-2.0/gobject/gtype.h:2034:3: note: expanded from macro 
'_G_DEFINE_TYPE_EXTENDED_BEGIN'
>   _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, 
TYPE_PARENT, flags) \
>   ^
> /usr/include/glib-2.0/gobject/gtype.h:2005:7: note: expanded from macro 
'_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER'
>   g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
>   ^
> /usr/include/glib-2.0/glib/gthread.h:257:17: note: expanded from macro 
'g_once_init_leave'
> (void) (0 ? *(location) = (result) : 0); \
> ^

Change-Id: If67ad04f8fb242f50b43a1d98ad2b28c4bed55a4
Reviewed-on: https://gerrit.libreoffice.org/80937
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 17f2ef77a1d3..7692b0b4a162 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -43,7 +43,18 @@ struct GtvApplicationWindowPrivate
 GtvRenderingArgs* m_pRenderingArgs;
 };
 
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
 G_DEFINE_TYPE_WITH_PRIVATE(GtvApplicationWindow, gtv_application_window, 
GTK_TYPE_APPLICATION_WINDOW);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
 
 static GtvApplicationWindowPrivate*
 getPrivate(GtvApplicationWindow* win)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 7481076778eb..b6598991f44b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -19,7 +19,18 @@ struct GtvApplicationPrivate
 GtvRenderingArgs* m_pRenderingArgs;
 };
 
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
 G_DEFINE_TYPE_WITH_PRIVATE(GtvApplication, gtv_application, 
GTK_TYPE_APPLICATION);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
 
 static GtvApplicationPrivate*
 getPrivate(GtvApplication* app)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 57eba3e0efb3..9346057b7d01 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledvi

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.unusedparams.results |3 ---
 writerfilter/source/dmapper/DomainMapper.cxx   |4 
 writerfilter/source/dmapper/DomainMapper.hxx   |1 -
 writerfilter/source/dmapper/FontTable.cxx  |4 
 writerfilter/source/dmapper/FontTable.hxx  |1 -
 writerfilter/source/dmapper/GraphicImport.cxx  |4 
 writerfilter/source/dmapper/GraphicImport.hxx  |1 -
 writerfilter/source/dmapper/LoggedResources.cxx|4 ++--
 writerfilter/source/dmapper/LoggedResources.hxx|1 -
 9 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit 45eeefb064680d4b2af9ed73ce751685d14270a6
Author: Noel Grandin 
AuthorDate: Thu Oct 17 12:30:38 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 19:02:54 2019 +0200

loplugin:virtualdead unused param in LoggedStream::lcl_info

which means the whole method is actually unused

Change-Id: I72d33ab6e260012b82002ceae7ff9e54e2ea6349
Reviewed-on: https://gerrit.libreoffice.org/80953
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 29f217ae7cae..558aac33656e 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -439,6 +439,3 @@ writerfilter/inc/dmapper/resourcemodel.hxx:173
 writerfilter/inc/ooxml/OOXMLDocument.hxx:216
 void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,)
 0
-writerfilter/source/dmapper/LoggedResources.hxx:93
-void writerfilter::LoggedStream::lcl_info(const class 
std::__cxx11::basic_string, class 
std::allocator > &,)
-0
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index e97c41508a8f..efaaae381beb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3454,10 +3454,6 @@ void DomainMapper::lcl_substream(Id rName, 
::writerfilter::Reference::Po
 m_pImpl->substream(rName, ref);
 }
 
-void DomainMapper::lcl_info(const std::string & /*info_*/)
-{
-}
-
 void DomainMapper::lcl_startGlossaryEntry()
 {
 uno::Reference< text::XTextRange > xTextRange =  GetCurrentTextRange();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index 19c8ebbd942f..c9ef80be2652 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -151,7 +151,6 @@ private:
writerfilter::Reference::Pointer_t ref) 
override;
 virtual void lcl_substream(Id name,
::writerfilter::Reference::Pointer_t 
ref) override;
-virtual void lcl_info(const std::string & info) override;
 virtual void lcl_startGlossaryEntry() override;
 virtual void lcl_endGlossaryEntry() override;
 
diff --git a/writerfilter/source/dmapper/FontTable.cxx 
b/writerfilter/source/dmapper/FontTable.cxx
index 89bfaaa17c73..9bd11bdf1474 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -205,10 +205,6 @@ void FontTable::lcl_substream(Id, 
::writerfilter::Reference::Pointer_t)
 {
 }
 
-void FontTable::lcl_info(const std::string& )
-{
-}
-
 void FontTable::lcl_startShape(uno::Reference const&)
 {
 }
diff --git a/writerfilter/source/dmapper/FontTable.hxx 
b/writerfilter/source/dmapper/FontTable.hxx
index caf016bd6c18..dd45e46c2c34 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -76,7 +76,6 @@ class FontTable : public LoggedProperties, public LoggedTable
writerfilter::Reference::Pointer_t ref) 
override;
 virtual void lcl_substream(Id name,
::writerfilter::Reference::Pointer_t 
ref) override;
-virtual void lcl_info(const std::string & info) override;
 virtual void lcl_startShape(css::uno::Reference 
const& xShape) override;
 virtual void lcl_endShape( ) override;
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 0c44a6e8cdf0..90b82a89c313 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1481,10 +1481,6 @@ void GraphicImport::lcl_substream(Id /*name*/, 
::writerfilter::Reference
 {
 }
 
-void GraphicImport::lcl_info(const std::string& /*info*/)
-{
-}
-
 void GraphicImport::lcl_startShape(uno::Reference const&)
 {
 }
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx 
b/writerfilter/source/dmapper/GraphicImport.hxx
index a018ad824c97..a144519690cf 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -119,7 +119,6 @@ public:
 virtual void lcl_table(Id name,

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

2019-10-17 Thread Tor Lillqvist (via logerrit)

 sw/source/uibase/frmdlg/frmmgr.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c261b3aae843e10ed169b6f08356386688d521d2
Author: Tor Lillqvist 
AuthorDate: Thu Oct 17 19:01:44 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Oct 17 19:06:47 2019 +0200

tdf#128021 Make "Anchor to character" the default for inserted images on iOS

Apparently this matches Word on iOS, even if Word on Windows has it
the other way?

Change-Id: I9949585e1d4e70627d47056dd92abffea24f0b28
Reviewed-on: https://gerrit.libreoffice.org/80986
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx 
b/sw/source/uibase/frmdlg/frmmgr.cxx
index 184b4177fbb3..792bfa509522 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -87,7 +87,11 @@ SwFlyFrameAttrMgr::SwFlyFrameAttrMgr( bool bNew, SwWrtShell* 
pSh, Frmmgr_Type nT
 
 if (nType == Frmmgr_Type::GRF || nType == Frmmgr_Type::OLE)
 {
+#ifndef IOS // tdf#128021
 m_aSet.Put(SwFormatAnchor(RndStdIds::FLY_AS_CHAR));
+#else
+m_aSet.Put(SwFormatAnchor(RndStdIds::FLY_AT_CHAR));
+#endif
 }
 }
 else if ( nType == Frmmgr_Type::NONE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit e494a29d24347ae884b579638b98ef51bb370428
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 17:50:39 2019 +0200
Commit: Szymon Kłos 
CommitDate: Thu Oct 17 19:26:36 2019 +0200

jsdialogs: send combobox selections correctly

Change-Id: I687db5f38e24ee9e97786b736e01ac92a2f817cf

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 4615a8698..8bb22473f 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -100,8 +100,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (objectType == 'toolbutton' && eventType == 'click') {
builder.map.sendUnoCommand(data);
} else if (object) {
-   console.log('dialogevent ' + window.sidebarId + ' ' + 
object.id);
-   builder.map._socket.sendMessage('dialogevent ' + 
window.sidebarId + ' ' + object.id);
+   builder.map._socket.sendMessage('dialogevent ' + 
window.sidebarId + ' ' + object.id + ' ' + eventType + ' ' + data);
}
},
 
@@ -505,7 +504,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var entries = [];
for (var index in data.entries) {
-   var entry = { type: 'comboboxentry', text: 
data.entries[index], parent: data, style: 'ui-combobox-text' };
+   var entry = { type: 'comboboxentry', text: 
data.entries[index], pos: index, parent: data, style: 'ui-combobox-text' };
entries.push(entry);
}
 
@@ -525,7 +524,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
L.DomUtil.addClass(fixedtext, data.style);
 
$(fixedtext).click(function () {
-   builder.callback('combobox', 'selected', 
fixedtext.parent, fixedtext.innerHTML, builder);
+   builder.callback('combobox', 'selected', 
fixedtext.parent, data.pos + ';' + fixedtext.innerHTML, builder);
});
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Justin Luth (via logerrit)

 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 048433cbcaddea2f2bca7169526c6ce367af11a8
Author: Justin Luth 
AuthorDate: Thu Oct 17 10:37:49 2019 +0300
Commit: Justin Luth 
CommitDate: Thu Oct 17 20:13:40 2019 +0200

writerfilter: fix comment

The comment was introduced in commit 28a3156943
which was dealing with things being inside or
outside of a paragraph.

Change-Id: I1985776c4d2c0f86395e415c9943f9d6004a2fc4
Reviewed-on: https://gerrit.libreoffice.org/80929
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index efaaae381beb..49a040439a48 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2988,7 +2988,7 @@ void DomainMapper::lcl_endShape( )
 
 lcl_endParagraphGroup();
 m_pImpl->PopShapeContext( );
-// A shape is always inside a shape (anchored or inline).
+// A shape is always inside a paragraph (anchored or inline).
 m_pImpl->SetIsOutsideAParagraph(false);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basctl/source cui/source extras/source include/svx sc/source sd/source svtools/source svx/source sw/source

2019-10-17 Thread Caolán McNamara (via logerrit)

 basctl/source/dlged/managelang.cxx |2 -
 basctl/source/inc/managelang.hxx   |4 +-
 cui/source/dialogs/SpellDialog.cxx |2 -
 cui/source/inc/SpellDialog.hxx |2 -
 cui/source/inc/autocdlg.hxx|2 -
 cui/source/inc/chardlg.hxx |6 +--
 cui/source/inc/numfmt.hxx  |2 -
 cui/source/inc/optasian.hxx|2 -
 cui/source/inc/optdict.hxx |4 +-
 cui/source/inc/optlingu.hxx|4 +-
 cui/source/options/optasian.cxx|2 -
 cui/source/options/optdict.cxx |4 +-
 cui/source/options/optgdlg.cxx |8 ++---
 cui/source/options/optgdlg.hxx |8 ++---
 cui/source/options/optlingu.cxx|4 +-
 cui/source/tabpages/autocdlg.cxx   |2 -
 cui/source/tabpages/chardlg.cxx|   20 ++---
 cui/source/tabpages/numfmt.cxx |2 -
 extras/source/glade/libreoffice-catalog.xml.in |3 -
 include/svx/langbox.hxx|4 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx|2 -
 sc/source/ui/dbgui/textimportoptions.cxx   |2 -
 sc/source/ui/dbgui/tpsort.cxx  |2 -
 sc/source/ui/inc/scuiasciiopt.hxx  |2 -
 sc/source/ui/inc/textimportoptions.hxx |4 +-
 sc/source/ui/inc/tpsort.hxx|2 -
 sd/source/ui/dlg/dlgfield.cxx  |2 -
 sd/source/ui/dlg/headerfooterdlg.cxx   |4 +-
 sd/source/ui/inc/dlgfield.hxx  |4 +-
 svtools/source/contnr/DocumentInfoPreview.cxx  |3 -
 svx/source/dialog/langbox.cxx  |   38 -
 sw/source/ui/dialog/ascfldlg.cxx   |2 -
 sw/source/ui/index/cnttab.cxx  |2 -
 sw/source/ui/misc/srtdlg.cxx   |2 -
 sw/source/uibase/inc/ascfldlg.hxx  |2 -
 sw/source/uibase/inc/srtdlg.hxx|2 -
 sw/source/uibase/inc/swuicnttab.hxx|2 -
 37 files changed, 79 insertions(+), 85 deletions(-)

New commits:
commit 77c9c2c993da3bc9302131cef4345db114696333
Author: Caolán McNamara 
AuthorDate: Thu Oct 17 13:56:16 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 17 20:15:40 2019 +0200

rename LanguageBox back to SvxLanguageBox

Change-Id: I9bd29b7377fdf0e1ba36cc021e7e78f83bb1c12c
Reviewed-on: https://gerrit.libreoffice.org/80960
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index 2c10c81c0eab..1d87ab94039f 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -227,7 +227,7 @@ 
SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::s
 , m_xDefinedFT(m_xBuilder->weld_label("defined"))
 , m_xAddedFT(m_xBuilder->weld_label("added"))
 , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
-, m_xLanguageCB(new LanguageBox(m_xBuilder->weld_combo_box("hidden")))
+, m_xLanguageCB(new SvxLanguageBox(m_xBuilder->weld_combo_box("hidden")))
 {
 m_xLanguageLB->set_size_request(-1, m_xLanguageLB->get_height_rows(10));
 m_xCheckLangLB->set_size_request(-1, m_xCheckLangLB->get_height_rows(10));
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 24f408336e17..d605be858ad7 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-class LanguageBox;
+class SvxLanguageBox;
 
 namespace basctl
 {
@@ -84,7 +84,7 @@ private:
 std::unique_ptr m_xDefinedFT;
 std::unique_ptr m_xAddedFT;
 std::unique_ptr m_xAltTitle;
-std::unique_ptr<::LanguageBox> m_xLanguageCB;
+std::unique_ptr m_xLanguageCB;
 
 public:
 SetDefaultLanguageDialog(weld::Window* pParent, 
std::shared_ptr const & xLMgr);
diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 366c2662b865..9c65d47cf6da 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -165,7 +165,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* 
pChildWindow,
 , m_xResumeFT(m_xBuilder->weld_label("resumeft"))
 , m_xNoSuggestionsFT(m_xBuilder->weld_label("nosuggestionsft"))
 , m_xLanguageFT(m_xBuilder->weld_label("languageft"))
-, m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("languagelb")))
+, m_xLanguageLB(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("languagelb")))
 , m_xExplainFT(m_xBuilder->weld_label("explain"))
 , m_xExplainLink(m_xBuilder->weld_link_button("explainlink"))
 , m_xNotInDictFT(m_xBuilder->weld_label("notindictft"))
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b38880ee5869..61adf3

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

2019-10-17 Thread Noel Grandin (via logerrit)

 writerfilter/inc/ooxml/OOXMLDocument.hxx|1 -
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   14 --
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |5 +
 3 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 57924e5bef323c34e870f111288123887f07378d
Author: Noel Grandin 
AuthorDate: Thu Oct 17 12:36:53 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 20:32:20 2019 +0200

loplugin:virtualdead unused param in OOXMLDocument::setXNoteType

which means the whole method is dead

Change-Id: Ib3349f5beb8b9bb9fe223bc33aca84a20e581445
Reviewed-on: https://gerrit.libreoffice.org/80954
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx 
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 124368ee0bc1..7856a6a4dced 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -213,7 +213,6 @@ public:
 virtual css::uno::Reference 
getInputStreamForId(const OUString & rId) = 0;
 virtual void setXNoteId(const sal_Int32 nId) = 0;
 virtual sal_Int32 getXNoteId() const = 0;
-virtual void setXNoteType(Id nId) = 0;
 virtual const OUString & getTarget() const = 0;
 virtual css::uno::Reference 
getShapeContext( ) = 0;
 virtual void setShapeContext( 
css::uno::Reference xContext ) = 0;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 888f69a2320d..bec04a949ac7 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -237,10 +237,6 @@ sal_Int32 OOXMLDocumentImpl::getXNoteId() const
 return mnXNoteId;
 }
 
-void OOXMLDocumentImpl::setXNoteType(Id /*nId*/)
-{
-}
-
 const OUString & OOXMLDocumentImpl::getTarget() const
 {
 return mpStream->getTarget();
@@ -262,15 +258,13 @@ OOXMLDocumentImpl::getSubStream(const OUString & rId)
 }
 
 writerfilter::Reference::Pointer_t
-OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, Id aType,
-  const sal_Int32 nId)
+OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const 
sal_Int32 nId)
 {
 OOXMLStream::Pointer_t pStream =
 OOXMLDocumentFactory::createStream(mpStream, nType);
 // See above, no status indicator for the note stream, either.
 OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream, 
uno::Reference(), mbSkipImages, maMediaDescriptor);
 pDocument->setXNoteId(nId);
-pDocument->setXNoteType(aType);
 pDocument->setModel(getModel());
 pDocument->setDrawPage(getDrawPage());
 
@@ -282,7 +276,7 @@ void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
 const sal_Int32 nNoteId)
 {
 writerfilter::Reference::Pointer_t pStream =
-getXNoteStream(OOXMLStream::FOOTNOTES, aType, nNoteId);
+getXNoteStream(OOXMLStream::FOOTNOTES, nNoteId);
 
 Id nId;
 switch (aType)
@@ -304,7 +298,7 @@ void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
const sal_Int32 nNoteId)
 {
 writerfilter::Reference::Pointer_t pStream =
-getXNoteStream(OOXMLStream::ENDNOTES, aType, nNoteId);
+getXNoteStream(OOXMLStream::ENDNOTES, nNoteId);
 
 Id nId;
 switch (aType)
@@ -325,7 +319,7 @@ void OOXMLDocumentImpl::resolveComment(Stream & rStream,
const sal_Int32 nId)
 {
 writerfilter::Reference::Pointer_t pStream =
-getXNoteStream(OOXMLStream::COMMENTS, 0, nId);
+getXNoteStream(OOXMLStream::COMMENTS, nId);
 
 resolveFastSubStreamWithId(rStream, pStream, NS_ooxml::LN_annotation);
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 059ac1cea601..2bcc1e746ab0 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -82,9 +82,7 @@ private:
 getSubStream(const OUString & rId);
 
 writerfilter::Reference::Pointer_t
-getXNoteStream(OOXMLStream::StreamType_t nType,
-   Id aType,
-   const sal_Int32 nNoteId);
+getXNoteStream(OOXMLStream::StreamType_t nType, const sal_Int32 nNoteId);
 
 void resolveCustomXmlStream(Stream & rStream);
 void resolveGlossaryStream(Stream & rStream);
@@ -122,7 +120,6 @@ public:
 virtual css::uno::Reference 
getInputStreamForId(const OUString & rId) override;
 virtual void setXNoteId(const sal_Int32 nId) override;
 virtual sal_Int32 getXNoteId() const override;
-virtual void setXNoteType(Id aId) override;
 virtual const OUString & getTarget() const override;
 virtual css::uno::Reference 
getShapeContext( ) override;
 virtual void setShapeContext( 
css::uno::Reference xContext ) 
override;
___
Libreoffice-c

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.unusedparams.results   |6 --
 writerfilter/inc/dmapper/resourcemodel.hxx   |4 +---
 writerfilter/source/dmapper/DomainMapper.cxx |3 +--
 writerfilter/source/dmapper/DomainMapper.hxx |3 +--
 writerfilter/source/dmapper/GraphicImport.cxx|2 +-
 writerfilter/source/dmapper/GraphicImport.hxx|2 +-
 writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx |4 +---
 7 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit e872dbd715e8fcc1bfa3b4b79ba82005a2f8a922
Author: Noel Grandin 
AuthorDate: Thu Oct 17 12:40:49 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 17 20:32:35 2019 +0200

loplugin:virtualdead unused param in BinaryObj::data

Change-Id: I726745b82747f24cc93662bfb0dd381a114fde78
Reviewed-on: https://gerrit.libreoffice.org/80955
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 558aac33656e..041439172418 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -433,9 +433,3 @@ vcl/inc/WidgetDrawInterface.hxx:63
 vcl/inc/WidgetDrawInterface.hxx:87
 _Bool vcl::WidgetDrawInterface::getNativeControlRegion(enum 
ControlType,enum ControlPart,const class tools::Rectangle &,enum 
ControlState,const class ImplControlValue &,const class rtl::OUString &,class 
tools::Rectangle &,class tools::Rectangle &,)
 1011
-writerfilter/inc/dmapper/resourcemodel.hxx:173
-void writerfilter::BinaryObj::data(const unsigned char *,unsigned 
long,class tools::SvRef >,)
-110
-writerfilter/inc/ooxml/OOXMLDocument.hxx:216
-void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,)
-0
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx 
b/writerfilter/inc/dmapper/resourcemodel.hxx
index 728c6ed9a641..bd528d1a1e59 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -168,10 +168,8 @@ public:
 
@param buf pointer to buffer containing the data
@param len size of buffer
-   @param ref reference to properties of binary object
  */
-virtual void data(const sal_uInt8* buf, size_t len,
-  writerfilter::Reference::Pointer_t ref) = 0;
+virtual void data(const sal_uInt8* buf, size_t len) = 0;
 
 protected:
 ~BinaryObj() {}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 49a040439a48..cb46699fad95 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2838,8 +2838,7 @@ void 
DomainMapper::lcl_entry(writerfilter::Reference::Pointer_t ref)
 ref->resolve(*this);
 }
 
-void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/,
-writerfilter::Reference::Pointer_t /*ref*/)
+void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/)
 {
 }
 
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index c9ef80be2652..0913dd125814 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -86,8 +86,7 @@ public:
 virtual void markLastSectionGroup() override;
 
 // BinaryObj
-virtual void data(const sal_uInt8* buf, size_t len,
-  writerfilter::Reference::Pointer_t ref) 
override;
+virtual void data(const sal_uInt8* buf, size_t len) override;
 
 void sprmWithProps( Sprm& sprm, const PropertyMapPtr& pContext );
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 90b82a89c313..0d673cdc19bd 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1412,7 +1412,7 @@ uno::Reference 
GraphicImport::createGraphicObject(uno::Refer
 }
 
 
-void GraphicImport::data(const sal_uInt8* buf, size_t len, 
writerfilter::Reference::Pointer_t /*ref*/)
+void GraphicImport::data(const sal_uInt8* buf, size_t len)
 {
 beans::PropertyValues aMediaProperties( 1 );
 aMediaProperties[0].Name = getPropertyName(PROP_INPUT_STREAM);
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx 
b/writerfilter/source/dmapper/GraphicImport.hxx
index a144519690cf..a54a6980ef5f 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -92,7 +92,7 @@ public:
 virtual ~GraphicImport() override;
 
 // BinaryObj
-virtual void data(const sal_uInt8* buffer, size_t len, 
writerfilter::Reference::Pointer_t ref) override;
+virtual void data(const sal_uInt8* buffer, size_t len) override;
 
 css::uno::Reference GetGraphicObject();
 const css::uno::Reference& GetXSha

New Defects reported by Coverity Scan for LibreOffice

2019-10-17 Thread scan-admin

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

4 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 4 of 4 defect(s)


** CID 1454849:  Control flow issues  (DEADCODE)
/sc/source/ui/unoobj/docuno.cxx: 2027 in ScModelObj::render(int, const 
com::sun::star::uno::Any &, const 
com::sun::star::uno::Sequence &)()



*** CID 1454849:  Control flow issues  (DEADCODE)
/sc/source/ui/unoobj/docuno.cxx: 2027 in ScModelObj::render(int, const 
com::sun::star::uno::Any &, const 
com::sun::star::uno::Sequence &)()
2021 }
2022 }
2023 } aDrawViewKeeper;
2024 
2025 SCTAB nTab;
2026 if (bSinglePageSheets)
>>> CID 1454849:  Control flow issues  (DEADCODE)
>>> Execution cannot reach this statement: "nTab = nSelRenderer;".
2027 nTab = nSelRenderer;
2028 if ( !maValidPages.empty() )
2029 nTab = pPrintFuncCache->GetTabForPage( maValidPages.at( 
nRenderer )-1 );
2030 else
2031 nTab = pPrintFuncCache->GetTabForPage( nRenderer );
2032 

** CID 1454848:  Code maintainability issues  (UNUSED_VALUE)
/sc/source/ui/unoobj/docuno.cxx: 2027 in ScModelObj::render(int, const 
com::sun::star::uno::Any &, const 
com::sun::star::uno::Sequence &)()



*** CID 1454848:  Code maintainability issues  (UNUSED_VALUE)
/sc/source/ui/unoobj/docuno.cxx: 2027 in ScModelObj::render(int, const 
com::sun::star::uno::Any &, const 
com::sun::star::uno::Sequence &)()
2021 }
2022 }
2023 } aDrawViewKeeper;
2024 
2025 SCTAB nTab;
2026 if (bSinglePageSheets)
>>> CID 1454848:  Code maintainability issues  (UNUSED_VALUE)
>>> Assigning value from "nSelRenderer" to "nTab" here, but that stored 
>>> value is overwritten before it can be used.
2027 nTab = nSelRenderer;
2028 if ( !maValidPages.empty() )
2029 nTab = pPrintFuncCache->GetTabForPage( maValidPages.at( 
nRenderer )-1 );
2030 else
2031 nTab = pPrintFuncCache->GetTabForPage( nRenderer );
2032 

** CID 1454847:  Uninitialized members  (UNINIT_CTOR)
/sc/inc/interpretercontext.hxx: 67 in 
ScInterpreterContext::ScInterpreterContext(const ScDocument &, 
SvNumberFormatter *)()



*** CID 1454847:  Uninitialized members  (UNINIT_CTOR)
/sc/inc/interpretercontext.hxx: 67 in 
ScInterpreterContext::ScInterpreterContext(const ScDocument &, 
SvNumberFormatter *)()
61 , mnTokenCachePos(0)
62 , maTokens(TOKEN_CACHE_SIZE, nullptr)
63 , mScLookupCache(nullptr)
64 , pInterpreter(nullptr)
65 , mpFormatter(pFormatter)
66 {
>>> CID 1454847:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member field "maNFTypeCache.bIsValid" is not 
>>> initialized in this constructor nor in any functions that it calls.
67 }
68 
69 ScInterpreterContext() = delete;
70 
71 ~ScInterpreterContext();
72 

** CID 1454846:  Resource leaks  (RESOURCE_LEAK)
/desktop/source/lib/init.cxx: 3285 in 
doc_sendDialogEvent(_LibreOfficeKitDocument *, unsigned int, const char *)()



*** CID 1454846:  Resource leaks  (RESOURCE_LEAK)
/desktop/source/lib/init.cxx: 3285 in 
doc_sendDialogEvent(_LibreOfficeKitDocument *, unsigned int, const char *)()
3279 }
3280 
3281 char* pIdChar = strtok(pCopy, " ");
3282 
3283 if (!pIdChar) {
3284 SetLastExceptionMsg("Error parsing the command.");
>>> CID 1454846:  Resource leaks  (RESOURCE_LEAK)
>>> Variable "pCopy" going out of scope leaks the storage it points to.
3285 return;
3286 }
3287 
3288 OUString sId = OUString::createFromAscii(pIdChar);
3289 free(pCopy);
3290 



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB73RtgzoPcQtNNP5dkHLuV1E-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyrPkVZxE0q4RYCn-2B6gRt9wBjofytNk6R5Hl-2FXkRHdAjMUCYvstBk46CNVkiTHmpubzutGbNdLzIzz694DxRtUyEDHZnD6SQbZKKSARR6AUkJ1SpJSFn7zICFseLljhWtI-2BhDB8LcLf3nKa9BueQPGgslvjlk9s38JdvxAs3QJ8kk-3D

_

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 loleaflet/build/deps.js   |4 +
 loleaflet/src/core/Socket.js  |2 
 loleaflet/src/layer/ObjectFocusDarkOverlay.js |   57 ++
 loleaflet/src/layer/tile/TileLayer.js |   18 +++-
 loleaflet/src/map/Map.js  |   21 +
 5 files changed, 98 insertions(+), 4 deletions(-)

New commits:
commit 17ab9909d67a98457aa7819b6e01f578bbb289b8
Author: Szymon Kłos 
AuthorDate: Tue Jul 30 17:13:17 2019 +0200
Commit: Michael Meeks 
CommitDate: Thu Oct 17 21:47:32 2019 +0100

Unify none state for _graphicSelection

Change-Id: I8fb4f7813373b3b56a25040fc5d20e7592c6c92d

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 66c837fdf..fcc62e83b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -915,7 +915,7 @@ L.Socket = L.Class.extend({
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
this._map._docLayer._resetClientVisArea();
-   this._map._docLayer._graphicSelection = null;
+   this._map._docLayer._graphicSelection = new 
L.LatLngBounds(new L.LatLng(0, 0), new L.LatLng(0, 0));
this._map._docLayer._onUpdateGraphicSelection();
}
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fb0df110d..7587096fb 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -833,7 +833,7 @@ L.TileLayer = L.GridLayer.extend({
 
this._map.addObjectFocusDarkOverlay(xTwips, 
yTwips, wTwips, hTwips);
 
-   this._graphicSelection = null;
+   this._graphicSelection = new L.LatLngBounds(new 
L.LatLng(0, 0), new L.LatLng(0, 0));
this._onUpdateGraphicSelection();
}
}
@@ -1819,7 +1819,7 @@ L.TileLayer = L.GridLayer.extend({
// hide the selection handles
this._onUpdateTextSelection();
// hide the graphic selection
-   this._graphicSelection = null;
+   this._graphicSelection = new L.LatLngBounds(new L.LatLng(0, 0), 
new L.LatLng(0, 0));
this._onUpdateGraphicSelection();
this._cellCursor = null;
this._onUpdateCellCursor();
commit d0474118250684214bf2226d15da5e8dea593d70
Author: Szymon Kłos 
AuthorDate: Wed Jun 5 09:28:18 2019 +0200
Commit: Michael Meeks 
CommitDate: Thu Oct 17 21:16:53 2019 +0100

Remove dark overlay after crash or disconnection

Change-Id: Iceab041def6444b76c008a65d7fdeccb61126f84

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 39c2144b0..fb0df110d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -822,21 +822,16 @@ L.TileLayer = L.GridLayer.extend({
this._resetSelectionRanges();
}
else if (textMsg.match('INPLACE EXIT')) {
-   if (this._map.focusLayer) {
-   this._map.removeLayer(this._map.focusLayer);
-   this._map.focusLayer = null;
-   }
+   this._map.removeObjectFocusDarkOverlay();
}
else if (textMsg.match('INPLACE')) {
-   if (!this._map.focusLayer) {
-   this._map.focusLayer = new 
L.ObjectFocusDarkOverlay().addTo(this._map);
-
+   if (!this._map.hasObjectFocusDarkOverlay()) {
var xTwips = 
this._map._docLayer._latLngToTwips(this._graphicSelection.getNorthWest()).x;
var yTwips = 
this._map._docLayer._latLngToTwips(this._graphicSelection.getNorthWest()).y;
var wTwips = 
this._map._docLayer._latLngToTwips(this._graphicSelection.getSouthEast()).x - 
xTwips;
var hTwips = 
this._map._docLayer._latLngToTwips(this._graphicSelection.getSouthEast()).y - 
yTwips;
 
-   this._map.focusLayer.show({x: xTwips, y: 
yTwips, w: wTwips, h: hTwips});
+   this._map.addObjectFocusDarkOverlay(xTwips, 
yTwips, wTwips, hTwips);
 
this._graphicSelection = null;
this._onUpdateGraphicSelection();
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 628227522..d5feb7c25 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -317,6 +317,7 @@ L.Map = L.Evented.extend({
 
loadDocument: function(socket) {
this._socket.connect(socket);
+   this.removeObjectFocusDarkOverlay();

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

2019-10-17 Thread Tor Lillqvist (via logerrit)

 extensions/source/macosx/spotlight/OOoSpotlightImporter.m  
  |4 
 
extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/.gitignore
  |1 
 
extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
 |  308 ++
 
extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/xcshareddata/xcschemes/SpotlightImporterTester.xcscheme
 |   88 ++
 
extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester/main.m
|   30 
 5 files changed, 430 insertions(+), 1 deletion(-)

New commits:
commit d2b36c2674ab382140cf8aa5a4ea457065152f4c
Author: Tor Lillqvist 
AuthorDate: Fri Oct 18 00:45:46 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Oct 18 00:48:33 2019 +0300

tdf#128208: Don't crash if the zip archive is broken

Change-Id: I71f91752e6adeca1970a21c793cad3b5a5aeba13

diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m 
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 07e19332060a..a144fe259562 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -86,6 +86,8 @@ static unsigned char readByte(NSFileHandle *file)
 if (tmpBuf == nil)
 return 0;
 unsigned char *d = (unsigned char*)[tmpBuf bytes];
+if (d == nil)
+return 0;
 return *d;
 }
 
@@ -391,7 +393,7 @@ static NSData *getUncompressedData(NSFileHandle *file, 
NSString *name)
 
 if (unzipFile == nil) {
 //NSLog(@"zip file not open");
-return YES;
+return NO;
 }
 
 //first get the metadata
commit f8b80054751e83de669f607336e0f24515ea5e35
Author: Tor Lillqvist 
AuthorDate: Fri Oct 18 00:28:36 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Oct 18 00:48:22 2019 +0300

tdf#128208: Add a testbench for the Spotlight importer

Makes it much easier to test it.

Change-Id: I74c8651e34e9247acfa36c35165e5d7e4e32bb6e

diff --git 
a/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/.gitignore
 
b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/.gitignore
new file mode 100644
index ..96c4e5542fb7
--- /dev/null
+++ 
b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/.gitignore
@@ -0,0 +1 @@
+project.xcworkspace
diff --git 
a/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
 
b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
new file mode 100644
index ..f086d7ec93ca
--- /dev/null
+++ 
b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
@@ -0,0 +1,308 @@
+// !$*UTF8*$!
+{
+   archiveVersion = 1;
+   classes = {
+   };
+   objectVersion = 50;
+   objects = {
+
+/* Begin PBXBuildFile section */
+   BE9A7AC823590D9500931013 /* main.m in Sources */ = {isa = 
PBXBuildFile; fileRef = BE9A7AC723590D9500931013 /* main.m */; };
+   BE9A7AD723590E5D00931013 /* OOoSpotlightImporter.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = BE9A7ACE23590E5D00931013 /* 
OOoSpotlightImporter.m */; };
+   BE9A7AD823590E5D00931013 /* OOoMetaDataParser.m in Sources */ = 
{isa = PBXBuildFile; fileRef = BE9A7AD223590E5D00931013 /* OOoMetaDataParser.m 
*/; };
+   BE9A7AD923590E5D00931013 /* OOoContentDataParser.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = BE9A7AD323590E5D00931013 /* 
OOoContentDataParser.m */; };
+   BE9A7ADA23590E5D00931013 /* main.m in Sources */ = {isa = 
PBXBuildFile; fileRef = BE9A7AD423590E5D00931013 /* main.m */; };
+   BE9A7ADB23590E5D00931013 /* GetMetadataForFile.m in Sources */ 
= {isa = PBXBuildFile; fileRef = BE9A7AD623590E5D00931013 /* 
GetMetadataForFile.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+   BE9A7AC223590D9400931013 /* CopyFiles */ = {
+   isa = PBXCopyFilesBuildPhase;
+   buildActionMask = 2147483647;
+   dstPath = /usr/share/man/man1/;
+   dstSubfolderSpec = 0;
+   files = (
+   );
+   runOnlyForDeploymentPostprocessing = 1;
+   };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+   BE9A7AC423590D9500931013 /* SpotlightImporterTester */ = {isa = 
PBXFileReference; explicitFil

David L. Craig License Statement

2019-10-17 Thread David L. Craig

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
-- 

May the LORD God bless you exceedingly abundantly!

Dave_Craig__
"So the universe is not quite as you thought it was.
 You'd better rearrange your beliefs, then.
 Because you certainly can't rearrange the universe."
__--from_Nightfall_by_Asimov/Silverberg_


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

[Libreoffice-commits] core.git: Branch 'feature/skia' - RepositoryExternal.mk vcl/inc vcl/skia

2019-10-17 Thread Tomaž Vajngerl (via logerrit)

 RepositoryExternal.mk|1 
 vcl/inc/skia/gdiimpl.hxx |2 
 vcl/skia/gdiimpl.cxx |  128 ++-
 3 files changed, 119 insertions(+), 12 deletions(-)

New commits:
commit d6646488423e761f86e9eee664c6b7f7bf212aea
Author: Tomaž Vajngerl 
AuthorDate: Fri Oct 18 00:29:46 2019 +0200
Commit: Tomaž Vajngerl 
CommitDate: Fri Oct 18 00:29:46 2019 +0200

skia: implement invert operation

Change-Id: I248518283ee6a4604bc45f36f2af3804a15f5652

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 049ab3dbe317..c7963c83c380 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -115,6 +115,7 @@ ifneq ($(ENABLE_SKIA),)
 define gb_LinkTarget__use_skia
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,skia)/include/core \
+   -I$(call gb_UnpackedTarball_get_dir,skia)/include/effects \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/config \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \
-I$(call gb_UnpackedTarball_get_dir,skia) \
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index c4a1d74cc9ac..e0f5074c49d2 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -203,6 +203,8 @@ protected:
 
 bool isOffscreen() const { return mProvider == nullptr || 
mProvider->IsOffScreen(); }
 
+void invert(basegfx::B2DPolygon const& rPoly, SalInvert eFlags);
+
 protected:
 // get the width of the device
 int GetWidth() const { return mProvider ? mProvider->GetWidth() : 1; }
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 6fbb82f8c1b5..2f0519bb3d16 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -27,11 +27,51 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
 
 #ifdef DBG_UTIL
 #include 
 #endif
 
+namespace
+{
+// Create Skia Path from B2DPolygon
+// TODO - take bezier curves into account
+// TODO - use this for all Polygon / PolyPolygon needs
+static SkPath lclPolygonToPath(const basegfx::B2DPolygon& rPolygon)
+{
+SkPath aPath;
+
+const sal_uInt32 nPointCount(rPolygon.count());
+
+if (nPointCount == 0)
+return aPath;
+
+const bool bClosePath(rPolygon.isClosed());
+
+bool bFirst = true;
+
+for (sal_uInt32 nPointIndex = 0; nPointIndex < nPointCount; nPointIndex++)
+{
+auto const& rPoint = rPolygon.getB2DPoint(nPointIndex);
+if (bFirst)
+{
+aPath.moveTo(rPoint.getX(), rPoint.getY());
+bFirst = false;
+}
+else
+{
+aPath.lineTo(rPoint.getX(), rPoint.getY());
+}
+}
+if (bClosePath)
+aPath.close();
+return aPath;
+}
+}
+
 // Class that triggers flushing the backing buffer when idle.
 class SkiaFlushIdle : public Idle
 {
@@ -458,22 +498,86 @@ Color SkiaSalGraphicsImpl::getPixel(long nX, long nY)
 return fromSkColor(bitmap.getColor(nX, nY));
 }
 
-void SkiaSalGraphicsImpl::invert(long nX, long nY, long nWidth, long nHeight, 
SalInvert nFlags)
+void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon const& rPoly, SalInvert 
eFlags)
 {
-(void)nX;
-(void)nY;
-(void)nWidth;
-(void)nHeight;
-(void)nFlags;
-// TODO
+// TrackFrame just inverts a dashed path around the polygon
+if (eFlags == SalInvert::TrackFrame)
+{
+SkPath aPath = lclPolygonToPath(rPoly);
+SkPaint aPaint;
+aPaint.setStrokeWidth(2);
+float intervals[] = { 4.0f, 4.0f };
+aPaint.setStyle(SkPaint::kStroke_Style);
+aPaint.setPathEffect(SkDashPathEffect::Make(intervals, 
SK_ARRAY_COUNT(intervals), 0));
+aPaint.setColor(SkColorSetARGB(255, 255, 255, 255));
+aPaint.setBlendMode(SkBlendMode::kDifference);
+
+mSurface->getCanvas()->drawPath(aPath, aPaint);
+}
+else
+{
+SkPath aPath = lclPolygonToPath(rPoly);
+SkPaint aPaint;
+aPaint.setColor(SkColorSetARGB(255, 255, 255, 255));
+aPaint.setStyle(SkPaint::kFill_Style);
+aPaint.setBlendMode(SkBlendMode::kDifference);
+
+// N50 inverts in 4x4 checker pattern
+if (eFlags == SalInvert::N50)
+{
+// This creates 4x4 checker pattern bitmap
+// TODO Cache the bitmap
+SkBitmap aBitmap;
+aBitmap.allocN32Pixels(4, 4);
+SkPMColor* scanline;
+scanline = aBitmap.getAddr32(0, 0);
+*scanline++ = 0x;
+*scanline++ = 0x;
+*scanline++ = 0xFF00;
+*scanline++ = 0xFF00;
+scanline = aBitmap.getAddr32(0, 1);
+*scanline++ = 0x;
+*scanline++ = 0x;
+*scanline++ = 0xFF00;
+*scanline++ = 0xFF00;
+scanline = aBitmap.getAddr32(0, 2);
+*scanline++ = 0xFF00;
+*scanline++ = 0xFF00;
+*scanline++ = 0xFF

Peter Levine license statement

2019-10-17 Thread P Levine

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

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

2019-10-17 Thread Dennis Francis (via logerrit)

 sc/inc/interpretercontext.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 41d54e544781682f1e28f77c54cb16a71ecd6691
Author: Dennis Francis 
AuthorDate: Fri Oct 18 09:32:38 2019 +0530
Commit: Dennis Francis 
CommitDate: Fri Oct 18 07:22:57 2019 +0200

cid#1454847 : introduce an explicit constructor...

for NFIndexAndFmtType that initializes all its members appropriately.

Change-Id: Iec675458bca169c79b3a27f775ccff5265cee22d
Reviewed-on: https://gerrit.libreoffice.org/81004
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx
index 4ed6b3c66c4a..35b91947405c 100644
--- a/sc/inc/interpretercontext.hxx
+++ b/sc/inc/interpretercontext.hxx
@@ -40,6 +40,13 @@ struct NFIndexAndFmtType
 sal_uInt32 nIndex;
 SvNumFormatType eType : 16;
 bool bIsValid : 1;
+
+NFIndexAndFmtType()
+: nIndex(0)
+, eType(static_cast(0))
+, bIsValid(false)
+{
+}
 };
 
 class ScInterpreterContextPool;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/virtualdead.unusedparams.results |6 --
 sw/source/ui/dbui/mmoutputtypepage.cxx |8 +--
 sw/source/uibase/dbui/dbmgr.cxx|5 --
 sw/source/uibase/dbui/maildispatcher.cxx   |   36 ++---
 sw/source/uibase/inc/imaildsplistener.hxx  |4 -
 5 files changed, 12 insertions(+), 47 deletions(-)

New commits:
commit 6fe42f2050948f1d12bfb804e4c8fe1b82a6aa1d
Author: Noel Grandin 
AuthorDate: Thu Oct 17 13:09:47 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Oct 18 07:25:00 2019 +0200

loplugin:virtualdead unused params in IMailDispatcherListener

Change-Id: I0cc6a813db88efc98673400447d98e50c32bc720
Reviewed-on: https://gerrit.libreoffice.org/80962
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 041439172418..6f7c786361d9 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -346,12 +346,6 @@ sw/source/filter/xml/xmlexpit.hxx:84
 sw/source/filter/xml/xmlimpit.hxx:48
 _Bool SvXMLImportItemMapper::handleSpecialItem(const struct 
SvXMLItemMapEntry &,class SfxPoolItem &,class SfxItemSet &,const class 
rtl::OUString &,const class SvXMLUnitConverter &,const class SvXMLNamespaceMap 
&,)
 10
-sw/source/uibase/inc/imaildsplistener.hxx:44
-void IMailDispatcherListener::idle(class rtl::Reference,)
-0
-sw/source/uibase/inc/imaildsplistener.hxx:50
-void IMailDispatcherListener::mailDelivered(class rtl::Reference,class com::sun::star::uno::Reference,)
-01
 vcl/inc/outdev.h:122
 _Bool ImplGlyphFallbackFontSubstitution::FindFontSubstitute(class 
FontSelectPattern &,class LogicalFontInstance *,class rtl::OUString &,)const
 101
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx 
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index cdf6fa59b065..e5d0b2e8528d 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -121,9 +121,8 @@ class SwMailDispatcherListener_Impl : public 
IMailDispatcherListener
 public:
 explicit SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg);
 
-virtual void idle(::rtl::Reference xMailDispatcher) 
override;
-virtual void mailDelivered(::rtl::Reference 
xMailDispatcher,
-uno::Reference< mail::XMailMessage> xMailMessage) override;
+virtual void idle() override;
+virtual void mailDelivered(uno::Reference< mail::XMailMessage> 
xMailMessage) override;
 virtual void mailDeliveryError(::rtl::Reference 
xMailDispatcher,
 uno::Reference< mail::XMailMessage> xMailMessage, const 
OUString& sErrorMessage) override;
 
@@ -135,14 +134,13 @@ 
SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& r
 {
 }
 
-void SwMailDispatcherListener_Impl::idle(::rtl::Reference 
/*xMailDispatcher*/)
+void SwMailDispatcherListener_Impl::idle()
 {
 SolarMutexGuard aGuard;
 m_rSendMailDialog.AllMailsSent();
 }
 
 void SwMailDispatcherListener_Impl::mailDelivered(
-::rtl::Reference /*xMailDispatcher*/,
 uno::Reference< mail::XMailMessage> xMailMessage)
 {
 SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 4eeb3a32a3a9..c127143bf848 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1078,10 +1078,9 @@ public:
 explicit MailDispatcherListener_Impl( SwDBManager &rDBManager )
 : m_rDBManager( rDBManager ) {}
 
-virtual void idle( ::rtl::Reference ) override {}
+virtual void idle() override {}
 
-virtual void mailDelivered( ::rtl::Reference,
- uno::Reference< mail::XMailMessage> xMessage ) override
+virtual void mailDelivered( uno::Reference< mail::XMailMessage> xMessage ) 
override
 {
 osl::MutexGuard aGuard( m_rDBManager.m_pImpl->m_aAllEmailSendMutex );
 if ( m_rDBManager.m_pImpl->m_xLastMessage == xMessage )
diff --git a/sw/source/uibase/dbui/maildispatcher.cxx 
b/sw/source/uibase/dbui/maildispatcher.cxx
index e55e61bfb8ae..185d0d74eb55 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -31,43 +31,17 @@ typedef std::vector< 
::rtl::Reference > MailDispatcherL
 
 namespace /* private */
 {
-/* Generic event notifier for started,
-   stopped, and idle events which are
-   very similarly */
-class GenericEventNotifier
-{
-public:
-// pointer to virtual function typedef
-typedef void 
(IMailDispatcherListener::*GenericNotificationFunc_t)(::rtl::Reference);
-
-GenericEventNotifier(
-GenericNotificationFunc_t notification_function,
-::rtl::Reference const & mail_dispatcher) :
-notification_functi

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

2019-10-17 Thread Peter Levine (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |   10 
--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5917ba8bc645a2b105ec089101b8a664481b5b61
Author: Peter Levine 
AuthorDate: Thu Oct 17 23:08:57 2019 -0400
Commit: Samuel Mehrbrodt 
CommitDate: Fri Oct 18 07:39:40 2019 +0200

Fix building against MySQL Connector/C 8

In MySQL Connector/C 8, my_bool is replaced by bool. It was
previously defined as char. When building against
MySQL Connector/C 8, this leads to type punning build errors.
Redefine affected members of struct BindMetaData as bool if using
version 8 of greater. Otherwise, default to char.

Change-Id: If12b975d95afae86502867cb334cb4195802f91d
Reviewed-on: https://gerrit.libreoffice.org/81002
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index 1df2c704a38d..3450473ee895 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Type;
 
+#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 8)
+using my_bool = bool;
+#else
+using my_bool = char;
+#endif
+
 struct BindMetaData
 {
-char is_null = 0;
+my_bool is_null = 0;
 unsigned long length = 0;
-char error = 0;
+my_bool error = 0;
 };
 
 typedef ::cppu::ImplHelper5https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread andreas kainz (via logerrit)

 cui/uiconfig/ui/lineendstabpage.ui  |7 -
 cui/uiconfig/ui/linestyletabpage.ui |  152 ++--
 2 files changed, 64 insertions(+), 95 deletions(-)

New commits:
commit 5e69646bfde3bc277d32ace25a4729aecf498fe8
Author: andreas kainz 
AuthorDate: Wed Sep 25 11:02:24 2019 +0200
Commit: andreas_kainz 
CommitDate: Fri Oct 18 07:50:27 2019 +0200

Line Style Tab Page alignment improvement

Change-Id: Ia546a6bc72f133af9bba704741ed47c1f30bb0f5
Reviewed-on: https://gerrit.libreoffice.org/79512
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/cui/uiconfig/ui/lineendstabpage.ui 
b/cui/uiconfig/ui/lineendstabpage.ui
index cc9a600d5a33..cf831018b6c9 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -20,7 +20,7 @@
   
   
   
-   
+  
   
 
   
@@ -95,7 +95,6 @@
 True
 True
 start
-True
 30
   
   
@@ -107,7 +106,6 @@
   
 True
 False
-start
 liststore4
 0
 1
@@ -119,9 +117,6 @@
 
 
   
-  
-3
-  
 
   
   
diff --git a/cui/uiconfig/ui/linestyletabpage.ui 
b/cui/uiconfig/ui/linestyletabpage.ui
index 7b22bc37763d..b1642923d064 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -89,61 +89,6 @@
 vertical
 6
 
-  
-True
-False
-12
-
-  
-True
-False
-Line _style:
-True
-LB_LINESTYLES
-0
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-start
-liststore4
-0
-0
-1
-
-  
-  
-0
-  
-
-
-  
-  
-3
-  
-
-  
-  
-False
-True
-1
-  
-
-  
-  
-False
-True
-0
-  
-
-
   
 True
 False
@@ -162,7 +107,7 @@
   
   
 0
-0
+1
   
 
 
@@ -176,7 +121,7 @@
   
   
 0
-1
+2
   
 
 
@@ -190,7 +135,7 @@
   
   
 0
-2
+3
   
 
 
@@ -204,21 +149,6 @@
   
   
 0
-3
-  
-
-
-  
-_Fit to line width
-True
-True
-False
-True
-0
-True
-  
-  
-0

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

2019-10-17 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit dfabe21ac98d22150b23fbb973ef3d77ea839061
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 18:41:10 2019 +0200
Commit: Szymon Kłos 
CommitDate: Fri Oct 18 08:39:21 2019 +0200

jsdialogs: avoid exception crashing app on events

Change-Id: I83ddb44f54061d9f585eef3864415a472151976a
Reviewed-on: https://gerrit.libreoffice.org/80989
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2e9cfb7161e..ee0161d4eaf8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3297,10 +3297,13 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 else
 {
 OUString sAction("CLICK");
-WindowUIObject aUIObject(pWindow);
-std::unique_ptr pUIWindow(aUIObject.get_child(sId));
-if (pUIWindow)
-pUIWindow->execute(sAction, StringMap());
+try
+{
+WindowUIObject aUIObject(pWindow);
+std::unique_ptr pUIWindow(aUIObject.get_child(sId));
+if (pUIWindow)
+pUIWindow->execute(sAction, StringMap());
+} catch(...) {}
 
 // force resend
 pWindow->Resize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-17 Thread Miklos Vajna (via logerrit)

 solenv/bin/native-code.py   |1 +
 xmloff/inc/facreg.hxx   |5 -
 xmloff/source/core/facreg.cxx   |1 -
 xmloff/source/draw/sdxmlexp.cxx |9 -
 xmloff/util/xo.component|3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 90492bfbc3a2708a972233d90966594b1438c250
Author: Miklos Vajna 
AuthorDate: Thu Oct 17 21:02:46 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Oct 18 08:39:56 2019 +0200

xmloff: create XMLDrawSettingsExportOasis instances with an uno constructor

See tdf#74608 for motivation.

Change-Id: I25fbd841a8f91b51787cebd4b94f5a62cb0d9e07
Reviewed-on: https://gerrit.libreoffice.org/80996
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0b6b1f0a74f5..9e9640583ce0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -287,6 +287,7 @@ core_constructor_list = [
 "com_sun_star_comp_Draw_XMLContentExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLMetaExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
+"com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 242e6c0767ca..e46bee747c30 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -52,11 +52,6 @@ css::uno::Sequence 
XMLDrawMetaExportOasis_getSupportedServiceNames() t
 /// @throws css::uno::Exception
 css::uno::Reference 
XMLDrawMetaExportOasis_createInstance(
 css::uno::Reference const & rSMgr);
-OUString XMLDrawSettingsExportOasis_getImplementationName() throw();
-css::uno::Sequence 
XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLDrawSettingsExportOasis_createInstance(
-css::uno::Reference const & rSMgr);
 
 // impress animation import
 OUString AnimationsImport_getImplementationName() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 293b1b3d9c98..5944a8e9cc0f 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -61,7 +61,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 else SINGLEFACTORY( XMLDrawStylesExportOasis )
 else SINGLEFACTORY( XMLDrawContentExportOasis )
 else SINGLEFACTORY( XMLDrawMetaExportOasis )
-else SINGLEFACTORY( XMLDrawSettingsExportOasis )
 
 // drawing layer export
 else SINGLEFACTORY( XMLDrawingLayerExport )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 7fa2fa86c315..dadfeadb1331 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2737,11 +2737,18 @@ 
com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation(
 new SdXMLExport(pCtx, "XMLDrawSettingsExportOOO", true, 
SvXMLExportFlags::SETTINGS));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawSettingsExportOasis", 
true,
+ SvXMLExportFlags::OASIS | 
SvXMLExportFlags::SETTINGS));
+}
+
 SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", 
"XMLDrawExportOasis", true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED
 );
 SERVICE( XMLDrawStylesExportOasis, 
"com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", 
true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS
 );
 SERVICE( XMLDrawContentExportOasis, 
"com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", 
true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS
 );
 SERVICE( XMLDrawMetaExportOasis, 
"com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
-SERVICE( XMLDrawSettingsExportOasis, 
"com.sun.star.comp.Draw.XMLOasisSettingsExporter", 
"XMLDrawSettingsExportOasis", true, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
 
 SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", 
"XMLDrawingLayerExport", true, 
SvXMLExportFlags::OASIS|SvXMLExportFl

[Libreoffice-commits] core.git: 3 commits - desktop/source icon-themes/elementary icon-themes/elementary_svg officecfg/registry sw/source

2019-10-17 Thread Kelemen Gábor (via logerrit)

 desktop/source/lib/init.cxx   |   36 
--
 icon-themes/elementary/links.txt  |3 
 icon-themes/elementary/sw/res/sc20245.png |binary
 icon-themes/elementary/sw/res/sc20246.png |binary
 icon-themes/elementary/sw/res/sc20247.png |binary
 icon-themes/elementary/sw/res/sc20248.png |binary
 icon-themes/elementary_svg/sfx2/res/chevron.svg   |2 
 icon-themes/elementary_svg/sfx2/res/grip.svg  |2 
 icon-themes/elementary_svg/sw/res/sc20245.svg |1 
 icon-themes/elementary_svg/sw/res/sc20246.svg |1 
 icon-themes/elementary_svg/sw/res/sc20247.svg |1 
 icon-themes/elementary_svg/sw/res/sc20248.svg |1 
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 ++
 sw/source/uibase/shells/textfld.cxx   |6 +
 14 files changed, 52 insertions(+), 9 deletions(-)

New commits:
commit 2fca4bcfda927c6e63f67f70a3331d2d748e65ca
Author: Kelemen Gábor 
AuthorDate: Tue Oct 15 13:34:02 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Oct 18 08:41:35 2019 +0200

tdf#86188 Compatibility setting enabling comments to footnotes

For better OOXML interoperability allow disabling the insertion
of comments to footnotes/endnotes.

It is not possible to add comments to footnotes/endnotes in Word
so no wonder Writer generates invalid XML if one tries to save
comments added to footnotes as DOCX.

Prevent that by adding a centrally manageably key for disabling the
menu item if the cursor is in a footnote/endnote. In OOXML-heavy
environments sysadmins should be able to disable this and thus
hide the footgun from users.

Default setting is true so it means no change compared to current
feature set.

Change-Id: I2f799cb3f77a47fc14fa60b55fc5689a2710aff7
Reviewed-on: https://gerrit.libreoffice.org/80829
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 5d781baf6b64..1712a85a30cc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -163,6 +163,14 @@
 
 false
   
+  
+
+
+Specifies whether adding comments to footnotes is allowed. 
This is allowed for ODF but not in OOXML and can result in invalid docx files 
being saved.
+Allow adding comments to footnotes. Disable for better 
OOXML interperability.
+
+true
+  
 
   
 
diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index d5c4e6b73154..ea78347f73a9 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -81,6 +81,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace nsSwDocInfoSubType;
@@ -904,6 +905,11 @@ void SwTextShell::StateField( SfxItemSet &rSet )
 {
 rSet.DisableItem(nWhich);
 }
+// tdf#86188 Allow disabling comment insertion on 
footnote/endnote for better OOXML interoperability
+else if ( rSh.IsCursorInFootnote() && 
!officecfg::Office::Compatibility::View::AllowCommentsInFootnotes::get() )
+{
+rSet.DisableItem(nWhich);
+}
 }
 
 break;
commit cdeff4f1b4021c5fca55743e119a70fa2bd52b91
Author: Szymon Kłos 
AuthorDate: Thu Oct 17 19:23:22 2019 +0200
Commit: Szymon Kłos 
CommitDate: Fri Oct 18 08:41:15 2019 +0200

jsdialogs: handle combobox selections

Change-Id: Ib968bfaf7ad9e7becd16355259142d583bf7b5e3
Reviewed-on: https://gerrit.libreoffice.org/80991
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ee0161d4eaf8..b3cd142d9790 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3279,35 +3279,63 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 }
 
 char* pIdChar = strtok(pCopy, " ");
+char* pOptionalEventType = strtok(nullptr, " ");
+char* pOptionalData = strtok(nullptr, " ");
 
 if (!pIdChar) {
 SetLastExceptionMsg("Error parsing the command.");
+free(pCopy);
 return;
 }
 
 OUString sId = OUString::createFromAscii(pIdChar);
-free(pCopy);
 
 VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
 if (!pWindow)
 {
 SetLastExceptionMsg("Document doesn't support dialog rendering, or 
window not found.");
+free(pCopy);

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

2019-10-17 Thread Gülşah Köse (via logerrit)

 oox/source/drawingml/textbodypropertiescontext.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 49e0127419dbad8a75f1899db02115a2fe54aacd
Author: Gülşah Köse 
AuthorDate: Thu Oct 17 18:23:07 2019 +0300
Commit: Andras Timar 
CommitDate: Fri Oct 18 08:53:25 2019 +0200

tdf#128209 Add check for crash handling 3D rotation.

Handling text 3D z rotation works only for custom shapes.
Prevent to use it for other services.

Change-Id: I99971bccc2f7a4b08e212e467343cb661869804a
Reviewed-on: https://gerrit.libreoffice.org/80974
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index cac8bc10f89e..d696b4c3ac70 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -172,9 +172,12 @@ ContextHandlerRef 
TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
 break;
 
 case A_TOKEN( scene3d ):// CT_Scene3D
-return new Scene3DPropertiesContext( *this, 
mpShapePtr->get3DProperties() );
-break;
+{
+if(mpShapePtr && mpShapePtr->getServiceName() == 
"com.sun.star.drawing.CustomShape")
+return new Scene3DPropertiesContext( *this, 
mpShapePtr->get3DProperties() );
 
+break;
+}
 
 // EG_Text3D
 case A_TOKEN( sp3d ):   // CT_Shape3D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

78 matches

Mail list logo