[Libreoffice-commits] core.git: compilerplugins/clang config_host/config_clang.h.in configure.ac

[Libreoffice Gerrit user]

 compilerplugins/clang/plugin.hxx |2 --
 config_host/config_clang.h.in|4 
 configure.ac |3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit efe28895498b03f1468a9dc9f510452f36affc2f
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 14:50:07 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 08:37:14 2018 +0100

Remove broken rebuild of compilerplugins when CLANG_FULL_VERSION changed

Not all compilerplugins/clang/*.cxx depend on config_clang.h (e.g., 
check.cxx
doesn't), so this mechanism trying to rebuild compilerplugins once the
underlying Clang installation changes doesn't work reliably in practice 
(just
debugged through this with Miklos on IRC, and it wasn't the first time that
`make distclean` fixed compilerplugins for somebody after they upgraded 
their
Clang installation).  Removing the brittle mechanism shows that plugin.hxx
doesn't actually depend on config_clang.h.

(There's a second mechanism trying to rebuild compilerplugins once the
underlying Clang installation changes, namely

> # Clang most probably doesn't maintain binary compatibility, so rebuild 
when clang changes.
> $(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang$(CLANG_EXE_EXT)
> $(QUIET)touch $@

in compilerplugins/Makefile-clang.mk, but that doesn't work reliably 
either, as
it depends on the newly installed clang executable being newer than our
clang-timestamp file, which will be the case for self-built Clang 
installations,
but not necessarily when updating e.g. a distro-provided Clang 
installation.)

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

diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index 0157540ee680..4aab4beb4b8d 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -12,8 +12,6 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include 
-
 #include 
 #include 
 #include 
diff --git a/config_host/config_clang.h.in b/config_host/config_clang.h.in
index c19c0875ce86..66629bfd780e 100644
--- a/config_host/config_clang.h.in
+++ b/config_host/config_clang.h.in
@@ -13,8 +13,4 @@ Settings related to Clang compiler plugins.
 
 #undef CLANG_VERSION
 
-/* This is actually unused, but it should change whenever Clang changes,
-thus causing update of this .h file and triggering rebuild of our Clang 
plugin. */
-#undef CLANG_FULL_VERSION
-
 #endif
diff --git a/configure.ac b/configure.ac
index ac7dfdeafbdd..d338e625638c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3673,16 +3673,15 @@ if test "$COM_IS_CLANG" = TRUE; then
 my_args="-E -P"
 fi
 clang_version=`echo 
__clang_major__.__clang_minor__.__clang_patchlevel__ | $CC_PLAIN $my_args -`
-CLANG_FULL_VERSION=`echo __clang_version__ | $CC_PLAIN $my_args -`
 CLANGVER=`echo $clang_version \
 | $AWK -F. '{ print 
\$1*1+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
 if test "$CLANGVER" -ge 50002; then
 AC_MSG_RESULT([yes ($clang_version)])
 else
+CLANG_FULL_VERSION=`echo __clang_version__ | $CC_PLAIN $my_args -`
 AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, 
must be at least Clang 5.0.2])
 fi
 AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER)
-AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 87d4597090aeaa473727834bad4caad83698275e
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 10:14:17 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 08:35:43 2018 +0100

Fix reading 16 bit millisecond value

It had originally been read as 16 bit via >> in
d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to 
filter",
then accidentally changed to be read as 32 bit via >> in
9830fd36dbdb72c79703b0c61efc027fba793c5a "date/time IDL datatypes 
incompatible
change" (and later changed to be read as 32 bit explicitly via ReadUInt32 
with
15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 "convert SvStream::operator>> 
methods
to ReadXXX methods").

Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3
Reviewed-on: https://gerrit.libreoffice.org/64604
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins
(cherry picked from commit f84f5b0a0cdb82f444de572f9d8554a96056f874)
Reviewed-on: https://gerrit.libreoffice.org/64635
Reviewed-by: Stephan Bergmann 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index ac8728cd424f..97eefcc77c8b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2704,6 +2704,7 @@ static void ImportComment10( SvxMSDffManager const & 
rMan, SvStream& rStCtrl, Sd
 
 case PPT_PST_CommentAtom10 :
 {
+sal_uInt16 millisec = 0;
 rStCtrl.ReadInt32( nIndex )
.ReadInt16( aDateTime.Year )
.ReadUInt16( aDateTime.Month )
@@ -2712,11 +2713,11 @@ static void ImportComment10( SvxMSDffManager const & 
rMan, SvStream& rStCtrl, Sd
.ReadUInt16( aDateTime.Hours )
.ReadUInt16( aDateTime.Minutes )
.ReadUInt16( aDateTime.Seconds )
-   .ReadUInt32( aDateTime.NanoSeconds )
+   .ReadUInt16( millisec )
.ReadInt32( nPosX )
.ReadInt32( nPosY );
 
-aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli;
+aDateTime.NanoSeconds = millisec * ::tools::Time::nanoPerMilli;
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 binaryurp/source/cache.hxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 23e32f46b169bf1ec69266c925dabf7c93ba8109
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 23:16:56 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 08:19:25 2018 +0100

Use structured binding

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

diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index d1c1df7e32bf..722e7494bd8e 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -55,26 +55,25 @@ public:
 }
 // try to insert into the map
 list_.push_front( rContent); // create a temp entry
-typedef std::pair MapPair;
-MapPair aMP = map_.emplace( list_.begin(), 0 );
-*pbFound = !aMP.second;
+auto const [it, inserted] = map_.emplace( list_.begin(), 0 );
+*pbFound = !inserted;
 
-if( !aMP.second) { // insertion not needed => found the entry
+if( !inserted) { // insertion not needed => found the entry
 list_.pop_front(); // remove the temp entry
-list_.splice( list_.begin(), list_, aMP.first->first); // the 
found entry is moved to front
-return aMP.first->second;
+list_.splice( list_.begin(), list_, it->first); // the found entry 
is moved to front
+return it->second;
 }
 
 // test insertion successful => it was new so we keep it
 IdxType n = static_cast( map_.size() - 1);
 if( n >= size_) { // cache full => replace the LRU entry
 // find the least recently used element in the map
-typename LruItMap::iterator it = map_.find( --list_.end());
-n = it->second;
-map_.erase( it); // remove it from the map
+typename LruItMap::iterator lru = map_.find( --list_.end());
+n = lru->second;
+map_.erase( lru); // remove it from the map
 list_.pop_back(); // remove from the list
 }
-aMP.first->second = n;
+it->second = n;
 return n;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/Ant_java_uno.mk bridges/inc bridges/java bridges/Library_cpp_uno.mk bridges/Library_java_uno.mk bridges/Makefile bridges/Module_bridges.mk

[Libreoffice Gerrit user]

 Module_ooo.mk|1 
 Repository.mk|6 
 bridges/Ant_java_uno.mk  |   27 +
 bridges/Library_cpp_uno.mk   |  565 +++
 bridges/Library_java_uno.mk  |   67 ++
 bridges/Makefile |   32 +
 bridges/Module_bridges.mk|   33 +
 bridges/inc/pch/precompiled_bridges_java_uno.cxx |   25 +
 bridges/inc/pch/precompiled_bridges_java_uno.hxx |  144 +
 bridges/java/java_uno/build.xml  |   41 +
 bridges/prj/build.lst|   36 -
 bridges/prj/d.lst|   11 
 bridges/prj/makefile.mk  |   44 +
 bridges/source/bridge_exports.map|   18 
 bridges/source/cpp_uno/shared/component.cxx  |6 
 bridges/source/jni_uno/jni_bridge.cxx|8 
 bridges/source/jni_uno/jni_data.cxx  |2 
 bridges/source/jni_uno/jni_info.cxx  |2 
 bridges/source/jni_uno/jni_java2uno.cxx  |2 
 bridges/source/jni_uno/jni_uno2java.cxx  |2 
 bridges/source/jni_uno/nativethreadpool.cxx  |2 
 21 files changed, 1016 insertions(+), 58 deletions(-)

New commits:
commit 3249a22f6f6d07eab1d5f7a761022de5f64e3903
Author: Damjan Jovanovic 
AuthorDate: Thu Dec 6 06:24:29 2018 +
Commit: Damjan Jovanovic 
CommitDate: Thu Dec 6 06:24:29 2018 +

Port main/bridges to gbuild.

Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index d7ce54c26135..5cf64514bac2 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 basic \
 bean \
 binaryurp \
+bridges \
 canvas \
 codemaker \
 comphelper \
diff --git a/Repository.mk b/Repository.mk
index 503f6423521b..dca0d0c7b275 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -194,9 +194,15 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+gcc3_uno \
+java_uno \
 jpipe \
 jpipx \
+msci_uno \
+mscx_uno \
+s5abi_uno \
 sunjavaplugin \
+sunpro5_uno \
 xmlreader \
 ))
 
diff --git a/bridges/Ant_java_uno.mk b/bridges/Ant_java_uno.mk
new file mode 100644
index ..b20fbb644b56
--- /dev/null
+++ b/bridges/Ant_java_uno.mk
@@ -0,0 +1,27 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_Ant_Ant,java_uno,$(SRCDIR)/bridges/java/java_uno/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
new file mode 100644
index ..d46b5f30907f
--- /dev/null
+++ b/bridges/Library_cpp_uno.mk
@@ -0,0 +1,565 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_Library_Library,$(COMNAME)_uno))
+
+$(eval $(call 
gb_Library_add_precompiled_header,$(COMNAME)_uno,$(SRCDIR)/bridges/inc/pch/precompiled_bridges))
+
+$(eval $(call gb_Library_set_include,$(COMNAME)_uno,\
+   $$(INCLUDE) \
+   -I$(SRCDIR) \
+   -I$(SRCDIR)/bridg

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

[Libreoffice Gerrit user]

 sw/qa/uitest/findReplace/tdf119462.py |   51 ++
 1 file changed, 51 insertions(+)

New commits:
commit fcc76610649a9830859f9e2efe2a06dbc6db74da
Author: Zdeněk Crhonek 
AuthorDate: Wed Dec 5 22:35:39 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Thu Dec 6 07:36:22 2018 +0100

uitest for bug tdf#119462

Change-Id: I87e601b8a68bfcfee700299526e2b899427e56f1
Reviewed-on: https://gerrit.libreoffice.org/64652
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/findReplace/tdf119462.py 
b/sw/qa/uitest/findReplace/tdf119462.py
new file mode 100644
index ..1c7638209d6a
--- /dev/null
+++ b/sw/qa/uitest/findReplace/tdf119462.py
@@ -0,0 +1,51 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+
+#Bug 119462 - Find with formatting adds 0pt text size
+
+class tdf119462(UITestCase):
+def test_tdf119462_find_format(self):
+writer_doc = self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#1. Choose Edit > Find & Replace
+
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+#2. Choose Format
+format = xDialog.getChild("format")
+def handle_format_dlg(dialog):
+
+#3. Choose Bold
+xTabs = dialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xweststylelbcjk = dialog.getChild("weststylelb-cjk")
+xweststylelbcjk.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Bold"}))
+xOkBtn = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.execute_blocking_action(format.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_format_dlg)
+#verify label searchdesc
+searchdesc = xDialog.getChild("searchdesc")
+self.assertEqual(get_state_as_dict(searchdesc)["Text"], "bold")
+noformat = xDialog.getChild("noformat")
+noformat.executeAction("CLICK", tuple())   #click No format button
+self.assertEqual(get_state_as_dict(searchdesc)["Text"], "")
+xcloseBtn = xDialog.getChild("close")
+self.ui_test.close_dialog_through_button(xcloseBtn)
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 dev/null  |binary
 sw/qa/extras/ww8export/ww8export2.cxx |   27 ---
 sw/source/filter/ww8/ww8par6.cxx  |   27 ---
 3 files changed, 54 deletions(-)

New commits:
commit 931cb1caf26a09d7152360407e1f163fc3fab1c2
Author: Justin Luth 
AuthorDate: Tue Dec 4 11:37:29 2018 +0300
Commit: Justin Luth 
CommitDate: Thu Dec 6 07:30:55 2018 +0100

Revert "tdf#106174 ww8import: bidi - prev adjust? prev bidi?"

This reverts commit 85818da3307a28b2d9c6fa5c1c97ca7833dfe24c which
caused bug 121110. Only reverting from 6.2 because I hope to fix
this for the current master 6.3, but I won't backport the fix
because it isn't trivial.

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

diff --git a/sw/qa/extras/ww8export/data/tdf106174_rtlParaAlign.docx 
b/sw/qa/extras/ww8export/data/tdf106174_rtlParaAlign.docx
deleted file mode 100644
index a222f5881461..
Binary files a/sw/qa/extras/ww8export/data/tdf106174_rtlParaAlign.docx and 
/dev/null differ
diff --git a/sw/qa/extras/ww8export/data/tdf98620_rtlJustify.doc 
b/sw/qa/extras/ww8export/data/tdf98620_rtlJustify.doc
deleted file mode 100644
index c643b96a4d3d..
Binary files a/sw/qa/extras/ww8export/data/tdf98620_rtlJustify.doc and 
/dev/null differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index e1597f634a0c..97895233e5d6 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -254,32 +253,6 @@ 
DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, "tdf112074_RTLtableJ
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTable, 
"HoriOrient"));
 CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty(xTable, 
"LeftMargin") > 3000);
 CPPUNIT_ASSERT_MESSAGE("Table Indent is 3750", getProperty(xTable, 
"LeftMargin") < 4000 );
-CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraphOrTable(2),
 "ParaAdjust")) );
-}
-
-DECLARE_WW8EXPORT_TEST(testTdf98620_rtlJustify, "tdf98620_rtlJustify.doc")
-{
-CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")) );
-}
-
-DECLARE_WW8EXPORT_TEST(testTdf106174_rtlParaAlign, 
"tdf106174_rtlParaAlign.docx")
-{
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER), 
getProperty(getParagraph(1), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER), 
getProperty(getParagraph(2), "ParaAdjust"));
-uno::Reference 
xPropertySet(getStyles("ParagraphStyles")->getByName("Another paragraph aligned 
to right"), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(xPropertySet, "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(3), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(4), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(5), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),  
getProperty(getParagraph(6), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(7), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(8), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),  
getProperty(getParagraph(9), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),  
getProperty(getParagraph(10), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(11), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),  
getProperty(getParagraph(12), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),  
getProperty(getParagraph(13), "ParaAdjust"));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT), 
getProperty(getParagraph(14), "ParaAdjust"));
 }
 
 DECLARE_WW8EXPORT_TEST(testTdf119232_startEvenPage, 
"tdf119232_startEvenPage.doc")
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 671bbb944786..7d927c968868 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -318,33 +318,6 @@ void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const 
sal_uInt8* pData, short nL
 {
 SvxFrameDirection eDir =
 *pData ? SvxFrameDirection::Horizontal_RL_TB : 
SvxFrameDirection::Horizontal_LR_TB;
-
-// Previous adjust 

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

[Libreoffice Gerrit user]

 vcl/win/gdi/salgdi.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6ad0a96a460551389808fa96e0992938540c5b72
Author: Dmitriy Shilin 
AuthorDate: Thu Dec 6 07:52:37 2018 +0300
Commit: Noel Grandin 
CommitDate: Thu Dec 6 07:21:27 2018 +0100

vcl: move SysColorEntry to anonymous namespace

Change-Id: Ib483decf4cd7d8ec5cb73a23c36181bd3e1d49c0
Relates: tdf#107792
Reviewed-on: https://gerrit.libreoffice.org/64661
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index da06dc999e4c..363476a7107f 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -45,17 +45,17 @@
 #define DITHER_MAX_SYSCOLOR 16
 #define DITHER_EXTRA_COLORS 1
 
+namespace
+{
+
 struct SysColorEntry
 {
 DWORD   nRGB;
 SysColorEntry*  pNext;
 };
 
-static SysColorEntry* pFirstSysColor = nullptr;
-static SysColorEntry* pActSysColor = nullptr;
-
-namespace
-{
+SysColorEntry* pFirstSysColor = nullptr;
+SysColorEntry* pActSysColor = nullptr;
 
 void DeleteSysColorList()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 unoxml/source/dom/documentbuilder.cxx |6 +++---
 unoxml/source/dom/documentbuilder.hxx |2 --
 unoxml/source/dom/saxbuilder.cxx  |6 +++---
 unoxml/source/dom/saxbuilder.hxx  |2 --
 unoxml/source/xpath/xpathapi.cxx  |6 +++---
 unoxml/source/xpath/xpathapi.hxx  |2 --
 6 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 2b938a369462b6ae650b1bfb973f0c7d380daf52
Author: Noel Grandin 
AuthorDate: Wed Dec 5 10:03:14 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 6 07:19:06 2018 +0100

loplugin:singlevalfields in unoxml

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

diff --git a/unoxml/source/dom/documentbuilder.cxx 
b/unoxml/source/dom/documentbuilder.cxx
index 8d244ab6d6e9..bbb412a32df0 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -101,15 +101,15 @@ namespace DOM
 return static_cast< XDocumentBuilder* >(new CDocumentBuilder);
 }
 
-const char* CDocumentBuilder::aImplementationName = 
"com.sun.star.comp.xml.dom.DocumentBuilder";
-const char* CDocumentBuilder::aSupportedServiceNames[] = {
+static const char aImplementationName[] = 
"com.sun.star.comp.xml.dom.DocumentBuilder";
+static const char* aSupportedServiceNames[] = {
 "com.sun.star.xml.dom.DocumentBuilder",
 nullptr
 };
 
 OUString CDocumentBuilder::_getImplementationName()
 {
-return OUString::createFromAscii(aImplementationName);
+return OUString(aImplementationName);
 }
 Sequence CDocumentBuilder::_getSupportedServiceNames()
 {
diff --git a/unoxml/source/dom/documentbuilder.hxx 
b/unoxml/source/dom/documentbuilder.hxx
index 4ef3e1840de1..ca5927161ceb 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -60,8 +60,6 @@ namespace DOM
 explicit CDocumentBuilder();
 
 // static helpers for service info and component management
-static const char* aImplementationName;
-static const char* aSupportedServiceNames[];
 static OUString _getImplementationName();
 static css::uno::Sequence< OUString > _getSupportedServiceNames();
 static css::uno::Reference< XInterface > _getInstance(
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 81da91c51073..a6e189b4b475 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -38,8 +38,8 @@ namespace DOM
 return static_cast< XSAXDocumentBuilder* >(new 
CSAXDocumentBuilder(rSMgr));
 }
 
-const char* CSAXDocumentBuilder::aImplementationName = 
"com.sun.star.comp.xml.dom.SAXDocumentBuilder";
-const char* CSAXDocumentBuilder::aSupportedServiceNames[] = {
+static const char aImplementationName[] = 
"com.sun.star.comp.xml.dom.SAXDocumentBuilder";
+static const char* aSupportedServiceNames[] = {
 "com.sun.star.xml.dom.SAXDocumentBuilder",
 nullptr
 };
@@ -51,7 +51,7 @@ namespace DOM
 
 OUString CSAXDocumentBuilder::_getImplementationName()
 {
-return OUString::createFromAscii(aImplementationName);
+return OUString(aImplementationName);
 }
 Sequence CSAXDocumentBuilder::_getSupportedServiceNames()
 {
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index 79c8ba0c5ff7..e2279a0c24bb 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -61,8 +61,6 @@ namespace DOM
 
 public:
 // static helpers for service info and component management
-static const char* aImplementationName;
-static const char* aSupportedServiceNames[];
 static OUString _getImplementationName();
 static css::uno::Sequence< OUString > _getSupportedServiceNames();
 static css::uno::Reference< XInterface > _getInstance(const 
css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr);
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 74f216d59a7f..b010c6b61341 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -58,15 +58,15 @@ namespace XPath
 {
 }
 
-const char* CXPathAPI::aImplementationName = 
"com.sun.star.comp.xml.xpath.XPathAPI";
-const char* CXPathAPI::aSupportedServiceNames[] = {
+static const char aImplementationName[] = 
"com.sun.star.comp.xml.xpath.XPathAPI";
+static const char* aSupportedServiceNames[] = {
 "com.sun.star.xml.xpath.XPathAPI",
 nullptr
 };
 
 OUString CXPathAPI::_getImplementationName()
 {
-return OUString::createFromAscii(aImplementationName);
+return OUString(aImplementationName);
 }
 
 Sequence CXPathAPI::_getSupportedServiceNames()
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpat

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

[Libreoffice Gerrit user]

 cui/source/tabpages/tpcolor.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c0e4ac9a90920d2a9af94f36e2b943b7403b1391
Author: Jim Raykowski 
AuthorDate: Fri Nov 23 23:03:25 2018 -0900
Commit: Jim Raykowski 
CommitDate: Thu Dec 6 02:30:01 2018 +0100

Add the color name or hex representation to the recent color bar

...after choosing a color using the color tab page

Change-Id: I8f39ed2055e8974356c9ad0894fc908db754b5a4
Reviewed-on: https://gerrit.libreoffice.org/63929
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index c7b79ed69bc2..1cebd3b7527c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -243,8 +243,14 @@ DeactivateRC SvxColorTabPage::DeactivatePage( SfxItemSet* 
_pSet )
 
 bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
 {
-maPaletteManager.AddRecentColor( aCurrentColor, OUString() );
-rSet->Put( XFillColorItem( OUString(), aCurrentColor ) );
+Color aColor = m_xValSetColorList->GetItemColor( 
m_xValSetColorList->GetSelectedItemId() );
+OUString sColorName;
+if ( aCurrentColor == aColor )
+   sColorName = m_xValSetColorList->GetItemText( 
m_xValSetColorList->GetSelectedItemId() );
+else
+   sColorName = "#" + aCurrentColor.AsRGBHexString().toAsciiUpperCase();
+maPaletteManager.AddRecentColor( aCurrentColor, sColorName );
+rSet->Put( XFillColorItem( sColorName, aCurrentColor ) );
 rSet->Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 slideshow/source/engine/animationnodes/animationcommandnode.cxx |   19 
++
 slideshow/source/engine/animationnodes/animationcommandnode.hxx |1 
 2 files changed, 20 insertions(+)

New commits:
commit d6b1e268796aac1448f8fe6a153d4aa129466c76
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 16:42:10 2018 +
Commit: Thorsten Behrens 
CommitDate: Thu Dec 6 00:16:44 2018 +0100

tdf#121830 TogglePause should reset to original state on deactivate_st ?

is that how it should work, or should there be an additional TogglePause
created at import time to get the apparent intended pause effect

Change-Id: I0573bd8d9534271f2b36d7ab3b8cdc20e0f985a1
Reviewed-on: https://gerrit.libreoffice.org/64548
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1aa10fcb668f67f4313b7170a4090027e52164c5)
Reviewed-on: https://gerrit.libreoffice.org/64620

diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 0c9519589ed0..3bd05db936b2 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -109,6 +109,25 @@ void AnimationCommandNode::activate_st()
"AnimationCommandNode::deactivate" ) );
 }
 
+void AnimationCommandNode::deactivate_st( NodeState /*eDestState*/ )
+{
+switch( mxCommandNode->getCommand() ) {
+// the command toggles the pause status on a media object
+case EffectCommands::TOGGLEPAUSE:
+{
+if( mpShape )
+{
+if( mpShape->isPlaying() )
+mpShape->pause();
+else
+mpShape->play();
+}
+break;
+}
+
+}
+}
+
 bool AnimationCommandNode::hasPendingAnimation() const
 {
 return mxCommandNode->getCommand() == EffectCommands::STOPAUDIO || mpShape;
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 675da7c3b0e8..cf753e001949 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -46,6 +46,7 @@ protected:
 
 private:
 virtual void activate_st() override;
+virtual void deactivate_st( NodeState eDestState ) override;
 virtual bool hasPendingAnimation() const override;
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7f1b4c02c61dbe846ca190b246061b11c59e1df
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 23:32:49 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 5 23:32:49 2018 +0100

loplugin:unnecessaryparen

Change-Id: Ic717f68f0d107138dd18116b70f3a49588c5778f

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 2df4356c81b5..c31cf180a704 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -119,7 +119,7 @@ static OUString toUNOname( char const * p )
 while ('E' != *p)
 {
 // read chars count
-long n = (*p++ - '0');
+long n = *p++ - '0';
 while ('0' <= *p && '9' >= *p)
 {
 n *= 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa

[Libreoffice Gerrit user]

 framework/qa/complex/api_internal/api.lst|1 
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv |2 
 qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java|  112 
--
 sc/qa/extras/sccellformatsobj.cxx|9 
 sc/qa/unoapi/sc_2.sce|1 
 6 files changed, 8 insertions(+), 118 deletions(-)

New commits:
commit a91782b92d9509619da2598904c644a19aead70b
Author: Jens Carl 
AuthorDate: Wed Dec 5 19:49:21 2018 +
Commit: Jens Carl 
CommitDate: Wed Dec 5 23:14:51 2018 +0100

tdf#45904 Move XIndexAccess Java tests to C++

Move XIndexAccess Java tests to C++ for ScCellFormatsObj.

Change-Id: I5ef1e789a535af55705c3a39f07a939adbed
Reviewed-on: https://gerrit.libreoffice.org/64648
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/framework/qa/complex/api_internal/api.lst 
b/framework/qa/complex/api_internal/api.lst
index 4f1cc7cb2540..167c2308c54f 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -77,7 +77,6 @@ job79=sc.ScAutoFormatObj
 job80=sc.ScAutoFormatsObj
 job81=sc.ScCellFieldObj
 job82=sc.ScCellFieldsObj
-job84=sc.ScCellFormatsObj
 job85=sc.ScCellSearchObj
 job88=sc.ScDatabaseRangeObj
 job89=sc.ScDatabaseRangesObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 80b62f084af6..86bda8985a6b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -960,7 +960,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
 qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
 qadevOOo/tests/java/mod/_sc/ScCellFieldsObj \
-qadevOOo/tests/java/mod/_sc/ScCellFormatsObj \
 qadevOOo/tests/java/mod/_sc/ScCellObj \
 qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
 qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
deleted file mode 100644
index d9fa9324ba53..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java 
b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
deleted file mode 100644
index e67bcf105a4a..
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XCellFormatRangesSupplier;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* com.sun.star.sheet.CellFormatRanges. 
-* Object implements the following interfaces :
-* 
-*   com::sun::star::container::XEnumerationAccess
-*   com::sun::star::container::XElementAccess
-* 
-* @see com.sun.star.sheet.CellFormatRanges
-* @see com.sun.star.container.XEnumerationAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XEnumerationAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScCellFormatsObj extends TestCase {
-private XSpreadsheetDocument xSheetDoc = null;
-
-/**
-* Creates Spreadsheet document.
-*/
-@Override
-protected void initialize( TestParameters tParam, PrintWriter log ) throws 
Exception {
-// get a soffice factory object
-SOfficeFactory SOF = SOfficeFacto

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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv |1 -
 sc/qa/extras/sccellformatsobj.cxx|8 
+++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 849944f62cecd75103d85ae59d79d98bf273c6e4
Author: Jens Carl 
AuthorDate: Wed Dec 5 19:40:28 2018 +
Commit: Jens Carl 
CommitDate: Wed Dec 5 23:14:06 2018 +0100

tdf#45904 Move XEnumerationAccess Java test to C++

Move XEnumerationAccess Java test to C++ for ScCellFormatsObj.

Change-Id: I68b9e0308b1959b848e8a53b143c6a6a49589bb7
Reviewed-on: https://gerrit.libreoffice.org/64647
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
index 08c7325ce95d..d9fa9324ba53 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
@@ -1,3 +1,2 @@
 "ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
 "ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScCellFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/qa/extras/sccellformatsobj.cxx 
b/sc/qa/extras/sccellformatsobj.cxx
index 0a79374f9f42..e4d407002d4d 100644
--- a/sc/qa/extras/sccellformatsobj.cxx
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -28,7 +29,9 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellFormatsObj : public CalcUnoApiTest, public apitest::XElementAccess
+class ScCellFormatsObj : public CalcUnoApiTest,
+ public apitest::XElementAccess,
+ public apitest::XEnumerationAccess
 {
 public:
 ScCellFormatsObj();
@@ -43,6 +46,9 @@ public:
 CPPUNIT_TEST(testGetElementType);
 CPPUNIT_TEST(testHasElements);
 
+// XEnumerationAccess
+CPPUNIT_TEST(testCreateEnumeration);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/filter/oox/sheetdatacontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41f19175c2e4c344c582c8b57a803f5ec4e5aaad
Author: Eike Rathke 
AuthorDate: Wed Dec 5 00:21:17 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Wed Dec 5 23:01:47 2018 +0100

Resolves: tdf#121887 RowModel::mnRow is 1-based, always

Basically this was always wrong.

Original code didn't treat the r attribute as optional and
resulted in an invalid -1 row for such cases, hence the RowModel
wasn't applied later.

Then

commit af8e6f4f544ecd01d3eda5f38bbd4779d5e8b2c6
CommitDate: Wed May 29 22:05:02 2013 +0200

r is an optional attribute in c and r, fdo#65059

introduced a 0-based SheetDataContext::mnRow but assigned that to
a 1-based RowModel::mnRow as well if r attribute was missing, and
did not update SheetDataContext::mnRow if r attribute was given.

commit ff56553e34dfed01b9226ce7a516dbeb6da32124
CommitDate: Thu Mar 13 18:39:22 2014 -0400

fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.

then correctly assigned the decremented r attribute to
SheetDataContext::mnRow but did not touch the assignment to
RowModel::mnRow if r was not given. Probably confused by the
++mnRow already there which is correct but not sufficient for the
assignment.

Which we now finally fix herewith..

Change-Id: Iae1563ed01b95e7852ddad4fd59374c07186b493
Reviewed-on: https://gerrit.libreoffice.org/64580
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 76fbe494785faee1313d1c0be8ed2ca7b0d74f68)
Reviewed-on: https://gerrit.libreoffice.org/64639
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index 5f17d8c419b6..9732ce668d5c 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -272,7 +272,7 @@ void SheetDataContext::importRow( const AttributeList& 
rAttribs )
 mnRow = nRow-1; // to 0-based row index.
 }
 else
-aModel.mnRow = ++mnRow;
+aModel.mnRow = (++mnRow + 1);   // increment 0-based row index, to 
1-based model row
 mrAddressConv.checkRow( mnRow, true);
 mnCol = -1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/sheetdatacontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f237e07a08abf703e0da15030bd708fde28e616
Author: Eike Rathke 
AuthorDate: Wed Dec 5 00:21:17 2018 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 5 22:43:37 2018 +0100

Resolves: tdf#121887 RowModel::mnRow is 1-based, always

Basically this was always wrong.

Original code didn't treat the r attribute as optional and
resulted in an invalid -1 row for such cases, hence the RowModel
wasn't applied later.

Then

commit af8e6f4f544ecd01d3eda5f38bbd4779d5e8b2c6
CommitDate: Wed May 29 22:05:02 2013 +0200

r is an optional attribute in c and r, fdo#65059

introduced a 0-based SheetDataContext::mnRow but assigned that to
a 1-based RowModel::mnRow as well if r attribute was missing, and
did not update SheetDataContext::mnRow if r attribute was given.

commit ff56553e34dfed01b9226ce7a516dbeb6da32124
CommitDate: Thu Mar 13 18:39:22 2014 -0400

fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.

then correctly assigned the decremented r attribute to
SheetDataContext::mnRow but did not touch the assignment to
RowModel::mnRow if r was not given. Probably confused by the
++mnRow already there which is correct but not sufficient for the
assignment.

Which we now finally fix herewith..

Change-Id: Iae1563ed01b95e7852ddad4fd59374c07186b493
Reviewed-on: https://gerrit.libreoffice.org/64580
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 76fbe494785faee1313d1c0be8ed2ca7b0d74f68)
Reviewed-on: https://gerrit.libreoffice.org/64638

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index e3a3aea9fade..4206cde2a617 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -275,7 +275,7 @@ void SheetDataContext::importRow( const AttributeList& 
rAttribs )
 mnRow = nRow-1; // to 0-based row index.
 }
 else
-aModel.mnRow = ++mnRow;
+aModel.mnRow = (++mnRow + 1);   // increment 0-based row index, to 
1-based model row
 mrAddressConv.checkRow( mnRow, true);
 mnCol = -1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ios/Mobile/Info.plist.in |   27 ---
 1 file changed, 27 deletions(-)

New commits:
commit 4c8d0f2e2564abb25c47ba37dbebb14136264d6b
Author: Tor Lillqvist 
AuthorDate: Wed Dec 5 23:35:08 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 5 23:41:49 2018 +0200

Revert "Work in progress: Add .ott"

Using a template has been implemented to work in a way more
appropriate for the platform.

There is little reason to allow direct opening of a template in the
iOS app as long as it don't have any way to save it as an actual
document, based on the template, after editing, (with a different file
name) anyway.

This reverts commit f01a73fa92c885a65cb04d90e4673f267243b866.

Change-Id: Iff4b2f299c6e6eda27c00e40a49374899af41cf0

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 5e1998741..7ff8ff3a8 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -51,16 +51,6 @@
 
 
 CFBundleTypeName
-OpenDocument Text Template
-LSHandlerRank
-Owner
-LSItemContentTypes
-
-org.oasis-open.opendocument.text-template
-
-
-
-CFBundleTypeName
 OpenDocument Flat Text
 LSHandlerRank
 Default
@@ -259,23 +249,6 @@
 
 public.data
 
-UTTypeDescription
-OpenDocument Text Template
-UTTypeIconFiles
-
-UTTypeIdentifier
-org.oasis-open.opendocument.text-template
-UTTypeTagSpecification
-
-public.filename-extension
-ott
-
-
-
-UTTypeConformsTo
-
-public.data
-
 UTTypeIdentifier
 com.collabora.office.uti.fodt
 UTTypeTagSpecification
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv |2 
 sc/CppunitTest_sc_cellformatsobj.mk  |   43 
 sc/Module_sc.mk  |1 
 sc/qa/extras/sccellformatsobj.cxx|   91 
++
 4 files changed, 135 insertions(+), 2 deletions(-)

New commits:
commit b4ffa8c04117ba75f7f63f2a7655a2b611b83ab9
Author: Jens Carl 
AuthorDate: Wed Dec 5 19:35:13 2018 +
Commit: Jens Carl 
CommitDate: Wed Dec 5 22:20:19 2018 +0100

tdf#45904 Move XElementAccess Java tests to C++

Move XElementAccess Java tests to C++ for ScCellFormatsObj.

Change-Id: I8c72c7eb352720f4ff40727df4823855ec8014e5
Reviewed-on: https://gerrit.libreoffice.org/64646
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
index 6d993456bd81..08c7325ce95d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
@@ -1,5 +1,3 @@
 "ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
 "ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScCellFormatsObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScCellFormatsObj";"com::sun::star::container::XElementAccess";"hasElements()"
 
"ScCellFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_cellformatsobj.mk 
b/sc/CppunitTest_sc_cellformatsobj.mk
new file mode 100644
index ..82175e00d918
--- /dev/null
+++ b/sc/CppunitTest_sc_cellformatsobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_cellformatsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellformatsobj, \
+   sc/qa/extras/sccellformatsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellformatsobj, \
+   cppu \
+   sal \
+   subsequenttest \
+   test \
+   unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_cellformatsobj,\
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_cellformatsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_cellformatsobj,\
+   $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellformatsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 530b5a791fec..60a1f6ebaf44 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_autoformatobj \
CppunitTest_sc_cellcursorobj \
CppunitTest_sc_cellformatsenumeration \
+   CppunitTest_sc_cellformatsobj \
CppunitTest_sc_cellobj \
CppunitTest_sc_cellsobj \
CppunitTest_sc_cellrangeobj \
diff --git a/sc/qa/extras/sccellformatsobj.cxx 
b/sc/qa/extras/sccellformatsobj.cxx
new file mode 100644
index ..0a79374f9f42
--- /dev/null
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScCellFormatsObj : public CalcUnoApiTest, public apitest::XElementAccess
+{
+public:
+ScCellFormatsObj();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScCellFormatsObj);
+
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
+CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference m_xComponent;
+};
+
+ScCellFormatsObj::ScCellFormatsObj()
+: CalcUnoApiTest("/s

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

[Libreoffice Gerrit user]

 source/text/sbasic/shared/03/lib_tools.xhp |  892 ++---
 1 file changed, 564 insertions(+), 328 deletions(-)

New commits:
commit 4c0b3129e36d461f4d93ba924075cf6ec3e7ded1
Author: Olivier Hallot 
AuthorDate: Wed Dec 5 19:07:55 2018 -0200
Commit: Olivier Hallot 
CommitDate: Wed Dec 5 22:12:30 2018 +0100

Refactor BASIC code layout

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

diff --git a/source/text/sbasic/shared/03/lib_tools.xhp 
b/source/text/sbasic/shared/03/lib_tools.xhp
index a6480cc4e..716e29cc3 100644
--- a/source/text/sbasic/shared/03/lib_tools.xhp
+++ b/source/text/sbasic/shared/03/lib_tools.xhp
@@ -51,7 +51,9 @@
 ActivateReadOnlyFlag
 
 
-Sub ActivateReadOnlyFlag()
+
+Sub ActivateReadOnlyFlag()
+
 
 
 
@@ -59,7 +61,9 @@
 DeactivateReadOnlyFlag
 
 
-Sub DeactivateReadOnlyFlag(
+
+Sub DeactivateReadOnlyFlag()
+
 
 
 
@@ -67,7 +71,9 @@
 SetBasicReadOnlyFlag
 
 
-Sub SetBasicReadOnlyFlag(bReadOnly as 
Boolean)
+
+Sub SetBasicReadOnlyFlag(bReadOnly as 
Boolean)
+
 
 
 
@@ -75,7 +81,9 @@
 WritedbgInfo
 
 
-Sub WritedbgInfo(LocObject as 
Object)
+
+Sub WritedbgInfo(LocObject as 
Object)
+
 
 
 
@@ -83,7 +91,9 @@
 WriteDbgString
 
 
-Sub WriteDbgString(LocString as 
string)
+
+Sub WriteDbgString(LocString as 
string)
+
 
 
 
@@ -91,7 +101,9 @@
 ShowArray
 
 
-Sub ShowArray(LocArray())
+
+Sub ShowArray(LocArray())
+
 
 
 
@@ -99,7 +111,9 @@
 ShowPropertyValues
 
 
-Sub ShowPropertyValues(oLocObject as 
Object)
+
+Sub ShowPropertyValues(oLocObject as 
Object)
+
 
 
 
@@ -107,7 +121,9 @@
 ShowNameValuePair
 
 
-Sub ShowNameValuePair(Pair())
+
+Sub ShowNameValuePair(Pair())
+
 
 
 
@@ -117,9 +133,11 @@
 
 ' Retrieves all the Elements of 
aSequence of an object, with the
 ' possibility to define a filter(sfilter 
<> "")
-Sub ShowElementNames(
-oLocElements() as Object,
-Optional sFiltername as String)
+
+Sub ShowElementNames(
+oLocElements() as Object,
+Optional sFiltername as String)
+
 
 
 
@@ -129,9 +147,11 @@
 
 ' Retrieves all the supported 
servicenames of an object, with the 
 ' possibility to define a filter(sfilter 
<> "")
-Sub ShowSupportedServiceNames(
-oLocObject as Object,
-Optional sFilterName as String)
+
+Sub ShowSupportedServiceNames(
+oLocObject as Object,
+Optional sFilterName as String)
+
 
 
 
@@ -141,9 +161,11 @@
 
 ' Retrieves all the available 
Servicenames of an object, with the
 ' possibility to define a filter(sfilter 
<> "")
-Sub ShowAvailableServiceNames(
-oLocObject as Object, 
-Optional sFilterName as String)
+
+Sub ShowAvailableServiceNames(
+oLocObject as Object, 
+Optional sFilterName as String)
+
 
 
 
@@ -151,7 +173,9 @@
 Sho

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 3c6cb05cafa4e40daebbc53d49e02793c247c666
Author: Olivier Hallot 
AuthorDate: Wed Dec 5 19:07:55 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Wed Dec 5 22:12:30 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Refactor BASIC code layout

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

diff --git a/helpcontent2 b/helpcontent2
index 5c79d5ed41c8..4c0b3129e36d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5c79d5ed41c81305e7315ee6ce6e9faa987cb696
+Subproject commit 4c0b3129e36d461f4d93ba924075cf6ec3e7ded1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ios/Mobile/TemplateCollectionViewController.mm |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1f0b0b6a0d41575850e35e4f3d645f863fdd69b0
Author: Tor Lillqvist 
AuthorDate: Wed Dec 5 22:13:26 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 5 22:13:26 2018 +0200

Bin leftover dummy NSLog() call

Change-Id: I0597be90ff211dfb7f5fd2f321bfb36c9ec01308

diff --git a/ios/Mobile/TemplateCollectionViewController.mm 
b/ios/Mobile/TemplateCollectionViewController.mm
index 66224cf3e..c6bb67be9 100644
--- a/ios/Mobile/TemplateCollectionViewController.mm
+++ b/ios/Mobile/TemplateCollectionViewController.mm
@@ -111,9 +111,7 @@ static NSString *mapTemplateExtensionToActual(NSString 
*templateName)
 
 self.importHandler(newURL, UIDocumentBrowserImportModeMove);
 
-[self dismissViewControllerAnimated:YES completion:^ {
-NSLog(@"foo");
-}];
+[self dismissViewControllerAnimated:YES completion:nil];
 
 return YES;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ios/Mobile/DocumentBrowserViewController.mm|   14 +---
 ios/Mobile/TemplateCollectionViewController.h  |2 +
 ios/Mobile/TemplateCollectionViewController.mm |   43 +
 3 files changed, 47 insertions(+), 12 deletions(-)

New commits:
commit 296e0eb8034c62a4266bb595d01e6d3fb1043730
Author: Tor Lillqvist 
AuthorDate: Wed Dec 5 20:12:34 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Dec 5 22:02:59 2018 +0200

More work on template selection for a new document

It took quite some time for me to understand how to do it. Not sure if
this is The Right Way, but at least it now works better.

The trick was to store the importHandler block as a property of the
TemplateCollectionViewController and call it when the right template
has been selected.

There is no need to call the importHandler already in the
documentBrowser:didRequestDocumentCreationWithHandler: instance method
and it would not be possible anyway as there apparently is no way to
have the presentViewController:animated:completion: method work in a
truly modal way, so that it would not return until the selection has
been done.

Change-Id: Ia229500c181844fcd99f1f099b2e6744c22b5266

diff --git a/ios/Mobile/DocumentBrowserViewController.mm 
b/ios/Mobile/DocumentBrowserViewController.mm
index 95b5bcd88..4e7c5c31b 100644
--- a/ios/Mobile/DocumentBrowserViewController.mm
+++ b/ios/Mobile/DocumentBrowserViewController.mm
@@ -37,19 +37,9 @@
 - (void)documentBrowser:(UIDocumentBrowserViewController *)controller 
didRequestDocumentCreationWithHandler:(void (^)(NSURL * _Nullable, 
UIDocumentBrowserImportMode))importHandler {
 UIStoryboard *storyBoard = [UIStoryboard storyboardWithName:@"Main" 
bundle:nil];
 TemplateCollectionViewController *templateCollectionViewController = 
[storyBoard 
instantiateViewControllerWithIdentifier:@"TemplateCollectionViewController"];
-[self presentViewController:templateCollectionViewController animated:YES 
completion:nil];
-
-#if 0
-NSURL *newDocumentURL = nil;
 
-// Set the URL for the new document here. Optionally, you can present a 
template chooser before calling the importHandler.
-// Make sure the importHandler is always called, even if the user cancels 
the creation request.
-if (newDocumentURL != nil) {
-importHandler(newDocumentURL, UIDocumentBrowserImportModeMove);
-} else {
-importHandler(newDocumentURL, UIDocumentBrowserImportModeNone);
-}
-#endif
+templateCollectionViewController.importHandler = importHandler;
+[self presentViewController:templateCollectionViewController animated:YES 
completion:nil];
 }
 
 -(void)documentBrowser:(UIDocumentBrowserViewController *)controller 
didPickDocumentURLs:(NSArray *)documentURLs {
diff --git a/ios/Mobile/TemplateCollectionViewController.h 
b/ios/Mobile/TemplateCollectionViewController.h
index 1e5ef3675..50861a599 100644
--- a/ios/Mobile/TemplateCollectionViewController.h
+++ b/ios/Mobile/TemplateCollectionViewController.h
@@ -14,6 +14,8 @@
 NSArray *templates[3];
 }
 
+@property (copy) void (^ _Nullable importHandler)(NSURL * _Nullable, 
UIDocumentBrowserImportMode);
+
 @end
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ios/Mobile/TemplateCollectionViewController.mm 
b/ios/Mobile/TemplateCollectionViewController.mm
index fcf6c1d8a..66224cf3e 100644
--- a/ios/Mobile/TemplateCollectionViewController.mm
+++ b/ios/Mobile/TemplateCollectionViewController.mm
@@ -6,9 +6,27 @@
 // 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/.
 
+#import 
+#import 
+
 #import "TemplateCollectionViewController.h"
 #import "TemplateSectionHeaderView.h"
 
+static NSString *mapTemplateExtensionToActual(NSString *templateName)
+{
+NSString *baseName = [templateName stringByDeletingPathExtension];
+NSString *extension = [templateName substringFromIndex:baseName.length];
+
+if ([extension isEqualToString:@".ott"])
+return [baseName stringByAppendingString:@".odt"];
+else if ([extension isEqualToString:@".ots"])
+return [baseName stringByAppendingString:@".ods"];
+else if ([extension isEqualToString:@".otp"])
+return [baseName stringByAppendingString:@".odp"];
+else
+assert(false);
+}
+
 @implementation TemplateCollectionViewController
 
 -(void)viewDidLoad {
@@ -75,6 +93,31 @@
 return header;
 }
 
+- (BOOL)collectionView:(UICollectionView *)collectionView 
shouldSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+NSURL *selectedTemplate = templates[[indexPath 
indexAtPosition:0]][[indexPath indexAtPosition:1]];
+
+NSURL *cacheDirectory = [NSFileManager.defaultManager 
URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask][0];
+NSURL *newURL = [cacheDirectory 
URLByAppendingPathComponent:mapTemplateExtensionToActual(selectedTemplate.lastPathComponent)
+  

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

[Libreoffice Gerrit user]

 loleaflet/po/templates/loleaflet-help.pot |2 -
 loleaflet/po/templates/loleaflet-ui.pot   |   60 --
 2 files changed, 33 insertions(+), 29 deletions(-)

New commits:
commit 0c76f3f1db3ca92b28e77f08d9d6b8adc58b0dc2
Author: Andras Timar 
AuthorDate: Wed Dec 5 20:34:48 2018 +0100
Commit: Andras Timar 
CommitDate: Wed Dec 5 20:34:48 2018 +0100

loleaflet: updated pot files

Change-Id: I6a28078b2b9a45651d8f9cad559ab42ad744a183

diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index fb1d4b99a..2f70e55b8 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-04 22:43+0200\n"
+"POT-Creation-Date: 2018-12-05 20:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 31f4bdfa0..ea55fc6a5 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-04 22:42+0100\n"
+"POT-Creation-Date: 2018-12-05 20:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -374,7 +374,7 @@ msgstr ""
 msgid "Entering text mode"
 msgstr ""
 
-#: js/toolbar.js:1425 js/toolbar.js:1467 js/toolbar.js:1494
+#: js/toolbar.js:1425 js/toolbar.js:1467 js/toolbar.js:1495
 msgid "Text Language"
 msgstr ""
 
@@ -422,52 +422,52 @@ msgstr ""
 msgid "Word Counter"
 msgstr ""
 
-#: js/toolbar.js:1489
+#: js/toolbar.js:1490
 msgid "Number of Slides"
 msgstr ""
 
-#: js/toolbar.js:1525
+#: js/toolbar.js:1528
 msgid "%n users"
 msgstr ""
 
-#: js/toolbar.js:1526
+#: js/toolbar.js:1529
 msgid "1 user"
 msgstr ""
 
-#: js/toolbar.js:1527
+#: js/toolbar.js:1530
 msgid "0 users"
 msgstr ""
 
-#: js/toolbar.js:1657
+#: js/toolbar.js:1660
 msgid "Document saved"
 msgstr ""
 
-#: js/toolbar.js:1807
+#: js/toolbar.js:1810
 msgid "Style"
 msgstr ""
 
-#: js/toolbar.js:1829
+#: js/toolbar.js:1832
 msgid "Font"
 msgstr ""
 
-#: js/toolbar.js:1862
+#: js/toolbar.js:1865
 msgid "Previous slide"
 msgstr ""
 
-#: js/toolbar.js:1863
+#: js/toolbar.js:1866
 msgid "Next slide"
 msgstr ""
 
-#: js/toolbar.js:1925
+#: js/toolbar.js:1928
 msgid ""
 "Conflict Undo/Redo with multiple users. Please use document repair to resolve"
 msgstr ""
 
-#: js/toolbar.js:2159 src/control/Control.DocumentRepair.js:95
+#: js/toolbar.js:2162 src/control/Control.DocumentRepair.js:95
 msgid "You"
 msgstr ""
 
-#: js/toolbar.js:2165
+#: js/toolbar.js:2168
 msgid "Readonly"
 msgstr ""
 
@@ -649,59 +649,63 @@ msgstr ""
 msgid "Enter new sheet name"
 msgstr ""
 
-#: src/control/Signing.js:153 src/control/Signing.js:226
+#: src/control/Signing.js:156 src/control/Signing.js:229
 msgid "PIN Code"
 msgstr ""
 
-#: src/control/Signing.js:216
+#: src/control/Signing.js:219
 msgid "Login from email or mobile number"
 msgstr ""
 
-#: src/control/Signing.js:227
+#: src/control/Signing.js:230
 msgid "Check your email"
 msgstr ""
 
-#: src/control/Signing.js:450
+#: src/control/Signing.js:325
+msgid "Document uploaded."
+msgstr ""
+
+#: src/control/Signing.js:464
 msgid "Not Signed"
 msgstr ""
 
-#: src/control/Signing.js:453
+#: src/control/Signing.js:467
 msgid "Document signed and validated."
 msgstr ""
 
-#: src/control/Signing.js:454
+#: src/control/Signing.js:468
 msgid "Signed and validated"
 msgstr ""
 
-#: src/control/Signing.js:457
+#: src/control/Signing.js:471
 msgid "Document signed but signature is broken."
 msgstr ""
 
-#: src/control/Signing.js:458
+#: src/control/Signing.js:472
 msgid "Signature broken"
 msgstr ""
 
-#: src/control/Signing.js:461
+#: src/control/Signing.js:475
 msgid "Document signed but the document is already modified."
 msgstr ""
 
-#: src/control/Signing.js:462
+#: src/control/Signing.js:476
 msgid "Signed but document modified"
 msgstr ""
 
-#: src/control/Signing.js:465
+#: src/control/Signing.js:479
 msgid "Document signed but can not be validated."
 msgstr ""
 
-#: src/control/Signing.js:466
+#: src/control/Signing.js:480
 msgid "Signed but not validated"
 msgstr ""
 
-#: src/control/Signing.js:469
+#: src/control/Signing.js:483
 msgid "Document signed but not all files are signed."
 msgstr ""
 
-#: src/control/Signing.js:470
+#: src/control/Signing.js:484
 msgid "Signed but not all files are signed"
 msgstr ""
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/shells/textsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7be57e1f047a11cea355232db6926879199f198b
Author: Michael Stahl 
AuthorDate: Fri Nov 23 14:14:17 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 19:06:44 2018 +0100

sw: fix wrong title of AutoFormat with redlining dialog

(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1)

(cherry picked from commit 564260804ee3a8846b921188e36bc269fc8ba98e)

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

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 96fe601d5546..503f52b502fc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -290,6 +290,7 @@ static short lcl_AskRedlineFlags(weld::Window *pWin)
 {
 std::unique_ptr xBuilder(Application::CreateBuilder(pWin, 
"modules/swriter/ui/queryredlinedialog.ui"));
 std::unique_ptr 
xQBox(xBuilder->weld_message_dialog("QueryRedlineDialog"));
+xQBox->set_title(SwResId(STR_AUTOCORRECT));
 return xQBox->run();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/headless vcl/inc vcl/opengl vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win

[Libreoffice Gerrit user]

 vcl/headless/svpgdi.cxx  |2 +-
 vcl/inc/headless/svpgdi.hxx  |2 +-
 vcl/inc/openglgdiimpl.hxx|2 +-
 vcl/inc/qt5/Qt5Graphics.hxx  |2 +-
 vcl/inc/quartz/salgdi.h  |2 +-
 vcl/inc/salgdi.hxx   |2 +-
 vcl/inc/salgdiimpl.hxx   |2 +-
 vcl/inc/unx/genpspgraphics.h |2 +-
 vcl/inc/unx/salgdi.h |2 +-
 vcl/inc/win/salgdi.h |2 +-
 vcl/opengl/gdiimpl.cxx   |2 +-
 vcl/qt5/Qt5Graphics_GDI.cxx  |2 +-
 vcl/quartz/salgdicommon.cxx  |4 ++--
 vcl/source/gdi/print.cxx |2 +-
 vcl/source/gdi/virdev.cxx|2 +-
 vcl/source/outdev/outdevstate.cxx|2 +-
 vcl/source/window/window.cxx |2 +-
 vcl/unx/generic/gdi/gdiimpl.cxx  |2 +-
 vcl/unx/generic/gdi/gdiimpl.hxx  |2 +-
 vcl/unx/generic/gdi/salgdi.cxx   |4 ++--
 vcl/unx/generic/print/genpspgraphics.cxx |2 +-
 vcl/win/gdi/gdiimpl.cxx  |2 +-
 vcl/win/gdi/gdiimpl.hxx  |2 +-
 vcl/win/gdi/salgdi.cxx   |4 ++--
 24 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 708da2a6342a58fe379217064848c1c311216f05
Author: Xisco Fauli 
AuthorDate: Wed Dec 5 01:23:17 2018 +0100
Commit: Xisco Faulí 
CommitDate: Wed Dec 5 18:58:58 2018 +0100

tdf#121719: Revert fix for tdf#96971

it's still used on Mac. Revert it until XOL is removed

This reverts 258301879bcd20397c38bbd522dea2c923bd9fc2

This also includes https://gerrit.libreoffice.org/#/c/64596/
Thanks Stephan

Change-Id: I06548a590f370618ad640724a1b9c59a3faceec2
Reviewed-on: https://gerrit.libreoffice.org/64582
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit be504e8c7ef06637f055c43ad350381377df1e90)
Reviewed-on: https://gerrit.libreoffice.org/64631
Reviewed-by: Xisco Faulí 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ec01ec520a86..1c310a2b1c70 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -667,7 +667,7 @@ void SvpSalGraphics::SetFillColor( Color nColor )
 m_aFillColor = nColor;
 }
 
-void SvpSalGraphics::SetXORMode(bool bSet )
+void SvpSalGraphics::SetXORMode(bool bSet, bool )
 {
 m_ePaintMode = bSet ? PaintMode::Xor : PaintMode::Over;
 }
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 8546387f8962..9ba284300a37 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -163,7 +163,7 @@ public:
 virtual voidSetFillColor() override;
 virtual voidSetFillColor( Color nColor ) override;
 
-virtual voidSetXORMode( bool bSet ) override;
+virtual voidSetXORMode( bool bSet, bool ) override;
 
 virtual voidSetROPLineColor( SalROPColor nROPColor ) override;
 virtual voidSetROPFillColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index bc19dcd338fb..132a64327e42 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -228,7 +228,7 @@ public:
 virtual void SetFillColor( Color nColor ) override;
 
 // enable/disable XOR drawing
-virtual void SetXORMode( bool bSet ) override;
+virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
 
 // set line color for raster operations
 virtual void SetROPLineColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 480f2f4a4bf5..9430be94a112 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -168,7 +168,7 @@ public:
 virtual void SetLineColor(Color nColor) override;
 virtual void SetFillColor() override;
 virtual void SetFillColor(Color nColor) override;
-virtual void SetXORMode(bool bSet) override;
+virtual void SetXORMode(bool bSet, bool bInvertOnly) override;
 virtual void SetROPLineColor(SalROPColor nROPColor) override;
 virtual void SetROPFillColor(SalROPColor nROPColor) override;
 
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index b79bf4425534..cacf56dcb84f 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -320,7 +320,7 @@ public:
 // filled accordingly
 virtual voidSetFillColor( Color nColor ) override;
 // enable/disable XOR drawing
-virtual voidSetXORMode( bool bSet ) override;
+virtual voidSetXORMode( bool bSet, bool bInvertOnly ) override;
 // set line color for raster operations
 virtual voidSetROPLineColor( SalROPColor nROPColor ) override;
 // set fill color for raster operations
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index b09f3223cdad..c81

[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

[Libreoffice Gerrit user]

 include/test/view/xcontrolaccess.hxx  |   35 ++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv |1 
 sc/qa/extras/scviewpaneobj.cxx|   11 +
 test/Library_subsequenttest.mk|2 
 test/source/view/xcontrolaccess.cxx   |   56 ++
 5 files changed, 104 insertions(+), 1 deletion(-)

New commits:
commit 4cb874c1b068d45039d7eed6f47c5ae5229fa301
Author: Jens Carl 
AuthorDate: Wed Dec 5 05:01:27 2018 +
Commit: Jens Carl 
CommitDate: Wed Dec 5 18:47:23 2018 +0100

tdf#45904 Move XControlAccess Java test to C++

Move XControlAccess Java test to C++ for ScViewPaneObj.

Change-Id: If18596b41fccc140186820c9e370f502fb2b6458
Reviewed-on: https://gerrit.libreoffice.org/64606
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/test/view/xcontrolaccess.hxx 
b/include/test/view/xcontrolaccess.hxx
new file mode 100644
index ..b25cb169c377
--- /dev/null
+++ b/include/test/view/xcontrolaccess.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_VIEW_XCONTROLACCESS_HXX
+#define INCLUDED_TEST_VIEW_XCONTROLACCESS_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XControlAccess
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXComponent() = 0;
+
+void testGetControl();
+
+protected:
+~XControlAccess() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_VIEW_XCONTROLACCESS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
index fb9eba91fcf4..a4a3586f943f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
@@ -1,4 +1,3 @@
-"ScViewPaneObj";"com::sun::star::view::XControlAccess#optional";"getControl()"
 
"ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"getFromController()"
 
"ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"isFormDesignMode()"
 
"ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"setFormDesignMode()"
diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx
index 9aee4a553cd6..499cc7924f31 100644
--- a/sc/qa/extras/scviewpaneobj.cxx
+++ b/sc/qa/extras/scviewpaneobj.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -26,12 +27,14 @@ namespace sc_apitest {
 
 class ScViewPaneObj : public CalcUnoApiTest,
   public apitest::XCellRangeReferrer,
+  public apitest::XControlAccess,
   public apitest::XViewPane
 {
 public:
 ScViewPaneObj();
 
 virtual uno::Reference< uno::XInterface > init() override;
+virtual uno::Reference< uno::XInterface > getXComponent() override;
 virtual void setUp() override;
 virtual void tearDown() override;
 
@@ -40,6 +43,9 @@ public:
 // XCellRangeReferrer
 CPPUNIT_TEST(testGetReferredCells);
 
+// XControlAccess
+CPPUNIT_TEST(testGetControl);
+
 // XViewPane
 CPPUNIT_TEST(testFirstVisibleColumn);
 CPPUNIT_TEST(testFirstVisibleRow);
@@ -56,6 +62,11 @@ ScViewPaneObj::ScViewPaneObj()
 {
 }
 
+uno::Reference ScViewPaneObj::getXComponent()
+{
+return mxComponent;
+}
+
 uno::Reference< uno::XInterface > ScViewPaneObj::init()
 {
 uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent, 
uno::UNO_QUERY_THROW);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 78c2e7f6a727..1b71ab44270b 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Library_Library,subsequenttest))
 
 $(eval $(call gb_Library_set_include,subsequenttest,\
+   -I$(SRCDIR)/test/inc \
 $$(INCLUDE) \
 ))
 
@@ -162,6 +163,7 @@ $(eval $(call 
gb_Library_add_exception_objects,subsequenttest,\
test/source/util/xrefreshable \
test/source/util/xreplaceable \
test/source/util/xsearchable \
+   test/source/view/xcontrolaccess \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/test/source/view/xcontrolaccess.cxx 
b/test/source/view/xcontrolaccess.cxx
new file mode 100644
index ..29ca1fa339aa
--- /dev/null
+++ b/test/source/view/xcontrolaccess.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fi

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - include/svx sd/qa svx/source

[Libreoffice Gerrit user]

 include/svx/unoshprp.hxx|2 -
 sd/qa/unit/data/tdf120527.jpg   |binary
 sd/qa/unit/misc-tests.cxx   |   44 
 svx/source/unodraw/unoshap2.cxx |   14 
 4 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 07b098c126cdd01a2ce4335aeb4e1dad134c7f32
Author: Miklos Vajna 
AuthorDate: Mon Nov 26 21:14:39 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 17:52:42 2018 +0100

tdf#120527 svx GraphicObjectShape: handle XBitmap for GraphicURL

This restores compatibility for API users who called getByName() on the
bitmap table and expected that the result can be set as a value for the
GraphicURL property.

The case is similar to the Writer images, which was handled in commit
587803ba46055d43b5b108be744fdde17aeabc7c (sw TextGraphicObject: handle
XBitmap for GraphicURL, 2018-08-08) already.

Change-Id: I3740a68989b306425d0d6c4d4e350ac163cb4170
Reviewed-on: https://gerrit.libreoffice.org/64069
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit e30f3e76a9350e2b027d99bba5a46aa0a0ff8256)
Reviewed-on: https://gerrit.libreoffice.org/64427

diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 0ac66b706ebd..1ea5683a9731 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -432,7 +432,7 @@
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
-{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
+{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE), 
OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID), 
OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME), 
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType::get(), 
0, 0}, \
diff --git a/sd/qa/unit/data/tdf120527.jpg b/sd/qa/unit/data/tdf120527.jpg
new file mode 100644
index ..12b393569efb
Binary files /dev/null and b/sd/qa/unit/data/tdf120527.jpg differ
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index a0e62f15788a..2a7404524614 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -77,6 +77,7 @@ public:
 void testTdf119392();
 void testTdf67248();
 void testTdf119956();
+void testTdf120527();
 
 CPPUNIT_TEST_SUITE(SdMiscTest);
 CPPUNIT_TEST(testTdf96206);
@@ -91,6 +92,7 @@ public:
 CPPUNIT_TEST(testTdf119392);
 CPPUNIT_TEST(testTdf67248);
 CPPUNIT_TEST(testTdf119956);
+CPPUNIT_TEST(testTdf120527);
 CPPUNIT_TEST_SUITE_END();
 
 virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -425,6 +427,48 @@ void SdMiscTest::testTdf38225()
 CPPUNIT_ASSERT(pStyle);
 }
 
+void SdMiscTest::testTdf120527()
+{
+sd::DrawDocShellRef xDocShRef
+= new sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false, 
DocumentType::Draw);
+uno::Reference xLoadable(xDocShRef->GetModel(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xLoadable.is());
+xLoadable->initNew();
+
+// Load a bitmap into the bitmap table.
+uno::Reference xFactory(xDocShRef->GetModel(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFactory.is());
+uno::Reference xBitmaps(
+xFactory->createInstance("com.sun.star.drawing.BitmapTable"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBitmaps.is());
+OUString aGraphicURL = 
m_directories.getURLFromSrc("/sd/qa/unit/data/tdf120527.jpg");
+xBitmaps->insertByName("test", uno::makeAny(aGraphicURL));
+
+// Create a graphic.
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape.is());
+uno::Reference xShapeProperySet(xShape, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShapeProperySet.is());
+xShapeProperySet->setPropertyValue("GraphicURL", 
xBitmaps->getByName("test"));
+
+// Insert it.
+uno::Reference 
xDrawPagesSupplier(xDocShRef->GetModel(),
+   
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDrawPagesSupplier.is());
+uno::Reference xDrawPages = 
xDrawPagesSupplier->getDrawPages();
+CPPUNIT_ASSERT(xDrawPages.is());
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDrawPage.is());
+// This failed with a lang.Illega

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |8 
 1 file changed, 8 insertions(+)

New commits:
commit 57a72ea4e944060240dbbb3e581eefeed2bd9a6b
Author: Miklos Vajna 
AuthorDate: Wed Dec 5 17:50:29 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 17:50:29 2018 +0100

document signing: inform user after upload

Change-Id: Ic84c64b1aea39e452b169b2e334f7a9ee3dca58f

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 5c3c9961b..52cb61ca2 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -320,6 +320,12 @@ L.Map.include({
};
var blob = new 
Blob(['uploadsigneddocument\n', JSON.stringify(jsonRequest)]);
map._socket.sendMessage(blob);
+   // Let the user know that we're 
done.
+   map.fire('infobar', {
+   msg: _('Document 
uploaded.'),
+   action: null,
+   actionLabel: null
+   });
}
}
}
@@ -451,6 +457,8 @@ L.Map.include({
},
onChangeSignStatus: function(signstatus) {
var statusText = '';
+   // This is meant to be in sync with core.git
+   // include/sfx2/signaturestate.hxx, SignatureState.
switch (signstatus) {
case '0':
currentDocumentSigningStatus = _('Not Signed');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/filter/oox/sheetdatacontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76fbe494785faee1313d1c0be8ed2ca7b0d74f68
Author: Eike Rathke 
AuthorDate: Wed Dec 5 00:21:17 2018 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 5 17:06:44 2018 +0100

Resolves: tdf#121887 RowModel::mnRow is 1-based, always

Basically this was always wrong.

Original code didn't treat the r attribute as optional and
resulted in an invalid -1 row for such cases, hence the RowModel
wasn't applied later.

Then

commit af8e6f4f544ecd01d3eda5f38bbd4779d5e8b2c6
CommitDate: Wed May 29 22:05:02 2013 +0200

r is an optional attribute in c and r, fdo#65059

introduced a 0-based SheetDataContext::mnRow but assigned that to
a 1-based RowModel::mnRow as well if r attribute was missing, and
did not update SheetDataContext::mnRow if r attribute was given.

commit ff56553e34dfed01b9226ce7a516dbeb6da32124
CommitDate: Thu Mar 13 18:39:22 2014 -0400

fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.

then correctly assigned the decremented r attribute to
SheetDataContext::mnRow but did not touch the assignment to
RowModel::mnRow if r was not given. Probably confused by the
++mnRow already there which is correct but not sufficient for the
assignment.

Which we now finally fix herewith..

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

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index e3a3aea9fade..4206cde2a617 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -275,7 +275,7 @@ void SheetDataContext::importRow( const AttributeList& 
rAttribs )
 mnRow = nRow-1; // to 0-based row index.
 }
 else
-aModel.mnRow = ++mnRow;
+aModel.mnRow = (++mnRow + 1);   // increment 0-based row index, to 
1-based model row
 mrAddressConv.checkRow( mnRow, true);
 mnCol = -1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/BitmapTools.hxx   |6 +--
 vcl/headless/svpgdi.cxx   |9 ++---
 vcl/source/bitmap/BitmapTools.cxx |   59 +++---
 3 files changed, 31 insertions(+), 43 deletions(-)

New commits:
commit c2374d702b0e4b7a1828964faa528344a5a9ee17
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 13:09:46 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 5 17:06:00 2018 +0100

Revert "Compute (un-)premultiply_table at compile time"

This reverts commit 644188bf7f3a07222f2b58a3794348197fb8ad24.  It has been 
found
to cause compilation failure ("vcl/source/bitmap/BitmapTools.cxx(1078): 
error
C2131: expression did not evaluate to a constant") with Visual Studio 2017
version 15.9, as discussed in the mail thread starting at


"Windows build failure - C2131: expression did not evaluate to a constant" 
(and
Mike thankfully filed a bug upstream,
).  Also, Jenkins 
node
tb39 which runs the "Gerrit Windows" sub-job of Jenkins' "Gerrit for master"
job apparently has such a Visual Studio 2017 version 15.9 installed, so 
keeps
failing that job.

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

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index c952498c5c58..ff431783ad24 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -28,10 +28,10 @@ namespace com { namespace sun { namespace star { namespace 
geometry { struct Int
 namespace vcl {
 namespace bitmap {
 
-typedef std::array, 256> lookup_table;
+typedef sal_uInt8 (*lookup_table)[256];
 
-VCL_DLLPUBLIC lookup_table const & get_premultiply_table();
-VCL_DLLPUBLIC lookup_table const & get_unpremultiply_table();
+lookup_table VCL_DLLPUBLIC get_premultiply_table();
+lookup_table VCL_DLLPUBLIC get_unpremultiply_table();
 
 /**
  * Intended to be used to feed into CreateFromData to create a BitmapEx. RGB 
data format.
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0a428545f8b3..0b4bd8d377ea 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1654,7 +1654,7 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
 }
 sal_Int32 nStride;
 unsigned char *mask_data = aSurface.getBits(nStride);
-vcl::bitmap::lookup_table const & unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
+vcl::bitmap::lookup_table unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
 for (long y = rTR.mnSrcY ; y < rTR.mnSrcY + rTR.mnSrcHeight; ++y)
 {
 unsigned char *row = mask_data + (nStride*y);
@@ -1762,7 +1762,7 @@ Color SvpSalGraphics::getPixel( long nX, long nY )
 cairo_destroy(cr);
 
 cairo_surface_flush(target);
-vcl::bitmap::lookup_table const & unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
+vcl::bitmap::lookup_table unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
 unsigned char *data = cairo_image_surface_get_data(target);
 sal_uInt8 a = data[SVP_CAIRO_ALPHA];
 sal_uInt8 b = unpremultiply_table[a][data[SVP_CAIRO_BLUE]];
@@ -2096,9 +2096,8 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, 
bool bXorModeAllowed, cons
 sal_Int32 nUnscaledExtentsRight = nExtentsRight * m_fScale;
 sal_Int32 nUnscaledExtentsTop = nExtentsTop * m_fScale;
 sal_Int32 nUnscaledExtentsBottom = nExtentsBottom * m_fScale;
-vcl::bitmap::lookup_table const & unpremultiply_table
-= vcl::bitmap::get_unpremultiply_table();
-vcl::bitmap::lookup_table const & premultiply_table = 
vcl::bitmap::get_premultiply_table();
+vcl::bitmap::lookup_table unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
+vcl::bitmap::lookup_table premultiply_table = 
vcl::bitmap::get_premultiply_table();
 for (sal_Int32 y = nUnscaledExtentsTop; y < nUnscaledExtentsBottom; 
++y)
 {
 unsigned char *true_row = target_surface_data + (nStride*y);
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index f9095a86f541..4bac9745795e 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -8,11 +8,6 @@
  *
  */
 
-#include 
-
-#include 
-#include 
-
 #include 
 
 #include 
@@ -273,7 +268,7 @@ BitmapEx* CreateFromCairoSurface(Size aSize, 
cairo_surface_t * pSurface)
 cairo_surface_flush(pPixels);
 unsigned char *pSrc = cairo_image_surface_get_data( pPixels );
 unsigned int nStride = cairo_image_surface_get_stride( pPixels );
-vcl::bitmap::lookup_table const & unpremultiply_table = 
vcl::bitmap::get_unpremultiply_table();
+vcl::bitmap

[Libreoffice-commits] core.git: Changes to 'private/mst/sw_redlinehide_4b'

[Libreoffice Gerrit user]

New branch 'private/mst/sw_redlinehide_4b' available with the following commits:
commit 1fd8c2d9bee42c09ab2fd0d9f0907c0fb3f2541b
Author: Michael Stahl 
Date:   Wed Dec 5 16:37:18 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

commit c6380c4a162b0a35951ad66f1c3250c30c0e3bdc
Author: Michael Stahl 
Date:   Tue Dec 4 15:57:47 2018 +0100

sw_redlinehide_4b: FindText layout parameter

Change-Id: I22c0adb40219bc53b5685e2e20bd55bfd65fd4a3

commit 9e9f7a2f691b51f21af7e39aec32f5c938438600
Author: Michael Stahl 
Date:   Tue Dec 4 14:20:02 2018 +0100

sw: refactor a confusing thicket of overloads, all named Find()

Also, some of these don't really make much sense as member functions of
SwPaM, so make them plain functions instead.

Also, some pointer parameters are never null, but there is code to
handle that case in MakeRegion(); simplify that.

Change-Id: I822e814b0cab14f7f31cfa33478ed15774405a61

commit 30f957cc8e1800088b5221290db818a6d98a41b1
Author: Michael Stahl 
Date:   Wed Dec 5 16:49:34 2018 +0100

sw_redlinehide_4b: fix crash in CanSkipOverRedline()

This was another IsDelLastPara() redline in ooo27109-1.sxw.

Change-Id: I1f4198a4bcbed7bdd52991af3cb3322ebacc65fe

commit 7d1e6c383f6780b81f756152f72fbb5f2cbbe68c
Author: Michael Stahl 
Date:   Wed Dec 5 16:26:22 2018 +0100

sw_redlinehide_4b: fix wrong handling of IsDelLastPara() redlines

CheckParaRedlineMerge(): Fully deleted SwTextNode followed by a table,
as seen in ooo81405-1.odt.

Change-Id: I2a7d935a9cedcb66aeaa9dce418b1fab758f1784

commit 9075687133063fea49e8b3d739d65dfa9e69cc7f
Author: Michael Stahl 
Date:   Wed Dec 5 15:24:55 2018 +0100

sw_redlinehide_4b: consider the comments in the margin

SwPostItMgr needs to hide the comments that are in delete redlines.

Also notify SwPostItMgr when redlines are created/removed.

SwPostItMgr is owned by the ViewShell but there is currently only one
layout so SwRootFrame still needs to broadcast to all of them.

Also an EndListening call was missing in
SwPostItMgr::CheckForRemovedPostIts() which caused asserts.

Change-Id: Ic0fccde50f6fdaa449afb535476c00c41ba94287

commit a7d2885bf8b6d717b441f6cc9215e7ae2700b82a
Author: Michael Stahl 
Date:   Wed Dec 5 12:45:24 2018 +0100

sw_redlinehide_4b: fix wrong assert in AppendObjs()

Clearly this is wrong, the first node might be deleted; triggered e.g.
by ooo69593-1.odt.

Change-Id: I8f491372fcc375e68f2f7611924d8d4c7f673f17

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

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

[Libreoffice Gerrit user]

 sw/source/core/unocore/unoparagraph.cxx |4 +++-
 sw/source/core/unocore/unotext.cxx  |5 ++---
 sw/source/uibase/uno/unotxvw.cxx|5 -
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 3afae09e96051f3bdf05b7f5fb7b5994d3a37a79
Author: Vasily Melenchuk 
AuthorDate: Mon Dec 3 12:19:27 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 16:55:12 2018 +0100

sw uno: do not throw exceptions on getString()

getString() is passive method and no reason to throw
an exception instead of returning empty string in some
corner situations like object is being disposed.

As a compromise information about inbalid state is
reported into log.

Change-Id: Ied6ecb356ce341d44e5a2bb21fb8379257e38c31
Reviewed-on: https://gerrit.libreoffice.org/64442
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit dae741a2418f1d1dd35d364ec416516cc50f5054)
Reviewed-on: https://gerrit.libreoffice.org/64628
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index f7a76e902013..1cbc8671104d 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -1342,7 +1342,9 @@ OUString SAL_CALL SwXParagraph::getString()
 }
 else
 {
-throw uno::RuntimeException();
+// Seems object is being disposed or some other problem occurs.
+// Anyway from user point of view object still exist, so on that level 
this is not an error
+SAL_WARN("sw.uno", "getString() for invalid paragraph called. 
Returning empty string.");
 }
 return aRet;
 }
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 5ecc6fbf399b..4f2b1c0c6c90 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -902,9 +902,8 @@ OUString SAL_CALL SwXText::getString()
 const uno::Reference< text::XTextCursor > xRet = CreateCursor();
 if(!xRet.is())
 {
-uno::RuntimeException aRuntime;
-aRuntime.Message = cInvalidObject;
-throw aRuntime;
+SAL_WARN("sw.uno", "cursor was not created in getString() call. 
Returning empty string.");
+return OUString();
 }
 xRet->gotoEnd(true);
 return xRet->getString();
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 1348a5fde2bf..42c709ec7db9 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1365,7 +1365,10 @@ OUString SwXTextViewCursor::getString()
 if(m_pView)
 {
 if (!IsTextSelection( false ))
-throw  uno::RuntimeException("no text selection", static_cast < 
cppu::OWeakObject * > ( this ) );
+{
+SAL_WARN("sw.uno", "no text selection in getString() " << 
static_cast(this));
+return uRet;
+}
 
 ShellMode eSelMode = m_pView->GetShellMode();
 switch(eSelMode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   13 +++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |2 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |8 +-
 sw/source/filter/ww8/wrtw8nds.cxx |   95 ++
 sw/source/filter/ww8/wrtww8.hxx   |1 
 5 files changed, 114 insertions(+), 5 deletions(-)

New commits:
commit 1575b46276a44fe0566fec8910188a781589dd75
Author: Serge Krot 
AuthorDate: Thu Nov 22 10:05:47 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 16:56:43 2018 +0100

tdf#121561: sw: DOCX: add std/stdPr/stdContent around TOC

During export into DOCX from ODT we need to do it
because in this case the TOC title will be recognized
inside MS Word as part of the TOC.

Later we could add support of these keywords in LO import
in order to detect TOC title from DOCX input.

Added unit test for export.

Change-Id: I7135e91dc04d4c0501e6074a046fc473e041f014
Reviewed-on: https://gerrit.libreoffice.org/63786
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index d7fd52d87b6d..3b005e198b87 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -131,6 +131,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121456_tabsOffset, 
"tdf121456_tabsOffset.odt")
 }
 }
 
+// tdf#121561: make sure w:sdt/w:sdtContent around TOC is written during 
ODT->DOCX conversion
+DECLARE_OOXMLEXPORT_TEST(testTdf121561_tocTitle, "tdf121456_tabsOffset.odt")
+{
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p/w:r/w:t", "Inhaltsverzeichnis");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p/w:r/w:instrText", " TOC \\f \\o 
\"1-9\" \\h");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtPr/w:docPartObj/w:docPartGallery", "val", "Table 
of Contents");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtPr/w:docPartObj/w:docPartUnique", 1);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf106174_rtlParaAlign, 
"tdf106174_rtlParaAlign.docx")
 {
 CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER), 
getProperty(getParagraph(1), "ParaAdjust"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index be20dd24b246..bd662172ae0c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -693,7 +693,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo77129, "fdo77129.docx")
return;
 
 // Data was lost from this paragraph.
-assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[5]/w:r[1]/w:t", 
"Abstract");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[4]/w:r[1]/w:t", 
"Abstract");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 277f8b71ce22..84b38fc0a26a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -143,7 +143,7 @@ DECLARE_OOXMLEXPORT_TEST(testFieldFlagO,"TOC_field_f.docx")
 
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\f \\o \"1-3\" \\u 
\\h");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[2]/w:instrText", " TOC \\z 
\\f \\o \"1-3\" \\u \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTOCFlag_f, "toc_doc.docx")
@@ -160,7 +160,7 @@ DECLARE_OOXMLEXPORT_TEST(testTOCFlag_f, "toc_doc.docx")
 
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\o \"1-3\" \\u \\h");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[2]/w:instrText", " TOC \\z 
\\o \"1-3\" \\u \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPreserveZfield,"preserve_Z_field_TOC.docx")
@@ -190,7 +190,7 @@ DECLARE_OOXMLEXPORT_TEST(testFieldFlagB,"TOC_field_b.docx")
 
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\b \"bookmark111\" \\o 
\"1-9\" \\h");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[2]/w:instrText", " TOC \\b 
\"bookmark111\" \\o \"1-9\" \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPreserveXfieldTOC, "PreserveXfieldTOC.docx")
@@ -448,7 +448,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78654 , "fdo78654.docx")
 return;
 // In cas

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

[Libreoffice Gerrit user]

 sdext/source/minimizer/optimizerdialog.cxx |   32 +++--
 1 file changed, 22 insertions(+), 10 deletions(-)

New commits:
commit a0cf99fabb49b9f3ff310efa9ab059aab1620d46
Author: Vasily Melenchuk 
AuthorDate: Fri Nov 23 12:55:02 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 16:54:46 2018 +0100

presentation minimizer: suggest filename for a new presentation

If presentation was never saved suggested filename was empty.
Right now it will show filename like "Untitled 1 (minimized)".

Change-Id: I0077e6c9f2e86665f9de6d41fa434fd21167c779
Reviewed-on: https://gerrit.libreoffice.org/63876
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 16d12d50c2bfd924d2a7e6946896526a15a150d4)
Reviewed-on: https://gerrit.libreoffice.org/64625
Tested-by: Thorsten Behrens 

diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext/source/minimizer/optimizerdialog.cxx
index 9185f8e4f327..5e24ea1e38d7 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -22,6 +22,7 @@
 #include "impoptimizer.hxx"
 #include "fileopendialog.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -504,24 +505,35 @@ void ActionListener::actionPerformed( const ActionEvent& 
rEvent )
 FileOpenDialog aFileOpenDialog( 
mrOptimizerDialog.GetComponentContext() );
 
 // generating default file name
+OUString aName;
 Reference< XStorable > xStorable( 
mrOptimizerDialog.mxController->getModel(), UNO_QUERY );
 if ( xStorable.is() && xStorable->hasLocation() )
 {
 INetURLObject aURLObj( xStorable->getLocation() );
-if ( !aURLObj.hasFinalSlash() ) {
+if ( !aURLObj.hasFinalSlash() )
+{
 // tdf#105382 uri-decode file name
 aURLObj.removeExtension(INetURLObject::LAST_SEGMENT, 
false);
-auto aName( aURLObj.getName( 
INetURLObject::LAST_SEGMENT,
- false,
- 
INetURLObject::DecodeMechanism::WithCharset ) );
-// Add "(minimized)"
-aName += " ";
-aName += 
mrOptimizerDialog.getString(STR_FILENAME_SUFFIX);
-aFileOpenDialog.setDefaultName( aName );
+aName = aURLObj.getName(INetURLObject::LAST_SEGMENT, 
false,
+
INetURLObject::DecodeMechanism::WithCharset);
 }
 }
- bool bDialogExecuted = aFileOpenDialog.execute() == 
dialogs::ExecutableDialogResults::OK;
-if ( bDialogExecuted )
+else
+{
+// If no filename, try to use model title ("Untitled 1" or 
something like this)
+Reference xTitle(
+
mrOptimizerDialog.GetFrame()->getController()->getModel(), UNO_QUERY);
+aName = xTitle->getTitle();
+}
+
+if (!aName.isEmpty())
+{
+aName += " ";
+aName += mrOptimizerDialog.getString(STR_FILENAME_SUFFIX);
+aFileOpenDialog.setDefaultName(aName);
+}
+
+if (aFileOpenDialog.execute() == 
dialogs::ExecutableDialogResults::OK)
 {
 aSaveAsURL = aFileOpenDialog.getURL();
 mrOptimizerDialog.SetConfigProperty( TK_SaveAsURL, Any( 
aSaveAsURL ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/unocore/unoparagraph.cxx |4 +++-
 sw/source/core/unocore/unotext.cxx  |5 ++---
 sw/source/uibase/uno/unotxvw.cxx|5 -
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit be5582f8ed5fe799695e6a483f7c2b7728109fa2
Author: Vasily Melenchuk 
AuthorDate: Mon Dec 3 12:19:27 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 16:55:33 2018 +0100

sw uno: do not throw exceptions on getString()

getString() is passive method and no reason to throw
an exception instead of returning empty string in some
corner situations like object is being disposed.

As a compromise information about inbalid state is
reported into log.

Change-Id: Ied6ecb356ce341d44e5a2bb21fb8379257e38c31
Reviewed-on: https://gerrit.libreoffice.org/64442
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit dae741a2418f1d1dd35d364ec416516cc50f5054)
Reviewed-on: https://gerrit.libreoffice.org/64627
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index 39417de5c410..47919339ecf0 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -1383,7 +1383,9 @@ OUString SAL_CALL SwXParagraph::getString() throw 
(uno::RuntimeException, std::e
 }
 else
 {
-throw uno::RuntimeException();
+// Seems object is being disposed or some other problem occurs.
+// Anyway from user point of view object still exist, so on that level 
this is not an error
+SAL_WARN("sw.uno", "getString() for invalid paragraph called. 
Returning empty string.");
 }
 return aRet;
 }
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 3255daa35c21..94982e1fc058 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -900,9 +900,8 @@ OUString SAL_CALL SwXText::getString() throw 
(uno::RuntimeException, std::except
 const uno::Reference< text::XTextCursor > xRet = CreateCursor();
 if(!xRet.is())
 {
-uno::RuntimeException aRuntime;
-aRuntime.Message = cInvalidObject;
-throw aRuntime;
+SAL_WARN("sw.uno", "cursor was not created in getString() call. 
Returning empty string.");
+return OUString();
 }
 xRet->gotoEnd(true);
 return xRet->getString();
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index ecbb9df8a620..29f4fa5e89d6 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1413,7 +1413,10 @@ OUString SwXTextViewCursor::getString()
 if(m_pView)
 {
 if (!IsTextSelection( false ))
-throw  uno::RuntimeException("no text selection", static_cast < 
cppu::OWeakObject * > ( this ) );
+{
+SAL_WARN("sw.uno", "no text selection in getString() " << 
static_cast(this));
+return uRet;
+}
 
 ShellModes  eSelMode = m_pView->GetShellMode();
 switch(eSelMode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f84f5b0a0cdb82f444de572f9d8554a96056f874
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 10:14:17 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 5 16:43:19 2018 +0100

Fix reading 16 bit millisecond value

It had originally been read as 16 bit via >> in
d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to 
filter",
then accidentally changed to be read as 32 bit via >> in
9830fd36dbdb72c79703b0c61efc027fba793c5a "date/time IDL datatypes 
incompatible
change" (and later changed to be read as 32 bit explicitly via ReadUInt32 
with
15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 "convert SvStream::operator>> 
methods
to ReadXXX methods").

Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3
Reviewed-on: https://gerrit.libreoffice.org/64604
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 259035bd2285..2670bff723e2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2704,6 +2704,7 @@ static void ImportComment10( SvxMSDffManager const & 
rMan, SvStream& rStCtrl, Sd
 
 case PPT_PST_CommentAtom10 :
 {
+sal_uInt16 millisec = 0;
 rStCtrl.ReadInt32( nIndex )
.ReadInt16( aDateTime.Year )
.ReadUInt16( aDateTime.Month )
@@ -2712,11 +2713,11 @@ static void ImportComment10( SvxMSDffManager const & 
rMan, SvStream& rStCtrl, Sd
.ReadUInt16( aDateTime.Hours )
.ReadUInt16( aDateTime.Minutes )
.ReadUInt16( aDateTime.Seconds )
-   .ReadUInt32( aDateTime.NanoSeconds )
+   .ReadUInt16( millisec )
.ReadInt32( nPosX )
.ReadInt32( nPosY );
 
-aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli;
+aDateTime.NanoSeconds = millisec * ::tools::Time::nanoPerMilli;
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138b' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit ea245b7e513db31a6fb34f230cf649fb7fefbdf0
Author: Samuel Mehrbrodt 
AuthorDate: Wed Dec 5 16:19:53 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Dec 5 16:19:53 2018 +0100

Bump version to 6.0.8.2

Change-Id: I87c43774689b6722e1a1ad1dcb9cebf40752081f

diff --git a/configure.ac b/configure.ac
index 795cde16d38f..51659bfe2e01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.8.1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.8.2],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/FileServer.cpp

[Libreoffice Gerrit user]

 wsd/FileServer.cpp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6e0d1ad707ef17e2af7413a381179847e5816b7c
Author: Miklos Vajna 
AuthorDate: Wed Dec 5 16:13:26 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 16:14:44 2018 +0100

document signing: whitelist CSP frame-src for doc sign endpoint URL

If document signing is enabled in loolwsd.xml, then explicitly whitelist
iframe creation towards the doc sign endpoint server, to avoid

> Refused to frame '...' because it violates the following Content Security 
Policy directive: "frame-src 'self' blob:".

Note that this happened only in non-debug builds, as we currently don't
send eny Content Security Policy headers in debug builds.

Change-Id: Iee2a0644d67d5803ab3f5c636b8e960fa619792f

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index cd799929f..5855491ff 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -670,9 +670,11 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 << "X-XSS-Protection: 1; mode=block\r\n"
 << "Referrer-Policy: no-referrer\r\n";
 
+// Document signing: if endpoint URL is configured, whitelist that for
+// iframe purposes.
 std::ostringstream cspOss;
 cspOss << "Content-Security-Policy: default-src 'none'; "
-   << "frame-src 'self' blob:; "
+   << "frame-src 'self' blob: " << documentSigningURL << "; "
<< "connect-src 'self' " << host << "; "
<< "script-src 'unsafe-inline' 'self'; "
<< "style-src 'self' 'unsafe-inline'; "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/svxruler.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ca30a2032bc9ff078e3af6cc1fd3a6650580d1ea
Author: Noel Grandin 
AuthorDate: Wed Dec 5 16:41:50 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 16:49:54 2018 +0200

fix logic in SvxRuler::UpdateColumns

after
commit cee2602d14214ff44dbc995f790b4d72b764f800
"remove unused RulerBorderStyle enum value"
introduced a broken if-chain

and
commit 55605810942227350b59e7cb4c61703b8ba991cf
-Werror=duplicated-cond
fixed the chain but did not quite re-introduce the original logic.

Change-Id: I868d8cfe6628192a19a923ebe86c2596fb347d86

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3da42c451b5d..cea75dc33fe8 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -800,7 +800,11 @@ void SvxRuler::UpdateColumns()
 mxRulerImpl->aProtectItem.IsPosProtected();
 
 if( !bProtectColumns )
-nStyleFlags |= RulerBorderStyle::Moveable | 
RulerBorderStyle::Sizeable;
+{
+nStyleFlags |= RulerBorderStyle::Moveable;
+if( !mxColumnItem->IsTable() )
+  nStyleFlags |= RulerBorderStyle::Sizeable;
+}
 
 sal_uInt16 nBorders = mxColumnItem->Count();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx   |   10 +
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx   |1 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|2 
 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx  |3 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |   17 
+++
 chart2/source/inc/chartview/ChartSfxItemIds.hxx|3 
 chart2/source/view/main/ChartItemPool.cxx  |1 
 chart2/uiconfig/ui/tp_SeriesToAxis.ui  |   53 
+-
 8 files changed, 87 insertions(+), 3 deletions(-)

New commits:
commit 19b2ed4dee1ec33ad55473d43bfcd0bfa194cbee
Author: Markus Mohrhard 
AuthorDate: Wed Dec 5 04:34:39 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Wed Dec 5 15:43:42 2018 +0100

related tdf#51671, add UI options for new "hide legend entry" feature

Change-Id: I4a9025e317dbd93fb45e676f266c555c72f4d18b
Reviewed-on: https://gerrit.libreoffice.org/64614
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx 
b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 2cab39c84e8e..91f2255cf99e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -53,6 +53,7 @@ SchOptionTabPage::SchOptionTabPage(TabPageParent 
pWindow,const SfxItemSet& rInAt
 , m_xRB_AssumeZero(m_xBuilder->weld_radio_button("RB_ASSUME_ZERO"))
 , m_xRB_ContinueLine(m_xBuilder->weld_radio_button("RB_CONTINUE_LINE"))
 , 
m_xCBIncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS"))
+, 
m_xCBHideLegendEntry(m_xBuilder->weld_check_button("CB_LEGEND_ENTRY_HIDDEN"))
 {
 m_xRbtAxis1->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl));
 m_xRbtAxis2->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl));
@@ -108,6 +109,9 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 if (m_xCBIncludeHiddenCells->get_visible())
 rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, 
m_xCBIncludeHiddenCells->get_active()));
 
+if(m_xCBHideLegendEntry->get_visible())
+rOutAttrs->Put(SfxBoolItem(SCHATTR_HIDE_LEGEND_ENTRY, 
m_xCBHideLegendEntry->get_active()));
+
 return true;
 }
 
@@ -215,6 +219,12 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
 m_xGrpPlotOptions->show(false);
 }
 
+if (rInAttrs->GetItemState(SCHATTR_HIDE_LEGEND_ENTRY, true, &pPoolItem) == 
SfxItemState::SET)
+{
+bool bVal = static_cast(pPoolItem)->GetValue();
+m_xCBHideLegendEntry->set_active(bVal);
+}
+
 AdaptControlPositionsAndVisibility();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx 
b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 1f6a16aeac43..7ffbed77ca9d 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -70,6 +70,7 @@ private: //member
 std::unique_ptr m_xRB_AssumeZero;
 std::unique_ptr m_xRB_ContinueLine;
 std::unique_ptr m_xCBIncludeHiddenCells;
+std::unique_ptr m_xCBHideLegendEntry;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx 
b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index ad8fd31cfd20..378956c47212 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -74,6 +74,8 @@ private:
 
 bool m_bSupportingPlottingOfHiddenCells;
 bool m_bIncludeHiddenCells;
+
+bool m_bHideLegendEntry;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx 
b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index b8c85f61c046..e7c0fca9b855 100644
--- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
+++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
@@ -130,7 +130,8 @@ const sal_uInt16 nTextLabelWhichPairs[] =
 SCHATTR_CLOCKWISE,SCHATTR_CLOCKWISE, \
 SCHATTR_MISSING_VALUE_TREATMENT,SCHATTR_MISSING_VALUE_TREATMENT, \
 
SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,
 \
-SCHATTR_INCLUDE_HIDDEN_CELLS,SCHATTR_INCLUDE_HIDDEN_CELLS
+SCHATTR_INCLUDE_HIDDEN_CELLS,SCHATTR_INCLUDE_HIDDEN_CELLS, \
+SCHATTR_HIDE_LEGEND_ENTRY,SCHATTR_HIDE_LEGEND_ENTRY
 
 const sal_uInt16 nSeriesOptionsWhichPairs[] =
 {
diff --git 
a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 7b98478e75b2..b289a16423ae 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -74,6 +7

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

[Libreoffice Gerrit user]

 chart2/source/model/main/DataSeriesProperties.cxx |7 +++
 chart2/source/model/main/DataSeriesProperties.hxx |3 ++-
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |5 +
 offapi/com/sun/star/chart2/DataSeries.idl |7 +++
 sc/source/filter/excel/xichart.cxx|   16 +++-
 sc/source/filter/inc/xichart.hxx  |2 ++
 sc/source/filter/inc/xlchart.hxx  |8 
 7 files changed, 46 insertions(+), 2 deletions(-)

New commits:
commit c32a4c2fac32b766a05473d037d73cbcd972dadd
Author: Markus Mohrhard 
AuthorDate: Wed Dec 5 03:45:17 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Wed Dec 5 15:43:28 2018 +0100

tdf#51671, implement feature to disable legend entry for series

No UI and no ODF or OOXML support yet.

Change-Id: I839c195e9c42f074838ff6592331f7cdd13b6cd2
Reviewed-on: https://gerrit.libreoffice.org/64583
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/model/main/DataSeriesProperties.cxx 
b/chart2/source/model/main/DataSeriesProperties.cxx
index 6c7e38d7e038..375e6c441c2a 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -57,6 +57,12 @@ void DataSeriesProperties::AddPropertiesToVector(
   | beans::PropertyAttribute::MAYBEVOID
   | beans::PropertyAttribute::MAYBEDEFAULT );
 
+rOutProperties.emplace_back( "ShowLegendEntry",
+  PROP_DATASERIES_SHOW_LEGEND_ENTRY,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEDEFAULT );
+
 // add properties of service DataPointProperties
 DataPointProperties::AddPropertiesToVector( rOutProperties );
 }
@@ -67,6 +73,7 @@ void DataSeriesProperties::AddDefaultsToMap(
 PropertyHelper::setPropertyValueDefault( rOutMap, 
PROP_DATASERIES_STACKING_DIRECTION, chart2::StackingDirection_NO_STACKING );
 PropertyHelper::setPropertyValueDefault( rOutMap, 
PROP_DATASERIES_VARY_COLORS_BY_POINT, false );
 PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, 
PROP_DATASERIES_ATTACHED_AXIS_INDEX, 0 );
+PropertyHelper::setPropertyValueDefault( rOutMap, 
PROP_DATASERIES_SHOW_LEGEND_ENTRY, true );
 
 // PROP_DATASERIES_ATTRIBUTED_DATA_POINTS has no default
 
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx 
b/chart2/source/model/main/DataSeriesProperties.hxx
index e27b9acd44f2..6791078d5678 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/model/main/DataSeriesProperties.hxx
@@ -36,7 +36,8 @@ namespace DataSeriesProperties
 PROP_DATASERIES_ATTRIBUTED_DATA_POINTS = 
FAST_PROPERTY_ID_START_DATA_SERIES,
 PROP_DATASERIES_STACKING_DIRECTION,
 PROP_DATASERIES_VARY_COLORS_BY_POINT,
-PROP_DATASERIES_ATTACHED_AXIS_INDEX
+PROP_DATASERIES_ATTACHED_AXIS_INDEX,
+PROP_DATASERIES_SHOW_LEGEND_ENTRY
 };
 
 void AddPropertiesToVector(
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ff09606cda5c..ee76f7351d93 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2208,6 +2208,11 @@ std::vector< ViewLegendEntry > 
VSeriesPlotter::createLegendEntries(
 if (!pSeries)
 continue;
 
+if 
(!pSeries->getPropertiesOfSeries()->getPropertyValue("ShowLegendEntry").get())
+{
+continue;
+}
+
 std::vector aSeriesEntries(
 createLegendEntriesForSeries(
 rEntryKeyAspectRatio, *pSeries, 
xTextProperties,
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl 
b/offapi/com/sun/star/chart2/DataSeries.idl
index 0d43ee6adf56..357ec4fcd097 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -173,6 +173,13 @@ service DataSeries
 this series there.
 */
 [optional, property] long   AttachedAxisIndex;
+
+/** This property describes whether the legend entry for the
+the data series should be shown.
+
+@since LibreOffice 6.3
+  */
+[optional, property] booleanShowLegendEntry;
 };
 
 } ; // chart2
diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 6ff977f9d7a6..b8d32f81a4d7 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1778,7 +1778,8 @@ XclImpChSeries::XclImpChSeries( const XclImpChRoot& 
rRoot, sal_uInt16 nSeriesIdx
 XclImpChRoot( rRoot ),
 mnGroupIdx( EXC_CHSERGROUP_NONE ),
 mnSeriesIdx( nSeriesIdx ),
-mnParentIdx( EXC_CHSERIES_INVALID )
+

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

[Libreoffice Gerrit user]

 include/vcl/imapobj.hxx  |2 --
 vcl/source/treelist/imap.cxx |4 
 2 files changed, 6 deletions(-)

New commits:
commit 7e7b9a90adc5186d48febce5ee0c0afb09aedaee
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:04:57 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 15:39:11 2018 +0100

loplugin:singlevalfields in vcl

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

diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index b5fedbd3cfb2..a9bf0ce7bc8f 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -74,8 +74,6 @@ protected:
 
 public:
 
-static rtl_TextEncoding nActualTextEncoding;
-
 IMapObject();
 IMapObject( const OUString& rURL,
 const OUString& rAltText,
diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx
index bcd69ad5a6fb..31880908718c 100644
--- a/vcl/source/treelist/imap.cxx
+++ b/vcl/source/treelist/imap.cxx
@@ -43,10 +43,6 @@
 
 
/**/
 
-sal_uInt16 IMapObject::nActualTextEncoding = 
sal_uInt16(RTL_TEXTENCODING_DONTKNOW);
-
-/**/
-
 
 IMapObject::IMapObject()
 : bActive( false )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/global.hxx|2 +-
 sc/inc/progress.hxx  |2 --
 sc/source/core/data/global.cxx   |1 -
 sc/source/core/tool/progress.cxx |   35 +++
 4 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit c64046f61eb8a2d7d288e538377f1464a9ef34eb
Author: Noel Grandin 
AuthorDate: Wed Dec 5 10:59:52 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 15:38:57 2018 +0100

loplugin:singlevalfields in sc

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

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index e6a33de7830b..38406014c4a8 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -551,7 +551,7 @@ public:
 static ::utl::TransliterationWrapper* GetCaseTransliteration();
 
 SC_DLLPUBLIC static LanguageTypeeLnge;
-static sal_Unicode  cListDelimiter;
+static constexpr sal_Unicode cListDelimiter = ',';
 
 static const OUString&  GetClipDocName();
 static void SetClipDocName( const OUString& rNew );
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index 7ad445a0913c..c8fb59646e58 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -44,9 +44,7 @@ private:
 static  sal_uLongnGlobalRange;
 static  sal_uLong   nGlobalPercent;
 static  ScProgress* pInterpretProgress;
-static  ScProgress* pOldInterpretProgress;
 static  sal_uLong   nInterpretProgress;
-static  boolbAllowInterpretProgress;
 static  ScDocument* pInterpretDoc;
 static  boolbIdleWasEnabled;
 boolbEnabled;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 2138f3e776b8..22b96ec9b45c 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -83,7 +83,6 @@ std::atomic 
ScGlobal::pCaseCollator(nullptr);
 std::atomic<::utl::TransliterationWrapper*> 
ScGlobal::pTransliteration(nullptr);
 std::atomic<::utl::TransliterationWrapper*> 
ScGlobal::pCaseTransliteration(nullptr);
 css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix;
-sal_Unicode ScGlobal::cListDelimiter = ',';
 OUString*   ScGlobal::pEmptyOUString = nullptr;
 OUString*   ScGlobal::pStrClipDocName = nullptr;
 
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 3ebcdb107138..628f779bd05c 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -40,9 +40,7 @@ SfxProgress*ScProgress::pGlobalProgress = nullptr;
 sal_uLong   ScProgress::nGlobalRange = 0;
 sal_uLong   ScProgress::nGlobalPercent = 0;
 ScProgress* ScProgress::pInterpretProgress = &theDummyInterpretProgress;
-ScProgress* ScProgress::pOldInterpretProgress = nullptr;
 sal_uLong   ScProgress::nInterpretProgress = 0;
-boolScProgress::bAllowInterpretProgress = true;
 ScDocument* ScProgress::pInterpretDoc;
 boolScProgress::bIdleWasEnabled = false;
 
@@ -134,30 +132,27 @@ ScProgress::~ScProgress()
 
 void ScProgress::CreateInterpretProgress( ScDocument* pDoc, bool bWait )
 {
-if ( bAllowInterpretProgress )
+if ( nInterpretProgress )
+nInterpretProgress++;
+else if ( pDoc->GetAutoCalc() )
 {
-if ( nInterpretProgress )
-nInterpretProgress++;
-else if ( pDoc->GetAutoCalc() )
-{
-nInterpretProgress = 1;
-bIdleWasEnabled = pDoc->IsIdleEnabled();
-pDoc->EnableIdle(false);
-// Interpreter may be called in many circumstances, also if another
-// progress bar is active, for example while adapting row heights.
-// Keep the dummy interpret progress.
-if ( !pGlobalProgress )
-pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
-ScResId( STR_PROGRESS_CALCULATING ),
-
pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, bWait );
-pInterpretDoc = pDoc;
-}
+nInterpretProgress = 1;
+bIdleWasEnabled = pDoc->IsIdleEnabled();
+pDoc->EnableIdle(false);
+// Interpreter may be called in many circumstances, also if another
+// progress bar is active, for example while adapting row heights.
+// Keep the dummy interpret progress.
+if ( !pGlobalProgress )
+pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
+ScResId( STR_PROGRESS_CALCULATING ),
+pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, 
bWait );
+pInterpretDoc = pDoc;
 }
 }
 
 void ScProgress::DeleteInterpretProgress()
 {
-if ( bAllowInterpretProgress && nInterpretProgress )
+if ( nInterpretProgress )
 {
 /*  Do not decrement

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

[Libreoffice Gerrit user]

 svx/source/dialog/svxruler.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 55605810942227350b59e7cb4c61703b8ba991cf
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 15:25:59 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 5 15:25:59 2018 +0100

-Werror=duplicated-cond

...after cee2602d14214ff44dbc995f790b4d72b764f800 "remove unused
RulerBorderStyle enum value" apparently broke things by accident:

> --- a/svx/source/dialog/svxruler.cxx
> +++ b/svx/source/dialog/svxruler.cxx
> @@ -802,8 +802,6 @@ void SvxRuler::UpdateColumns()
>  if( !bProtectColumns )
>  nStyleFlags |= RulerBorderStyle::Moveable;
>
> -if( mxColumnItem->IsTable() )
> -nStyleFlags |= RulerBorderStyle::Table;
>  else if ( !bProtectColumns )
>  nStyleFlags |= RulerBorderStyle::Sizeable;
>

Change-Id: I898ccc9cdb12ee75f2e100d24027dfe74a99da90

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index a76c8901eedc..3da42c451b5d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -800,10 +800,7 @@ void SvxRuler::UpdateColumns()
 mxRulerImpl->aProtectItem.IsPosProtected();
 
 if( !bProtectColumns )
-nStyleFlags |= RulerBorderStyle::Moveable;
-
-else if ( !bProtectColumns )
-nStyleFlags |= RulerBorderStyle::Sizeable;
+nStyleFlags |= RulerBorderStyle::Moveable | 
RulerBorderStyle::Sizeable;
 
 sal_uInt16 nBorders = mxColumnItem->Count();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sdext/source

[Libreoffice Gerrit user]

 sdext/source/minimizer/optimizerdialog.cxx |   33 -
 1 file changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 411147db70fa9f3e3acb40a94fcece2667394a03
Author: Vasily Melenchuk 
AuthorDate: Fri Nov 23 12:55:02 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 15:10:17 2018 +0100

presentation minimizer: suggest filename for a new presentation

If presentation was never saved suggested filename was empty.
Right now it will show filename like "Untitled 1 (minimized)".

Change-Id: I0077e6c9f2e86665f9de6d41fa434fd21167c779
Reviewed-on: https://gerrit.libreoffice.org/63876
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/64624
Tested-by: Thorsten Behrens 

diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext/source/minimizer/optimizerdialog.cxx
index 4b789ca7e408..bf17f9c4643c 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -21,6 +21,8 @@
 #include "optimizerdialog.hxx"
 #include "impoptimizer.hxx"
 #include "fileopendialog.hxx"
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -510,24 +512,35 @@ void ActionListener::actionPerformed( const ActionEvent& 
rEvent )
 FileOpenDialog aFileOpenDialog( 
mrOptimizerDialog.GetComponentContext() );
 
 // generating default file name
+OUString aName;
 Reference< XStorable > xStorable( 
mrOptimizerDialog.mxController->getModel(), UNO_QUERY );
 if ( xStorable.is() && xStorable->hasLocation() )
 {
 INetURLObject aURLObj( xStorable->getLocation() );
-if ( !aURLObj.hasFinalSlash() ) {
+if ( !aURLObj.hasFinalSlash() )
+{
 // tdf#105382 uri-decode file name
 aURLObj.removeExtension(INetURLObject::LAST_SEGMENT, 
false);
-auto aName( aURLObj.getName( 
INetURLObject::LAST_SEGMENT,
- false,
- 
INetURLObject::DECODE_WITH_CHARSET ) );
-// Add "(minimized)"
-aName += " ";
-aName += 
mrOptimizerDialog.getString(STR_FILENAME_SUFFIX);
-aFileOpenDialog.setDefaultName( aName );
+aName = aURLObj.getName(INetURLObject::LAST_SEGMENT, 
false,
+
INetURLObject::DECODE_WITH_CHARSET);
 }
 }
- bool bDialogExecuted = aFileOpenDialog.execute() == 
dialogs::ExecutableDialogResults::OK;
-if ( bDialogExecuted )
+else
+{
+// If no filename, try to use model title ("Untitled 1" or 
something like this)
+Reference xTitle(
+
mrOptimizerDialog.GetFrame()->getController()->getModel(), UNO_QUERY);
+aName = xTitle->getTitle();
+}
+
+if (!aName.isEmpty())
+{
+aName += " ";
+aName += mrOptimizerDialog.getString(STR_FILENAME_SUFFIX);
+aFileOpenDialog.setDefaultName(aName);
+}
+
+if (aFileOpenDialog.execute() == 
dialogs::ExecutableDialogResults::OK)
 {
 aSaveAsURL = aFileOpenDialog.getURL();
 mrOptimizerDialog.SetConfigProperty( TK_SaveAsURL, Any( 
aSaveAsURL ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svl/documentlockfile.hxx |5 -
 sfx2/source/doc/docfile.cxx  |2 +-
 svl/source/misc/documentlockfile.cxx |3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a0e01e3a34d9f60822a5bc1bfe90cb74b62bb999
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:05:10 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 14:54:51 2018 +0100

loplugin:singlevalfields in svl

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

diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 25531dc3332e..f91aa352c56e 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -31,9 +31,6 @@ namespace svt {
 
 class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
 {
-// the workaround for automated testing!
-static bool m_bAllowInteraction;
-
 css::uno::Reference< css::io::XInputStream > OpenStream();
 
 void WriteEntryToStream( const LockFileEntry& aEntry, const 
css::uno::Reference< css::io::XOutputStream >& xStream );
@@ -49,8 +46,6 @@ public:
 void RemoveFile();
 /// Only delete lockfile, disregarding ownership
 void RemoveFileDirectly();
-
-static bool IsInteractionAllowed() { return m_bAllowInteraction; }
 };
 
 }
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 04ae1f735cdc..45449a26731b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1000,7 +1000,7 @@ SfxMedium::ShowLockResult 
SfxMedium::ShowLockedDocumentDialog(const OUString& aD
 // show the interaction regarding the document opening
 uno::Reference< task::XInteractionHandler > xHandler = 
GetInteractionHandler();
 
-if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( 
bIsLoading || !bHandleSysLocked || bOwnLock ) )
+if ( xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
 {
 OUString aDocumentURL = GetURLObject().GetLastName();
 OUString aInfo;
diff --git a/svl/source/misc/documentlockfile.cxx 
b/svl/source/misc/documentlockfile.cxx
index 837005bd6f85..406dfb5d9693 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -54,9 +54,6 @@ using namespace ::com::sun::star;
 
 namespace svt {
 
-bool DocumentLockFile::m_bAllowInteraction = true;
-
-
 DocumentLockFile::DocumentLockFile( const OUString& aOrigURL )
 : LockFileCommon( aOrigURL, ".~lock." )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/svapp.hxx  |   16 
 vcl/inc/svdata.hxx |1 +
 vcl/source/app/salplug.cxx |7 +++
 vcl/source/app/svapp.cxx   |   12 
 vcl/source/opengl/OpenGLHelper.cxx |   13 -
 5 files changed, 28 insertions(+), 21 deletions(-)

New commits:
commit a6dc9f3fd18ad69aa041662628f4f923ab3a82f8
Author: Jan-Marek Glogowski 
AuthorDate: Fri Nov 23 08:43:04 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Dec 5 14:39:37 2018 +0100

Add interface for software-only bitmap rendering

When SAL_USE_VCLPLUGIN=svp is used, LO is expected to render
output only to bitmaps, without real GUI windows. This adds an
enabler and a getter function to the Application class, so one
can query this information easy as (Enable|Is)BitmapRendering.

This can be used by all VCL plugins, which can't fall back to
the Cairo based SVP plugin, primary OSX and Win.

A working implementation should allow to run all test via SSH.
All window-requiring tests already have to set this requirement
using gb_CppunitTest_use_vcl_non_headless(_with_windows)? and
should be moved to a different make target, or we need some test
harness to handle this correctly, before VCL fails the test.

Change-Id: I4bd4c81122a6686b090fdd93256d4712ac5f05dd
Reviewed-on: https://gerrit.libreoffice.org/64051
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 6249e3449e6f..c597ba453de3 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1218,19 +1218,19 @@ public:
 
 /** Enable Console Only mode
 
- Used to disable Mac specific app init that requires an app bundle.
+ Convenience function to enable headless and bitmap rendering.
 */
 static void EnableConsoleOnly();
 
-/** Determines if console only mode is enabled.
-
- Used to see if Mac specific app init has been disabled.
+/** Enable software-only bitmap rendering
+ */
+static void EnableBitmapRendering();
 
- @returns True if console only mode is on, false if not.
+/** Determines if bitmap rendering is enabled
 
- @see EnableConsoleOnly
-*/
-static bool IsConsoleOnly();
+  @return True if bitmap rendering is enabled.
+ */
+static bool IsBitmapRendering();
 
 ///@}
 
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 21ca3567b56a..b83607f75c44 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -154,6 +154,7 @@ struct ImplSVAppData
 boolmbAppQuit = false;  // is 
Application::Quit() called
 boolmbSettingsInit = false; // true: Settings 
are initialized
 DialogCancelMode meDialogCancel = DialogCancelMode::Off; // true: All 
Dialog::Execute() calls will be terminated immediately with return false
+bool mbRenderToBitmaps = false; // set via svp / headless plugin
 
 /** Controls whether showing any IME status window is toggled on or off.
 
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index a79339cd0ad2..205f5dae0526 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -243,6 +243,13 @@ SalInstance *CreateSalInstance()
 #endif
 rtl::Bootstrap::get( "SAL_USE_VCLPLUGIN", aUsePlugin );
 
+if (aUsePlugin == "svp")
+{
+Application::EnableBitmapRendering();
+#ifndef HEADLESS_VCLPLUG
+aUsePlugin.clear();
+#endif
+}
 if( !aUsePlugin.isEmpty() )
 pInst = tryInstance( aUsePlugin, true );
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b42c1f158a9f..40ff79b7d70f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1438,6 +1438,7 @@ const LocaleDataWrapper& 
Application::GetAppLocaleDataWrapper()
 
 void Application::EnableHeadlessMode( bool dialogsAreFatal )
 {
+assert(GetDialogCancelMode() == DialogCancelMode::Off);
 SetDialogCancelMode(
 dialogsAreFatal ? DialogCancelMode::Fatal : DialogCancelMode::Silent );
 }
@@ -1447,17 +1448,20 @@ bool Application::IsHeadlessModeEnabled()
 return IsDialogCancelEnabled() || comphelper::LibreOfficeKit::isActive();
 }
 
-static bool bConsoleOnly = false;
+void Application::EnableBitmapRendering()
+{
+ImplGetSVData()->maAppData.mbRenderToBitmaps = true;
+}
 
-bool Application::IsConsoleOnly()
+bool Application::IsBitmapRendering()
 {
-return bConsoleOnly;
+return ImplGetSVData()->maAppData.mbRenderToBitmaps;
 }
 
 void Application::EnableConsoleOnly()
 {
 EnableHeadlessMode(true);
-bConsoleOnly = true;
+EnableBitmapRendering();
 }
 
 static bool bEventTestingMode = false;
diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 588ae70cabe0..882f35d424af 100644
--- a/vcl/source/opengl/OpenGLHe

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

[Libreoffice Gerrit user]

 framework/source/services/frame.cxx |  204 ++--
 include/vcl/svapp.hxx   |6 -
 vcl/workben/commonfuzzer.hxx|2 
 vcl/workben/fftester.cxx|3 
 4 files changed, 109 insertions(+), 106 deletions(-)

New commits:
commit 329db5d412cc0d5e0f97cb939b94259679396ead
Author: Jan-Marek Glogowski 
AuthorDate: Fri Nov 23 08:21:15 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Dec 5 14:38:22 2018 +0100

Make Application::SetDialogCancelMode "private"

Change callers to Application::EnableHeadlessMode instead except
for the Frame dispose sequence, which has to disable a fatal
mode temporary.

Since Frame is not a unique identifier, rename it to XFrameImpl,
otherwise we get a "non-unique" compile error for other files.

When we update our gcc baseline, we should be able to forward
declare and friend XFrameImpl and really make it private.

Change-Id: Ifcad0355adade8f6539ec092b174dd70af8352c2
Reviewed-on: https://gerrit.libreoffice.org/64050
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 8f3c36fefbcb..d9a58fe31ed1 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -106,7 +106,7 @@ enum EActiveState
 subtree, find of subframes, activate- and deactivate-mechanism 
as well as
 set/get of a frame window, component or controller.
 
*//*-*/
-class Frame:
+class XFrameImpl:
 private cppu::BaseMutex,
 public cppu::PartialWeakComponentImplHelper<
 css::lang::XServiceInfo, css::frame::XFrame2, 
css::awt::XWindowListener,
@@ -118,7 +118,7 @@ class Frame:
 {
 public:
 
-explicit Frame(const css::uno::Reference< css::uno::XComponentContext >& 
xContext);
+explicit XFrameImpl(const css::uno::Reference< css::uno::XComponentContext 
>& xContext);
 
 /// Initialization function after having acquire()'d.
 void initListeners();
@@ -452,7 +452,7 @@ private:
 The value must be different from NULL!
 @onerrorASSERT in debug version or nothing in release version.
 
*//*-*/
-Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& 
xContext )
+XFrameImpl::XFrameImpl( const css::uno::Reference< css::uno::XComponentContext 
>& xContext )
 : PartialWeakComponentImplHelper(m_aMutex)
 //  init member
 , m_xContext  ( xContext )
@@ -475,7 +475,7 @@ Frame::Frame( const css::uno::Reference< 
css::uno::XComponentContext >& xContext
 {
 }
 
-void Frame::initListeners()
+void XFrameImpl::initListeners()
 {
 css::uno::Reference< css::uno::XInterface > xThis(static_cast< 
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW);
 
@@ -509,13 +509,13 @@ void Frame::initListeners()
 
 // Safe impossible cases
 // We can't work without these helpers!
-SAL_WARN_IF( !xDispatchProvider.is(), "fwk.frame", "Frame::Frame(): 
Slowest slave for dispatch- and interception helper "
+SAL_WARN_IF( !xDispatchProvider.is(), "fwk.frame", 
"XFrameImpl::XFrameImpl(): Slowest slave for dispatch- and interception helper "
 "is not valid. XDispatchProvider, XDispatch, 
XDispatchProviderInterception are not full supported!" );
-SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk.frame", "Frame::Frame(): 
Interception helper is not valid. XDispatchProvider, "
+SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk.frame", 
"XFrameImpl::XFrameImpl(): Interception helper is not valid. XDispatchProvider, 
"
 "XDispatch, XDispatchProviderInterception are not full supported!" );
-SAL_WARN_IF( !m_xFramesHelper.is(), "fwk.frame", "Frame::Frame(): Frames 
helper is not valid. XFrames, "
+SAL_WARN_IF( !m_xFramesHelper.is(), "fwk.frame", 
"XFrameImpl::XFrameImpl(): Frames helper is not valid. XFrames, "
 "XIndexAccess and XElementAccess are not supported!" );
-SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk.frame", "Frame::Frame(): 
DropTarget helper is not valid. "
+SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk.frame", 
"XFrameImpl::XFrameImpl(): DropTarget helper is not valid. "
 "Drag and drop without functionality!" );
 
 // establish notifies for changing of "disabled commands" configuration 
during runtime
@@ -575,7 +575,7 @@ void Frame::initListeners()
 @onerrorWe return a null reference.
 @threadsafe yes
 
*//*-*/
-css::uno::Reference< css::lang::XComponent > SAL_CALL 
Frame::loadComponentFromURL(
+css::uno::Reference< css::lang::XComponent > SAL_CALL 
XFrameImpl::loadC

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Graphics.hxx |2 +-
 vcl/qt5/Qt5Graphics_GDI.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bcc28ff92493dbc9a51acb1cf693b9ce3162a110
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 09:42:53 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 5 14:17:58 2018 +0100

Adapt Qt5Graphics::SetXORMode

...to be504e8c7ef06637f055c43ad350381377df1e90 "tdf#121719: Revert fix for
tdf#96971", which re-introduced the second "bool bInvertOnly" to virtual
SalGraphics::SetXORMode.  It had been removed with
258301879bcd20397c38bbd522dea2c923bd9fc2 "tdf#96971 SetXORMode - remove
un-needed parameter" before the (back then named) Kf5Graphics::SetXORMode
override was introduced with 9335945c7cb215f387ed1444e28533fac437c6e8 "KF5
initial VCL plugin".

Assume that actually ignoring bInvertOnly in the implementation of
Qt5Graphics::SetXORMode is fine (as is done in various other overriding
implementations of SetXORMode, too).

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

diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 480f2f4a4bf5..9430be94a112 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -168,7 +168,7 @@ public:
 virtual void SetLineColor(Color nColor) override;
 virtual void SetFillColor() override;
 virtual void SetFillColor(Color nColor) override;
-virtual void SetXORMode(bool bSet) override;
+virtual void SetXORMode(bool bSet, bool bInvertOnly) override;
 virtual void SetROPLineColor(SalROPColor nROPColor) override;
 virtual void SetROPFillColor(SalROPColor nROPColor) override;
 
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 0280f9120baa..fb766205f654 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -657,7 +657,7 @@ void Qt5Graphics::SetFillColor() { m_aFillColor = 
SALCOLOR_NONE; }
 
 void Qt5Graphics::SetFillColor(Color nColor) { m_aFillColor = nColor; }
 
-void Qt5Graphics::SetXORMode(bool bSet)
+void Qt5Graphics::SetXORMode(bool bSet, bool)
 {
 if (bSet)
 m_eCompositionMode = QPainter::CompositionMode_Xor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdpage.cxx |   30 +-
 1 file changed, 25 insertions(+), 5 deletions(-)

New commits:
commit b38f856f234f364199d306226875471ed589b764
Author: Armin Le Grand 
AuthorDate: Wed Dec 5 10:56:29 2018 +0100
Commit: Armin Le Grand 
CommitDate: Wed Dec 5 13:57:52 2018 +0100

tdf#121022 Do change parent of SdrObj early

Need to change parent of an SdrObject in the
according SdrObjList methods before calling
InsertedStateChange - that one relies on asking
for the parent of the SdrObject

Change-Id: I8c4d39190cafe889b27975941d72afca870e2ce5
Reviewed-on: https://gerrit.libreoffice.org/64608
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 5e38b25e043f..90d6d687c81b 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -384,8 +384,14 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum)
 pObj->GetViewContact().flushViewObjectContacts();
 
 DBG_ASSERT(pObj->IsInserted(),"The object does not have the status 
Inserted.");
-pObj->InsertedStateChange(); // calls UserCall, among other
+
+// tdf#121022 Do first remove from SdrObjList - InsertedStateChange
+// relies now on IsInserted which uses getParentSdrObjListFromSdrObject
 SetParentAtSdrObjectFromSdrObjList(*pObj, nullptr);
+
+// calls UserCall, among other
+pObj->InsertedStateChange();
+
 if (!mbObjOrdNumsDirty)
 {
 // optimizing for the case that the last object has to be removed
@@ -426,9 +432,13 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
 
 pObj->getSdrModelFromSdrObject().SetChanged();
 
-pObj->InsertedStateChange(); // calls, among other things, the UserCall
+// tdf#121022 Do first remove from SdrObjList - InsertedStateChange
+// relies now on IsInserted which uses getParentSdrObjListFromSdrObject
 SetParentAtSdrObjectFromSdrObjList(*pObj, nullptr);
 
+// calls, among other things, the UserCall
+pObj->InsertedStateChange();
+
 if (!mbObjOrdNumsDirty)
 {
 // optimization for the case that the last object is removed
@@ -475,18 +485,28 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, 
size_t nObjNum)
 pObj->getSdrModelFromSdrObject().Broadcast(aHint);
 }
 
-pObj->InsertedStateChange();
+// Change parent and replace in SdrObjList
 SetParentAtSdrObjectFromSdrObjList(*pObj, nullptr);
 ReplaceObjectInContainer(*pNewObj,nObjNum);
 
-// flushViewObjectContacts() clears the VOC's and those invalidate
+// tdf#121022 InsertedStateChange uses the parent
+// to detect if pObj is inserted or not, so have to call
+// it *after* changing these settings, else a obviously wrong
+// 'SdrUserCallType::Inserted' would be sent
+pObj->InsertedStateChange();
+
+// flushViewObjectContacts() clears the VOC's and those
+// trigger the evtl. needed invalidate(s)
 pObj->GetViewContact().flushViewObjectContacts();
 
+// Setup data at new SdrObject - it already *is* inserted to
+// the SdrObjList due to 'ReplaceObjectInContainer' above
 pNewObj->SetOrdNum(nObjNum);
 SetParentAtSdrObjectFromSdrObjList(*pNewObj, this);
 
 // Inform the parent about change to allow invalidations at
-// evtl. existing parent visualisations
+// evtl. existing parent visualisations, but also react on
+// newly inserted SdrObjects (as e.g. GraphCtrlUserCall does)
 impChildInserted(*pNewObj);
 
 pNewObj->InsertedStateChange();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 slideshow/source/engine/animationnodes/animationcommandnode.cxx |   19 
++
 slideshow/source/engine/animationnodes/animationcommandnode.hxx |1 
 2 files changed, 20 insertions(+)

New commits:
commit 1aa10fcb668f67f4313b7170a4090027e52164c5
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 16:42:10 2018 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 5 13:51:59 2018 +0100

tdf#121830 TogglePause should reset to original state on deactivate_st ?

is that how it should work, or should there be an additional TogglePause
created at import time to get the apparent intended pause effect

Change-Id: I0573bd8d9534271f2b36d7ab3b8cdc20e0f985a1
Reviewed-on: https://gerrit.libreoffice.org/64548
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 0c9519589ed0..3bd05db936b2 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -109,6 +109,25 @@ void AnimationCommandNode::activate_st()
"AnimationCommandNode::deactivate" ) );
 }
 
+void AnimationCommandNode::deactivate_st( NodeState /*eDestState*/ )
+{
+switch( mxCommandNode->getCommand() ) {
+// the command toggles the pause status on a media object
+case EffectCommands::TOGGLEPAUSE:
+{
+if( mpShape )
+{
+if( mpShape->isPlaying() )
+mpShape->pause();
+else
+mpShape->play();
+}
+break;
+}
+
+}
+}
+
 bool AnimationCommandNode::hasPendingAnimation() const
 {
 return mxCommandNode->getCommand() == EffectCommands::STOPAUDIO || mpShape;
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 675da7c3b0e8..cf753e001949 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -46,6 +46,7 @@ protected:
 
 private:
 virtual void activate_st() override;
+virtual void deactivate_st( NodeState eDestState ) override;
 virtual bool hasPendingAnimation() const override;
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/vcl.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c262f5e82261961365a7c2c866cd34f812e6a42
Author: Andras Timar 
AuthorDate: Wed Dec 5 13:33:48 2018 +0100
Commit: Andras Timar 
CommitDate: Wed Dec 5 13:33:58 2018 +0100

loleaflet: hide Vereign iframe

The insertion was:
g.setAttribute('style','display:none;');
after:
g=document.createElement("iframe");

Change-Id: I3e993e1c26657f3555f8bbf79772600e5551b2cd

diff --git a/loleaflet/src/vcl.js b/loleaflet/src/vcl.js
index c0febeba5..2a136efcb 100644
--- a/loleaflet/src/vcl.js
+++ b/loleaflet/src/vcl.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-alert, no-console */
 /* jshint ignore:start*/
-!function(e,n){var r={};!function(e){"use 
strict";Object.defineProperty(e,"__esModule",{value:!0});var 
n=e.ERR_CONNECTION_DESTROYED="ConnectionDestroyed",r=e.ERR_CONNECTION_TIMEOUT="ConnectionTimeout",t=e.ERR_NOT_IN_IFRAME="NotInIframe",o={"http:":"80","https:":"443"},a=/^(https?:)?\/\/([^\/:]+)(:(\d+))?/,i={ERR_CONNECTION_DESTROYED:n,ERR_CONNECTION_TIMEOUT:r,ERR_NOT_IN_IFRAME:t,Promise:function(){try{return
 window?window.Promise:null}catch(e){return null}}(),debug:!1},d=function(){var 
e=0;return function(){return++e}}(),c=function(){for(var 
e=arguments.length,n=Array(e),r=0;r0&&void 
0!==arguments[0]?arguments[0]:{},o=e.parentOrigin,a=void 
0===o?"*":o,d=e.methods,u=void 
0===d?{}:d,l=e.timeout;if(window===window.top){var m=new 
Error("connectToParent() must be called within an iframe");throw m.code=t,m}var 
p=void 0,h=new s(function(e){p=e}),g=window,E=g.parent;return{promise:new 
i.Promise(function(e,t){var o=void 0;void 0!==l&&(o=setTimeout(function(){var 
e=new Error("Connection to parent timed out after 
"+l+"ms");e.code=r,t(e),p()},l));var i=function 
n(r){if(("*"===a||a===r.origin)&&r.source===E&&"handshake-reply"===r.data.penpal){c("Child:
 Received handshake reply"),g.removeEventListener("message",n);var 
t={localName:"Child",local:g,remote:E,remoteOrigin:r.origin},i={};v(t,u,h),f(i,t,r.data.methodNames,h),clearTimeout(o),e(i)}};g.addEventListener("message",i),h.then(function(){g.removeEventListener("message",i);var
 e=new Error("Connection destroyed");e.code=n,t(e)}),c(
 "Child: Sending 
handshake"),E.postMessage({penpal:"handshake",methodNames:Object.keys(u)},a)}),destroy:p}},e.default=i}(r),"function"==typeof
 define&&define.amd?define("Penpal",r.default):e.Penpal=r.default}(this);
+!function(e,n){var r={};!function(e){"use 
strict";Object.defineProperty(e,"__esModule",{value:!0});var 
n=e.ERR_CONNECTION_DESTROYED="ConnectionDestroyed",r=e.ERR_CONNECTION_TIMEOUT="ConnectionTimeout",t=e.ERR_NOT_IN_IFRAME="NotInIframe",o={"http:":"80","https:":"443"},a=/^(https?:)?\/\/([^\/:]+)(:(\d+))?/,i={ERR_CONNECTION_DESTROYED:n,ERR_CONNECTION_TIMEOUT:r,ERR_NOT_IN_IFRAME:t,Promise:function(){try{return
 window?window.Promise:null}catch(e){return null}}(),debug:!1},d=function(){var 
e=0;return function(){return++e}}(),c=function(){for(var 
e=arguments.length,n=Array(e),r=0;r0&&void 
0!==arguments[0]?arguments[0]:{},o=e.parentOrigin,a=void 
0===o?"*":o,d=e.methods,u=void 
0===d?{}:d,l=e.timeout;if(window===window.top){var m=new 
Error("connectToParent() must be called within an iframe");throw m.code=t,m}var 
p=void 0,h=new s(function(e){p=e}),g=window,E=g.parent;return{promise:new 
i.Promise(function(e,t){var o=void 0;void 0!==l&&(o=setTimeout(function(){var 
e=new Error("Connection to parent timed out after 
"+l+"ms");e.code=r,t(e),p()},l));var i=function 
n(r){if(("*"===a||a===r.origin)&&r.source===E&&"handshake-reply"===r.data.penpal){c("Child:
 Received handshake reply"),g.removeEventListener("message",n);var 
t={localName:"Child",local:g,remote:E,remoteOrigin:r.origin},i={};v(t,u,h),f(i,t,r.data.methodNames,h),clearTimeout(o),e(i)}};g.addEventListener("message",i),h.then(function(){g.removeEventListener("message",i);var
 e=new Error("C
 onnection destroyed");e.code=n,t(e)}),c("Child: Sending 
handshake"),E.postMessage({penpal:"handshake",methodNames:Object.keys(u)},a)}),destroy:p}},e.default=i}(r),"function"==typeof
 define&&define.amd?define("Penpal",r.default):e.Penpal=r.default}(this);
 
 function setupViamAPI(divId, methodsArg, envUrl) {
const connection = Penpal.connectToChild({
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/quartz

[Libreoffice Gerrit user]

 vcl/quartz/salvd.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9d7897521efd0c37693241e84c562ea32750740e
Author: Stephan Bergmann 
AuthorDate: Mon Oct 8 11:21:45 2018 +0200
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 13:31:23 2018 +0100

tdf#121778: Work around odd macOS 10.14 graphicsContextWithWindow failure

Although Stephan's original commit message below talks mainly about a
unit test, this change helps at least in tdf#121778, too, and possibly
other cases.

It is interesting that wihout this change, a lot of these warnings are
printed before the crash:
warn:vcl.quartz:42670:52899343:vcl/quartz/salvd.cxx:312: No context

Original commit message:

When running on macOS 10.14, both master and libreoffice-6-1 (at least) 
started
to fail CppunitTest_vcl_bitmap_render_test with

> 
/Users/stephan/Software/lo2/core/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:90:
 Assertion
> Test name: BitmapRenderTest::testTdf113918
> equality assertion failed
> - Expected: mcBlueOrIndex: 255, mcGreen: 255, mcRed: 255, mcAlpha: 0
> - Actual  : mcBlueOrIndex: 1, mcGreen: 112, mcRed: 15, mcAlpha: 0

in --enable-debug/--enable-dbgutil builds.

I tracked that down to the OSL_DEBUG_LEVEL>0--only call to
Scheduler::ProcessEventsToIdle in test::BootstrapFixture::setUp
(test/source/bootstrapfixture.cxx).  If that call is also included in 
non-debug
(i.e., OSL_DEBUG_LEVEL=0) builds, or if it is removed from all builds and
instead an unsuspecting

  [NSApp nextEventMatchingMask: 0 untilDate: nil inMode: 
NSDefaultRunLoopMode dequeue: NO];

is added directly before the call to

  pVDev->SetOutputSizePixel(Size(2480, 3508));

at the start of BitmapRenderTest::testTdf113918
(vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:76), the test always 
fails.

What happens is that, after such a nextEventMatchingMask call done, the 
call to
NSGraphicsContext graphicsContextWithWindow in 
AquaSalVirtualDevice::SetSize (as
called from the SetOutputSizePixel call in the test) returns nil, for 
unclear
reasons.

Until those underlying reasons are understood, change the code of SetSize to
"fall back to a bitmap context" also in case the graphicsContextWithWindow 
call
returned nil.

Reviewed-on: https://gerrit.libreoffice.org/61519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e659c6a1857fbb8e5a6e8ff60fe241483eea32dd)

Change-Id: I604ebd2c444b58610e4ed73ec70af87b0a08e864
Reviewed-on: https://gerrit.libreoffice.org/64576
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 03f37fe67366..355a78de96d2 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -272,7 +272,14 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 xCGContext = static_cast([pNSContext 
graphicsPort]);
 }
 }
-else
+// At least on macOS 10.14 during CppunitTests (that have hidden 
windows), it happens
+// that the above
+//
+//   [NSGraphicsContext graphicsContextWithWindow: pNSWindow]
+//
+// returns nil for unclear reasons; so use the below fallback even 
if there is a
+// pNSWindow but obtaining a graphics context for it fails:
+if (xCGContext == nullptr)
 {
 // fall back to a bitmap context
 mnBitmapDepth = 32;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Windows build failure - C2131: expression did not evaluate to a constant

[Stephan Bergmann]

On 04/12/2018 14:18, Kaganski Mike wrote:

Reported that to
https://developercommunity.visualstudio.com/content/problem/398218/c2131-error-with-stdarray-and-stdmake-integer-sequ.html.

As noted there, I have discovered the code to succeed if I replace 256
to any number up to 234.


So lets revert that again until there is a newer Visual Studio 2017 that 
fixes that regression.   
"Revert 'Compute (un-)premultiply_table at compile time'".

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

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

[Libreoffice Gerrit user]

 lotuswordpro/inc/xfilter/xfglobal.hxx   |3 ---
 lotuswordpro/source/filter/xfilter/xfglobal.cxx |8 
 2 files changed, 11 deletions(-)

New commits:
commit 38e358585591dbfcfc532ee2b4fc1de0f5962ee7
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:00:02 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 13:11:03 2018 +0100

loplugin:singlevalfields in lotuswordpro

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

diff --git a/lotuswordpro/inc/xfilter/xfglobal.hxx 
b/lotuswordpro/inc/xfilter/xfglobal.hxx
index 088e24611124..30bea2c5be94 100644
--- a/lotuswordpro/inc/xfilter/xfglobal.hxx
+++ b/lotuswordpro/inc/xfilter/xfglobal.hxx
@@ -135,12 +135,9 @@ public:
 public:
 static int  s_nSectionID;
 static int  s_nFrameID;
-static int  s_nGraphID;
-static int  s_nTableID;
 static int  s_nNoteID;
 static int  s_nStrokeDashID;
 static int  s_nAreaID;
-static int s_nObjID;
 static int s_nImageID;
 };
 
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx 
b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
index 160dfba4907a..36649937dcab 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
@@ -63,16 +63,10 @@
 #include 
 
 int XFGlobal::s_nFrameID = 1;
-int XFGlobal::s_nGraphID = 1;
 int XFGlobal::s_nSectionID = 1;
-int XFGlobal::s_nTableID = 1;
 int XFGlobal::s_nNoteID = 1;
 int XFGlobal::s_nStrokeDashID = 1;
 int XFGlobal::s_nAreaID = 1;
-
-//For chart object, /2005/2
-int XFGlobal::s_nObjID = 1;
-
 int XFGlobal::s_nImageID = 1;
 
 OUString XFGlobal::GenSectionName()
@@ -123,11 +117,9 @@ voidXFGlobal::Reset()
 {
 s_nSectionID = 1;
 s_nFrameID = 1;
-s_nTableID = 1;
 s_nNoteID = 1;
 s_nStrokeDashID = 1;
 s_nAreaID = 1;
-s_nObjID = 1;
 }
 
 voidXFGlobalReset()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/viewopt.hxx  |1 -
 sw/source/core/inc/txtfrm.hxx   |2 +-
 sw/source/core/text/txtinit.cxx |1 -
 sw/source/uibase/config/viewopt.cxx |3 ---
 4 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit a2a922c273e90af27810cee4ec8cb724125b6aa5
Author: Noel Grandin 
AuthorDate: Wed Dec 5 10:59:41 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 13:10:48 2018 +0100

loplugin:singlevalfields in sw

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

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 2f9332789451..d2bec092e54b 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -185,7 +185,6 @@ protected:
 bool  m_bTest6:1; // Test-flag  "No screen adj"
 bool  m_bTest7:1; // Test-flag  "win format"
 bool  m_bTest8:1; // Test-flag  ""
-static bool  s_bTest9;// Test-Flag  "DrawingLayerNotLoading"
 bool  m_bTest10   :1; // Test-Flag  "Format by Input"
 #endif
 
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index ea7f3d2c82fc..49de0599e4a9 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
 /// will still be set; GetFormatted() is the function that forces
 /// recreation of the SwLineLayout by Format() if necessary.
 static SwCache *s_pTextCache;
-static long nMinPrtLine;// This Line must not be underrun when printing
+static constexpr long nMinPrtLine = 0;// This Line must not be 
underrun when printing
 // Hack for table cells stretching multiple 
pages
 
 sal_uLong  mnAllLines:24; // Line count for the Paint (including 
nThisLines)
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 83e4cf8de3d0..bd52450f444a 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -39,7 +39,6 @@
 #include 
 
 SwCache *SwTextFrame::s_pTextCache = nullptr;
-long SwTextFrame::nMinPrtLine = 0;
 SwContourCache *pContourCache = nullptr;
 SwDropCapCache *pDropCapCache = nullptr;
 
diff --git a/sw/source/uibase/config/viewopt.cxx 
b/sw/source/uibase/config/viewopt.cxx
index ad2f1d870645..024ad5f370b0 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -43,9 +43,6 @@
 #include 
 #include 
 
-#ifdef DBG_UTIL
-bool SwViewOption::s_bTest9 = false;//DrawingLayerNotLoading
-#endif
 Color SwViewOption::s_aDocBoundColor(COL_LIGHTGRAY);
 Color SwViewOption::s_aObjectBoundColor(COL_LIGHTGRAY);
 Color SwViewOption::s_aDocColor(COL_LIGHTGRAY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 editeng/inc/edtspell.hxx|2 +-
 editeng/source/editeng/edtspell.cxx |2 --
 editeng/source/items/textitem.cxx   |   10 --
 include/editeng/fontitem.hxx|2 --
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 4d725e38b5cb53d039dfb6db0940c91ce62ce746
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:05:19 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 13:10:29 2018 +0100

loplugin:singlevalfields in editeng

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

diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 82ed2f618e9d..53565fd71d9e 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -62,7 +62,7 @@ public:
  */
 class WrongList
 {
-static size_t Valid;
+static constexpr size_t Valid = std::numeric_limits::max();
 
 std::vector maRanges;
 size_t mnInvalidStart;
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index db235d41d7d5..63b402ffad53 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -154,8 +154,6 @@ void EditSpellWrapper::CheckSpellTo()
 }
 }
 
-size_t WrongList::Valid = std::numeric_limits::max();
-
 WrongList::WrongList() : mnInvalidStart(0), mnInvalidEnd(Valid) {}
 
 void WrongList::SetRanges( const std::vector& rRanges )
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 483e83f657f7..69246c19d3aa 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -99,8 +99,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
 
-bool SvxFontItem::bEnableStoreUnicodeNames = false;
-
 SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);}
 SfxPoolItem* SvxPostureItem::CreateDefault() { return new 
SvxPostureItem(ITALIC_NONE, 0);}
 SfxPoolItem* SvxWeightItem::CreateDefault() {return new 
SvxWeightItem(WEIGHT_NORMAL, 0);}
@@ -345,14 +343,6 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 
/*nItemVersion*/ ) co
 rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet());
 rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet());
 
-// catch for EditEngine, only set while creating clipboard stream.
-if ( bEnableStoreUnicodeNames )
-{
-rStrm.WriteUInt32( STORE_UNICODE_MAGIC_MARKER );
-rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE 
);
-rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
-}
-
 return rStrm;
 }
 
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 224ebf682002..3a226dfd3e3f 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -36,8 +36,6 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
 FontPitch ePitch;
 rtl_TextEncoding eTextEncoding;
 
-static bool bEnableStoreUnicodeNames;
-
 public:
 static SfxPoolItem* CreateDefault();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 544aafe70a0e27d689b2947b6a0fc39a84d9b9fd
Author: Andras Timar 
AuthorDate: Wed Dec 5 13:09:35 2018 +0100
Commit: Andras Timar 
CommitDate: Wed Dec 5 13:09:35 2018 +0100

loleaflet: Hide spreadsheet-row-column-frame for text, presentation and 
draw documents

Change-Id: I5f47faf639dce2d972f219c31d52bfc686c112a9

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index c221a3ba4..47f13c6b8 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1471,6 +1471,7 @@ function onDocLayerInit() {
// Remove irrelevant toolbars
$('#formulabar').hide();
$('#spreadsheet-toolbar').hide();
+   $('#spreadsheet-row-column-frame').hide();
$('#presentation-toolbar').hide();
 
break;
@@ -1499,6 +1500,7 @@ function onDocLayerInit() {
// Remove irrelevant toolbars
$('#formulabar').hide();
$('#spreadsheet-toolbar').hide();
+   $('#spreadsheet-row-column-frame').hide();
 
break;
case 'drawing':
@@ -1507,6 +1509,7 @@ function onDocLayerInit() {
// Remove irrelevant toolbars
$('#formulabar').hide();
$('#spreadsheet-toolbar').hide();
+   $('#spreadsheet-row-column-frame').hide();
 
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmlsecurity/source/xmlsec/xmlstreamio.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9518a9af852f069a268badbc691abb4c09a37be8
Author: Miklos Vajna 
AuthorDate: Tue Dec 4 17:48:47 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 13:09:44 2018 +0100

tdf#118373 xmlsecurity: avoid stderr output on libxmlsec version check

Make sure that our normal SAL_WARN() reporting is registered during the
xmlSecCheckVersionExt() invocation, just like it's registered during
other libxmlsec API calls.

(cherry picked from commit 099ab643f60efc5be6f151bff89651efd2da1fc9)

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

diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx 
b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index be48ae34b232..5b1b0212073c 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -22,8 +22,10 @@
  * Implementation of the I/O interfaces based on stream and URI binding
  */
 #include 
+#include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -151,6 +153,10 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
 //Notes: all none default callbacks will lose.
 xmlSecIOCleanupCallbacks() ;
 
+// Make sure that errors are reported via SAL_WARN().
+setErrorRecorder();
+comphelper::ScopeGuard g([] { clearErrorRecorder(); });
+
 // Newer xmlsec wants the callback order in the opposite direction.
 if (xmlSecCheckVersionExt(1, 2, 26, xmlSecCheckVersionABICompatible))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/win/gdi/salgdi.cxx |   38 --
 1 file changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 6fa4c3e4778959d4591c053461329d396741ee64
Author: Dmitriy Shilin 
AuthorDate: Fri Nov 30 08:41:00 2018 +0300
Commit: Mike Kaganski 
CommitDate: Wed Dec 5 12:16:45 2018 +0100

tdf#39593 vcl: extract SysColor list deletion

Change-Id: I7d1b319a1cf551e1fd6b67f13f738ab42df1b77d
Reviewed-on: https://gerrit.libreoffice.org/64591
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index c1ec8bd88e2d..da06dc999e4c 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -54,6 +54,24 @@ struct SysColorEntry
 static SysColorEntry* pFirstSysColor = nullptr;
 static SysColorEntry* pActSysColor = nullptr;
 
+namespace
+{
+
+void DeleteSysColorList()
+{
+SysColorEntry* pEntry = pFirstSysColor;
+pActSysColor = pFirstSysColor = nullptr;
+
+while( pEntry )
+{
+SysColorEntry* pTmp = pEntry->pNext;
+delete pEntry;
+pEntry = pTmp;
+}
+}
+
+} // namespace
+
 // Blue7
 static PALETTEENTRY aImplExtraColor1 =
 {
@@ -315,15 +333,7 @@ void ImplFreeSalGDI()
 delete[] pSalData->mpDitherHigh;
 }
 
-// delete SysColorList
-SysColorEntry* pEntry = pFirstSysColor;
-while( pEntry )
-{
-SysColorEntry* pTmp = pEntry->pNext;
-delete pEntry;
-pEntry = pTmp;
-}
-pFirstSysColor = nullptr;
+DeleteSysColorList();
 
 // delete icon cache
 SalIcon* pIcon = pSalData->mpFirstIcon;
@@ -409,15 +419,7 @@ static void ImplInsertSysColorEntry( int nSysIndex )
 
 void ImplUpdateSysColorEntries()
 {
-// delete old SysColorList
-SysColorEntry* pEntry = pFirstSysColor;
-while( pEntry )
-{
-SysColorEntry* pTmp = pEntry->pNext;
-delete pEntry;
-pEntry = pTmp;
-}
-pActSysColor = pFirstSysColor = nullptr;
+DeleteSysColorList();
 
 // create new sys color list
 ImplInsertSysColorEntry( COLOR_ACTIVEBORDER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 0b15bd381cb6b3b8d69eae4a044c8384d83046cb
Author: Miklos Vajna 
AuthorDate: Wed Dec 5 11:40:50 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 12:05:45 2018 +0100

loleaflet: completely hide document signing bar by default

This used to be mostly hidden by the document container, but a 1px
horizontal red line was still visible.

Also return early in adjustUIState() to silence errors when the feature
is not enabled in loolwsd.xml.

Change-Id: I140bc5a79bdb85790021f57dd0ab810587bb2529

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 61806eaa1..5c3c9961b 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -110,6 +110,9 @@ function updateCurrentPassport() {
 }
 
 function adjustUIState() {
+   if (w2ui['document-signing-bar'] === undefined)
+   return;
+
if (library && identity) {
w2ui['document-signing-bar'].hide('login');
w2ui['document-signing-bar'].show('logout');
@@ -264,18 +267,21 @@ function vereignRestoreIdentity() {
 
 L.Map.include({
showSignDocument: function() {
+   $('#document-signing-bar').show();
this.initializeLibrary();
oldtoolbarSize = $('#document-container').css('top');
 
$('#document-container').css('top', '110px');
},
hideSignDocument: function() {
+   $('#document-signing-bar').hide();
library = null;
identity = null;
currentPassport = null;
$('#document-container').css('top', oldtoolbarSize);
},
signingInitializeBar: function() {
+   $('#document-signing-bar').hide();
adjustUIState();
},
signDocument: function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/reference.md wsd/Storage.cpp wsd/Storage.hpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |   12 +---
 wsd/DocumentBroker.hpp |4 +++-
 wsd/Storage.cpp|1 +
 wsd/Storage.hpp|7 +--
 wsd/reference.md   |4 
 5 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 2e9af9da16a7ed42bde4b6294f7970c00be9c566
Author: Samuel Mehrbrodt 
AuthorDate: Tue Dec 4 08:49:49 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Dec 5 11:50:59 2018 +0100

Add custom http header when saving before document is cleaned up from memory

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index c2dda9221..3b4de7ee6 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -962,7 +962,9 @@ bool DocumentBroker::autoSave(const bool force)
 {
 LOG_TRC("Sending forced save command for [" << _docKey << "].");
 // Don't terminate editing as this can be invoked by the admin OOM, 
but otherwise force saving anyway.
-sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/ true, 
/*dontSaveIfUnmodified=*/ true, /*isAutosave=*/ false);
+sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/true,
+   /*dontSaveIfUnmodified=*/true, /*isAutosave=*/false,
+   /*isExitSave=*/true);
 }
 else if (_isModified)
 {
@@ -979,14 +981,17 @@ bool DocumentBroker::autoSave(const bool force)
 timeSinceLastSaveMs >= autoSaveDurationMs)
 {
 LOG_TRC("Sending timed save command for [" << _docKey << "].");
-sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/ true, 
/*dontSaveIfUnmodified=*/ true, /*isAutosave=*/ true);
+sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/true,
+   /*dontSaveIfUnmodified=*/true, 
/*isAutosave=*/true,
+   /*isExitSave=*/false);
 }
 }
 
 return sent;
 }
 
-bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool 
dontTerminateEdit, bool dontSaveIfUnmodified, bool isAutosave)
+bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool 
dontTerminateEdit,
+ bool dontSaveIfUnmodified, bool isAutosave, 
bool isExitSave)
 {
 assertCorrectThread();
 
@@ -1029,6 +1034,7 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
 
 assert(_storage);
 _storage->setIsAutosave(isAutosave || UnitWSD::get().isAutosave());
+_storage->setIsExitSave(isExitSave);
 
 const std::string saveArgs = oss.str();
 LOG_TRC(".uno:Save arguments: " << saveArgs);
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 09ee0e9d6..3d47c722d 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -348,7 +348,9 @@ public:
 }
 
 /// Sends the .uno:Save command to LoKit.
-bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = 
true, bool dontSaveIfUnmodified = true, bool isAutosave = false);
+bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = 
true,
+ bool dontSaveIfUnmodified = true, bool isAutosave = false,
+ bool isExitSave = false);
 
 /// Sends a message to all sessions
 void broadcastMessage(const std::string& message);
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index b40bebfb3..11c658b65 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -717,6 +717,7 @@ StorageBase::SaveResult 
WopiStorage::saveLocalFileToStorage(const Authorization&
 request.set("X-WOPI-Override", "PUT");
 request.set("X-LOOL-WOPI-IsModifiedByUser", isUserModified()? 
"true": "false");
 request.set("X-LOOL-WOPI-IsAutosave", getIsAutosave()? "true": 
"false");
+request.set("X-LOOL-WOPI-IsExitSave", isExitSave()? "true": 
"false");
 
 if (!getForceSave())
 {
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 893fa9e35..6d56c64b0 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -174,10 +174,11 @@ public:
 
 bool isUserModified() const { return _isUserModified; }
 
-/// To be able to set the WOPI 'is autosave?' header appropriately.
+/// To be able to set the WOPI 'is autosave/is exitsave?' headers 
appropriately.
 void setIsAutosave(bool isAutosave) { _isAutosave = isAutosave; }
-
 bool getIsAutosave() const { return _isAutosave; }
+void setIsExitSave(bool isExitSave) { _isExitSave = isExitSave; }
+bool isExitSave() const { return _isExitSave; }
 
 void setFileInfo(const FileInfo& fileInfo) { _fileInfo = fileInfo; }
 
@@ -225,6 +226,8 @@ private:
 
 /// This save operation is an autosave.
 bool _isAutosave;
+/// Saving on exit (when the document is cleaned up from memory)
+bo

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

[Libreoffice Gerrit user]

 icon-themes/elementary/cmd/32/displaymasterbackground.png   |binary
 icon-themes/elementary/cmd/32/displaymasterobjects.png  |binary
 icon-themes/elementary/cmd/32/editcurindex.png  |binary
 icon-themes/elementary/cmd/32/hfixedline.png|binary
 icon-themes/elementary/cmd/lc_displaymasterbackground.png   |binary
 icon-themes/elementary/cmd/lc_displaymasterobjects.png  |binary
 icon-themes/elementary/cmd/lc_editcurindex.png  |binary
 icon-themes/elementary/cmd/lc_hfixedline.png|binary
 icon-themes/elementary/cmd/sc_displaymasterbackground.png   |binary
 icon-themes/elementary/cmd/sc_displaymasterobjects.png  |binary
 icon-themes/elementary/cmd/sc_editcurindex.png  |binary
 icon-themes/elementary/cmd/sc_hfixedline.png|binary
 icon-themes/elementary/links.txt|5 
-
 icon-themes/elementary_svg/cmd/32/displaymasterbackground.svg   |1 +
 icon-themes/elementary_svg/cmd/32/displaymasterobjectspng.svg   |1 +
 icon-themes/elementary_svg/cmd/32/editcurindex.svg  |1 +
 icon-themes/elementary_svg/cmd/32/hfixedline.svg|1 +
 icon-themes/elementary_svg/cmd/lc_displaymasterbackground.svg   |1 +
 icon-themes/elementary_svg/cmd/lc_displaymasterobjects.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_editcurindex.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_hfixedline.svg|1 +
 icon-themes/elementary_svg/cmd/sc_displaymasterbackground.svg   |2 +-
 icon-themes/elementary_svg/cmd/sc_displaymasterobjects.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_editcurindex.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_hfixedline.svg|2 ++
 icon-themes/elementary_svg/cmd/sc_vfixedline.svg|3 ++-
 icon-themes/karasa_jaga/cmd/32/dbformedit.png   |binary
 icon-themes/karasa_jaga/cmd/32/displaymasterbackground.png  |binary
 icon-themes/karasa_jaga/cmd/32/displaymasterobjectspng.png  |binary
 icon-themes/karasa_jaga/cmd/32/editcurindex.png |binary
 icon-themes/karasa_jaga/cmd/32/equalizeheight.png   |binary
 icon-themes/karasa_jaga/cmd/32/equalizewidth.png|binary
 icon-themes/karasa_jaga/cmd/32/formatpaintbrush.png |binary
 icon-themes/karasa_jaga/cmd/32/insertcaptiondialog.png  |binary
 icon-themes/karasa_jaga/cmd/32/outlinecollapse.png  |binary
 icon-themes/karasa_jaga/cmd/32/outlinecollapseall.png   |binary
 icon-themes/karasa_jaga/cmd/32/outlineexpand.png|binary
 icon-themes/karasa_jaga/cmd/32/outlineexpandall.png |binary
 icon-themes/karasa_jaga/cmd/lc_dbreportedit.png |binary
 icon-themes/karasa_jaga/cmd/lc_displaymasterbackground.png  |binary
 icon-themes/karasa_jaga/cmd/lc_displaymasterobjects.png |binary
 icon-themes/karasa_jaga/cmd/lc_editcurindex.png |binary
 icon-themes/karasa_jaga/cmd/lc_equalizeheight.png   |binary
 icon-themes/karasa_jaga/cmd/lc_equalizewidth.png|binary
 icon-themes/karasa_jaga/cmd/lc_fliphorizontal.png   |binary
 icon-themes/karasa_jaga/cmd/lc_flipvertical.png |binary
 icon-themes/karasa_jaga/cmd/lc_formatpaintbrush.png |binary
 icon-themes/karasa_jaga/cmd/lc_insertcaptiondialog.png  |binary
 icon-themes/karasa_jaga/cmd/sc_displaymasterbackground.png  |binary
 icon-themes/karasa_jaga/cmd/sc_displaymasterobjects.png |binary
 icon-themes/karasa_jaga/cmd/sc_editcurindex.png |binary
 icon-themes/karasa_jaga/cmd/sc_equalizeheight.png   |binary
 icon-themes/karasa_jaga/cmd/sc_equalizewidth.png|binary
 icon-themes/karasa_jaga/cmd/sc_formatpaintbrush.png |binary
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 +++
 55 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 40c620a6d0761fbeb80c6cf7020a229ccc130797
Author: Rizal Muttaqin 
AuthorDate: Sat Dec 1 14:50:16 2018 +0700
Commit: Rizal Muttaqin 
CommitDate: Wed Dec 5 11:14:18 2018 +0100

KJ & elementary: Update master objects & master bg, etc

Change-Id: I3f63ecc13e830ae9a0062b34256f3c3f73ef7e5e
Reviewed-on: https://gerrit.libreoffice.org/64377
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/displaymasterbackground.png 
b/icon-themes/elementary/cmd/32/displaymasterbackground.png
new file mode 100644
index ..232d8b40b4fd
Binary files /dev/null and 
b/icon-themes/elementary/cmd/32/disp

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_financial.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3156228b1d737ca47ff4e959a6e357581af3ec2e
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 13:25:18 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 11:03:14 2018 +0100

OpenCL FVSCHEDULE() error checking

Change-Id: If93a9ea6e0265ba616b4a1fbe138d310ea3e8693
Reviewed-on: https://gerrit.libreoffice.org/64546
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 6f728cbbbdd2..66d1f9d18e28 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -750,8 +750,11 @@ void 
OpMDuration::GenSlidingWindowFunction(std::stringstream& ss,
 void Fvschedule::GenSlidingWindowFunction(
 std::stringstream &ss, const std::string &sSymName, SubArguments 
&vSubArguments)
 {
+CHECK_PARAMETER_COUNT( 2, 2 );
 FormulaToken* pCur = vSubArguments[1]->GetFormulaToken();
 assert(pCur);
+if(vSubArguments[0]->GetFormulaToken()->GetType() != 
formula::svDoubleVectorRef)
+throw Unhandled( __FILE__, __LINE__ );
 const formula::DoubleVectorRefToken* pCurDVR =
 static_cast(pCur);
 size_t nCurWindowSize = pCurDVR->GetRefRowSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_math.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 581c7e4a0ec50aaa13112985c7e79cd66628f997
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:58:11 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 11:02:24 2018 +0100

OpenCL SQRT() error checking

Change-Id: I6208cf21f53d1a2a0eb4f08962c7bddcc372aab5
Reviewed-on: https://gerrit.libreoffice.org/64545
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 224c6480c3b5..4b34df551426 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1278,6 +1278,10 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "arg0=";
 ss << tmpCur->GetDouble() << ";\n";
 }
+else
+{
+throw Unhandled( __FILE__, __LINE__ );
+}
 }
 else
 {
@@ -1285,6 +1289,8 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << vSubArguments[0]->GenSlidingWindowDeclRef();
 ss << ";\n";
 }
+ss << "if( arg0 < 0 )\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "return sqrt(arg0);\n";
 ss << "}";
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_statistical.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 866eb1c49d385f497aa1585284393343910098ab
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:57:55 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 11:01:32 2018 +0100

OpenCL NORMDIST() error checking

Change-Id: I15636a64ad869bf874fc6e2ada87842050da1a9a
Reviewed-on: https://gerrit.libreoffice.org/64544
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index fd4508727d87..9e1637f0bfc3 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -4051,6 +4051,8 @@ void OpNormdist::GenSlidingWindowFunction(
 ss << "mue = tmp1;\n";
 ss << "sigma = tmp2;\n";
 ss << "c = tmp3;\n";
+ss << "if(sigma <= 0)\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "double mid,tmp;\n";
 ss << "mid = (x - mue)/sigma;\n";
 ss << "if(c)\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 canvas/source/vcl/spritecanvashelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 984518a9ad988b1c7f87775725459ee2079af212
Author: Andrea Gelmini 
AuthorDate: Wed Dec 5 10:49:17 2018 +0100
Commit: Julien Nabet 
CommitDate: Wed Dec 5 11:01:10 2018 +0100

Fix typo

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

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 626692d842d9..2365023f52a8 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -228,7 +228,7 @@ namespace vclcanvas
 pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion);
 }
 
-// TODO(P1): Might be worthwile to track areas of background
+// TODO(P1): Might be worthwhile to track areas of background
 // changes, too.
 if( !bUpdateAll && !io_bSurfaceDirty )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_math.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 79ed7bbacae43468b690a3d3a6b1acf31e641cee
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:44:40 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:59:59 2018 +0100

fix OpenCL ROUND() when the second parameter is negative

Change-Id: Ibbf374f72e83609a602504d9ffde922896338c2c
Reviewed-on: https://gerrit.libreoffice.org/64543
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index a9216f72b3e7..224c6480c3b5 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1610,6 +1610,7 @@ void OpLn::GenSlidingWindowFunction(
 void OpRound::GenSlidingWindowFunction(std::stringstream &ss,
  const std::string &sSymName, SubArguments &vSubArguments)
 {
+CHECK_PARAMETER_COUNT( 1, 2 );
 ss << "\ndouble " << sSymName;
 ss << "_"<< BinFuncName() <<"(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -1627,12 +1628,16 @@ void 
OpRound::GenSlidingWindowFunction(std::stringstream &ss,
 {
 ss << "for(int i=0;itmp1;i--)\n";
+ss << "tmp0 = tmp0 / 10;\n";
 }
 ss << "double tmp=round(tmp0);\n";
 if(vSubArguments.size() ==2)
 {
 ss << "for(int i=0;itmp1;i--)\n";
+ss << "tmp = tmp * 10;\n";
 }
 ss << "return tmp;\n";
 ss << "}";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 sc/source/core/opencl/op_addin.cxx   |   18 ++
 2 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 9881ac6874d0001795e5c8892e2d5ac80eeacdc8
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:36:46 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:59:30 2018 +0100

better/sane error checking in OpenCL BESSELJ()

Change-Id: I1f1945e7fd2721a320ab11196385e22a70d3da70
Reviewed-on: https://gerrit.libreoffice.org/64542
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index ccc6fbbe4f7e..8676a300ca16 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -43,6 +43,7 @@ static const char* const publicFunc =
  "#define IllegalArgument 502\n"
  "#define IllegalFPOperation 503 // #NUM!\n"
  "#define NoValue 519 // #VALUE!\n"
+ "#define NoConvergence 523\n"
  "#define DivisionByZero 532 // #DIV/0!\n"
  "#define NOTAVAILABLE 0x7fff // #N/A\n"
  "\n"
diff --git a/sc/source/core/opencl/op_addin.cxx 
b/sc/source/core/opencl/op_addin.cxx
index 5feabef7076b..4dcfc9f8a59e 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -19,6 +19,7 @@ namespace sc { namespace opencl {
 void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
 const std::string &sSymName, SubArguments &vSubArguments)
 {
+CHECK_PARAMETER_COUNT( 2, 2 );
 ss << "\ndouble " << sSymName;
 ss << "_" << BinFuncName() << "(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -31,11 +32,6 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "int gid0 = get_global_id(0);\n";
 ss << "double x = 0.0;\n";
 ss << "double N = 0.0;\n";
-if(vSubArguments.size() != 2)
-{
-ss << "return DBL_MAX;\n}\n";
-return ;
-}
 FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
 assert(tmpCur0);
 if(ocPush == vSubArguments[0]->GetFormulaToken()->GetOpCode())
@@ -58,8 +54,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "return DBL_MAX;\n}\n";
-return ;
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 else
@@ -90,8 +85,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "return DBL_MAX;\n}\n";
-return ;
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 else
@@ -104,7 +98,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "double f_PI_DIV_2 = f_PI / 2.0;\n";
 ss << "double f_PI_DIV_4 = f_PI / 4.0;\n";
 ss << "if( N < 0.0 )\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "if (x == 0.0)\n";
 ss << "return (N == 0.0) ? 1.0 : 0.0;\n";
 ss << "double fSign = ((int)N % 2 == 1 && x < 0.0) ? -1.0 : 1.0;\n";
@@ -118,7 +112,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "return fSign * sqrt(f_2_DIV_PI/fX)";
 ss << "* cos(fX-N*f_PI_DIV_2-f_PI_DIV_4);\n";
 ss << "else\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(NoConvergence);\n";
 ss << "}\n";
 ss << "double epsilon = 1.0e-15;\n";
 ss << "bool bHasfound = false;\n";
@@ -179,7 +173,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "if (bHasfound)\n";
 ss << "return u * fSign;\n";
 ss << "else\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(NoConvergence);\n";
 ss << "}";
 }
 void OpGestep::GenSlidingWindowFunction(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_statistical.cxx |   28 +++-
 1 file changed, 7 insertions(+), 21 deletions(-)

New commits:
commit 94efbf7b1eb854cae5087239a2cd1555b752edf9
Author: Luboš Luňák 
AuthorDate: Tue Nov 27 15:53:45 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:58:41 2018 +0100

make OpenCL SLOPE() handle problems more gracefully

It's silly to just return NaN just because the function can't handle
something. If nothing else, at least a proper error should be reported
(or in this case, the fallback to the core function will take care of it).

Change-Id: I9c971082f4c5c9836318cf63d15fa7c278274273
Reviewed-on: https://gerrit.libreoffice.org/64244
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit c0c03aadb3ec25ca5c4c07f270164158b6667cc2)
Reviewed-on: https://gerrit.libreoffice.org/64534

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index 5278ad2b31f7..d18b3ffceec1 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -2548,6 +2548,7 @@ void OpStDevP::GenSlidingWindowFunction(std::stringstream 
&ss,
 void OpSlope::GenSlidingWindowFunction(std::stringstream &ss,
 const std::string &sSymName, SubArguments &vSubArguments)
 {
+CHECK_PARAMETER_COUNT(2,2);
 ss << "\ndouble " << sSymName;
 ss << "_" << BinFuncName() << "(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -2567,12 +2568,6 @@ void OpSlope::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "double fCount = 0.0;\n";
 ss << "double argX = 0.0;\n";
 ss << "double argY = 0.0;\n";
-if(vSubArguments.size() != 2)
-{
-ss << "return NAN;\n";
-ss << "}\n";
-return ;
-}
 FormulaToken *pCur = vSubArguments[1]->GetFormulaToken();
 FormulaToken *pCur1 = vSubArguments[0]->GetFormulaToken();
 assert(pCur);
@@ -2591,11 +2586,7 @@ void OpSlope::GenSlidingWindowFunction(std::stringstream 
&ss,
pDVR1->GetArrayLength() ? pDVR->GetArrayLength():
 pDVR1->GetArrayLength();
 if(nCurWindowSize != nCurWindowSize1)
-{
-ss << "return NAN;\n";
-ss << "}\n";
-return ;
-}
+throw Unhandled(__FILE__, __LINE__);
 ss << "for (int i = ";
 if ((!pDVR->IsStartFixed() && pDVR->IsEndFixed())
 &&(!pDVR1->IsStartFixed() && pDVR1->IsEndFixed()))
@@ -2626,13 +2617,7 @@ void OpSlope::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "0; i < " << nCurWindowSize << "; i++)\n";
-ss << "{\n";
-ss << "break;\n";
-ss << "}";
-ss << "return NAN;\n";
-ss << "}\n";
-return ;
+throw Unhandled(__FILE__, __LINE__);
 }
 
 ss << "argX = ";
@@ -2701,8 +2686,7 @@ void OpSlope::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "return NAN;\n";
-ss << "}\n";
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 void OpSTEYX::GenSlidingWindowFunction(std::stringstream &ss,
commit 4cf986afb3d7fb9f59b900f766c0273d4455b8e0
Author: Luboš Luňák 
AuthorDate: Tue Nov 27 15:35:27 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:58:26 2018 +0100

check that OpenCL NORMDIST() takes a proper number of arguments

Change-Id: I885a1b70556311f5a0862fec24a3596dbeada5d6
Reviewed-on: https://gerrit.libreoffice.org/64243
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 93054cd09f521499ed48848cb4d3563e629593f7)
Reviewed-on: https://gerrit.libreoffice.org/64533

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index 374b383dcc4c..5278ad2b31f7 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -4016,6 +4016,7 @@ void OpNormdist::GenSlidingWindowFunction(
 std::stringstream &ss, const std::string &sSymName,
 SubArguments &vSubArguments)
 {
+CHECK_PARAMETER_COUNT(3,4);
 ss << "\ndouble " << sSymName;
 ss << "_"<< BinFuncName() <<"(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -4028,7 +4029,8 @@ void OpNormdist::GenSlidingWindowFunction(
 ss << "{\n";
 ss << "double x,mue,sigma,c;\n";
 ss << "int gid0=get_global_id(0);\n";
-ss << "double tmp0,tmp1,tmp2,tmp3;\n";
+ss << "double tmp0,tmp1,tmp2;\n";
+ss << "double tmp3 = 0;\n"; // optional argument
 ss <<"\n";
 for (size_t i = 0; i < vSubArguments.size(); i++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/li

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_statistical.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 64d54e91a054e31b0a8378036577ff890ad7eb28
Author: Luboš Luňák 
AuthorDate: Tue Nov 27 16:21:43 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:58:52 2018 +0100

fixes for OpenCL COVAR()

Change-Id: Ie171eea334de65b993554146c11adb95e0dbb85e
Reviewed-on: https://gerrit.libreoffice.org/64245
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 9a446225f4d395b584887eb42851e40cf2ab1fc7)
Reviewed-on: https://gerrit.libreoffice.org/64535

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index d18b3ffceec1..fd4508727d87 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -6843,6 +6843,7 @@ void OpPoisson::GenSlidingWindowFunction(
 void OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
 const std::string &sSymName, SubArguments& vSubArguments)
 {
+CHECK_PARAMETER_COUNT(2,2);
 ss << "\ndouble " << sSymName;
 ss << "_"<< BinFuncName() <<"(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -6944,7 +6945,7 @@ void OpCovar::GenSlidingWindowFunction(std::stringstream& 
ss,
 else {
 ss << "int i = 0; i < " << nCurWindowSizeX << " && ";
 ss << " i + gid0 < " << pCurDVRX->GetArrayLength();
-ss << " && i + gid0 < " << pCurDVRX->GetArrayLength();
+ss << " && i + gid0 < " << pCurDVRY->GetArrayLength();
 ss << "; i++) {\n";
 ss << "if ((isnan(";
 ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ")) || ";
@@ -7054,6 +7055,10 @@ void 
OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
 ss << "}\n";
 ss << "}";
 }
+else
+{
+throw Unhandled(__FILE__, __LINE__);
+}
 }
 else {
 ss << "int cnt0 = 0,cnt1 = 0;\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 sc/source/core/opencl/op_financial.cxx   |3 +++
 sc/source/core/opencl/op_math.cxx|4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1b0dc235543fc3f8185fc2f5f7bdf92c164a0826
Author: Luboš Luňák 
AuthorDate: Fri Nov 16 17:46:43 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:58:15 2018 +0100

opencl SERIESSUM does not handle plain double arguments

sc_subsequent_filters_test in ScFiltersTest::testFunctionsODS() also
checks "SERIESSUM(2;3;2;3)", which the opencl code does not handle.
At least bail out gracefully instead of returning 0.

Change-Id: I154dca8cc437a6225b4eb98012232d80683f0114
Reviewed-on: https://gerrit.libreoffice.org/64242
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 6a2241e7db0c1db232b33dce619a203aadf21ec0)
Reviewed-on: https://gerrit.libreoffice.org/64532

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 45306aee893e..341c3b04c333 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -3080,7 +3080,7 @@ void 
OpQuotient::GenSlidingWindowFunction(std::stringstream &ss,
 void OpSeriesSum::GenSlidingWindowFunction(std::stringstream &ss,
 const std::string &sSymName, SubArguments &vSubArguments)
 {
-if( vSubArguments.size() != 4){return;}
+CHECK_PARAMETER_COUNT(4,4);
 ss << "\ndouble " << sSymName;
 ss << "_"<< BinFuncName() <<"(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -3184,6 +3184,8 @@ void 
OpSeriesSum::GenSlidingWindowFunction(std::stringstream &ss,
 ss << "))\n";
 ss << "return 0;\n";
 }
+else
+throw Unhandled(__FILE__, __LINE__);
 }
 ss << "return res;\n";
 ss << "}";
commit 7a8d6a23ea5b895f00f759017ad4a1d1eb7c94c9
Author: Luboš Luňák 
AuthorDate: Fri Nov 16 17:22:42 2018 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 5 10:58:04 2018 +0100

fix opencl YIELDDISC

Otherwise the yielddisc unittest fails.

Change-Id: I2ebb0fbf9d4aea6678c91d0289418991aa92dbb5
Reviewed-on: https://gerrit.libreoffice.org/64241
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit de5dd98320533888973432797254bfc5c9b52680)
Reviewed-on: https://gerrit.libreoffice.org/64531

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 04c95a8de21f..25dd22da6a7a 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -40,6 +40,7 @@
 
 static const char* const publicFunc =
  "\n"
+ "#define IllegalArgument 502\n"
  "#define IllegalFPOperation 503 // #NUM!\n"
  "#define NoValue 519 // #VALUE!\n"
  "#define DivisionByZero 532 // #DIV/0!\n"
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 6b108eeed2d3..6f728cbbbdd2 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -3913,6 +3913,7 @@ void 
OpReceived::GenSlidingWindowFunction(std::stringstream &ss,
 void OpYielddisc::GenSlidingWindowFunction(
 std::stringstream &ss, const std::string &sSymName, SubArguments 
&vSubArguments)
 {
+CHECK_PARAMETER_COUNT(5,5);
 ss << "\ndouble " << sSymName;
 ss << "_"<< BinFuncName() <<"(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -4010,6 +4011,8 @@ void OpYielddisc::GenSlidingWindowFunction(
 ss << vSubArguments[4]->GenSlidingWindowDeclRef();
 ss<<";\n\t";
 
+ss<< "if(tmp002 <= 0 || tmp003 <= 0 || tmp000 >= tmp001 )\n";
+ss<< "return CreateDoubleError(IllegalArgument);\n";
 ss<< "tmp = (tmp003/tmp002)-1;\n\t";
 ss << "tmp /= GetYearFrac( GetNullDate(),tmp000,tmp001,tmp004);\n\t";
 ss << "return tmp;\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/filter/FilterConfigCache.cxx |   10 --
 vcl/source/filter/FilterConfigCache.hxx |   10 --
 2 files changed, 20 deletions(-)

New commits:
commit 7c692c56d509e7641d499c7d0ca800c13e1974af
Author: Noel Grandin 
AuthorDate: Wed Dec 5 09:58:23 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 10:50:49 2018 +0100

loplugin:singlevalfields in FilterConfigCache

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

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 30f6e4399511..864be3324c07 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -54,16 +54,6 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameLi
 "epp", "ira", "era", "itg", "iti", "eti", "exp", nullptr
 };
 
-bool FilterConfigCache::bInitialized = false;
-sal_Int32 FilterConfigCache::nIndType = -1;
-sal_Int32 FilterConfigCache::nIndUIName = -1;
-sal_Int32 FilterConfigCache::nIndDocumentService = -1;
-sal_Int32 FilterConfigCache::nIndFilterService = -1;
-sal_Int32 FilterConfigCache::nIndFlags = -1;
-sal_Int32 FilterConfigCache::nIndUserData = -1;
-sal_Int32 FilterConfigCache::nIndFileFormatVersion = -1;
-sal_Int32 FilterConfigCache::nIndTemplateName = -1;
-
 void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const 
OUString& rUserDataEntry )
 {
 bIsPixelFormat = bIsInternalFilter = false;
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 70237afeba3e..5dc81367e330 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -59,16 +59,6 @@ class FilterConfigCache
 std::vector< FilterConfigCacheEntry > aImport;
 std::vector< FilterConfigCacheEntry > aExport;
 
-static bool   bInitialized;
-static sal_Int32  nIndType;
-static sal_Int32  nIndUIName;
-static sal_Int32  nIndDocumentService;
-static sal_Int32  nIndFilterService;
-static sal_Int32  nIndFlags;
-static sal_Int32  nIndUserData;
-static sal_Int32  nIndFileFormatVersion;
-static sal_Int32  nIndTemplateName;
-
 static const char*  InternalFilterListForSvxLight[];
 
 void ImplInit();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: test/inc test/Library_test.mk test/source

[Libreoffice Gerrit user]

 test/Library_test.mk|2 +
 test/inc/helper/form.hxx|   42 +
 test/source/helper/form.cxx |   55 
 3 files changed, 99 insertions(+)

New commits:
commit 04ca6792748eb410e997e8c6a5d4a18c9e9c531a
Author: Jens Carl 
AuthorDate: Wed Dec 5 04:56:57 2018 +
Commit: Jens Carl 
CommitDate: Wed Dec 5 10:47:09 2018 +0100

Make helper to create XControlShape.

Change-Id: I74dc16cde0acdbc995a8808b8e8005c66c300823
Reviewed-on: https://gerrit.libreoffice.org/64584
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/test/Library_test.mk b/test/Library_test.mk
index 92097613eb4d..1e4a013e1e4b 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Library_Library,test))
 
 $(eval $(call gb_Library_set_include,test,\
+   -I$(SRCDIR)/test/inc \
 $$(INCLUDE) \
 ))
 
@@ -52,6 +53,7 @@ $(eval $(call gb_Library_add_exception_objects,test,\
 test/source/primitive2dxmldump \
 test/source/screenshot_test \
 test/source/unoapi_property_testers \
+   test/source/helper/form \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/test/inc/helper/form.hxx b/test/inc/helper/form.hxx
new file mode 100644
index ..173306b118c8
--- /dev/null
+++ b/test/inc/helper/form.hxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_INC_HELPER_FORM_HXX
+#define INCLUDED_TEST_INC_HELPER_FORM_HXX
+
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+namespace apitest
+{
+/** @brief Create a XControlShape
+ *
+ * @param r_xComponent  The document.
+ * @param nHeight   The height of the shape.
+ * @param nWidthThe width of the shape.
+ * @param nXThe x-position of the shape.
+ * @param nYThe y-position of the shape.
+ * @param r_aKind   The kind of the shape.
+ */
+css::uno::Reference OOO_DLLPUBLIC_TEST 
createControlShape(
+const css::uno::Reference& r_xComponent, const 
sal_Int32 nHeight,
+const sal_Int32 nWidth, const sal_Int32 nX, const sal_Int32 nY, const 
OUString& r_aKind);
+
+} // namespace apitest
+
+#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx
new file mode 100644
index ..47da3565f79d
--- /dev/null
+++ b/test/source/helper/form.cxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+using namespace css;
+
+namespace apitest
+{
+uno::Reference
+createControlShape(const uno::Reference& r_xComponent, const 
sal_Int32 nHeight,
+   const sal_Int32 nWidth, const sal_Int32 nX, const sal_Int32 
nY,
+   const OUString& r_aKind)
+{
+uno::Reference xMSF(r_xComponent, 
uno::UNO_QUERY_THROW);
+
+uno::Reference xControlShape(
+xMSF->createInstance("com.sun.star.drawing.ControlShape"), 
uno::UNO_QUERY_THROW);
+
+uno::Reference aComponent(
+xMSF->createInstance("com.sun.star.form.component." + r_aKind), 
uno::UNO_QUERY_THROW);
+uno::Reference xPropertySet(aComponent, 
uno::UNO_QUERY_THROW);
+uno::Any aValue;
+aValue <<= "com.sun.star.form.control." + r_aKind;
+xPropertySet->setPropertyValue("DefaultControl", aValue);
+uno::Reference xControlModel(aComponent, 
uno::UNO_QUERY_THROW);
+
+xControlShape->setSize(awt::Size(nHeight, nWidth));
+xControlShape->setPosition(awt::Point(nX, nY));
+
+xControlShape->setControl(xControlModel);
+
+return xControlShape;
+}
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/singlevalfields.could-be-bool.results |6 
 compilerplugins/clang/singlevalfields.cxx   |  104 ++--
 compilerplugins/clang/singlevalfields.results   |  151 +++-
 3 files changed, 180 insertions(+), 81 deletions(-)

New commits:
commit 84568fb1badc96dce12f1919e7c3c027fbfebd6d
Author: Noel Grandin 
AuthorDate: Wed Dec 5 09:10:28 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 10:45:40 2018 +0100

loplugin:singlevalfields add checking for static class fields

which required a completely different set of code

Also add checking for in-class initialiser on struct/class fields

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

diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results 
b/compilerplugins/clang/singlevalfields.could-be-bool.results
index ebe419b9d22b..be9a6f8bc130 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -28,10 +28,10 @@ include/vbahelper/vbapagesetupbase.hxx:50
 include/vcl/dialog.hxx:48
 Dialog mnMousePositioned
 long
-include/vcl/headbar.hxx:216
+include/vcl/headbar.hxx:213
 HeaderBar mnBorderOff1
 long
-include/vcl/headbar.hxx:217
+include/vcl/headbar.hxx:214
 HeaderBar mnBorderOff2
 long
 libreofficekit/source/gtk/tilebuffer.hxx:219
@@ -55,7 +55,7 @@ 
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1100
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1102
 ScPagePreviewCountData nFooters
 long
-sc/source/ui/vba/vbahyperlink.hxx:82
+sc/source/ui/vba/vbahyperlink.hxx:83
 ScVbaHyperlink mnType
 long
 sd/qa/unit/tiledrendering/tiledrendering.cxx:968
diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
index 3412756b87cb..86479ee546af 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -96,7 +96,7 @@ public:
 else
 {
 for (const MyFieldAssignmentInfo & s : assignedSet)
-if 
(compiler.getSourceManager().isInMainFile(compat::getBeginLoc(s.fieldDecl)))
+if (s.fieldDecl && 
compiler.getSourceManager().isInMainFile(compat::getBeginLoc(s.fieldDecl)))
 report(
 DiagnosticsEngine::Warning,
 "assign %0",
@@ -110,24 +110,32 @@ public:
 bool shouldVisitImplicitCode() const { return true; }
 
 bool VisitFieldDecl( const FieldDecl* );
+bool VisitVarDecl( const VarDecl* );
 bool VisitMemberExpr( const MemberExpr* );
+bool VisitDeclRefExpr( const DeclRefExpr* );
 bool VisitCXXConstructorDecl( const CXXConstructorDecl* );
 //bool VisitUnaryExprOrTypeTraitExpr( const UnaryExprOrTypeTraitExpr* );
 private:
-void niceName(const FieldDecl*, MyFieldInfo&);
+void niceName(const DeclaratorDecl*, MyFieldInfo&);
+void walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl, const 
Stmt* stmt );
 std::string getExprValue(const Expr*);
 const FunctionDecl* get_top_FunctionDecl_from_Stmt(const Stmt&);
 void checkCallExpr(const Stmt* child, const CallExpr* callExpr, 
std::string& assignValue, bool& bPotentiallyAssignedTo);
 };
 
-void SingleValFields::niceName(const FieldDecl* fieldDecl, MyFieldInfo& aInfo)
+void SingleValFields::niceName(const DeclaratorDecl* fieldOrVarDecl, 
MyFieldInfo& aInfo)
 {
+const VarDecl* varDecl = dyn_cast(fieldOrVarDecl);
+const FieldDecl* fieldDecl = dyn_cast(fieldOrVarDecl);
 aInfo.fieldDecl = fieldDecl;
-aInfo.parentClass = fieldDecl->getParent()->getQualifiedNameAsString();
-aInfo.fieldName = fieldDecl->getNameAsString();
-aInfo.fieldType = fieldDecl->getType().getAsString();
-
-SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( 
fieldDecl->getLocation() );
+if (fieldDecl)
+aInfo.parentClass = fieldDecl->getParent()->getQualifiedNameAsString();
+else
+aInfo.parentClass = 
dyn_cast(varDecl->getDeclContext())->getQualifiedNameAsString();
+aInfo.fieldName = fieldOrVarDecl->getNameAsString();
+aInfo.fieldType = fieldOrVarDecl->getType().getAsString();
+
+SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( 
fieldOrVarDecl->getLocation() );
 StringRef name = compiler.getSourceManager().getFilename(expansionLoc);
 aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + 
std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
 loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
@@ -135,16 +143,52 @@ void SingleValFields::niceName(const FieldDecl* 
fieldDecl, MyFieldInfo& aInfo)
 
 bool SingleValFields::VisitFieldDecl( const FieldDecl* fieldDecl )
 {
-  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - i18npool/source

[Libreoffice Gerrit user]

 i18npool/source/localedata/data/af_NA.xml  |2 +-
 i18npool/source/localedata/data/bg_BG.xml  |2 +-
 i18npool/source/localedata/data/bs_BA.xml  |2 +-
 i18npool/source/localedata/data/ee_GH.xml  |4 ++--
 i18npool/source/localedata/data/eu_ES.xml  |4 ++--
 i18npool/source/localedata/data/ha_Latn_GH.xml |4 ++--
 i18npool/source/localedata/data/ia.xml |4 ++--
 i18npool/source/localedata/data/km_KH.xml  |4 ++--
 i18npool/source/localedata/data/ln_CD.xml  |4 ++--
 i18npool/source/localedata/data/lo_LA.xml  |2 +-
 i18npool/source/localedata/data/no_NO.xml  |4 ++--
 i18npool/source/localedata/data/ny_MW.xml  |4 ++--
 i18npool/source/localedata/data/vi_VN.xml  |8 
 i18npool/source/localedata/data/wa_BE.xml  |4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit bc89fd9ef06b528e096098bf7d605c71b1d9ffc5
Author: Eike Rathke 
AuthorDate: Tue Dec 4 17:13:25 2018 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 5 10:32:28 2018 +0100

 already includes LongDateDayOfWeekSeparator, do not duplicate

Seems these were always wrong in some locales.

Change-Id: I5dfc89a607d57c19034d6fac07a07bf3c5395ed8
Reviewed-on: https://gerrit.libreoffice.org/64541
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit a40c56aae9fa3ccac4abb83f7d7ddb80f5d8b6a8)
Reviewed-on: https://gerrit.libreoffice.org/64578

diff --git a/i18npool/source/localedata/data/bg_BG.xml 
b/i18npool/source/localedata/data/bg_BG.xml
index 926876f85ed9..fa6b8afc8261 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -112,7 +112,7 @@
   D.M.YY
 
 
-   D  " г."
+  D  " г."
 
 
   D.MM.YY
diff --git a/i18npool/source/localedata/data/bs_BA.xml 
b/i18npool/source/localedata/data/bs_BA.xml
index 8ebc0c6404bc..8084ebf55353 100644
--- a/i18npool/source/localedata/data/bs_BA.xml
+++ b/i18npool/source/localedata/data/bs_BA.xml
@@ -57,7 +57,7 @@
   D.M.
 
 
-   DD.  
+  DD.  
 
 
   D.M.
diff --git a/i18npool/source/localedata/data/ee_GH.xml 
b/i18npool/source/localedata/data/ee_GH.xml
index c6dc3abb5a93..3c0d8df74402 100644
--- a/i18npool/source/localedata/data/ee_GH.xml
+++ b/i18npool/source/localedata/data/ee_GH.xml
@@ -108,7 +108,7 @@
   M/D/YY
 
 
-  ,  DD, 
+   DD, 
 
 
   MM/DD/YY
@@ -141,7 +141,7 @@
   NN,  D, 
 
 
-  ,  D, 
+   D, 
 
 
   MM/DD
diff --git a/i18npool/source/localedata/data/eu_ES.xml 
b/i18npool/source/localedata/data/eu_ES.xml
index cc7c6d515d21..d445a352be64 100644
--- a/i18npool/source/localedata/data/eu_ES.xml
+++ b/i18npool/source/localedata/data/eu_ES.xml
@@ -108,7 +108,7 @@
   /MM/DD
 
 
-   ".eko" "k" D
+  ".eko" "k" D
 
 
   YY/MM/DD
@@ -141,7 +141,7 @@
   NN, "k" D, 
 
 
-   ".eko" "k" D
+  ".eko" "k" D
 
 
   MM-DD
diff --git a/i18npool/source/localedata/data/ha_Latn_GH.xml 
b/i18npool/source/localedata/data/ha_Latn_GH.xml
index 11559d9d913f..be2dff3095ac 100644
--- a/i18npool/source/localedata/data/ha_Latn_GH.xml
+++ b/i18npool/source/localedata/data/ha_Latn_GH.xml
@@ -109,7 +109,7 @@
   M/D/YY
 
 
-  ,  DD, 
+   DD, 
 
 
   MM/DD/YY
@@ -142,7 +142,7 @@
   NN,  D, 
 
 
-  ,  D, 
+   D, 
 
 
   MM/DD
diff --git a/i18npool/source/localedata/data/ia.xml 
b/i18npool/source/localedata/data/ia.xml
index b1e73204c395..fdd9d682cd6a 100644
--- a/i18npool/source/localedata/data/ia.xml
+++ b/i18npool/source/localedata/data/ia.xml
@@ -78,7 +78,7 @@
   DD/MM/YY
 
 
-   D  
+  D  
 
 
   D MMM YY
@@ -96,7 +96,7 @@
   NN "le" D "de"  
 
 
-   "le" D "de"  
+  "le" D "de"  
 
 
   D. MMM. 
diff --git a/i18npool/source/localedata/data/km_KH.xml 
b/i18npool/source/localedata/data/km_KH.xml
index 61195ea91c7a..d532fc3ba34d 100644
--- a/i18npool/source/localedata/data/km_KH.xml
+++ b/i18npool/source/localedata/data/km_KH.xml
@@ -132,7 +132,7 @@
   D/M/YY
 
 
-  [NatNum1] "ទី" DD "ខែ"  "ឆ្នាំ" 
+  [NatNum1]"ទី" DD "ខែ"  "ឆ្នាំ" 
 
 
   DD/MM/YY
@@ -165,7 +165,7 @@
   [NatNum1]NN "ថ្ងៃទី" D "ខែ"  "ឆ្នាំ" 
 
 
-  [NatNum1] "ទី" D "ខែ" MMM "ឆ្នាំ" 
+  [NatNum1]"ទី" D "ខែ" MMM "ឆ្នាំ" 
 
 
   DD-MM
diff --git a/i18npool/source/localedata/data/ln_CD.xml 
b/i18npool/source/localedata/data/ln_CD.xml

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - i18npool/source

[Libreoffice Gerrit user]

 i18npool/source/localedata/data/ha_Latn_NG.xml |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 6e27e878be3996db84818504e70c2b79782a6d72
Author: Eike Rathke 
AuthorDate: Tue Dec 4 16:48:49 2018 +0100
Commit: Eike Rathke 
CommitDate: Wed Dec 5 10:31:55 2018 +0100

Some date format corrections, tdf#116868 follow-up

Order is 'D, MMM '  instead of 'MMM, D '
', ' displays separator twice.

Change-Id: Id84af3e1bb94dad0e8405c680e63f48f38415fba
(cherry picked from commit 35dd9167ef2ee78d8611b02c48b7630e5eeca27c)
Reviewed-on: https://gerrit.libreoffice.org/64540
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/ha_Latn_NG.xml 
b/i18npool/source/localedata/data/ha_Latn_NG.xml
index d3c6c9b4f39b..cfb635b756d7 100644
--- a/i18npool/source/localedata/data/ha_Latn_NG.xml
+++ b/i18npool/source/localedata/data/ha_Latn_NG.xml
@@ -38,8 +38,8 @@
   .
   ;
   , 
-  , 
-   
+   
+  , 
    
 
 
@@ -109,7 +109,7 @@
   D/M/YY
 
 
-  ,  DD, 
+  DD , 
 
 
   DD/MM/YY
@@ -124,13 +124,13 @@
   D MMM, 
 
 
-  D, MMM 
+  D MMM, 
 
 
-   D, 
+  , D 
 
 
-  D,  
+  , D 
 
 
   NN, DD/MMM/YY
@@ -142,7 +142,7 @@
   NN, D , 
 
 
-  , D , 
+  D , 
 
 
   DD/MM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 5b017b8ebede87c53ce94dc46be1c252c45705e6
Author: Michael Weghorn 
AuthorDate: Tue Dec 4 14:42:31 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:52:19 2018 +0100

tdf#121399 Join cmd reading thread in gtk3_kde5

Stop reading commands from the pipe on kde5 side once
the "Quit" command has been sent, in order to have
the thread that is reading commands from stdin finish
properly.

Join the thread in the 'FilePickerIpc' destructor, rather than
just deleting it while it may still be running, which
resulted in 'terminate()' being called.

Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194
Reviewed-on: https://gerrit.libreoffice.org/63835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 93815c2b04f1905e43c695caf5cc2c594bb897ce)
Reviewed-on: https://gerrit.libreoffice.org/64587
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 550e1d8bb2d4..a2ea6b7bbefd 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -192,6 +192,12 @@ static void readCommands(FilePickerIpc* ipc)
 readCommandArgs(command, args);
 
 emit ipc->commandReceived(messageId, command, args);
+
+// stop processing once 'Quit' command has been sent
+if (command == Commands::Quit)
+{
+return;
+}
 }
 }
 
@@ -211,7 +217,11 @@ FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker, 
QObject* parent)
 m_ipcReaderThread = std::unique_ptr{ new 
std::thread(readCommands, this) };
 }
 
-FilePickerIpc::~FilePickerIpc() = default;
+FilePickerIpc::~FilePickerIpc()
+{
+// join thread that reads commands
+m_ipcReaderThread->join();
+};
 
 bool FilePickerIpc::handleCommand(uint64_t messageId, Commands command, 
QList args)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/dialog/dinfdlg.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 16100d8db2398050f9ec10ee55178b2888141818
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 15:27:54 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:50:56 2018 +0100

Resolves: tdf#121641 properties invisible after 'reset'

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

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 9631fac4358a..296fda7cc639 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1481,7 +1481,10 @@ void CustomPropertiesWindow::dispose()
 {
 m_aEditLoseFocusIdle.Stop();
 m_aBoxLoseFocusIdle.Stop();
-ClearAllLines();
+
+m_aCustomPropertiesLines.clear();
+m_pCurrentLine = nullptr;
+
 m_pHeaderBar.clear();
 m_pScrollBar.clear();
 m_pHeaderAccName.clear();
@@ -1713,7 +1716,10 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
 
 void CustomPropertiesWindow::ClearAllLines()
 {
-m_aCustomPropertiesLines.clear();
+for (auto& pLine : m_aCustomPropertiesLines)
+{
+pLine->Clear();
+}
 m_pCurrentLine = nullptr;
 m_aCustomProperties.clear();
 m_nScrollPos = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/source

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/TextDirectionListBox.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 41088375bac5941dbb0da0489878213d5a928ed3
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 17:05:09 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:50:36 2018 +0100

Related: tdf#121904 widget hidden but label and frame remain

if we want to hide the text direction widget, we should hide
the rest of the elements too. For now show them all.

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

diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx 
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index f0440155e9e6..cb4afc8597f7 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -33,11 +33,6 @@ 
TextDirectionListBox::TextDirectionListBox(std::unique_ptr pCont
 append(SvxFrameDirection::Horizontal_LR_TB, 
SchResId(STR_TEXT_DIRECTION_LTR));
 append(SvxFrameDirection::Horizontal_RL_TB, 
SchResId(STR_TEXT_DIRECTION_RTL));
 append(SvxFrameDirection::Environment, SchResId(STR_TEXT_DIRECTION_SUPER));
-
-if (!SvtLanguageOptions().IsCTLFontEnabled())
-{
-hide();
-}
 }
 
 } //namespace chart
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/attributedialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3da3e1f281740ec9d10f018752ecab8e7cd77148
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 17:13:38 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:49:50 2018 +0100

tdf#121904 use min size for attribute dialog

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

diff --git a/chart2/uiconfig/ui/attributedialog.ui 
b/chart2/uiconfig/ui/attributedialog.ui
index 7d3e0802cbf2..bae0f3e821db 100644
--- a/chart2/uiconfig/ui/attributedialog.ui
+++ b/chart2/uiconfig/ui/attributedialog.ui
@@ -5,6 +5,8 @@
   
 False
 6
+0
+0
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Libreoffice Gerrit user]

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

New commits:
commit a80fd148d8a9827c7aa424d8c5d7c04b48805af1
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 17:31:22 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:50:10 2018 +0100

only scroll if the event doesn't come from the page content

Change-Id: I579cef26964aebc89bf6c4786725b4bf85fb4fe5
Reviewed-on: https://gerrit.libreoffice.org/64556
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 862987edfc77..ebf175b3e0eb 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3135,6 +3135,15 @@ private:
 
 bool signal_scroll(GdkEventScroll* event)
 {
+GtkWidget* pEventWidget = 
gtk_get_event_widget(reinterpret_cast(event));
+if (!pEventWidget)
+return false;
+
+/* ignore page content scroll events */
+GtkWidget* pPage = gtk_notebook_get_nth_page(m_pNotebook, 
gtk_notebook_get_current_page(m_pNotebook));
+if (gtk_widget_is_ancestor(pEventWidget, pPage) || pPage == 
pEventWidget)
+return false;
+
 bool bNext(false), bPrev(false);
 switch (event->direction)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit e441e54774d19ee038ffa242b252e81abea68676
Author: Caolán McNamara 
AuthorDate: Tue Dec 4 17:31:22 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 5 09:49:34 2018 +0100

only scroll if the event doesn't come from the page content

Change-Id: I579cef26964aebc89bf6c4786725b4bf85fb4fe5
Reviewed-on: https://gerrit.libreoffice.org/64555
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 862987edfc77..ebf175b3e0eb 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3135,6 +3135,15 @@ private:
 
 bool signal_scroll(GdkEventScroll* event)
 {
+GtkWidget* pEventWidget = 
gtk_get_event_widget(reinterpret_cast(event));
+if (!pEventWidget)
+return false;
+
+/* ignore page content scroll events */
+GtkWidget* pPage = gtk_notebook_get_nth_page(m_pNotebook, 
gtk_notebook_get_current_page(m_pNotebook));
+if (gtk_widget_is_ancestor(pEventWidget, pPage) || pPage == 
pEventWidget)
+return false;
+
 bool bNext(false), bPrev(false);
 switch (event->direction)
 {
___
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

[Libreoffice Gerrit user]

 cui/source/tabpages/tplnedef.cxx |1 -
 cui/source/tabpages/tplneend.cxx |1 -
 include/svx/tabarea.hxx  |5 ++---
 3 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 5a73599206916f87c1836af7c4e0a02c28cb9887
Author: Noel Grandin 
AuthorDate: Tue Dec 4 10:00:12 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 09:40:02 2018 +0100

remove unused ChangeType enum value

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

diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 5d822005f8ba..9d0a57943c09 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -773,7 +773,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, 
weld::Button&, void)
 
 if( pDashList->Save() )
 {
-*pnDashListState |= ChangeType::SAVED;
 *pnDashListState &= ~ChangeType::MODIFIED;
 }
 else
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 38f42d51d71b..18282f52fa69 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -610,7 +610,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, 
weld::Button&, void)
 
 if( pLineEndList->Save() )
 {
-*pnLineEndListState |= ChangeType::SAVED;
 *pnLineEndListState &= ~ChangeType::MODIFIED;
 }
 else
diff --git a/include/svx/tabarea.hxx b/include/svx/tabarea.hxx
index d4d3c69fd604..b1307b4c41e6 100644
--- a/include/svx/tabarea.hxx
+++ b/include/svx/tabarea.hxx
@@ -25,12 +25,11 @@ enum class ChangeType
 {
 NONE = 0x00,
 MODIFIED = 0x01,
-CHANGED  = 0x02,
-SAVED= 0x04,
+CHANGED  = 0x02
 };
 namespace o3tl
 {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 #endif // INCLUDED_SVX_TABAREA_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/svdmodel.hxx   |1 -
 svx/source/svdraw/svdmodel.cxx |1 -
 svx/source/unodraw/unomod.cxx  |1 -
 3 files changed, 3 deletions(-)

New commits:
commit dfe52570efbfdd988e5727aab9483f20b1975713
Author: Noel Grandin 
AuthorDate: Tue Dec 4 10:26:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 09:38:53 2018 +0100

remove unused SdrHintKind enum value

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

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 5cddb416791f..e3e9edf86fd4 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -108,7 +108,6 @@ enum class SdrHintKind
 ModelCleared, // deleted the whole model (no pages exist anymore). 
not impl.
 RefDeviceChange,  // RefDevice changed
 DefaultTabChange, // Default tabulator width changed
-DefaultFontHeightChange,   // Default FontHeight changed
 SwitchToPage,  // #94278# UNDO/REDO at an object evtl. on another 
page
 BeginEdit, // Is called after the object has entered text edit 
mode
 EndEdit// Is called after the object has left text edit 
mode
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 462e7e173173..f9b7b8d08c2b 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -855,7 +855,6 @@ void SdrModel::SetDefaultFontHeight(sal_Int32 nVal)
 {
 if (nVal!=mnDefTextHgt) {
 mnDefTextHgt=nVal;
-Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange));
 ImpReformatAllTextObjects();
 }
 }
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 13407a4b0f97..f6e60d5b022a 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -146,7 +146,6 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* 
pDoc, const SdrHint* pSdr
 pObj = pSdrHint->GetObject();
 break;
 //SdrHintKind::DefaultTabChange,   // default tab width changed
-//SdrHintKind::DefaultFontHeightChange,   // default 
FontHeight changed
 //SdrHintKind::SwitchToPage,// #94278# UNDO/REDO at an 
object evtl. on another page
 //HINT_OBJLISTCLEAR // Is called before an SdrObjList will 
be cleared
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svtools/ruler.hxx  |5 ++---
 svx/source/dialog/svxruler.cxx |2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit cee2602d14214ff44dbc995f790b4d72b764f800
Author: Noel Grandin 
AuthorDate: Tue Dec 4 11:58:28 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 09:38:35 2018 +0100

remove unused RulerBorderStyle enum value

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

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 26183807d4f8..8f042909bd2b 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -502,11 +502,10 @@ enum class RulerBorderStyle {
 Sizeable   = 0x0001,
 Moveable   = 0x0002,
 Variable   = 0x0004,
-Table  = 0x0008,
-Invisible  = 0x0040
+Invisible  = 0x0008
 };
 namespace o3tl {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 struct RulerBorder
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 8fa6a67df992..a76c8901eedc 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -802,8 +802,6 @@ void SvxRuler::UpdateColumns()
 if( !bProtectColumns )
 nStyleFlags |= RulerBorderStyle::Moveable;
 
-if( mxColumnItem->IsTable() )
-nStyleFlags |= RulerBorderStyle::Table;
 else if ( !bProtectColumns )
 nStyleFlags |= RulerBorderStyle::Sizeable;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit e33e73862ba2bbec9ee1f4e21ad12c6b0c0d13e5
Author: Noel Grandin 
AuthorDate: Wed Dec 5 10:24:50 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 10:25:30 2018 +0200

-Werror=unused-but-set-variable

after
commit 0adbc69c81cc287386b31b25b2dc89780933e2b1
remove unused VclEventId enum values

Change-Id: Idcea4bfb2c7215fa903ebac806e73b8d1c7d4f63

diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 3a048a3fedb8..5de0f2fe1a0b 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1065,9 +1065,8 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool 
bSelect )
 
 if ( 0 <= nPos && nPos < mpImplLB->GetEntryList()->GetEntryCount() )
 {
-sal_Int32 newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos();
+sal_Int32 nCurrentPos = mpImplLB->GetCurrentPos();
 mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), 
bSelect );
-newSelectCount = GetSelectedEntryCount();
 //Only when bSelect == true, send both Selection & Focus events
 if (nCurrentPos != nPos && bSelect)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/TileCacheTests.cpp

[Libreoffice Gerrit user]

 test/TileCacheTests.cpp |6 --
 1 file changed, 6 deletions(-)

New commits:
commit c04fd49d42dc41ed807cf4a9309a2f503027081e
Author: Miklos Vajna 
AuthorDate: Wed Dec 5 09:07:18 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 09:14:50 2018 +0100

TileCacheTests: these writes are never read

They are written again inside the do { ... } while (...) which runs at
least once.

Change-Id: I9ff07d7cb68b73bccf1bd38490fcba615b87a6ba

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 3f0be4016..3b1954a8b 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1238,7 +1238,6 @@ void TileCacheTests::testTileWireIDHandling()
 
 // For the second input wsd will send one tile, since some of them are 
indentical
 arrivedTiles = 0;
-gotTile = false;
 do
 {
 std::vector tile = getResponseMessage(socket, "tile:", testname);
@@ -1299,7 +1298,6 @@ void TileCacheTests::testTileProcessed()
 
 // Now we can get the remaining tiles
 int arrivedTile2 = 0;
-gotTile = false;
 do
 {
 std::vector tile = getResponseMessage(socket, "tile:", testname);
@@ -1391,7 +1389,6 @@ void TileCacheTests::testTileBeingRenderedHandling()
 assertResponseString(socket, "invalidatetiles:", testname);
 
 arrivedTiles = 0;
-gotTile = false;
 do
 {
 std::vector tile = getResponseMessage(socket, "tile:", 
testname, 500);
@@ -1449,7 +1446,6 @@ void TileCacheTests::testWireIDFilteringOnWSDSide()
 
 // For the second input wsd will send one tile, since other tiles are 
indentical
 arrivedTiles = 0;
-gotTile = false;
 do
 {
 std::vector tile = getResponseMessage(socket1, "tile:", 
testname, 1000);
@@ -1466,7 +1462,6 @@ void TileCacheTests::testWireIDFilteringOnWSDSide()
 
 // We expect three tiles sent to the second client
 arrivedTiles = 0;
-gotTile = false;
 do
 {
 std::vector tile = getResponseMessage(socket2, "tile:", 
testname, 1000);
@@ -1511,7 +1506,6 @@ void TileCacheTests::testLimitTileVersionsOnFly()
 sendChar(socket, 'x', skNone, testname);
 
 // Handle all tiles sent by wsd
-getTileResp = false;
 do
 {
 std::string tile = getResponseString(socket, "tile:", testname, 1000);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 04a4a2343e30b2bb4f48f74d352ce6918ff37bbf
Author: Gabor Kelemen 
AuthorDate: Tue Dec 4 19:15:33 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 09:06:49 2018 +0100

Jakarta Ant is actually called Apache Ant

According to https://archive.apache.org/dist/ant/source/
it was renamed in version 1.5.2 (2003!) and we require 1.6.0 anyways

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

diff --git a/configure.ac b/configure.ac
index cb54af0e828f..ac7dfdeafbdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1989,7 +1989,7 @@ AC_ARG_WITH(jvm-path,
 
 AC_ARG_WITH(ant-home,
 AS_HELP_STRING([--with-ant-home=],
-[If you have installed Jakarta Ant on your system, please supply the 
path here.
+[If you have installed Apache Ant on your system, please supply the 
path here.
  Note that this is not the location of the Ant binary but the location
  of the entire distribution.]),
 ,)
@@ -11758,7 +11758,7 @@ if test "$ENABLE_JAVA" != "" -a "$NEED_ANT" = "TRUE"; 
then
 fi
 fi
 if test -z "$with_ant_home"; then
-AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
+AC_PATH_PROGS(ANT, [ant ant.sh ant.bat ant.cmd])
 else
 if test "$_os" = "WINNT"; then
 # AC_PATH_PROGS needs unix path
@@ -11766,7 +11766,7 @@ if test "$ENABLE_JAVA" != "" -a "$NEED_ANT" = "TRUE"; 
then
 fi
 AbsolutePath "$with_ant_home"
 with_ant_home=$absolute_path
-AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat 
ant.cmd],,$with_ant_home/bin:$PATH)
+AC_PATH_PROGS(ANT, [ant ant.sh ant.bat 
ant.cmd],,$with_ant_home/bin:$PATH)
 WITH_ANT_HOME=$with_ant_home
 ANT_HOME=$with_ant_home
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/rtfattributeoutput.cxx |  127 ++--
 sw/source/filter/ww8/rtfexport.hxx  |   11 ++
 sw/source/filter/ww8/rtfsdrexport.cxx   |   16 +--
 3 files changed, 85 insertions(+), 69 deletions(-)

New commits:
commit 437093ea77013763186866ba5b5c62e3f06d880d
Author: Miklos Vajna 
AuthorDate: Tue Dec 4 21:13:15 2018 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 5 09:06:14 2018 +0100

sw RtfExport: make members private

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

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 62adfc62fc8e..d309364f3f1f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -304,8 +304,8 @@ void 
RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTex
 {
 // We're ending a paragraph that is the last paragraph of a footnote 
or endnote, or of clipboard.
 bLastPara
-= m_rExport.m_nCurrentNodeIndex
-  && m_rExport.m_nCurrentNodeIndex == 
m_rExport.m_pCurPam->End()->nNode.GetIndex();
+= m_rExport.GetCurrentNodeIndex()
+  && m_rExport.GetCurrentNodeIndex() == 
m_rExport.m_pCurPam->End()->nNode.GetIndex();
 }
 
 FinishTableRowCell(pTextNodeInfoInner);
@@ -392,7 +392,7 @@ void RtfAttributeOutput::SectionBreaks(const SwNode& rNode)
 void RtfAttributeOutput::StartParagraphProperties()
 {
 OStringBuffer aPar;
-if (!m_rExport.m_bRTFFlySyntax)
+if (!m_rExport.GetRTFFlySyntax())
 {
 aPar.append(OOO_STRING_SVTOOLS_RTF_PARD);
 aPar.append(OOO_STRING_SVTOOLS_RTF_PLAIN);
@@ -452,7 +452,7 @@ void RtfAttributeOutput::EndRunProperties(const 
SwRedlineData* /*pRedlineData*/)
 void RtfAttributeOutput::RunText(const OUString& rText, rtl_TextEncoding 
/*eCharSet*/)
 {
 SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rText: " << rText);
-RawText(rText, m_rExport.m_eCurrentEncoding);
+RawText(rText, m_rExport.GetCurrentEncoding());
 }
 
 OStringBuffer& RtfAttributeOutput::RunText() { return 
m_aRunText.getLastBuffer(); }
@@ -513,13 +513,13 @@ bool RtfAttributeOutput::StartURL(const OUString& rUrl, 
const OUString& rTarget)
 m_aRun->append(" HYPERLINK ");
 
 m_aRun->append("\"");
-m_aRun->append(msfilter::rtfutil::OutString(rUrl, 
m_rExport.m_eCurrentEncoding));
+m_aRun->append(msfilter::rtfutil::OutString(rUrl, 
m_rExport.GetCurrentEncoding()));
 m_aRun->append("\" ");
 
 if (!rTarget.isEmpty())
 {
 m_aRun->append("t \"");
-m_aRun->append(msfilter::rtfutil::OutString(rTarget, 
m_rExport.m_eCurrentEncoding));
+m_aRun->append(msfilter::rtfutil::OutString(rTarget, 
m_rExport.GetCurrentEncoding()));
 m_aRun->append("\" ");
 }
 
@@ -1133,7 +1133,8 @@ void RtfAttributeOutput::EndStyle()
 m_rExport.InsStyle(m_nStyleId, aStyles);
 m_aStylesheet.append(aStyles);
 m_aStylesheet.append(' ');
-m_aStylesheet.append(msfilter::rtfutil::OutString(m_rStyleName, 
m_rExport.m_eCurrentEncoding));
+m_aStylesheet.append(
+msfilter::rtfutil::OutString(m_rStyleName, 
m_rExport.GetCurrentEncoding()));
 m_aStylesheet.append(";}");
 m_aStylesheet.append(SAL_NEWLINE_STRING);
 }
@@ -1494,7 +1495,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, 
sal_uInt16 nStart,
 m_rExport.Strm().WriteCharPtr("\\'").WriteCharPtr(
 msfilter::rtfutil::OutHex(rNumberingString.getLength(), 
2).getStr());
 
m_rExport.Strm().WriteCharPtr(msfilter::rtfutil::OutString(rNumberingString,
-   
m_rExport.m_eDefaultEncoding,
+   
m_rExport.GetDefaultEncoding(),
/*bUnicode 
=*/false)
   .getStr());
 }
@@ -1544,12 +1545,12 @@ void RtfAttributeOutput::WriteField_Impl(const SwField* 
pField, ww::eField eType
 m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FLDINST
" ");
 m_aRunText->append(
-msfilter::rtfutil::OutString(rFieldCmd, 
m_rExport.m_eCurrentEncoding));
+msfilter::rtfutil::OutString(rFieldCmd, 
m_rExport.GetCurrentEncoding()));
 m_aRunText->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
 }
 if (pField)
 
m_aRunText->append(msfilter::rtfutil::OutString(pField->ExpandField(true, 
nullptr),
-
m_rExport.m_eDefaultEncoding));
+
m_rExport.GetDefaul