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

[Michael Weghorn (via logerrit)]

 cui/source/options/optjava.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3935a0bd3bcf747aa9bede59b045d23ab598f2d4
Author: Michael Weghorn 
AuthorDate: Wed Oct 21 10:23:30 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 22 08:54:38 2020 +0200

Properly (un)tick Java checkbox in Java options in direct mode

While the Java settings cannot be changed when the direct mode
of the Java framework is used
(s. Change-ID Ife017f9b5c6c6488f84201dd78b23305c67bec1b,
"Gray out Java options when framework's direct mode is used"),
it still makes sense to (un)tick the (grayed out) checkbox which
indicates whether a JRE is used or not, which depends on whether
the JRE that is set (e.g. via env variable
'UNO_JAVA_JFW_JREHOME') is usable or not.

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

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 6a54ab6e0fdf..53c10ce1aa80 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -568,6 +568,10 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ 
)
 {
 // direct mode disregards Java settings made here, so gray them out
 m_xJavaFrame->set_sensitive(false);
+// check whether a usable JRE was set
+std::unique_ptr pSelectedJava;
+eErr = jfw_getSelectedJRE( &pSelectedJava );
+bEnabled = (eErr == JFW_E_NONE);
 }
 else if ( eErr != JFW_E_NONE )
 bEnabled = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make check fails in [build JCS]

[Stephan Bergmann]

On 29/08/2018 11:06, Stephan Bergmann wrote:

On 29/08/18 10:04, Regina Henschel wrote:

[build JCS] JunitTest/comphelper_complex
[build JCS] JunitTest/forms_unoapi_3
[build JCS] JunitTest/forms_unoapi_4
[build JCS] JunitTest/forms_complex
[build JCS] JunitTest/framework_complex
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/comphelper_complex/done] 
Error 2

make[1]: *** Waiting for unfinished jobs
error: illegal argument for --class-path: Illegal char <:> at index 4: 
file:///D:/Build_sep18/core/instdir/program/classes/juh.jar
make[1]: *** [D:/Build_Sep18/core/solenv/gbuild/JavaClassSet.mk:53: 
D:/Build_sep18/core/workdir/JavaClassSet/JunitTest/forms_complex/done] 
Error 2

make: *** [Makefile:286: build] Error 2
I run into such errors on Windows with recent JDK (9/10; I /think/ it 
started with 9) for quite a while now, wondered why apparently nobody 
else did, locally applied below hack for now, and moved on for the time 
being without investigating deeper into the issue.  (Apparently, Java no 
longer accepts file:... URLs there, at least on Windows, and won't 
accept full pathnames starting with a drive letter like C:/..., but does 
accept ("drive-absolute") pathnames like /...; so my hack should work as 
long as your files are on drive C.)


Apparently, needs more investigation and a proper fix, eventually.


So just for the record:  With more recent JDK, like Java 15 from 
AdoptOpenJDK, I no longer run into the above issue during build, and no 
longer need the below hack applied locally.



diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 151fb990a0a6..87f76d8a75a4 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -196,7 +196,7 @@ endef

 define gb_Jar_use_system_jar
 $(call gb_JavaClassSet_use_system_jar,$(call 
gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_Jar_add_manifest_classpath,$(1),$(call 
gb_Helper_make_url,$(2)))

+$(call gb_Jar_add_manifest_classpath,$(1),$(subst C:,,$(2)))

 endef

diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index cc5fde435c7b..dd0420382e28 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -11,9 +11,9 @@
 $(eval $(call gb_Jar_Jar,test))

 $(eval $(call gb_Jar_add_manifest_classpath,test,\
-    $(call gb_Helper_make_url,$(call gb_Jar_get_target,juh)) \
-    $(call gb_Helper_make_url,$(call gb_Jar_get_target,ridl)) \
-    $(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil)) \
+    $(subst C:,,$(call gb_Jar_get_target,juh)) \
+    $(subst C:,,$(call gb_Jar_get_target,ridl)) \
+    $(subst C:,,$(call gb_Jar_get_target,unoil)) \
 ))

 $(eval $(call gb_Jar_use_jars,test,\


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

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

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 211ba118b3f99e2c785309403b81319bae7b1213
Author: Seth Chaiklin 
AuthorDate: Wed Oct 21 13:43:28 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Oct 22 08:17:22 2020 +0200

tdf#135668  - remove quotes around keyname in tooltip

  for "Go To Page" control in  Navigator panel

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

diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui 
b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index b1e5753c7bc4..87ab616bd6f9 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -336,7 +336,7 @@
 Go to Page
 
   
-  Enter page number and press 
"Enter". Use arrows to move to next page forward or backward.
+  Enter page number and press 
Enter. Use arrows to move to next page forward or backward.
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/test smoketest/libtest.cxx sot/source starmath/inc starmath/qa starmath/source

[Noel (via logerrit)]

 slideshow/test/slidetest.cxx  |   17 +++---
 smoketest/libtest.cxx |5 +
 sot/source/sdstor/stg.cxx |2 
 sot/source/sdstor/stgstrms.cxx|2 
 starmath/inc/caret.hxx|   26 -
 starmath/inc/dialog.hxx   |6 +-
 starmath/inc/node.hxx |   14 ++---
 starmath/inc/rect.hxx |   66 
 starmath/inc/scrwin.hxx   |6 +-
 starmath/inc/utility.hxx  |   14 ++---
 starmath/inc/view.hxx |2 
 starmath/qa/cppunit/test_node.cxx |8 +-
 starmath/source/accessibility.cxx |2 
 starmath/source/cursor.cxx|6 +-
 starmath/source/dialog.cxx|4 -
 starmath/source/edit.cxx  |6 +-
 starmath/source/mathmlimport.cxx  |6 +-
 starmath/source/node.cxx  |  104 +++---
 starmath/source/parse.cxx |4 -
 starmath/source/rect.cxx  |   40 +++---
 starmath/source/scrwin.cxx|6 +-
 starmath/source/unomodel.cxx  |8 +-
 starmath/source/utility.cxx   |6 +-
 starmath/source/view.cxx  |   18 +++---
 starmath/source/visitors.cxx  |   48 -
 25 files changed, 214 insertions(+), 212 deletions(-)

New commits:
commit d3158450293875051e04b0e13106ad4c112c8ba6
Author: Noel 
AuthorDate: Wed Oct 21 15:32:32 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 22 08:08:55 2020 +0200

long->tools::Long in slideshow..starmath

Change-Id: I18f5b7c5da513d386f8ac848835b0410ebc7d95b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104629
Reviewed-by: Dante DM 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Tested-by: Noel Grandin 

diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 1ba6e71638d1..469ed059260d 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -316,13 +317,13 @@ public:
 mpLayerManager->removeShape(pShape4);
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 1 must have refcount of 1",
-  long(1), mpTestShape.use_count() );
+  tools::Long(1), mpTestShape.use_count() 
);
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 2 must have refcount of ",
-  long(1), pShape2.use_count() );
+  tools::Long(1), pShape2.use_count() );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 3 must have refcount of 1",
-  long(1), pShape3.use_count() );
+  tools::Long(1), pShape3.use_count() );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 4 must have refcount of",
-  long(1), pShape4.use_count() );
+  tools::Long(1), pShape4.use_count() );
 
 
 mpLayerManager->addShape(mpTestShape);
@@ -339,13 +340,13 @@ public:
 mpLayerManager->removeShape(pShape4);
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 1 must have refcount of 1",
-  long(1), mpTestShape.use_count() );
+  tools::Long(1), mpTestShape.use_count() 
);
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 2 must have refcount of ",
-  long(1), pShape2.use_count() );
+  tools::Long(1), pShape2.use_count() );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 3 must have refcount of 1",
-  long(1), pShape3.use_count() );
+  tools::Long(1), pShape3.use_count() );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shape 4 must have refcount of 1",
-  long(1), pShape4.use_count() );
+  tools::Long(1), pShape4.use_count() );
 }
 
 // hook up the test
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 0d9c34d429e1..7d90a8522353 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -16,6 +16,7 @@
 
 #include 
 #include 
+#include 
 
 
 #ifdef _WIN32
@@ -38,7 +39,7 @@
 
 #else
 #include 
-static long getTimeMS()
+static tools::Long getTimeMS()
 {
 struct timeval t;
 gettimeofday(&t, nullptr);
@@ -69,7 +70,7 @@ static int help()
 
 int main (int argc, char **argv)
 {
-long start, end;
+tools::Long start, end;
 
 start = getTimeMS();
 
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 3e72d13b3fff..398e3fdb53d1 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -30,7 +30,7 @@
 #include "stgio.hxx"
 #include "stgole.hxx"
 
-static long nTmpCount = 0;
+static tools::Long nTmpCount = 0;
 
 // The internal open mode is StreamMode::READ | StreamMode::TRUNC, which is 
silly
 //

[Libreoffice-commits] core.git: 2 commits - hwpfilter/source i18nlangtag/source i18npool/source i18nutil/source include/i18nutil io/source lotuswordpro/inc lotuswordpro/source oox/source sw/qa

[Xisco Fauli (via logerrit)]

 hwpfilter/source/hwpread.cxx  |3 -
 hwpfilter/source/hwpreader.cxx|2 
 hwpfilter/source/mzstring.cxx |2 
 hwpfilter/source/mzstring.h   |3 -
 i18nlangtag/source/languagetag/languagetag.cxx|3 -
 i18npool/source/calendar/calendar_hijri.cxx   |   15 +++
 i18npool/source/localedata/saxparser.cxx  |4 -
 i18nutil/source/utility/paper.cxx |   29 +++--
 include/i18nutil/paper.hxx|   13 +++---
 io/source/stm/odata.cxx   |3 -
 lotuswordpro/inc/localtime.hxx|   22 +-
 lotuswordpro/source/filter/bencont.cxx|2 
 lotuswordpro/source/filter/bento.hxx  |2 
 lotuswordpro/source/filter/explode.cxx|2 
 lotuswordpro/source/filter/localtime.cxx  |   38 +-
 lotuswordpro/source/filter/lwpgrfobj.hxx  |2 
 lotuswordpro/source/filter/lwpnotes.cxx   |2 
 lotuswordpro/source/filter/lwpoleobject.hxx   |4 -
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |   10 ++--
 lotuswordpro/source/filter/lwpsdwrect.cxx |   38 +-
 lotuswordpro/source/filter/lwpsdwrect.hxx |7 +--
 oox/source/drawingml/fillproperties.cxx   |2 
 oox/source/drawingml/textparagraph.cxx|2 
 oox/source/export/drawingml.cxx   |6 +-
 oox/source/export/vmlexport.cxx   |2 
 oox/source/helper/propertymap.cxx |1 
 oox/source/shape/WpsContext.cxx   |4 -
 sw/qa/uitest/options/optionsDialog.py |   38 ++
 sw/qa/uitest/writer_dialogs/openDialogs.py|3 -
 29 files changed, 157 insertions(+), 107 deletions(-)

New commits:
commit 7dc6fc32eb618da6defb8a9f330978fa019677b8
Author: Xisco Fauli 
AuthorDate: Wed Oct 21 19:09:18 2020 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 22 08:08:28 2020 +0200

uitest: Check the more icons dialog opens

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

diff --git a/sw/qa/uitest/options/optionsDialog.py 
b/sw/qa/uitest/options/optionsDialog.py
new file mode 100644
index ..13a856c0e246
--- /dev/null
+++ b/sw/qa/uitest/options/optionsDialog.py
@@ -0,0 +1,38 @@
+# -*- 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
+
+class optionsDialog(UITestCase):
+
+def test_moreIconsDialog(self):
+self.ui_test.create_doc_in_start_center("writer")
+
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
+
+xDialog = self.xUITest.getTopFocusWindow()
+xPages = xDialog.getChild("pages")
+xLOEntry = xPages.getChild('0')
+xLOEntry.executeAction("EXPAND", tuple())
+xViewEntry = xLOEntry.getChild('2')
+xViewEntry.executeAction("SELECT", tuple())
+
+xMoreIconsBtn = xDialog.getChild("btnMoreIcons")
+
+def handle_more_icons_dlg(dialog):
+# Check it doesn't crash while opening it
+xCloseBtn = dialog.getChild("buttonClose")
+self.ui_test.close_dialog_through_button(xCloseBtn)
+
+self.ui_test.execute_blocking_action(xMoreIconsBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_more_icons_dlg)
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py 
b/sw/qa/uitest/writer_dialogs/openDialogs.py
index 9e4ed0d85f4a..4dbacaa1215e 100644
--- a/sw/qa/uitest/writer_dialogs/openDialogs.py
+++ b/sw/qa/uitest/writer_dialogs/openDialogs.py
@@ -109,7 +109,8 @@ dialogs = [
 {"command": "service:com.sun.star.deployment.ui.PackageManagerDialog", 
"closeButton": "close"},
 # {"command": ".uno:ConfigureDialog", "closeButton": "cancel"},
 # tested in uitest/writer_tests/customizeDialog.py
-{"command": ".uno:OptionsTreeDialog", "closeButton": "cancel"},
+#{"command": ".uno:OptionsTreeDialog", "closeButton": "cancel"},
+# used in various places
 {"command": ".uno:ShowLicense", "closeButton": "close"},
 # {"command": ".uno:About", "closeButton": "close"},
 # tested in sw/qa/uitest/writer_tests5/about_test.py
commit e25fd7782ad04dc363b4265e1bd08d6e092b50c5
Author: No

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

[Xisco Fauli (via logerrit)]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |4 
 dbaccess/source/ui/app/AppIconControl.cxx  |2 
 dbaccess/source/ui/app/AppIconControl.hxx  |4 
 dbaccess/source/ui/app/DocumentInfoPreview.cxx |4 
 dbaccess/source/ui/app/DocumentInfoPreview.hxx |4 
 dbaccess/source/ui/browser/brwview.cxx |2 
 dbaccess/source/ui/browser/sbagrid.cxx |   18 +--
 dbaccess/source/ui/browser/unodatbr.cxx|4 
 dbaccess/source/ui/control/ColumnControlWindow.cxx |2 
 dbaccess/source/ui/control/RelationControl.cxx |   24 ++--
 dbaccess/source/ui/control/TableGrantCtrl.cxx  |   10 -
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx  |   12 +-
 dbaccess/source/ui/inc/ColumnControlWindow.hxx |2 
 dbaccess/source/ui/inc/FieldDescControl.hxx|2 
 dbaccess/source/ui/inc/JoinController.hxx  |4 
 dbaccess/source/ui/inc/JoinTableView.hxx   |2 
 dbaccess/source/ui/inc/TableDesignControl.hxx  |   22 ++--
 dbaccess/source/ui/inc/TableGrantCtrl.hxx  |   10 -
 dbaccess/source/ui/inc/TableRow.hxx|3 
 dbaccess/source/ui/inc/WTypeSelect.hxx |2 
 dbaccess/source/ui/inc/indexfieldscontrol.hxx  |   12 +-
 dbaccess/source/ui/inc/sbagrid.hxx |4 
 dbaccess/source/ui/misc/WTypeSelect.cxx|2 
 dbaccess/source/ui/querydesign/ConnectionLine.cxx  |   18 +--
 dbaccess/source/ui/querydesign/JoinController.cxx  |4 
 dbaccess/source/ui/querydesign/JoinTableView.cxx   |   28 ++---
 dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx |4 
 dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx  |2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx  |   64 +--
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx  |   20 +--
 dbaccess/source/ui/querydesign/TableWindow.cxx |   10 -
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx|2 
 dbaccess/source/ui/relationdesign/RTableConnection.cxx |4 
 dbaccess/source/ui/tabledesign/TEditControl.cxx|   70 ++---
 dbaccess/source/ui/tabledesign/TEditControl.hxx|   40 +++
 dbaccess/source/ui/tabledesign/TableDesignControl.cxx  |8 -
 dbaccess/source/ui/tabledesign/TableFieldControl.cxx   |2 
 dbaccess/source/ui/tabledesign/TableFieldControl.hxx   |2 
 dbaccess/source/ui/tabledesign/TableRow.cxx|2 
 dbaccess/source/ui/tabledesign/TableUndo.cxx   |   28 ++---
 dbaccess/source/ui/tabledesign/TableUndo.hxx   |   18 +--
 desktop/qa/desktop_lib/test_desktop_lib.cxx|   18 +--
 desktop/source/app/cmdlineargs.cxx |2 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx   |   22 ++--
 desktop/source/deployment/gui/dp_gui_dialog2.hxx   |   10 -
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|   70 ++---
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx|   24 ++--
 desktop/source/lib/init.cxx|   46 
 desktop/source/splash/splash.cxx   |   12 +-
 sw/qa/extras/ooxmlexport/data/tdf133771.odt|binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |   22 
 52 files changed, 366 insertions(+), 343 deletions(-)

New commits:
commit f308520f1e3624c88e2a0e99be2eb26e2f2d0fc4
Author: Xisco Fauli 
AuthorDate: Wed Oct 21 17:29:01 2020 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 22 08:07:35 2020 +0200

tdf#133771: sw_ooxmlexport14: Add unittest

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf133771.odt 
b/sw/qa/extras/ooxmlexport/data/tdf133771.odt
new file mode 100644
index ..fd54160af9d1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133771.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 224a79eb3c32..3ac228db6cca 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -736,6 +736,28 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, 
testTableStyleConfNested)
 assertXPath(pXmlDoc, 
"//w:body/w:tbl/w:tr/w:tc[2]/w:tcPr/w:tcBorders/w:top", "val", "nil");
 }
 
+CPPUNIT_TEST_FIXTURE(SwModelTestBase, testTdf133771)
+{
+// Create the doc model.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"tdf133771.odt";
+loadURL(aURL, nullptr, /*pPass

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

[Noel (via logerrit)]

 emfio/inc/mtftools.hxx|4 -
 emfio/source/reader/mtftools.cxx  |8 +--
 emfio/source/reader/wmfreader.cxx |6 +-
 extensions/source/bibliography/bibbeam.cxx|2 
 extensions/source/bibliography/bibconfig.hxx  |   13 +++---
 extensions/source/bibliography/bibcont.cxx|8 +--
 extensions/source/bibliography/general.cxx|4 -
 extensions/source/scanner/grid.cxx|8 +--
 extensions/source/scanner/sanedlg.cxx |   14 +++---
 filter/source/graphicfilter/egif/egif.cxx |   22 +-
 filter/source/graphicfilter/eps/eps.cxx   |   52 -
 filter/source/graphicfilter/icgm/actimpr.cxx  |   30 +++---
 filter/source/graphicfilter/icgm/bitmap.cxx   |   10 ++--
 filter/source/graphicfilter/icgm/bitmap.hxx   |2 
 filter/source/graphicfilter/icgm/bundles.hxx  |   10 ++--
 filter/source/graphicfilter/icgm/cgm.cxx  |2 
 filter/source/graphicfilter/icgm/cgmtypes.hxx |6 +-
 filter/source/graphicfilter/icgm/class1.cxx   |2 
 filter/source/graphicfilter/icgm/class3.cxx   |4 -
 filter/source/graphicfilter/icgm/class4.cxx   |   26 ++--
 filter/source/graphicfilter/icgm/class5.cxx   |4 -
 filter/source/graphicfilter/icgm/classx.cxx   |2 
 filter/source/graphicfilter/icgm/elements.cxx |6 +-
 filter/source/graphicfilter/icgm/elements.hxx |   12 ++---
 filter/source/graphicfilter/icgm/outact.hxx   |4 -
 filter/source/graphicfilter/idxf/dxf2mtf.cxx  |   32 +++
 filter/source/graphicfilter/idxf/dxf2mtf.hxx  |6 +-
 filter/source/graphicfilter/idxf/dxfblkrd.hxx |2 
 filter/source/graphicfilter/idxf/dxfentrd.hxx |   53 +-
 filter/source/graphicfilter/idxf/dxfgrprd.cxx |2 
 filter/source/graphicfilter/idxf/dxfgrprd.hxx |9 ++--
 filter/source/graphicfilter/idxf/dxftblrd.cxx |2 
 filter/source/graphicfilter/idxf/dxftblrd.hxx |   34 
 filter/source/graphicfilter/idxf/dxfvec.cxx   |4 -
 filter/source/graphicfilter/ieps/ieps.cxx |   24 +--
 filter/source/graphicfilter/ipcd/ipcd.cxx |   24 +--
 filter/source/graphicfilter/ipict/ipict.cxx   |   16 +++
 filter/source/graphicfilter/ipict/shape.cxx   |   40 +--
 filter/source/graphicfilter/itga/itga.cxx |2 
 filter/source/graphicfilter/itiff/itiff.cxx   |   14 +++---
 filter/source/msfilter/msdffimp.cxx   |   36 -
 filter/source/msfilter/mstoolbar.cxx  |2 
 filter/source/msfilter/svdfppt.cxx|   14 +++---
 filter/source/msfilter/util.cxx   |2 
 filter/source/pdf/pdfexport.cxx   |   10 ++--
 filter/source/svg/svgfilter.cxx   |2 
 filter/source/svg/svgwriter.cxx   |   48 +++
 filter/source/svg/svgwriter.hxx   |   14 +++---
 include/filter/msfilter/msdffimp.hxx  |   20 -
 include/filter/msfilter/mstoolbar.hxx |2 
 include/filter/msfilter/util.hxx  |3 -
 51 files changed, 342 insertions(+), 336 deletions(-)

New commits:
commit 180dd91c189de0bf03d5062e33c20da94c5d35d9
Author: Noel 
AuthorDate: Wed Oct 21 15:26:38 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 22 08:07:45 2020 +0200

long->tools::Long in emfio..filter

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

diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 9506b4f5f31c..5c0c60973350 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -625,8 +625,8 @@ namespace emfio
 );
 voidDrawText(Point& rPosition,
 OUString const & rString,
-long* pDXArry = nullptr,
-long* pDYArry = nullptr,
+tools::Long* pDXArry = nullptr,
+tools::Long* pDYArry = nullptr,
 bool bRecordPath = false,
 sal_Int32 nGraphicsMode = GM_COMPATIBLE);
 
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 080521ed0523..e32b0f2be502 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -266,7 +266,7 @@ namespace emfio
 aFont.SetFontSize( aFontSize );
 pVDev->SetFont( aFont );
 FontMetric aMetric( pVDev->GetFontMetric() );
-long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
+tools::Long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
 if (nHeight)
 {
 double fHeight = (static_cast(aFontSize.Height()) * 
rFont.lfHeight ) / nHeight;
@@ -743,7 +743,7 @@ namespace emfio
 if ( pLineStyle->aLineInfo.GetStyle() == LineStyle::Dash )
 {
 aSize.AdjustWidth(1 );
-long nDot

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 5d422c0348efd1df6b3d44dd6efcf5c5490fc321
Author: Stephan Bergmann 
AuthorDate: Wed Oct 21 17:41:53 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 22 08:06:15 2020 +0200

Revert "sal_uIntPtr->unsigned long in SystemEnvData"

This reverts commit c0f1d211eff5f89f5c9298743f6e7d91d187b799, which states 
that
it changed the type of UNX-only SystemEnvData::aWindow from sal_uIntPtr to
unsigned long "to match the type used by X11".  (And while resource IDs 
used for
windows etc. are apparently 32-bit in the X11 protocol, see e.g.
, Xlib and 
the
underlying /usr/include/X11/Xdefs.h indeed appear to be somewhat confused
whether the typedef for XID should be unsigned long (presumably stemming 
from
times when long was universally 32-bit) or CARD32, see e.g.

.)

But at least for GTK3/Wayland, the sal_uIntPtr values returned by
GtkSalFrame::GetNativeWindowHandle (in vcl/unx/gtk3/gtk3gtkframe.cxx, and 
which
are stored in SystemEnvData::aWindow in GtkSalFrame::InitCommon,
vcl/unx/gtk3/gtk3gtkframe.cxx, and GtkSalObjectBase::Init,
vcl/unx/gtk3/gtk3gtkobject.cxx) as

> return 
reinterpret_cast(gdk_wayland_window_get_wl_surface(pWindow));

are struct wl_surface* values, so sal_uIntPtr looks like the overall more
appropriate type after all.

(The part of c0f1d211eff5f89f5c9298743f6e7d91d187b799 that dropped the 
somewhat
needless C-style-cast converting aWindow from sal_uIntPtr to sal_IntPtr in
SystemChildWindow::GetParentWindowHandle, vcl/source/window/syschild.cxx, 
has
not been reverted, though.)

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

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 14685c3b9d61..0957f5cc11a7 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -62,7 +62,7 @@ struct SystemEnvData
 enum class Platform { Wayland, Xcb };
 
 void*   pDisplay;   // the relevant display connection
-unsigned long   aWindow;// the window of the object
+sal_uIntPtr aWindow;// the window of the object
 void*   pSalFrame;  // contains a salframe, if object has 
one
 void*   pWidget;// the corresponding widget
 void*   pVisual;// the visual in use
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source formula/source fpicker/source framework/inc framework/source

[Noel (via logerrit)]

 forms/source/component/imgprod.cxx|   28 
+-
 forms/source/richtext/richtextimplcontrol.cxx |   20 
+++
 forms/source/runtime/formoperations.hxx   |3 -
 formula/source/ui/dlg/formula.cxx |6 +-
 formula/source/ui/dlg/funcutl.cxx |2 
 formula/source/ui/dlg/parawin.cxx |4 -
 fpicker/source/office/fileview.cxx|4 -
 framework/inc/uielement/fontsizemenucontroller.hxx|3 -
 framework/source/accelerators/acceleratorconfiguration.cxx|2 
 framework/source/dispatch/oxt_handler.cxx |3 -
 framework/source/layoutmanager/layoutmanager.cxx  |4 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |2 
 framework/source/uiconfiguration/imagemanagerimpl.cxx |6 +-
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |2 
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |4 -
 framework/source/uielement/fontsizemenucontroller.cxx |6 +-
 framework/source/uielement/spinfieldtoolbarcontroller.cxx |2 
 framework/source/uielement/toolbarmodemenucontroller.cxx  |4 -
 18 files changed, 54 insertions(+), 51 deletions(-)

New commits:
commit 700a833520396604b10c713c478d5138578a60b6
Author: Noel 
AuthorDate: Wed Oct 21 15:27:33 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 22 08:06:43 2020 +0200

long->tools::Long in forms..framework

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

diff --git a/forms/source/component/imgprod.cxx 
b/forms/source/component/imgprod.cxx
index 9bd74f9f4792..3e79596bb07f 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -365,14 +365,14 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& 
rGraphic )
 
 Bitmap  aMask( aBmpEx.GetMask() );
 BitmapReadAccess*   pMskAcc = !!aMask ? aMask.AcquireReadAccess() : 
nullptr;
-const long  nWidth = pBmpAcc->Width();
-const long  nHeight = pBmpAcc->Height();
-const long  nStartX = 0;
-const long  nEndX = nWidth - 1;
-const long  nStartY = 0;
-const long  nEndY = nHeight - 1;
-const long  nPartWidth = nEndX - nStartX + 1;
-const long  nPartHeight = nEndY - nStartY + 1;
+const tools::Long  nWidth = pBmpAcc->Width();
+const tools::Long  nHeight = pBmpAcc->Height();
+const tools::Long  nStartX = 0;
+const tools::Long  nEndX = nWidth - 1;
+const tools::Long  nStartY = 0;
+const tools::Long  nEndY = nHeight - 1;
+const tools::Long  nPartWidth = nEndX - nStartX + 1;
+const tools::Long  nPartHeight = nEndY - nStartY + 1;
 
 if( !pMskAcc )
 {
@@ -393,11 +393,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& 
rGraphic )
 css::uno::Sequence   aData( nPartWidth * nPartHeight );
 sal_Int8*   pTmp = 
aData.getArray();
 
-for( long nY = nStartY; nY <= nEndY; nY++ )
+for( tools::Long nY = nStartY; nY <= nEndY; nY++ )
 {
 Scanline pScanlineMask = pMskAcc->GetScanline( nY );
 Scanline pScanline = pBmpAcc->GetScanline( nY );
-for( long nX = nStartX; nX <= nEndX; nX++ )
+for( tools::Long nX = nStartX; nX <= nEndX; nX++ )
 {
 if( pMskAcc->GetPixelFromData( pScanlineMask, nX ) == 
aWhite )
 *pTmp++ = sal::static_int_cast< sal_Int8 >(
@@ -416,11 +416,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& 
rGraphic )
 css::uno::Sequence  aData( nPartWidth * nPartHeight );
 sal_Int32*  pTmp = 
aData.getArray();
 
-for( long nY = nStartY; nY <= nEndY; nY++ )
+for( tools::Long nY = nStartY; nY <= nEndY; nY++ )
 {
 Scanline pScanlineMask = pMskAcc->GetScanline( nY );
 Scanline pScanline = pBmpAcc->GetScanline( nY );
-for( long nX = nStartX; nX <= nEndX; nX++ )
+for( tools::Long nX = nStartX; nX <= nEndX; nX++ )
 {
 if( pMskAcc->GetPixelFromData( pScanlineMask, nX ) == 
aWhite )
 *pTmp++ = mnTransIndex;
@@ -440,11 +440,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& 
rGraphic )
 const BitmapColor   aWhite( 
pMskAcc->GetBestMatchingColor( COL_WHITE ) );
 sal_Int32*   

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

[Michael Weghorn (via logerrit)]

 cui/source/options/optjava.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2976590ed9f727c24064c97d80a51e9891253119
Author: Michael Weghorn 
AuthorDate: Wed Oct 21 10:23:30 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 22 07:40:45 2020 +0200

Gray out Java options when framework's direct mode is used

The 'javasettings_${_OS}_${_ARCH}.xml' files are only
meant to be used when the application mode of the
Java framework is used, not in direct mode.

From ure/source/README:

> You can also use the
> UNO_JAVA_JFW_JREHOME deployment variable to specify the location of a 
JDK/JRE
> installation.  For more information on this variable, see
> http://udk.openoffice.org/common/man/spec/javavendorextension.sxw.

From that http://udk.openoffice.org/common/man/spec/javavendorextension.sxw 
:

> The direct mode of the framework is used within the build environment.
> Java is needed there in order to register Java UNO components with the
> regcomp tool. Direct mode means that no settings are written or read.
> That is the parameters UNO_JAVA_JFW_USER_DATA and
> UNO_JAVA_JFW_SHARED_DATA are not used.
> [...]
> Another example for using the direct mode is the SDK. The SDK uses the
> libraries from the office installation. When an SDK is configured then
> one specifies what Java is to be used. This Java shall then be used for
> all task which require Java including registration of UNO components. In
> order to override the java settings of the office the script which
> prepares the SDK environment sets these environment variables:
> UNO_JAVA_JFW_JREHOME=
> UNO_JAVA_JFW_ENV_CLASSPATH=true
> UNO_JAVA_JFW_VENDOR_SETTINGS=
> By setting UNO_JAVA_JFW_JREHOME the framework is switched into direct mode
> and the office settings are disregarded.

Therefore, gray out the Java options in the "Advanced" page in "Tools"
-> "Options" to not give the user the wrong impression that settings
made there actually have any effect when using direct mode, e.g. by
starting LibreOffice like this

UNO_JAVA_JFW_JREHOME=file:///usr/lib/jvm/java-11-openjdk-amd64/ 
./instdir/program/soffice --writer

and then realizing on restart that all manually made settings
were discarded (e.g. newly added Java installation does not
show up,...).

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

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3cfb0e535b12..6a54ab6e0fdf 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -564,7 +564,12 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ 
)
 #if HAVE_FEATURE_JAVA
 bool bEnabled = false;
 javaFrameworkError eErr = jfw_getEnabled( &bEnabled );
-if ( eErr != JFW_E_NONE )
+if (eErr == JFW_E_DIRECT_MODE)
+{
+// direct mode disregards Java settings made here, so gray them out
+m_xJavaFrame->set_sensitive(false);
+}
+else if ( eErr != JFW_E_NONE )
 bEnabled = false;
 m_xJavaEnableCB->set_active(bEnabled);
 EnableHdl_Impl(*m_xJavaEnableCB);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 jvmfwk/source/framework.cxx |   65 +++-
 1 file changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 903a5aca86b41cd6c3d814af8bdd60b6885d300b
Author: Michael Weghorn 
AuthorDate: Wed Oct 21 10:23:29 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 22 07:40:07 2020 +0200

Only read Java settings files in application mode

The 'javasettings_${_OS}_${_ARCH}.xml' files are only
meant to be used when the application mode of the
Java framework is used, not in direct mode.

From ure/source/README:

> You can also use the
> UNO_JAVA_JFW_JREHOME deployment variable to specify the location of a 
JDK/JRE
> installation.  For more information on this variable, see
> http://udk.openoffice.org/common/man/spec/javavendorextension.sxw.

From that http://udk.openoffice.org/common/man/spec/javavendorextension.sxw 
:

> The direct mode of the framework is used within the build environment.
> Java is needed there in order to register Java UNO components with the
> regcomp tool. Direct mode means that no settings are written or read.
> That is the parameters UNO_JAVA_JFW_USER_DATA and
> UNO_JAVA_JFW_SHARED_DATA are not used.
> [...]
> Another example for using the direct mode is the SDK. The SDK uses the
> libraries from the office installation. When an SDK is configured then
> one specifies what Java is to be used. This Java shall then be used for
> all task which require Java including registration of UNO components. In
> order to override the java settings of the office the script which
> prepares the SDK environment sets these environment variables:
> UNO_JAVA_JFW_JREHOME=
> UNO_JAVA_JFW_ENV_CLASSPATH=true
> UNO_JAVA_JFW_VENDOR_SETTINGS=
> By setting UNO_JAVA_JFW_JREHOME the framework is switched into direct mode
> and the office settings are disregarded.

Therefore, don't try to read the settings when using direct mode.
This makes the relevant code path for accessing the settings conditional
on 'jfw::JFW_MODE_APPLICATION' being used.

Otherwise, using direct mode e.g. by starting LibreOffice using

UNO_JAVA_JFW_JREHOME=file:///usr/lib/jvm/java-11-openjdk-amd64/ 
./instdir/program/soffice --writer

then going to the "Advanced" options in "Tools" -> "Options", where
the Java settings reside would result in this SAL_WARN being triggered

warn:jfw:10207:10207:jvmfwk/source/framework.cxx:119: [Java framework] 
Trying to access settings files in direct mode.

and no JVM at all being shown in the list of available
Java installations.

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

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 5270439bda6a..5a7cef449b78 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -59,13 +59,8 @@ javaFrameworkError 
jfw_findAllJREs(std::vector> *pparI
 osl::MutexGuard guard(jfw::FwkMutex::get());
 
 jfw::VendorSettings aVendorSettings;
-//Add the JavaInfos found by jfw_plugin_getAllJavaInfos to the vector
 std::vector> vecInfo;
-//get the list of paths to jre locations which have been
-//added manually
-const jfw::MergedSettings settings;
-const std::vector& vecJRELocations =
-settings.getJRELocations();
+
 //Use all plug-in libraries to get Java installations.
 std::vector> arInfos;
 std::vector> infos;
@@ -81,32 +76,42 @@ javaFrameworkError 
jfw_findAllJREs(std::vector> *pparI
 for (auto & j: arInfos)
 vecInfo.push_back(std::move(j));
 
-//Check if any plugin can detect JREs at the location
-// of the paths added by jfw_addJRELocation
-//Check every manually added location
-for (auto const & ii: vecJRELocations)
+// direct mode disregards Java settings, so only retrieve
+// JREs from settings when application mode is used
+if (jfw::getMode() == jfw::JFW_MODE_APPLICATION)
 {
-std::unique_ptr aInfo;
-plerr = jfw_plugin_getJavaInfoByPath(
-ii,
-aVendorSettings,
-&aInfo);
-if (plerr == javaPluginError::NoJre)
-continue;
-if (plerr == javaPluginError::FailedVersion)
-continue;
-else if (plerr != javaPluginError::NONE)
-return JFW_E_ERROR;
-
-// Was this JRE already added?
-if (std::none_of(
-vecInfo.begin(), vecInfo.end(),
-[&aInfo](std::unique_ptr const & info) {
-return areEqualJavaInfo(
-info.get(), aInfo.ge

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/footnotedialog.png |binary
 icon-themes/colibre/cmd/32/insertendnote.png  |binary
 icon-themes/colibre/cmd/32/insertfootnote.png |binary
 icon-themes/colibre/cmd/lc_footnotedialog.png |binary
 icon-themes/colibre/cmd/lc_insertendnote.png  |binary
 icon-themes/colibre/cmd/lc_insertfootnote.png |binary
 icon-themes/colibre/cmd/sc_footnotedialog.png |binary
 icon-themes/colibre/cmd/sc_insertendnote.png  |binary
 icon-themes/colibre/cmd/sc_insertfootnote.png |binary
 icon-themes/colibre_svg/cmd/32/footnotedialog.svg |2 +-
 icon-themes/colibre_svg/cmd/32/insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/insertfootnote.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_footnotedialog.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/lc_insertfootnote.svg |2 +-
 icon-themes/colibre_svg/cmd/sc_footnotedialog.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/sc_insertfootnote.svg |3 ++-
 18 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 1e0e1b39f896a1887e5db35e307983a9fc39846c
Author: Rizal Muttaqin 
AuthorDate: Wed Oct 21 18:20:17 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu Oct 22 07:33:22 2020 +0200

Colibre: update endnote & footnote icons

Change-Id: I8c6ac16c83a0e46e424acde14acc048d7520b5cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104617
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 0b35ef17fedc96b31dd1dff67648a61fe884c857)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104599

diff --git a/icon-themes/colibre/cmd/32/footnotedialog.png 
b/icon-themes/colibre/cmd/32/footnotedialog.png
index 140acf9f97d8..ac746ac2fd05 100644
Binary files a/icon-themes/colibre/cmd/32/footnotedialog.png and 
b/icon-themes/colibre/cmd/32/footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/32/insertendnote.png 
b/icon-themes/colibre/cmd/32/insertendnote.png
index 1ad735b0c02a..dfd74b732ec9 100644
Binary files a/icon-themes/colibre/cmd/32/insertendnote.png and 
b/icon-themes/colibre/cmd/32/insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/32/insertfootnote.png 
b/icon-themes/colibre/cmd/32/insertfootnote.png
index 603ed14ccf8b..306e175d48e6 100644
Binary files a/icon-themes/colibre/cmd/32/insertfootnote.png and 
b/icon-themes/colibre/cmd/32/insertfootnote.png differ
diff --git a/icon-themes/colibre/cmd/lc_footnotedialog.png 
b/icon-themes/colibre/cmd/lc_footnotedialog.png
index 0fd053835a97..0f0f1e70d700 100644
Binary files a/icon-themes/colibre/cmd/lc_footnotedialog.png and 
b/icon-themes/colibre/cmd/lc_footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/lc_insertendnote.png 
b/icon-themes/colibre/cmd/lc_insertendnote.png
index 935434c39796..56dcf6e4dedb 100644
Binary files a/icon-themes/colibre/cmd/lc_insertendnote.png and 
b/icon-themes/colibre/cmd/lc_insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/lc_insertfootnote.png 
b/icon-themes/colibre/cmd/lc_insertfootnote.png
index 612ba9a9cba6..1e98d38b82ed 100644
Binary files a/icon-themes/colibre/cmd/lc_insertfootnote.png and 
b/icon-themes/colibre/cmd/lc_insertfootnote.png differ
diff --git a/icon-themes/colibre/cmd/sc_footnotedialog.png 
b/icon-themes/colibre/cmd/sc_footnotedialog.png
index cc7da28b6a51..5cf0424e7ec1 100644
Binary files a/icon-themes/colibre/cmd/sc_footnotedialog.png and 
b/icon-themes/colibre/cmd/sc_footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertendnote.png 
b/icon-themes/colibre/cmd/sc_insertendnote.png
index 27d96eae1327..473068222ffe 100644
Binary files a/icon-themes/colibre/cmd/sc_insertendnote.png and 
b/icon-themes/colibre/cmd/sc_insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertfootnote.png 
b/icon-themes/colibre/cmd/sc_insertfootnote.png
index 14ad8dd8b31e..04d8adcabf22 100644
Binary files a/icon-themes/colibre/cmd/sc_insertfootnote.png and 
b/icon-themes/colibre/cmd/sc_insertfootnote.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/footnotedialog.svg 
b/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
index 5b6e6e12c35e..9fb565f6cfbf 100644
--- a/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
+++ b/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/insertendnote.svg 
b/icon-themes/colibre_svg/cmd/32/insertendnote.svg
index b6dc0d51eed7..ef1d7e435f26 100644
--- a/icon-themes/colibre_svg/cmd/32/insertendnote.svg
+++ b/icon-themes/colibre_svg/cmd/32/insertendnote.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/insertfootnote.svg 
b/icon-themes/colibre_svg/cmd/

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

[Miklos Vajna (via logerrit)]

 vcl/source/window/builder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9c7b02852fce033b008f2ccd1703fc10276cfb4e
Author: Miklos Vajna 
AuthorDate: Wed Oct 21 11:28:59 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 22 00:37:21 2020 +0200

vcl: remove leftover debug printf

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7072c1f42934..bea4f8f42390 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1845,7 +1845,6 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 m_pParserState->m_aButtonMenuMaps.emplace_back(id, sMenu);
 
 OUString sType = extractWidgetName(rMap);
-fprintf(stderr, "special name is %s\n", sType.toUtf8().getStr());
 if (sType.isEmpty())
 {
 xButton = extractStockAndBuildMenuButton(pParent, rMap);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gokce Kuler (via logerrit)]

 sw/source/core/text/inftxt.hxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 113c6c9d91c8f8bb90cc29f4dbe73fcafdb995de
Author: Gokce Kuler 
AuthorDate: Wed Oct 21 00:32:04 2020 +0300
Commit: Gülşah Köse 
CommitDate: Wed Oct 21 23:58:31 2020 +0200

tdf#124176 Use pragma once instead of header guard

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

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 835600f22fdf..d3ce7116407b 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
-#define INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
+#pragma once
+
 #include 
 #include 
 
@@ -783,6 +783,4 @@ inline void SwTextFormatInfo::SetParaFootnote()
 GetTextFrame()->SetFootnote( true );
 }
 
-#endif
-
 /* 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: icon-themes/colibre icon-themes/colibre_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/footnotedialog.png |binary
 icon-themes/colibre/cmd/32/insertendnote.png  |binary
 icon-themes/colibre/cmd/32/insertfootnote.png |binary
 icon-themes/colibre/cmd/lc_footnotedialog.png |binary
 icon-themes/colibre/cmd/lc_insertendnote.png  |binary
 icon-themes/colibre/cmd/lc_insertfootnote.png |binary
 icon-themes/colibre/cmd/sc_footnotedialog.png |binary
 icon-themes/colibre/cmd/sc_insertendnote.png  |binary
 icon-themes/colibre/cmd/sc_insertfootnote.png |binary
 icon-themes/colibre_svg/cmd/32/footnotedialog.svg |2 +-
 icon-themes/colibre_svg/cmd/32/insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/insertfootnote.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_footnotedialog.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/lc_insertfootnote.svg |2 +-
 icon-themes/colibre_svg/cmd/sc_footnotedialog.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_insertendnote.svg  |2 +-
 icon-themes/colibre_svg/cmd/sc_insertfootnote.svg |3 ++-
 18 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 0b35ef17fedc96b31dd1dff67648a61fe884c857
Author: Rizal Muttaqin 
AuthorDate: Wed Oct 21 18:20:17 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Wed Oct 21 23:08:32 2020 +0200

Colibre: update endnote & footnote icons

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

diff --git a/icon-themes/colibre/cmd/32/footnotedialog.png 
b/icon-themes/colibre/cmd/32/footnotedialog.png
index 140acf9f97d8..ac746ac2fd05 100644
Binary files a/icon-themes/colibre/cmd/32/footnotedialog.png and 
b/icon-themes/colibre/cmd/32/footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/32/insertendnote.png 
b/icon-themes/colibre/cmd/32/insertendnote.png
index 1ad735b0c02a..dfd74b732ec9 100644
Binary files a/icon-themes/colibre/cmd/32/insertendnote.png and 
b/icon-themes/colibre/cmd/32/insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/32/insertfootnote.png 
b/icon-themes/colibre/cmd/32/insertfootnote.png
index 603ed14ccf8b..306e175d48e6 100644
Binary files a/icon-themes/colibre/cmd/32/insertfootnote.png and 
b/icon-themes/colibre/cmd/32/insertfootnote.png differ
diff --git a/icon-themes/colibre/cmd/lc_footnotedialog.png 
b/icon-themes/colibre/cmd/lc_footnotedialog.png
index 0fd053835a97..0f0f1e70d700 100644
Binary files a/icon-themes/colibre/cmd/lc_footnotedialog.png and 
b/icon-themes/colibre/cmd/lc_footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/lc_insertendnote.png 
b/icon-themes/colibre/cmd/lc_insertendnote.png
index 935434c39796..56dcf6e4dedb 100644
Binary files a/icon-themes/colibre/cmd/lc_insertendnote.png and 
b/icon-themes/colibre/cmd/lc_insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/lc_insertfootnote.png 
b/icon-themes/colibre/cmd/lc_insertfootnote.png
index 612ba9a9cba6..1e98d38b82ed 100644
Binary files a/icon-themes/colibre/cmd/lc_insertfootnote.png and 
b/icon-themes/colibre/cmd/lc_insertfootnote.png differ
diff --git a/icon-themes/colibre/cmd/sc_footnotedialog.png 
b/icon-themes/colibre/cmd/sc_footnotedialog.png
index cc7da28b6a51..5cf0424e7ec1 100644
Binary files a/icon-themes/colibre/cmd/sc_footnotedialog.png and 
b/icon-themes/colibre/cmd/sc_footnotedialog.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertendnote.png 
b/icon-themes/colibre/cmd/sc_insertendnote.png
index 27d96eae1327..473068222ffe 100644
Binary files a/icon-themes/colibre/cmd/sc_insertendnote.png and 
b/icon-themes/colibre/cmd/sc_insertendnote.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertfootnote.png 
b/icon-themes/colibre/cmd/sc_insertfootnote.png
index 14ad8dd8b31e..04d8adcabf22 100644
Binary files a/icon-themes/colibre/cmd/sc_insertfootnote.png and 
b/icon-themes/colibre/cmd/sc_insertfootnote.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/footnotedialog.svg 
b/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
index 5b6e6e12c35e..9fb565f6cfbf 100644
--- a/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
+++ b/icon-themes/colibre_svg/cmd/32/footnotedialog.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/insertendnote.svg 
b/icon-themes/colibre_svg/cmd/32/insertendnote.svg
index b6dc0d51eed7..ef1d7e435f26 100644
--- a/icon-themes/colibre_svg/cmd/32/insertendnote.svg
+++ b/icon-themes/colibre_svg/cmd/32/insertendnote.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/insertfootnote.svg 
b/icon-themes/colibre_svg/cmd/32/insertfootnote.svg
index 903b63bd5a51..e6a9c0f9d6f7 100644
--- a/icon-themes/colibre_svg/cmd/32/insertfootnote.svg
+++ b/icon-themes/c

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.3.1' created by Christian Lohmaier 
 at 2020-10-21 20:09 +

Tag libreoffice-7.0.3.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QlW8ACgkQ9DSh76/u
rqM0mQ/+M4DiVHL7j0hzJRQCT03RwJsGiTLvoU5tHOl0Gtoc6E0HBVaNj1R/eauz
GXFS9kVQfu4JAtkqItZt2YkaEcMhsIy1ByVOhvC654mq1JrIAIK/VacZGkxFTHKE
kG5RsnBuY6vo0jMvICXLIo91kAyORo0hF0xttKw2423q1Bw9qYMEXbkq1iR1PQcN
CGEXQszNWHE4ZsU0dqW5JWw/uDpGzs9Y1/Hx/twOhItYAj0vIsgq+/ypUkZVk+Am
EkG8efcwKk6O+SZLUDLMVWmr7hvPzCnUfwnBUAyiclJTdaWQtkmwH/ipIKsxf/Jr
X6jZTg7CRr26M7qKn4g8/mnXHzY8TT+OAta7amWvFnh1mnNyJoGUK1cLUleV5+NX
xvgwbGbwBqjnVd90A9Ejk2YcCDiYUGdJefNJviI3tHye7DijwvW/vYOACDfhMYzq
OnJaBKMDjI8pIFN9dPscBy7ONxHndNf4d/e7jHpml2jxKuKvXd/v3VFwkpVdK9GC
2dCjaaCFfFiTyet9Jd904KFEfYJOlZRMYeA2KY31CSRtd3sU2nT2b7kAq0mI7qI2
Hq3sQFy8rzhnO0GrrDeoJ0e48ykD9IWE9I0+MVKIik0YC3S7hDvEO/cNn6m9m04X
o+/d28G3Ie58+QPPSRcfrRM+ifIxVEz3RYaaIdVjDT8Yl2Sqczk=
=Uc5X
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-3' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 98548d3c12a00cb27729e88a99d5976db1e05f5e
Author: Christian Lohmaier 
AuthorDate: Wed Oct 21 22:09:47 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 21 22:09:47 2020 +0200

bump product version to 7.0.3.1.0+

Change-Id: Ife468ae1a211f8901166555b61a163ade1e330ce

diff --git a/configure.ac b/configure.ac
index 0e9323283195..7fcf4f4afa4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.3.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.3.1' created by Christian Lohmaier 
 at 2020-10-21 20:09 +

Tag libreoffice-7.0.3.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QlXMACgkQ9DSh76/u
rqNaXRAAtocTnHB3X4WNRtQ5MBpCbsNbR5lGcjUuAXDBHagvnkyNvWa5u/C0a3b9
vFQt9pMjqE2GPNQ84S8ncMN/eZMf3XCU83eMooK/YGew66RB7GESlLbbiSi4vLq+
dESdwH/TRuJ6+yHXdkAdWRX73NSXV3SDoVyWWrbar/WS0i/9QGUUmXYXjfcsNV2p
imWnhSz6Kkol40vJhZL8Rszxi+cVF0M9gjjWDXMxxhkuWxnd2AoFct2/H2yylI+Q
Rdtfx3SWyB1Xq3z62PjtgygEOckigsygjUZMCqtiO5VzzNF1I2sqHxo3mQeEkFoq
JbmkNK3gTUd75fYdzMZ7/Dzr2udxffJGwzLjxGNaHW3ei/LhdnyIWQUVwkaekfHw
8Xd5/3cqi9Ooyfr/LMAA3+QerAblWsn8ajVLfG1e6XpNsz3fTHG89Bj1TvyK7q0t
rbl3MEv8fM6CloE+gbsmnMZyMHm+EHio6wJ1Eh6a9k4k0VZqYaRMmMp+/ercIS3f
LjOYs07mV10IxG9Erfm6zB3cyK5msnhWyQP5bde6v26q56qGi0RUwLp8isdL8YBu
O6KVBe0vcJTX4uMP8WCwAIKMU2aDhqdtNl4ViNi/UMiPj/41eUXs9r3n2RY8a1z5
qy4efQGVH+4SMz9F1EWAzVUnuNsT+5Ncp/R7jAqoC80YkxirxTg=
=gB5i
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.3.1' created by Christian Lohmaier 
 at 2020-10-21 20:09 +

Tag libreoffice-7.0.3.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QlXMACgkQ9DSh76/u
rqM0WBAAtYXSq/QNetF1HPxrFpw67nF7EV9FdTfidPL5dd0wQXhOIddpwYMwD99s
1jA+Gyy71zJb0mPxjhbDKS6UpDOvTbh1lfaKy9a0WbSPizU/2w1cYzvMxYL1keO7
cKLdQ8woQnIPYUzcT8W0L9N+trBhzbuOPhTOnyw2EIdHMbDUXlL13EvhQH+QNLB1
UFwdZDuXq7LzA5ahGLWARbOWjO6ywFh3+XcsX9/MlcybBbWba+rRG7re166WCluh
XU/mid3l5/szzSJ/y5K6hma+kjKH8c5Y4dn2WKNcPq9mFVBjRCKrEBqCEV3fw7vt
OmuiEhzgZHUkfkui4H9MiautY3hCQ4QPfQtJ6p1n9Hvdecu8Xm698A+iRG+Gzx6O
QIKZszA3xkUDraD6e1THyN/3Rwl9pxO7tSM1lN/f7Qjdm9MrMNfXXKhJBGMPP/9l
p4hCsFC1PSCgYxBrtp6ruz00lqLVVNq4xZpX6YmiFCKKjnUsnhrpymX0BflKEw2R
G94UmV7BQ3Wzt21A9Oywd/WVyLd8DVioNGfYUeCgpyJq0Qt2Ips0MLhLcHVp038l
CFEceBY8MZ4FanUNlFbAu0NA+wMbkuA9I4vZh+5cHb3vEnyPzdaOHVohLbM346zC
1agrOYfcusoCcoRt8daUmEGf2f4VKW1dbulNiVbaif5ZDyAY2Zk=
=lTty
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.3.1' created by Christian Lohmaier 
 at 2020-10-21 20:09 +

Tag libreoffice-7.0.3.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QlXMACgkQ9DSh76/u
rqM29RAAgJI47/kwojuHHQMIFqZdfD9uY0ZrtKF8tkpP9biEEHy4wpLLw0tmfl+g
DmYXSyC2gjiGbhrjMbxRHMNQH1rs5wBwDSLtmNuP93eu102eXblEtseeZ64Yiz9m
cKQJH79piUGYJy6aBOpQubdCcGn9SIkx09neuQQ9ESHcKp9D1L0b2KJ5CfXIBDAr
UKFT5bymgziJZtfGXqVOOWnyUVaJo8HQsONcrgG7agfK9EUgix0GGOCq5heu6vOT
ZTVLxJVhBYg9+Yo4akjARRKhTHbg08YGaHDSVymuYYuONCDgPZ2vgfZXHt2Rrn/A
rmkf09M0GqP6rDxYmgSRdiBioTQfg97V5ii3emnMq0BIPvxziCwcMMR9M/g+mzVt
5qCifMYtUUMklH0Lnx+vxBe3eNSWgXd8teAsVqVPqssaieRZqsLF2Rz4tJNQaqOS
z4brobNyZSntkehRpRpuqXY+KthUIaaoejbuQ1RKsuU15N3eGR1b6fCY6bDt1sOW
XV9N0Ttr6Y+e+6IKV8CmRwzGzAXfrPmDXhBQv7pHHCDnqvqN4v0DXTPFy7TMDHN+
dwUv4zZS3qKT2zWJ48VHeMKcrPyYHp0Z6RC3z4nBIgBlv4WLHD+IK8CMylDrZNeQ
v+ZCar2/D/dBDpscgtr/SKNYglXKkpyixbDrzpVnCK2j5ngZR64=
=kKrW
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit e5b019d12043712c2d2a5ac424102e9861d21ad2
Author: Christian Lohmaier 
AuthorDate: Wed Oct 21 22:07:19 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 21 22:07:19 2020 +0200

bump product version to 7.0.4.0.0+

Change-Id: Ie42d0834e9061d443a26509a07f1f99c778f847c

diff --git a/configure.ac b/configure.ac
index 0e9323283195..99f0eb26902e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.4.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-3' available with the following commits:
commit 2a43849f835a667d0fc0da8de98aa58bc5ae83b1
Author: Christian Lohmaier 
Date:   Wed Oct 21 22:03:30 2020 +0200

Branch libreoffice-7-0-3

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

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

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

Change-Id: I9924ae7a98ea6ddc90a6617a836d848f78b9c2da

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

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

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-3' available with the following commits:
commit 85367707cc7ba61e9ef4d70f287103c3a37f91a0
Author: Christian Lohmaier 
Date:   Wed Oct 21 22:04:03 2020 +0200

Branch libreoffice-7-0-3

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

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

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

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

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

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-3' available with the following commits:
commit 48ffba2c7c85e9b15a727203b16f761d11dbcfa8
Author: Christian Lohmaier 
Date:   Wed Oct 21 22:03:30 2020 +0200

Branch libreoffice-7-0-3

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

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

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

Change-Id: I6026f98a381b29e0d8c2628cf9fde2bc50efbf5d

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

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

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-0-3' available with the following commits:
commit 381b2c040cd22d5a3ae38b738f50c87c685acd09
Author: Christian Lohmaier 
Date:   Wed Oct 21 22:03:31 2020 +0200

Branch libreoffice-7-0-3

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

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

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

Change-Id: I6d2a1e80c0d4d1a08f636396a9c2d0dd4f8a63f1

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

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

[Christian Lohmaier (via logerrit)]

 .gitmodules  |6 +++---
 translations |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 77a13e01cfead81f6ff8443cf2d82f564a0158ea
Author: Christian Lohmaier 
AuthorDate: Wed Oct 21 21:59:32 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 21 21:59:32 2020 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-0'
  to a032756b2ded48180d4db2996486c59d644bc6e3
  - update translations for 7.0.2 rc2

and force-fix errors using pocheck

Change-Id: Icc6c8d4e27bf80431ec26c8ceb37848058038c85

diff --git a/translations b/translations
index 4a12b40c8751..a032756b2ded 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4a12b40c8751323705d82539be43d04990f934a9
+Subproject commit a032756b2ded48180d4db2996486c59d644bc6e3
commit dd6dcb41731b87b02afe80e52614788f2906a83f
Author: Christian Lohmaier 
AuthorDate: Wed Oct 21 21:51:54 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 21 21:58:43 2020 +0200

gitmodules: use relative paths

as using https://git.libreoffice.org breaks the submodule subsription
(automatic update in core when something is pushed to the submodules),
since gerrit compares the URL with gerrit.canonicalWebUrl, the URL where
gerrit itself is found, not what is used as default repository URL

Change-Id: I2e4566e69c7e70c463f0aab393d622a6f4d61808
(cherry picked from commit f7d892aa0b44772ccd70786375d3b6a4515af180)

diff --git a/.gitmodules b/.gitmodules
index 61ecfe58b1f0..c441234d6030 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "dictionaries"]
path = dictionaries
-   url = https://git.libreoffice.org/dictionaries
+   url = ../dictionaries
branch = .
 [submodule "helpcontent2"]
path = helpcontent2
-   url = https://git.libreoffice.org/help
+   url = ../help
branch = .
 [submodule "translations"]
path = translations
-   url = https://git.libreoffice.org/translations
+   url = ../translations
branch = .
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitmodules

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f7d892aa0b44772ccd70786375d3b6a4515af180
Author: Christian Lohmaier 
AuthorDate: Wed Oct 21 21:51:54 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 21 21:51:54 2020 +0200

gitmodules: use relative paths

as using https://git.libreoffice.org breaks the submodule subsription
(automatic update in core when something is pushed to the submodules),
since gerrit compares the URL with gerrit.canonicalWebUrl, the URL where
gerrit itself is found, not what is used as default repository URL

Change-Id: I2e4566e69c7e70c463f0aab393d622a6f4d61808

diff --git a/.gitmodules b/.gitmodules
index 61ecfe58b1f0..c441234d6030 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "dictionaries"]
path = dictionaries
-   url = https://git.libreoffice.org/dictionaries
+   url = ../dictionaries
branch = .
 [submodule "helpcontent2"]
path = helpcontent2
-   url = https://git.libreoffice.org/help
+   url = ../help
branch = .
 [submodule "translations"]
path = translations
-   url = https://git.libreoffice.org/translations
+   url = ../translations
branch = .
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/attribute/fillgradientattribute.hxx |   12 +---
 include/drawinglayer/attribute/fillgraphicattribute.hxx  |9 ++---
 include/drawinglayer/attribute/fillhatchattribute.hxx|   12 +---
 3 files changed, 4 insertions(+), 29 deletions(-)

New commits:
commit fe9dff6c29898fc61901cb2c40105d2cbaed9a6a
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 21:01:43 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Oct 21 21:01:43 2020 +0200

cleanup namespaces for fill*attribute.hxx

Change-Id: I2aee131512e0eb194843f207de63e63af7ed219a

diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx 
b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 7b07d7022855..f9d9e2245d9a 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -30,10 +30,7 @@ class BColor;
 namespace drawinglayer::attribute
 {
 class ImpFillGradientAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 enum class GradientStyle
 {
 Linear,
@@ -44,10 +41,6 @@ enum class GradientStyle
 Rect
 };
 
-} // end of namespace drawinglayer::attribute
-
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
 {
 public:
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx 
b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 1649d1b38881..976d7bd37586 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -32,10 +32,7 @@ class B2DRange;
 namespace drawinglayer::attribute
 {
 class ImpFillGraphicAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillGraphicAttribute
 {
 public:
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx 
b/include/drawinglayer/attribute/fillhatchattribute.hxx
index 5d97fbc17026..a929b5715906 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -30,10 +30,7 @@ class BColor;
 namespace drawinglayer::attribute
 {
 class ImpFillHatchAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 enum class HatchStyle
 {
 Single,
@@ -41,10 +38,6 @@ enum class HatchStyle
 Triple
 };
 
-} // end of namespace drawinglayer::attribute
-
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute
 {
 public:
commit 81b82d049fdcc2fb1c1c2fe6a4a050a9505a1522
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 20:59:32 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Oct 21 20:59:32 2020 +0200

pragma once for fill*attribute.hxx

Change-Id: I588b0214bcd75b77c9c72b4c6f320a6dd8a82e01

diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx 
b/include/drawinglayer/attribute/fillgradientattribute.hxx
index cc2fab0518dc..7b07d7022855 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
+#pragma once
 
 #include 
 #include 
@@ -88,6 +87,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx 
b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 4ee0ab3f3ed5..1649d1b38881 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
+
+#pragma once
 
 #include 
 #include 
@@ -68,6 +68,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx 
b/include/drawinglayer/attribute/fillhatchattribute.hxx
index f13e46bf903b..5d97fbc17026 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
+#pragma once
 
 #include 
 #include 
@@ -95,6 +94,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIB

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 3 commits - drawinglayer/source include/drawinglayer solenv/clang-format

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/attribute/fontattribute.cxx  |  295 ++-
 drawinglayer/source/primitive2d/textprimitive2d.cxx  |4 
 include/drawinglayer/attribute/fillgradientattribute.hxx |  116 ++---
 include/drawinglayer/attribute/fillgraphicattribute.hxx  |   79 +---
 include/drawinglayer/attribute/fillhatchattribute.hxx|  128 +++---
 solenv/clang-format/excludelist  |4 
 6 files changed, 273 insertions(+), 353 deletions(-)

New commits:
commit a1e2de23fd1de7880520501736e2241e7d4d85aa
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 20:55:54 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Oct 21 20:55:54 2020 +0200

remove fill*attribute.hxx from clang-format excludelist

Change-Id: Idc70c350b1ed6015d56fd785acf5afbc394056fe

diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx 
b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 7363eb4bad89..cc2fab0518dc 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -23,81 +23,71 @@
 #include 
 #include 
 
-
-// predefines
-
-namespace basegfx {
-class BColor;
+namespace basegfx
+{
+class BColor;
 }
 
-namespace drawinglayer::attribute {
-class ImpFillGradientAttribute;
+namespace drawinglayer::attribute
+{
+class ImpFillGradientAttribute;
 }
 
-
 namespace drawinglayer::attribute
-{
-enum class GradientStyle
-{
-Linear,
-Axial,
-Radial,
-Elliptical,
-Square,
-Rect
-};
+{
+enum class GradientStyle
+{
+Linear,
+Axial,
+Radial,
+Elliptical,
+Square,
+Rect
+};
 
 } // end of namespace drawinglayer::attribute
 
-
 namespace drawinglayer::attribute
-{
-class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
-{
-public:
-typedef o3tl::cow_wrapper< ImpFillGradientAttribute > ImplType;
-
-private:
-ImplType mpFillGradientAttribute;
-
-public:
-/// constructors/assignmentoperator/destructor
-FillGradientAttribute(
-GradientStyle eStyle,
-double fBorder,
-double fOffsetX,
-double fOffsetY,
-double fAngle,
-const basegfx::BColor& rStartColor,
-const basegfx::BColor& rEndColor,
-sal_uInt16 nSteps);
-FillGradientAttribute();
-FillGradientAttribute(const FillGradientAttribute&);
-FillGradientAttribute(FillGradientAttribute&&);
-FillGradientAttribute& operator=(const FillGradientAttribute&);
-FillGradientAttribute& operator=(FillGradientAttribute&&);
-~FillGradientAttribute();
-
-// checks if the incarnation is default constructed
-bool isDefault() const;
-
-// compare operator
-bool operator==(const FillGradientAttribute& rCandidate) const;
-
-// data read access
-GradientStyle getStyle() const;
-double getBorder() const;
-double getOffsetX() const;
-double getOffsetY() const;
-double getAngle() const;
-const basegfx::BColor& getStartColor() const;
-const basegfx::BColor& getEndColor() const;
-sal_uInt16 getSteps() const;
-};
+{
+class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
+{
+public:
+typedef o3tl::cow_wrapper ImplType;
+
+private:
+ImplType mpFillGradientAttribute;
+
+public:
+/// constructors/assignmentoperator/destructor
+FillGradientAttribute(GradientStyle eStyle, double fBorder, double 
fOffsetX, double fOffsetY,
+  double fAngle, const basegfx::BColor& rStartColor,
+  const basegfx::BColor& rEndColor, sal_uInt16 nSteps);
+FillGradientAttribute();
+FillGradientAttribute(const FillGradientAttribute&);
+FillGradientAttribute(FillGradientAttribute&&);
+FillGradientAttribute& operator=(const FillGradientAttribute&);
+FillGradientAttribute& operator=(FillGradientAttribute&&);
+~FillGradientAttribute();
+
+// checks if the incarnation is default constructed
+bool isDefault() const;
+
+// compare operator
+bool operator==(const FillGradientAttribute& rCandidate) const;
+
+// data read access
+GradientStyle getStyle() const;
+double getBorder() const;
+double getOffsetX() const;
+double getOffsetY() const;
+double getAngle() const;
+const basegfx::BColor& getStartColor() const;
+const basegfx::BColor& getEndColor() const;
+sal_uInt16 getSteps() const;
+};
 
 } // end of namespace drawinglayer::attribute
 
-
 #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillgraphic

[Libreoffice-commits] core.git: connectivity/source cui/source offapi/com svx/source

[Andrea Gelmini (via logerrit)]

 connectivity/source/manager/mdrivermanager.cxx |2 +-
 cui/source/dialogs/hangulhanjadlg.cxx  |2 +-
 offapi/com/sun/star/awt/XTabListener.idl   |2 +-
 svx/source/inc/fmundo.hxx  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 269b8a086e3d3387ef6a68cf29508704331513d5
Author: Andrea Gelmini 
AuthorDate: Mon Oct 19 18:53:04 2020 +0200
Commit: Julien Nabet 
CommitDate: Wed Oct 21 20:37:07 2020 +0200

Fix typos

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

diff --git a/connectivity/source/manager/mdrivermanager.cxx 
b/connectivity/source/manager/mdrivermanager.cxx
index ae1e226cd2fc..afcb38279640 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -301,7 +301,7 @@ void OSDBCDriverManager::bootstrapDrivers()
 if ( xDriver.is() )
 {
 aDriverDescriptor.xDriver = xDriver;
-// and obtain it's implementation name
+// and obtain its implementation name
 xSI.set(xDriver, css::uno::UNO_QUERY);
 OSL_ENSURE( xSI.is(), 
"OSDBCDriverManager::bootstrapDrivers: a driver without service info?" );
 if ( xSI.is() )
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index bd252a2fe5a8..b2da62f49bd0 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -172,7 +172,7 @@ namespace svx
 
 // now draw the texts
 // as we already calculated the precise rectangles for the texts, we 
don't want to
-// use the alignment flags given - within it's rect, every text is 
centered
+// use the alignment flags given - within its rect, every text is 
centered
 DrawTextFlags nDrawTextStyle( nTextStyle );
 nDrawTextStyle &= ~DrawTextFlags( DrawTextFlags::Right | 
DrawTextFlags::Left | DrawTextFlags::Bottom | DrawTextFlags::Top );
 nDrawTextStyle |= DrawTextFlags::Center | DrawTextFlags::VCenter;
diff --git a/offapi/com/sun/star/awt/XTabListener.idl 
b/offapi/com/sun/star/awt/XTabListener.idl
index 130f86fa7d72..142fbb2344cc 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -46,7 +46,7 @@ interface XTabListener : com::sun::star::lang::XEventListener
  */
 void removed( [in] long ID );
 
-/** a tab was changed within it's properties.
+/** a tab was changed within its properties.
 
 @param  ID
 the unique ID of the changed tab.
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index d914a0e74071..02b8f4998766 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -91,7 +91,7 @@ private:
 m_xElement; // object not owned by the action
 css::uno::Reference< css::uno::XInterface >
 m_xOwnElement;  // object owned by the action
-sal_Int32   m_nIndex;   // index of the object within it's 
container
+sal_Int32   m_nIndex;   // index of the object within its container
 css::uno::Sequence< css::script::ScriptEventDescriptor >
 m_aEvents;  // events of the object
 Action  m_eAction;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/qa/uitest/writer_tests/tdf81457.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cdedcfe5548f676c6a39a3c9cc39eea0bcd99e80
Author: Stephan Bergmann 
AuthorDate: Wed Oct 21 13:18:31 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 21 20:35:47 2020 +0200

Fix one more get_url_for_data_file

...similar to 8bf87fe5112fbec54db1496b5037c43e24bc76fe "Fix one more
get_url_for_data_file" etc.

 had failed
PythonTest_solenv_python with

> Traceback (most recent call last):
>   File 
"/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/solenv/qa/python/gbuildtojson.py",
 line 136, in test_gbuildtojson
> shutil.copytree(os.path.join(os.environ['SRCDIR'], module), 
os.path.join(self.tempsrc, module),
>   File 
"/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python-core-3.8.4/lib/shutil.py",
 line 554, in copytree
> return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
>   File 
"/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python-core-3.8.4/lib/shutil.py",
 line 510, in _copytree
> raise Error(errors)
> shutil.Error: 
[('/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#',
 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/tempdir/gbuildadynlc3l/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#',
 "[Errno 2] No such file or directory: 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#'")]

presumably because UITest_writer_tests was running in parallel and 
temporarily
created that sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt# lock file 
in
the source tree.

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

diff --git a/sw/qa/uitest/writer_tests/tdf81457.py 
b/sw/qa/uitest/writer_tests/tdf81457.py
index 3b7108866ee3..436ed9cd7405 100644
--- a/sw/qa/uitest/writer_tests/tdf81457.py
+++ b/sw/qa/uitest/writer_tests/tdf81457.py
@@ -9,14 +9,15 @@
 
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.path import get_srcdir_url
 from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
 import time
 from uitest.debug import sleep
 from uitest.uihelper.common import select_pos
 
 def get_url_for_data_file(file_name):
-   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+   return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf81457(UITestCase):
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 vcl/source/gdi/TypeSerializer.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 0e8e352cc78af9b8cee27a77b0ac8e2e8f98f8cc
Author: Noel 
AuthorDate: Wed Oct 21 15:44:32 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 21 20:35:01 2020 +0200

clamp angle to valid value

fallout from
commit 0fb58a1ff168ae122e9c8993a3136658e3b0e3f0
new tools::Degree10 strong typedef

which caused failures in CppunitTest_vcl_filters_test

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

diff --git a/vcl/source/gdi/TypeSerializer.cxx 
b/vcl/source/gdi/TypeSerializer.cxx
index 0b1b53372030..bbfdbf430160 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -58,6 +58,11 @@ void TypeSerializer::readGradient(Gradient& rGradient)
 rGradient.SetStyle(static_cast(nStyle));
 rGradient.SetStartColor(aStartColor);
 rGradient.SetEndColor(aEndColor);
+if (nAngle > 3600)
+{
+SAL_WARN("vcl", "angle out of range " << nAngle);
+nAngle = 0;
+}
 rGradient.SetAngle(Degree10(nAngle));
 rGradient.SetBorder(nBorder);
 rGradient.SetOfsX(nOffsetX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6c60a98f4c0cb08107a221486fa52aef6ca4da7
Author: Tor Lillqvist 
AuthorDate: Wed Oct 21 09:42:35 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 21 18:32:16 2020 +0300

Accept iOS SDK 14.1

Change-Id: I093ee0a6cb6483a8891dd9ed4576da0108303c66

diff --git a/configure.ac b/configure.ac
index 1ad57a373c3e..079e5cbed7c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3066,8 +3066,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.0
-older_sdk_vers="13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.1
+older_sdk_vers="14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - configure.ac

[Miklos Vajna (via logerrit)]

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

New commits:
commit 6015ce4877a92453091aba2c692cf207c47a1176
Author: Miklos Vajna 
AuthorDate: Wed Oct 21 17:29:38 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 21 17:29:38 2020 +0200

Bump product version to 6.2.8.2.M2

Change-Id: Ib6d2fff5e7745987568b8c5637d6eb5406635350

diff --git a/configure.ac b/configure.ac
index 1278e25b65d7..ae4911f35461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.8.2.M1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M2],[],[],[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] core.git: Branch 'libreoffice-7-0' - cui/uiconfig sw/uiconfig

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/textflowpage.ui |2 +-
 sw/uiconfig/swriter/ui/insertbreak.ui   |2 +-
 sw/uiconfig/swriter/ui/tabletextflowpage.ui |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit af580166b64e1009eb76b750d7cb92121f994d08
Author: Caolán McNamara 
AuthorDate: Tue Oct 20 09:35:23 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 21 15:41:14 2020 +0200

tdf#137608 allow insert break to use a page number > 

writer is using sal_uInt16 for the page number. If we wanted anything bigger
then the max possible sal_uInt16 then we would need to make real changes to
writer to change the type.

Leaving the type as sal_uInt16 but allowing 65535 then makes it real easy to
use the ui to force writer to loop over to page 0 and I can predict the 
moaning
about that. So I propose instead of an arbitrary max of 1-1 to have an
arbitrary max of 65535-1 for 55535 instead.

and use same max-page in textflow as insert, break

and table-textflow too as well as para-textflow

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

diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index bcca12f89d48..4edafdc277a0 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -15,7 +15,7 @@
 10
   
   
-
+55535
 1
 1
 10
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui 
b/sw/uiconfig/swriter/ui/insertbreak.ui
index 7aca5957f514..e8140048487c 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -3,7 +3,7 @@
 
   
   
-
+55535
 1
 1
 10
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui 
b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index fc4baf97632c..be1b0c581354 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -3,7 +3,7 @@
 
   
   
-
+55535
 1
 1
 10
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0431fae4d04ca892d11a860c2b11e4a6ca079031
Author: Caolán McNamara 
AuthorDate: Wed Oct 14 16:27:57 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 21 15:39:35 2020 +0200

Related: tdf#137250 need signal-changed for ComboBoxText too

e.g. changing font in format, character with up/down/typeahead

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index cf06ebae9dfc..c8e8203cfa3e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13901,7 +13901,7 @@ private:
 m_bChangedByMenu = false;
 enable_notify_events();
 
-if (bInteractive && !m_bPopupActive && !m_pEntry)
+if (bInteractive && !m_bPopupActive)
 signal_changed();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source basic/source canvas/source canvas/workben chart2/qa chart2/source include/basegfx

[Noel (via logerrit)]

 basegfx/source/tools/zoomtools.cxx   |   16 
+++
 basic/source/comp/exprnode.cxx   |   15 
+++---
 basic/source/comp/symtbl.cxx |3 -
 basic/source/runtime/ddectrl.cxx |2 
 basic/source/runtime/inputbox.cxx|8 +--
 basic/source/runtime/methods.cxx |   20 
-
 basic/source/runtime/methods1.cxx|8 +--
 basic/source/uno/dlgcont.cxx |4 -
 canvas/source/cairo/cairo_canvasfont.cxx |2 
 canvas/source/cairo/cairo_canvashelper.cxx   |4 -
 canvas/source/cairo/cairo_textlayout.cxx |2 
 canvas/source/cairo/cairo_textlayout.hxx |2 
 canvas/source/vcl/canvasfont.cxx |2 
 canvas/source/vcl/spritehelper.cxx   |2 
 canvas/source/vcl/textlayout.cxx |2 
 canvas/source/vcl/textlayout.hxx |2 
 canvas/workben/canvasdemo.cxx|2 
 chart2/qa/extras/chart2import.cxx|6 +-
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx |3 -
 chart2/source/controller/dialogs/DataBrowser.cxx |   22 
+-
 chart2/source/controller/dialogs/DataBrowser.hxx |   12 
++---
 chart2/source/controller/dialogs/res_DataLabel.cxx   |2 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx|6 +-
 chart2/source/controller/dialogs/tp_PointGeometry.cxx|4 -
 chart2/source/controller/dialogs/tp_PolarOptions.cxx |2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx |   10 
++--
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx|2 
 chart2/source/controller/main/ChartController_Position.cxx   |8 +--
 chart2/source/controller/main/ChartController_Window.cxx |4 -
 chart2/source/controller/main/DragMethod_PieSegment.cxx  |2 
 chart2/source/controller/main/DrawCommandDispatch.cxx|8 +--
 chart2/source/model/main/ChartModel.cxx  |8 +--
 chart2/source/view/axes/DateHelper.cxx   |2 
 chart2/source/view/axes/MinimumAndMaximumSupplier.cxx|8 +--
 chart2/source/view/axes/ScaleAutomatism.cxx  |   15 
+++---
 chart2/source/view/charttypes/VSeriesPlotter.cxx |6 +-
 chart2/source/view/inc/DateHelper.hxx|3 -
 chart2/source/view/inc/MinimumAndMaximumSupplier.hxx |9 
++--
 chart2/source/view/inc/PlottingPositionHelper.hxx|5 +-
 chart2/source/view/inc/VSeriesPlotter.hxx|6 +-
 chart2/source/view/main/ChartView.cxx|2 
 chart2/source/view/main/PlottingPositionHelper.cxx   |2 
 chart2/source/view/main/VLegend.cxx  |4 -
 include/basegfx/utils/zoomtools.hxx  |5 +-
 44 files changed, 135 insertions(+), 127 deletions(-)

New commits:
commit 387a88fa252990ded26ee7ea6b89b11be7616986
Author: Noel 
AuthorDate: Wed Oct 21 09:29:45 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 21 15:34:16 2020 +0200

use tools::Long in basegfx..chart2

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

diff --git a/basegfx/source/tools/zoomtools.cxx 
b/basegfx/source/tools/zoomtools.cxx
index 488b19b31264..4fedb8ee848c 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -26,7 +26,7 @@ const double ZOOM_FACTOR = 1.12246205;
 * @param nCurrent current value
 * @param nMultiple multiple against which the current value is rounded
 */
-static long roundMultiple(long nCurrent, int nMultiple)
+static tools::Long roundMultiple(tools::Long nCurrent, int nMultiple)
 {
 // round zoom to a multiple of nMultiple
 return (( nCurrent + nMultiple / 2 ) - ( nCurrent + nMultiple / 2 ) % 
nMultiple);
@@ -39,10 +39,10 @@ static long roundMultiple(long nCurrent, int nMultiple)
 *
 * @param nCurrent current zoom factor
 */
-static long roundZoom(double nCurrent)
+static tools::Long roundZoom(double nCurrent)
 {
 // convert nCurrent properly to int
-long nNew = nCurrent + 0.5;
+tools::Long nNew = nCurrent + 0.5;
 
 // round to more common number

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docfly.cxx|   26 ++
 sw/source/core/layout/anchoreddrawobject.cxx |   11 ++-
 2 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 4e7b60682d48c7f3950e341c496dc7fc6f9b4367
Author: Michael Stahl 
AuthorDate: Tue Oct 20 19:19:35 2020 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 21 15:31:36 2020 +0200

tdf#136385 sw: fix Undo of changing anchor type

There were a few problems here:

1. the changes to positions in
   SwAnchoredDrawObject::AdjustPositioningAttr() weren't recorded
2. the Undo of setting the anchor type ran last, which ended up calling
   SwDrawContact::Changed_() via some callback, which changed the
   position from the correct one to a wrong one
3. if the fixup for FLY_AT_PAGE is done after AdjustPositioningAttr()
   then that doesn't need to take into account the anchor type

(regression from 1de2b0d3234462b488db54d36ebc17e2b579b0f0)

Change-Id: If70408ad6140a5bec739dea176936ffcbfe3f5ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104571
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1b3310a5805cf50f7aca88a83768ffa5adc42a0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104588
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index e435920da879..988e59c76a58 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -932,18 +932,6 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
 // #i26791# - Direct object positioning no longer needed. Apply
 // of attributes (method call ) takes care of the
 // invalidation of the object position.
-SetAttr( aNewAnch, *pContact->GetFormat() );
-if (aNewAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE)
-{
-SwFormatHoriOrient 
item(pContact->GetFormat()->GetHoriOrient());
-sal_Int16 nRelOrient(item.GetRelationOrient());
-if (sw::GetAtPageRelOrientation(nRelOrient, false))
-{
-SAL_INFO("sw.ui", "fixing horizontal RelOrientation 
for at-page anchor");
-
item.SetRelationOrient(text::RelOrientation::PAGE_FRAME);
-SetAttr(item, *pContact->GetFormat());
-}
-}
 if ( _bPosCorr )
 {
 // #i33313# - consider not connected 'virtual' drawing
@@ -962,6 +950,20 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
 ->AdjustPositioningAttr( pNewAnchorFrame );
 }
 }
+if (aNewAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE)
+{
+SwFormatHoriOrient 
item(pContact->GetFormat()->GetHoriOrient());
+sal_Int16 nRelOrient(item.GetRelationOrient());
+if (sw::GetAtPageRelOrientation(nRelOrient, false))
+{
+SAL_INFO("sw.ui", "fixing horizontal RelOrientation 
for at-page anchor");
+item.SetRelationOrient(nRelOrient);
+SetAttr(item, *pContact->GetFormat());
+}
+}
+// tdf#136385 set the anchor last - otherwise it messes up the
+// position in SwDrawContact::Changed_() callback
+SetAttr(aNewAnch, *pContact->GetFormat());
 }
 
 // we have changed the anchoring attributes, and those are used to
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index d3be5402febf..2cbe4bab0f3b 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -776,11 +776,12 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const 
SwFrame* _pNewAnchorFram
 nVertRelPos = aObjRect.Top() - aAnchorPos.Y();
 }
 
-GetFrameFormat().SetFormatAttr( SwFormatHoriOrient( nHoriRelPos, 
text::HoriOrientation::NONE,
-GetFrameFormat().GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE
-? text::RelOrientation::PAGE_FRAME
-: text::RelOrientation::FRAME ) );
-GetFrameFormat().SetFormatAttr( SwFormatVertOrient( nVertRelPos, 
text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+SwFormatHoriOrient hori(nHoriRelPos, text::HoriOrientation::NONE, 
text::RelOrientation::FRAME);
+SwFormatVertOrient vert(nVertRelPos, text::VertOrientation::NONE, 
text::RelOrientation::FRAME);
+SfxItemSet items(GetFrameFormat().GetDoc()->GetAttrPool(), 
svl::Items());
+items.Put(hori);
+items.Put(vert);
+GetFrameFormat().GetDoc()->SetAttr(items, GetFrameFormat());
 }
 
 // --> #i34748# - c

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

[Caolán McNamara (via logerrit)]

 sfx2/source/control/thumbnailview.cxx |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 4bea7a17056770c83006048f9fd3fa252958718b
Author: Caolán McNamara 
AuthorDate: Tue Oct 20 19:42:58 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 21 15:07:25 2020 +0200

mirror changes of ThumbnailView to SfxThumbnailView

in advance of replacement

commit 6cd1591fb8b0a550067c37cf720708c6a5630b6d
Author: Roman Kuznetsov 
Date:   Sun Apr 26 20:49:22 2020 +0100

tdf#132441 thumb scrolling in Start Center should be more accuracy

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

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 97235330b81b..fa1f2d26d7a8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1409,8 +1409,11 @@ void SfxThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
 // calculate window scroll ratio
 float nScrollRatio;
 if (bScrollBarUsed)
+{
 nScrollRatio = 
static_cast(mxScrolledWindow->vadjustment_get_value()) /
-
static_cast(mxScrolledWindow->vadjustment_get_upper()-2);
+   
static_cast(mxScrolledWindow->vadjustment_get_upper() -
+  
mxScrolledWindow->vadjustment_get_page_size());
+}
 else
 nScrollRatio = 0;
 
@@ -1448,11 +1451,10 @@ void SfxThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
 
 mbHasVisibleItems = true;
 
+long nFullSteps = (mnLines > mnVisLines) ? mnLines - mnVisLines + 1 : 1;
+
 long nItemHeightOffset = mnItemHeight + nVItemSpace;
-long nHiddenLines = (static_cast(
-( mnLines - 1 ) * nItemHeightOffset * nScrollRatio ) -
-nVItemSpace ) /
-nItemHeightOffset;
+long nHiddenLines = static_cast((nFullSteps - 1) * nScrollRatio);
 
 // calculate offsets
 long nStartX = nHItemSpace;
@@ -1460,8 +1462,7 @@ void SfxThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
 
 // calculate and draw items
 long x = nStartX;
-long y = nStartY - ( mnLines - 1 ) * nItemHeightOffset * nScrollRatio +
-nHiddenLines * nItemHeightOffset;
+long y = nStartY - ((nFullSteps - 1) * nScrollRatio - nHiddenLines) * 
nItemHeightOffset;
 
 // draw items
 // Unless we are scrolling (via scrollbar) we just use the precalculated
@@ -1536,8 +1537,8 @@ void SfxThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
 // check if scroll is needed
 mbScroll = mnLines > mnVisLines;
 
-
mxScrolledWindow->vadjustment_set_upper((nCurCount+mnCols-1)*gnFineness/mnCols);
-mxScrolledWindow->vadjustment_set_page_size(mnVisLines*gnFineness);
+mxScrolledWindow->vadjustment_set_upper(mnLines * gnFineness);
+mxScrolledWindow->vadjustment_set_page_size(mnVisLines * gnFineness);
 if (!bScrollBarUsed)
 
mxScrolledWindow->vadjustment_set_value(static_cast(mnFirstLine)*gnFineness);
 long nPageSize = mnVisLines;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit b48d9aeb848c6e9a4d94f84c7fe636319fcfb78f
Author: Caolán McNamara 
AuthorDate: Tue Oct 20 17:24:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 21 15:06:43 2020 +0200

don't trigger resize if size didn't change

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 67dd9751053b..9db6e5951917 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13415,6 +13415,12 @@ private:
 }
 virtual void signal_size_allocate(guint nWidth, guint nHeight) override
 {
+Size aNewSize(nWidth, nHeight);
+if (m_pSurface && aNewSize == m_xDevice->GetOutputSizePixel())
+{
+// unchanged
+return;
+}
 m_xDevice->SetOutputSizePixel(Size(nWidth, nHeight));
 m_pSurface = get_underlying_cairo_surface(*m_xDevice);
 GtkInstanceWidget::signal_size_allocate(nWidth, nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/salcall.cxx  |  135 -
 compilerplugins/clang/test/salcall.cxx |   25 ++
 2 files changed, 59 insertions(+), 101 deletions(-)

New commits:
commit 24e7fe20354a2bb4a468c023242c9a6c5eb00712
Author: Stephan Bergmann 
AuthorDate: Wed Oct 21 08:31:46 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 21 15:02:42 2020 +0200

Fix loplugin:salcall

For one, the addressOfSet filtering was only done for member functions, not 
for
free functions, which caused false positives in the wild like the one 
discussed
in the comments at  "call 
xDesktop->terminate()
when catching SIGTERM/SIGINT" regarding a free function
`terminationHandlerFunction` passed to `osl_createThread`.

For another, it failed to identify some cases where the address of a 
function is
taken implicitly, like for `f3` in compilerplugins/clang/test/salcall.cxx.  
So
make this plugin reuse the existing `loplugin::FunctionAddress` 
functionality
(which also meant to get rid of this plugin's two-phase design).

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

diff --git a/compilerplugins/clang/salcall.cxx 
b/compilerplugins/clang/salcall.cxx
index e70e6477f2b0..a3f5678a3918 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -10,6 +10,7 @@
 #include "plugin.hxx"
 #include "check.hxx"
 #include "compat.hxx"
+#include "functionaddress.hxx"
 
 #include 
 #include 
@@ -51,113 +52,41 @@ CXXMethodDecl const* 
getTemplateInstantiationPattern(CXXMethodDecl const* decl)
 return p == nullptr ? decl : cast(p);
 }
 
-class SalCall final : public loplugin::FilteringRewritePlugin
+class SalCall final : public 
loplugin::FunctionAddress>
 {
 public:
 explicit SalCall(loplugin::InstantiationData const& data)
-: FilteringRewritePlugin(data)
+: FunctionAddress(data)
 {
 }
 
 virtual void run() override
 {
-m_phase = PluginPhase::FindAddressOf;
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-m_phase = PluginPhase::Warning;
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+if (TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()))
+{
+auto const& addressOfSet = getFunctionsWithAddressTaken();
+for (auto const decl : m_decls)
+{
+if (addressOfSet.find(decl->getCanonicalDecl()) == 
addressOfSet.end())
+{
+handleFunctionDecl(decl);
+}
+}
+}
 }
 
 bool VisitFunctionDecl(FunctionDecl const*);
-bool VisitUnaryOperator(UnaryOperator const*);
-bool VisitInitListExpr(InitListExpr const*);
-bool VisitCallExpr(CallExpr const*);
-bool VisitBinaryOperator(BinaryOperator const*);
-bool VisitCXXConstructExpr(CXXConstructExpr const*);
 
 private:
-void checkForFunctionDecl(Expr const*, bool bCheckOnly = false);
+void handleFunctionDecl(FunctionDecl const* decl);
 bool rewrite(SourceLocation);
 bool isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation* 
pLoc = nullptr);
 
-std::set m_addressOfSet;
-enum class PluginPhase
-{
-FindAddressOf,
-Warning
-};
-PluginPhase m_phase;
+std::set m_decls;
 };
 
-bool SalCall::VisitUnaryOperator(UnaryOperator const* op)
-{
-if (op->getOpcode() != UO_AddrOf)
-{
-return true;
-}
-if (m_phase != PluginPhase::FindAddressOf)
-return true;
-checkForFunctionDecl(op->getSubExpr());
-return true;
-}
-
-bool SalCall::VisitBinaryOperator(BinaryOperator const* binaryOperator)
-{
-if (binaryOperator->getOpcode() != BO_Assign)
-{
-return true;
-}
-if (m_phase != PluginPhase::FindAddressOf)
-return true;
-checkForFunctionDecl(binaryOperator->getRHS());
-return true;
-}
-
-bool SalCall::VisitCallExpr(CallExpr const* callExpr)
-{
-if (m_phase != PluginPhase::FindAddressOf)
-return true;
-for (auto arg : callExpr->arguments())
-checkForFunctionDecl(arg);
-return true;
-}
-
-bool SalCall::VisitCXXConstructExpr(CXXConstructExpr const* constructExpr)
-{
-if (m_phase != PluginPhase::FindAddressOf)
-return true;
-for (auto arg : constructExpr->arguments())
-checkForFunctionDecl(arg);
-return true;
-}
-
-bool SalCall::VisitInitListExpr(InitListExpr const* initListExpr)
-{
-if (m_phase != PluginPhase::FindAddressOf)
-return true;
-for (auto subStmt : *initListExpr)
-checkForFunctionDecl(dyn_cast(subStmt));
-return true;
-}
-
-void SalCall::checkForFunctionDecl(Expr const* expr

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

[Miklos Vajna (via logerrit)]

 xmlsecurity/source/helper/pdfsignaturehelper.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b16d11c9d85f60867f634f5049e38c1f62d8d412
Author: Miklos Vajna 
AuthorDate: Tue Oct 20 21:07:23 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 21 14:44:31 2020 +0200

xmlsecurity: clean up last raw pdfium call

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

diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx 
b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index 6864c715cb86..f7427337fd1e 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -231,13 +231,17 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector pPdfDocument
+= pPdfium->openDocument(rStream.GetData(), rStream.GetSize());
+if (!pPdfDocument)
+{
+return;
+}
 
-int nPageCount = aPdfDocument.getPageCount();
+int nPageCount = pPdfDocument->getPageCount();
 for (int nPage = 0; nPage < nPageCount; ++nPage)
 {
-std::unique_ptr 
pPdfPage(aPdfDocument.openPage(nPage));
+std::unique_ptr pPdfPage = 
pPdfDocument->openPage(nPage);
 if (!pPdfPage)
 {
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source

[Noel (via logerrit)]

 accessibility/inc/helper/IComboListBoxHelper.hxx |3 
 accessibility/inc/helper/listboxhelper.hxx   |4 
 accessibility/source/extended/AccessibleGridControlTable.cxx |   18 +--
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |8 -
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx  |4 
 accessibility/source/extended/textwindowaccessibility.cxx|4 
 avmedia/source/gstreamer/gstplayer.hxx   |2 
 avmedia/source/viewer/mediawindow_impl.cxx   |4 
 basctl/source/basicide/baside2.cxx   |   34 +++
 basctl/source/basicide/baside2.hxx   |   10 +-
 basctl/source/basicide/baside2b.cxx  |   46 
+-
 basctl/source/basicide/baside3.cxx   |2 
 basctl/source/basicide/basides1.cxx  |   10 +-
 basctl/source/basicide/basobj3.cxx   |8 -
 basctl/source/basicide/layout.cxx|   34 +++
 basctl/source/basicide/linenumberwindow.cxx  |4 
 basctl/source/basicide/linenumberwindow.hxx  |6 -
 basctl/source/dlged/dlged.cxx|   34 +++
 basctl/source/dlged/dlgedfunc.cxx|   14 +--
 basctl/source/dlged/propbrw.cxx  |   10 +-
 basctl/source/inc/baside3.hxx|2 
 basctl/source/inc/basobj.hxx |3 
 basctl/source/inc/dlged.hxx  |2 
 basctl/source/inc/layout.hxx |   12 +-
 24 files changed, 140 insertions(+), 138 deletions(-)

New commits:
commit 915c7529e9b041879e8c63f15306028a6f649f48
Author: Noel 
AuthorDate: Wed Oct 21 09:28:47 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 21 14:34:01 2020 +0200

use tools::Long in accessibility..basctl

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

diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx 
b/accessibility/inc/helper/IComboListBoxHelper.hxx
index 52e796f1e673..e786311fd0df 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 namespace com::sun::star::datatransfer::clipboard {
 class XClipboard;
@@ -57,7 +58,7 @@ namespace accessibility
 virtual sal_Int32   GetSelectedEntryPos( sal_Int32  nSelIndex ) 
const = 0;
 virtual boolIsInDropDown() const = 0;
 virtual tools::Rectangle   GetEntryCharacterBounds( const 
sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
-virtual longGetIndexForPoint( const Point& rPoint, 
sal_Int32 & nPos ) const = 0;
+virtual tools::LongGetIndexForPoint( const Point& rPoint, 
sal_Int32 & nPos ) const = 0;
 virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard >
 GetClipboard() = 0;
 };
diff --git a/accessibility/inc/helper/listboxhelper.hxx 
b/accessibility/inc/helper/listboxhelper.hxx
index 919cbbdce5b3..b5e09034d01c 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -163,13 +163,13 @@ public:
 Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( 
_nEntryPos );
 if ( aEntryCharacterRange.A() + _nCharacterIndex <= 
aEntryCharacterRange.B() )
 {
-long nIndex = aEntryCharacterRange.A() + _nCharacterIndex;
+tools::Long nIndex = aEntryCharacterRange.A() + _nCharacterIndex;
 aRect = m_aComboListBox.GetCharacterBounds( nIndex );
 }
 return aRect;
 }
 
-long GetIndexForPoint( const Point& rPoint, sal_Int32& nPos ) const 
override
+tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32& nPos ) const 
override
 {
 return m_aComboListBox.GetIndexForPoint( rPoint, nPos );
 }
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx 
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index cf9aa221a5a1..75b96f4a825d 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -243,7 +243,7 @@ void SAL_CALL 
AccessibleGridControlTable::selectAllAccessibleChildren()
 
 ensureIsAlive();
 Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
-for(long i=0; i(pParagraph->getNumber());
 // XXX  numeric overflow
-::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoin

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

[Noel (via logerrit)]

 comphelper/source/misc/graphicmimetype.cxx|4 
 comphelper/source/misc/numberedcollection.cxx |3 
 connectivity/source/drivers/calc/CTable.cxx   |2 
 connectivity/source/drivers/dbase/DTable.cxx  |8 -
 cppcanvas/source/inc/implrenderer.hxx |2 
 cppcanvas/source/mtfrenderer/implrenderer.cxx |   18 ++--
 cppcanvas/source/mtfrenderer/textaction.cxx   |6 -
 cppcanvas/source/mtfrenderer/textaction.hxx   |2 
 cui/source/dialogs/AdditionsDialog.cxx|4 
 cui/source/dialogs/QrCodeGenDialog.cxx|4 
 cui/source/dialogs/SpellDialog.cxx|   20 ++--
 cui/source/dialogs/about.cxx  |4 
 cui/source/dialogs/colorpicker.cxx|   32 +++
 cui/source/dialogs/cuicharmap.cxx |   10 +-
 cui/source/dialogs/cuigrfflt.cxx  |8 -
 cui/source/dialogs/hangulhanjadlg.cxx |4 
 cui/source/dialogs/hltpbase.cxx   |4 
 cui/source/dialogs/insdlg.cxx |8 -
 cui/source/dialogs/splitcelldlg.cxx   |6 -
 cui/source/factory/dlgfact.cxx|6 -
 cui/source/factory/dlgfact.hxx|6 -
 cui/source/inc/QrCodeGenDialog.hxx|4 
 cui/source/inc/SpellDialog.hxx|2 
 cui/source/inc/border.hxx |2 
 cui/source/inc/cuitabline.hxx |2 
 cui/source/inc/grfpage.hxx|   12 +-
 cui/source/inc/page.hxx   |   20 ++--
 cui/source/inc/paragrph.hxx   |6 -
 cui/source/inc/splitcelldlg.hxx   |8 -
 cui/source/inc/swpossizetabpage.hxx   |2 
 cui/source/inc/tabstpge.hxx   |2 
 cui/source/options/optchart.cxx   |4 
 cui/source/options/optcolor.cxx   |   10 +-
 cui/source/options/optpath.cxx|4 
 cui/source/tabpages/border.cxx|   14 +--
 cui/source/tabpages/chardlg.cxx   |   30 +++
 cui/source/tabpages/grfpage.cxx   |   60 +++---
 cui/source/tabpages/labdlg.cxx|4 
 cui/source/tabpages/measure.cxx   |2 
 cui/source/tabpages/numfmt.cxx|6 -
 cui/source/tabpages/numpages.cxx  |  110 +-
 cui/source/tabpages/page.cxx  |   82 +--
 cui/source/tabpages/paragrph.cxx  |   12 +-
 cui/source/tabpages/swpossizetabpage.cxx  |4 
 cui/source/tabpages/tabstpge.cxx  |   10 +-
 cui/source/tabpages/textanim.cxx  |6 -
 cui/source/tabpages/tpbitmap.cxx  |   20 ++--
 cui/source/tabpages/tpcolor.cxx   |8 -
 cui/source/tabpages/tpgradnt.cxx  |8 -
 cui/source/tabpages/tphatch.cxx   |   10 +-
 cui/source/tabpages/tpline.cxx|   30 +++
 cui/source/tabpages/tplnedef.cxx  |   18 ++--
 cui/source/tabpages/tplneend.cxx  |   14 +--
 cui/source/tabpages/tppattern.cxx |8 -
 cui/source/tabpages/transfrm.cxx  |   10 +-
 55 files changed, 353 insertions(+), 352 deletions(-)

New commits:
commit 5e43e888f6b9bc32fc5d3361be5a7962796726ea
Author: Noel 
AuthorDate: Wed Oct 21 09:30:59 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 21 14:33:39 2020 +0200

use tools::Long in comphelper..cui

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

diff --git a/comphelper/source/misc/graphicmimetype.cxx 
b/comphelper/source/misc/graphicmimetype.cxx
index 290050df13f8..0aea5afdde98 100644
--- a/comphelper/source/misc/graphicmimetype.cxx
+++ b/comphelper/source/misc/graphicmimetype.cxx
@@ -52,8 +52,8 @@ OUString GraphicMimeTypeHelper::GetMimeTypeForExtension(const 
OString& rExt)
 
 OUString aMimeType;
 
-long const nCount = SAL_N_ELEMENTS(aMapper);
-for (long i = 0; (i < nCount) && aMimeType.isEmpty(); ++i)
+tools::Long const nCount = SAL_N_ELEMENTS(aMapper);
+for (tools::Long i = 0; (i < nCount) && aMimeType.isEmpty(); ++i)
 {
 if (rExt == aMapper[i].pExt)
 aMimeType = OUString(aMapper[i].pMimeType, 
strlen(aMapper[i].pMimeType),
diff --git a/comphelper/source/misc/numberedcollection.cxx 
b/comphelper/source/misc/numberedcollection.cxx
index c4ed3319d5c2..e0615656c231 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace comphelper{
 
@@ -229,7 +230,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix()
 void NumberedCollection::impl_cleanUpDeadItems (  TNumberedItemHash& 
lItems,
 const TDeadItemList& 
lDeadItems)
 {
-for (const long& rDeadItem : lDe

Re: Enable Ribbon Menu for Extension

[Fred Kruse]

I got the same problem



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

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

[Tor Lillqvist (via logerrit)]

 xmlsecurity/source/helper/pdfsignaturehelper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5100a06c15ee8d66dc88f58523a35014988fd9fe
Author: Tor Lillqvist 
AuthorDate: Wed Oct 21 10:22:39 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 21 13:24:00 2020 +0200

Avoid unused parameter 'nMDPPerm'

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

diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx 
b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index a1dde44aaeb7..6864c715cb86 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -285,6 +285,7 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
 return aSignedPages == aAllPages;
 #else
 (void)rStream;
+(void)nMDPPerm;
 return true;
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/04090001.xhp |   61 +++-
 1 file changed, 33 insertions(+), 28 deletions(-)

New commits:
commit 3b3e99ad5c9f2ab17900064d7b3726096287ec82
Author: Seth Chaiklin 
AuthorDate: Sat Oct 3 21:49:27 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 21 13:15:51 2020 +0200

Partially resolves: tdf#131206 update Document (field) help page

  -change instruction about double-click
  -add "Paragraph Signature"
  -update to ,,

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

diff --git a/source/text/swriter/01/04090001.xhp 
b/source/text/swriter/01/04090001.xhp
index 837a3852a..02849f890 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -20,31 +20,30 @@
 
 
   
-Document
+Document (Fields)
 /text/swriter/01/04090001.xhp
   
 
 
 
 
-
 
 
 
 
-Document
+Document
 Fields are used to insert information about the current document, for 
example, file name, template, statistics, user data, date, and 
time.
 
 
 
 
 
-For the HTML export 
and import of date and time fields, special $[officename] formats are used.
+For the HTML export and import of 
date and time fields, special $[officename] formats are 
used.
 
 
 
 
-Type
+Type
 Lists the available field types. 
To add a field to your document, click a field type, click a field in the 
Select list, and then click Insert. The 
following fields are available:
 
 
@@ -78,7 +77,7 @@
   Date
 
 
-  Inserts the current date. You can insert the date as a fixed 
field - Date (fixed) - that does not change, or as 
a dynamic field - Date - that it is updated 
automatically. To manually update the Date field, 
press F9.
+  Inserts the current date. You can insert the date as a fixed 
field - Date (fixed) - that does not change, or as 
a dynamic field - Date - that it is updated 
automatically. To manually update the Date field, 
press F9.
 
   
   
@@ -97,13 +96,22 @@
   Inserts the page number of the current, previous, or next 
page.
 
   
+ 
+   
+   Paragraph 
Signature
+   
+   
+  Inserts a 
meta-data field with a digital signature for the paragraph. You must have a 
digital certificate to sign a paragraph.
+   
+
+
   
 
   Sender
 
 
-  Inserts fields containing user data. You can change the 
user-data that is displayed by choosing %PRODUCTNAME - Preferences
-Tools - 
Options - $[officename] - User Data.
+  Inserts fields containing user data. You can change the 
user-data that is displayed by choosing %PRODUCTNAME - Preferences
+Tools - 
Options - $[officename] - User Data.
 
   
   
@@ -111,7 +119,7 @@
   Statistics
 
 
-  Inserts document statistics, such as page and word counts, as 
a field. To view the statistics of a document, choose File - 
Properties, and then click the Statistics tab. 
+  Inserts document statistics, such as page and word counts, as 
a field. To view the statistics of a document, choose File - 
Properties, and then click the Statistics tab. 

 
   
   
@@ -127,23 +135,22 @@
   Time
 
 
-  Inserts the current time. You can insert the time as a fixed 
field - Time (fixed) - that does not change, or as 
a dynamic field - Time - that it is updated 
automatically. To manually update the Time field, 
press F9.
+  Inserts the current time. You can insert the time as a fixed 
field - Time (fixed) - that does not change, or as a dynamic 
field - Time - that it is updated automatically. To manually 
update the Time field, press 
F9.
 
   
 
 
 
 
-The following 
fields can only be inserted if the corresponding field type is selected in the 
Type list.
+The following fields can only be 
inserted if the corresponding field type is selected in the Type 
list.
 
 
 
 
 
-Selecton "Document" and "DocInformation" tab page 
this is called "Select", on the other tab pages 
"Selection"
+Selecton "Document" and 
"DocInformation" tab page this is called "Select", on the other tab pages 
"Selection"
 Lists the available fields for 
the field type selected in the Type list. To insert a field, click 
the field, and then click Insert.
-To quickly insert a 
field from the list, hold down Command
-Ctrl and 
double-click the field.
+To quickly insert a field from the 
list, double-click the field.
 
 
   
@@ -156,26 +163,26 @@
   
   
 
-  Previous page
+  Page 
Number
 
 
-  Inserts the page number of the previous page in the 
document.
+  Inserts the current page number.
 
   
   
 
-  Next 
page 
+  Previous page
 
 
-  Inserts the page number of the next page in the 
document.
+  Inserts the page number of the previous page in the 
document.
 
   
   
 
-  Page 
Number 
+  Next 
p

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/05230100.xhp |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 4ff9c170c99c88f4af370692cb97a80e01bfa986
Author: Seth Chaiklin 
AuthorDate: Wed Oct 21 12:34:36 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 21 13:02:22 2020 +0200

tdf#137141 refactor switchinline into switch

   need to put same  into module switch (because
   cannot use switchinline to indicate different menu
   sequences between modules.  But have added variable
   to that text, so should avoid retranslating same
   text, and just have to translate each menu sequence.

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

diff --git a/source/text/shared/01/05230100.xhp 
b/source/text/shared/01/05230100.xhp
index 6dfd7ea71..02fbdcbe7 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -138,7 +138,15 @@
 
 Fit height to text
 Expands the height of the 
object to the height of the text, if the object is smaller than the 
text.
-Adapt is only available for Text Boxes. To 
adapt Shapes to text, use Format - 
Object - Text
+  
+
+
+  
+  Adapt is only available for Text Boxes. To adapt Shapes to text, 
use Format - Object - Text.
+  
+  
+
+ Format - 
Text.
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit 7fcf59df381340fb04cb3898a23c70f86ee90f92
Author: Andras Timar 
AuthorDate: Wed Oct 21 13:00:55 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Oct 21 13:00:55 2020 +0200

Bump version to 6.4-8

Change-Id: I8863748915da6b793318193a7563b2e023641a49

diff --git a/configure.ac b/configure.ac
index 9b52929e2db7..1ad57a373c3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.7],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.8],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-8'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-8' created by Andras Timar  at 
2020-10-21 11:01 +

cp-6.4-8

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

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

[Andras Timar (via logerrit)]

Tag 'cp-6.4-8' created by Andras Timar  at 
2020-10-21 11:01 +

cp-6.4-8

Changes since cp-6.4-7:
Andras Timar (1):
  more/better suggestions for Spanish

---
 es/es_ANY.aff |3 +++
 es/es_ANY.dic |   20 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-8'

[Christian Lohmaier (via logerrit)]

Tag 'cp-6.4-8' created by Andras Timar  at 
2020-10-21 11:01 +

cp-6.4-8

Changes since cp-6.4-6:
Christian Lohmaier (1):
  update translations for 6.4.7 rc2

---
 source/af/chart2/messages.po  
|8 
 source/af/cui/messages.po 
|   34 
 source/af/extras/source/autocorr/emoji.po 
| 1292 +-
 source/af/formula/messages.po 
|  151 
 source/af/instsetoo_native/inc_openoffice/windows/msi_languages.po
|4 
 source/af/officecfg/registry/data/org/openoffice/Office/UI.po 
|   16 
 source/af/sc/messages.po  
| 2486 +
 source/af/scaddins/messages.po
|   82 
 source/af/sd/messages.po  
|   23 
 source/af/svx/messages.po 
| 1908 +--
 source/af/sw/messages.po  
|   10 
 source/am/basctl/messages.po  
|8 
 source/an/chart2/messages.po  
|6 
 source/an/cui/messages.po 
|   22 
 source/an/dictionaries/hi_IN.po   
|   15 
 source/an/filter/messages.po  
|6 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po 
|5 
 source/an/sc/messages.po  
|   32 
 source/an/sfx2/messages.po
|8 
 source/an/sw/messages.po  
|   18 
 source/an/vcl/messages.po 
|6 
 source/an/writerperfect/messages.po   
|7 
 source/an/xmlsecurity/messages.po 
|   14 
 source/ar/chart2/messages.po  
|   24 
 source/ast/connectivity/messages.po   
|   24 
 source/ast/cui/messages.po
|   14 
 source/ast/dbaccess/messages.po   
|   24 
 source/ast/desktop/messages.po
|8 
 source/ast/extensions/messages.po 
|   10 
 source/ast/forms/messages.po  
|   20 
 source/ast/framework/messages.po  
|8 
 source/ast/helpcontent2/source/text/sdraw.po  
|6 
 source/ast/helpcontent2/source/text/sdraw/guide.po
|   12 
 source/ast/helpcontent2/source/text/shared/01.po  
|   22 
 source/ast/helpcontent2/source/text/shared/help.po
|4 
 source/ast/helpcontent2/source/text/shared/optionen.po
|6 
 source/ast/helpcontent2/source/text/simpress/00.po
|   12 
 source/ast/helpcontent2/source/text/simpress/01.po
|8 
 source/ast/helpcontent2/source/text/simpress/02.po
|   14 
 source/ast/helpcontent2/source/text/simpress/guide.po 
|8 
 source/ast/helpcontent2/source/text/smath/01.po   
|6 
 source/ast/librelogo/source/pythonpath.po 
|   10 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po
|   28 
 source/ast/reportdesign/messages.po   
|6 
 source/ast/sc/messages.po 
|   14 
 source/ast/scp2/source/ooo.po 
|   14 
 source/ast/sd/messages.po 
|   14 
 source/ast/sfx2/messages.po   
|   12 
 source/ast/shell/source/win32/shlxthandler/res.po 
|8 
 source/ast/svtools/messages.po
|6 
 source/ast/svx/messages.po
|   39 
 source/ast/sw/messages.po 
|8 
 source/ast/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po  
|   12 
 source/ast/uui/messages.po
|   10 
 source/ast/wizards/source/resources.po   

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-8'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-8' created by Andras Timar  at 
2020-10-21 11:01 +

cp-6.4-8

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

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/05230100.xhp |   56 +
 1 file changed, 32 insertions(+), 24 deletions(-)

New commits:
commit d5943b6dbf5be06d643adda6a3b8435d2c74ea4b
Author: Seth Chaiklin 
AuthorDate: Wed Oct 21 12:19:29 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 21 12:32:28 2020 +0200

tdf#137141 - untangle module switches for Position

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

diff --git a/source/text/shared/01/05230100.xhp 
b/source/text/shared/01/05230100.xhp
index 8d1757258..6dfd7ea71 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -46,19 +46,25 @@
   
 
 
-
-
+  
+  
 Position
 Specify the 
location of the selected object on the page.
+  
+
 
+  
   
 Coordinate axes start 
at column A  - row 1.
 X-coordinates are negative in a 
"right-to-left" table.
   
   DRAW/IMPRESS
 Coordinates are relative to the origin.  
Left/top corner of the page content area is the initial default.
-
+  
 
+
+  
+  
 
 Position X
 Enter the horizontal coordinate where 
the selected base point should be placed.
@@ -69,16 +75,16 @@
 Base point
 The selected base point will be moved 
to the specified Position Y and Position 
X.
 The base point always returns to the left/top 
corner on reopening the dialog.
-
+  
 
 Size
 
-
+  
 Specify 
the size of the selected object.
-
-
+  
+  
 Resize the 
selected object to the chosen width and height relative to the selected base 
point.
-
+  
 
 
 Width
@@ -89,25 +95,27 @@
 
 Keep ratio
 Maintains the width and height ratio when 
changing the width or height setting in the dialog box.
- 
-
-
+
+  
+  
 Only for shapes.
-
+  
 
+
 
-
-   
+  
+  
 To frame
 Anchors 
the selection to the surrounding frame.
-
-
+  
+  
 
 Base point
 Click a base point in the grid, and 
then enter the new size dimensions for the selected object in the 
Width and Height boxes.
 The selected base point remains fixed in the 
grid. The object is resized relative to that point.
-
+  
 
+
 Protect
 
 Position
@@ -116,12 +124,12 @@
 Size
 Prevents you from resizing the 
object.
 
-
-  
-  
-  
-
-
+  
+
+
+
+  
+  
 Adapt
 Specifies, if 
the size of a drawing object should be adjusted to fit the size of entered 
text.
 
@@ -131,7 +139,7 @@
 Fit height to text
 Expands the height of the 
object to the height of the text, if the object is smaller than the 
text.
 Adapt is only available for Text Boxes. To 
adapt Shapes to text, use Format - 
Object - Text
-
+  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sc/inc/scmod.hxx |7 ---
 sc/source/ui/app/inputhdl.cxx|5 +-
 sc/source/ui/app/inputwin.cxx|3 -
 sc/source/ui/app/scmod.cxx   |   34 
 sc/source/ui/formdlg/formula.cxx |   81 ---
 sc/source/ui/inc/formula.hxx |1 
 sc/source/ui/inc/tabvwsh.hxx |7 ++-
 sc/source/ui/view/cellsh3.cxx|5 +-
 sc/source/ui/view/tabvwsh4.cxx   |2 
 sc/source/ui/view/tabvwsha.cxx   |2 
 sc/source/ui/view/tabvwshc.cxx   |   11 +
 11 files changed, 82 insertions(+), 76 deletions(-)

New commits:
commit 7b23396950ac3fa79093bfdd4038d5f7b818db33
Author: Szymon Kłos 
AuthorDate: Wed Sep 5 21:12:23 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 21 11:09:10 2020 +0200

tdf#124513 Allow to use multiple Formula dialog instances

[ The 6.2 version deals with a non-welded ScFormulaDlg. ]

Conflicts:
sc/source/ui/app/inputwin.cxx
sc/source/ui/formdlg/formula.cxx

(cherry picked from commit e5f74d20c2b72b107fe719cc888d779f17e5d57c)

Change-Id: Ia24556f40dd06e3acb40f24334ab972e2dada26a

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 3a389ecc2d45..351d6d3bb95f 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -98,7 +98,6 @@ class ScModule: public SfxModule, public SfxListener, public 
utl::ConfigurationL
 std::unique_ptr   m_pCTLOptions;
 std::unique_ptr  m_pUserOptions;
 std::unique_ptr  m_pErrorHdl;
-std::unique_ptr   m_pFormEditData;
 sal_uInt16  m_nCurRefDlgId;
 boolm_bIsWaterCan:1;
 boolm_bIsInEditCommand:1;
@@ -203,7 +202,6 @@ public:
 voidInputSelection( const EditView* pView );
 voidInputChanged( const EditView* pView );
 ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = nullptr, bool 
bUseRef = true );
-
 voidSetRefInputHdl( ScInputHandler* pNew );
 ScInputHandler* GetRefInputHdl() { return m_pRefInputHandler;}
 
@@ -214,14 +212,9 @@ public:
 voidInputSetSelection( sal_Int32 nStart, sal_Int32 nEnd );
 voidInputReplaceSelection( const OUString& rStr );
 voidInputTurnOffWinEngine();
-OUStringInputGetFormulaStr();
 voidActivateInputWindow( const OUString* pStr = nullptr,
 bool bMatrix = false );
 
-voidInitFormEditData();
-voidClearFormEditData();
-ScFormEditData* GetFormEditData()   { return 
m_pFormEditData.get(); }
-
 // input of reference:
 SC_DLLPUBLIC void   SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* 
pViewFrm = nullptr );
 boolIsModalMode(SfxObjectShell* pDocSh = nullptr);
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 36af4bd5979c..c464a8c46268 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3633,9 +3633,12 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 {
 ScModule* pScMod = SC_MOD();
 
+ScTabViewShell* pScTabViewShell = pScMod ? 
dynamic_cast(pScMod->GetViewShell()) : nullptr;
+
 // Also take foreign reference input into account here (e.g. 
FunctionsAutoPilot),
 // FormEditData, if we're switching from Help to Calc:
-if ( !bFormulaMode && !pScMod->IsFormulaMode() && 
!pScMod->GetFormEditData() )
+if ( !bFormulaMode && !pScMod->IsFormulaMode() &&
+ ( !pScTabViewShell || !pScTabViewShell->GetFormEditData() ) )
 {
 bool bIgnore = false;
 if ( bModified )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 3669d3840793..9cc8116efa19 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -313,7 +314,7 @@ void ScInputWindow::Select()
 {
 //! new method at ScModule to query if function autopilot is 
open
 SfxViewFrame* pViewFrm = SfxViewFrame::Current();
-if ( pViewFrm && !pViewFrm->GetChildWindow( 
SID_OPENDLG_FUNCTION ) )
+if ( pViewFrm && ( comphelper::LibreOfficeKit::isActive() || 
!pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) )
 {
 pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION,
   SfxCallMode::SYNCHRON | 
SfxCallMode::RECORD );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 27c145d15c76..3bf42ebaf870 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -188,8 +188,6 @@ ScModule::~ScModule()
 
 SfxItemPool::Free(m_pMessagePool);
 
-m_pFormEditData.reset();
-
 m_pDrag

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

[Szymon Kłos (via logerrit)]

 include/vcl/errinf.hxx   |6 ++
 sfx2/source/doc/objserv.cxx  |   35 ---
 vcl/source/window/errinf.cxx |6 --
 3 files changed, 38 insertions(+), 9 deletions(-)

New commits:
commit 1a463987633bfdd58aac60a39ce6eb09ff8c500d
Author: Szymon Kłos 
AuthorDate: Tue Oct 20 22:05:11 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 21 10:48:27 2020 +0200

lok: Log save errors and avoid infinite loop

Don't create synchronous dialogs on errors
which were causing infinite loops.
Just send error for logging purposes.

Change-Id: I88e57ae34502a6f82e44051033c91ca41c1a7b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104579
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 76ee7aca37aa..b3029e7c5de3 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -39,6 +39,12 @@ class DynamicErrorInfo;
 class ImplDynamicErrorInfo;
 enum class DialogMask;
 
+class VCL_DLLPUBLIC ErrorStringFactory
+{
+public:
+static bool CreateString(const ErrorInfo*, OUString&);
+};
+
 typedef void (* DisplayFnPtr)();
 
 typedef DialogMask WindowDisplayErrorFunc(
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 55e36ff69cbb..3ebb1feb5f70 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -69,6 +69,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -454,6 +456,24 @@ uno::Reference 
SfxObjectShell::GetSignPDFCertificate() c
 return uno::Reference(it->second, uno::UNO_QUERY);
 }
 
+static void sendErrorToLOK(ErrCode error)
+{
+boost::property_tree::ptree aTree;
+aTree.put("code", error);
+aTree.put("kind", "");
+aTree.put("cmd", "");
+
+std::unique_ptr pInfo = ErrorInfo::GetErrorInfo(error);
+OUString aErr;
+if (ErrorStringFactory::CreateString(pInfo.get(), aErr))
+aTree.put("message", aErr.toUtf8());
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+
+SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_ERROR, 
aStream.str().c_str());
+}
+
 void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 {
 weld::Window* pDialogParent = rReq.GetFrameWeld();
@@ -956,8 +976,13 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 // may be nErrorCode should be shown in future
 if ( lErr != ERRCODE_IO_ABORT )
 {
-SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC,GetTitle());
-ErrorHandler::HandleError(lErr, pDialogParent);
+if (comphelper::LibreOfficeKit::isActive())
+sendErrorToLOK(lErr);
+else
+{
+SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC,GetTitle());
+ErrorHandler::HandleError(lErr, pDialogParent);
+}
 }
 
 if (nId == SID_DIRECTEXPORTDOCASPDF &&
@@ -1123,7 +1148,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
 SetModified( false );
 ErrCode lErr = GetErrorCode();
-ErrorHandler::HandleError(lErr, pDialogParent);
+
+if (comphelper::LibreOfficeKit::isActive())
+sendErrorToLOK(lErr);
+else
+ErrorHandler::HandleError(lErr, pDialogParent);
 
 rReq.SetReturnValue( SfxBoolItem(0, true) );
 rReq.Done();
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 31bec6e085a0..19b01c0e1a4a 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -30,12 +30,6 @@
 class ErrorHandler;
 class TheErrorRegistry: public rtl::Static {};
 
-class ErrorStringFactory
-{
-public:
-static bool CreateString(const ErrorInfo*, OUString&);
-};
-
 bool ErrorStringFactory::CreateString(const ErrorInfo* pInfo, OUString& rStr)
 {
 for(const ErrorHandler *pHdlr : TheErrorRegistry::get().errorHandlers)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 vcl/osx/saldata.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 86d4419c6c4961c8b473decccea99338c176ffe1
Author: Tor Lillqvist 
AuthorDate: Wed Oct 21 11:04:24 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 21 10:17:39 2020 +0200

Revert "tdf#137468: Use the colour space of the main display"

Sadly that commit made the CppunitTest_vcl_bitmap_render_test fail on
many Macs, including my 2020 iMac.

This reverts commit cb48b7205cc6cdcf6741bc430266481a8b6b4769.

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

diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 14124e4b00f8..5235f657f8ca 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -52,7 +51,7 @@ SalData::SalData()
 mpFirstPrinter( nullptr ),
 mpFontList( nullptr ),
 mpStatusItem( nil ),
-mxRGBSpace( CGDisplayCopyColorSpace( CGMainDisplayID() ) ),
+mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceSRGB) ),
 mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2) 
),
 maCursors(),
 mbIsScrollbarDoubleMax( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22ceb50ad866e97fdf6c438aa0f771fa6844abb7
Author: Tor Lillqvist 
AuthorDate: Wed Oct 21 09:42:35 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 21 10:11:05 2020 +0200

Accept iOS SDK 14.1

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

diff --git a/configure.ac b/configure.ac
index b6a5a8e4c022..67d1cbad9d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3304,8 +3304,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.0
-older_sdk_vers="13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.1
+older_sdk_vers="14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ef267dc5c1e46d236478ff32fc14925a0eeb0266
Author: Jan-Marek Glogowski 
AuthorDate: Tue Oct 20 21:01:31 2020 +0200
Commit: Michael Weghorn 
CommitDate: Wed Oct 21 10:01:43 2020 +0200

Qt5 use base color for workspace too

This was uncovered by the fix for tdf#136555. The current color
for the start center button bar is too dark.

Regressed-by: a927e0964ba0442d53fffb22c577e54bcf183ed7
Change-Id: I36356117f03255cfbf1fa24a6391cb81cf1883db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104578
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit e0c72e31c1d455c26110c35e8780d420e17cdea6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104589
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 768872fe8db0..eb39d6016bfa 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1022,7 +1022,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
 Color aText = toColor(pal.color(QPalette::Active, QPalette::Text));
 Color aBase = toColor(pal.color(QPalette::Active, QPalette::Base));
 Color aButn = toColor(pal.color(QPalette::Active, QPalette::ButtonText));
-Color aMid = toColor(pal.color(QPalette::Active, QPalette::Mid));
 Color aHigh = toColor(pal.color(QPalette::Active, QPalette::Highlight));
 Color aHighText = toColor(pal.color(QPalette::Active, 
QPalette::HighlightedText));
 Color aLink = toColor(pal.color(QPalette::Active, QPalette::Link));
@@ -1046,6 +1045,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
 style.SetFieldColor(aBase);
 style.SetWindowColor(aBase);
 style.SetActiveTabColor(aBase);
+style.SetWorkspaceColor(aBase);
 style.SetAlternatingRowColor(toColor(pal.color(QPalette::Active, 
QPalette::AlternateBase)));
 
 // Buttons
@@ -1077,9 +1077,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
 style.BatchSetBackgrounds(aBack);
 style.SetInactiveTabColor(aBack);
 
-// Workspace
-style.SetWorkspaceColor(aMid);
-
 // Selection
 style.SetHighlightColor(aHigh);
 style.SetHighlightTextColor(aHighText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gleb Popov (via logerrit)]

 configure.ac |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 922fc8396d91bd5d570a7a8e6a05ea61aeb89089
Author: Gleb Popov <6year...@gmail.com>
AuthorDate: Tue Oct 20 16:06:48 2020 +0400
Commit: Caolán McNamara 
CommitDate: Wed Oct 21 09:55:59 2020 +0200

Add "freebsd_powerpc" and "freebsd_powerpc64" platforms to configure.ac.

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

diff --git a/configure.ac b/configure.ac
index 120c531f44a8..b6a5a8e4c022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4643,6 +4643,16 @@ freebsd*)
 RTL_ARCH=X86_64
 PLATFORMID=freebsd_x86_64
 ;;
+powerpc64)
+CPUNAME=POWERPC64
+RTL_ARCH=PowerPC_64
+PLATFORMID=freebsd_powerpc64
+;;
+powerpc|powerpcspe)
+CPUNAME=POWERPC
+RTL_ARCH=PowerPC
+PLATFORMID=freebsd_powerpc
+;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Status of Data Provider feature

[Caolán McNamara]

On Mon, 2020-10-12 at 15:39 -0300, Travis Stewart wrote:
> There have been a number of requests to improve the documentation for
> the Data Provider, but the feature was removed from the menu in patch
> 85541 because it wasn't ready for production. I noticed people have
> patched the Data Provider code a few times since then. Should it be
> added to the menu again, or is is still not ready, or will it be
> permanently removed?

I don't think there has been sufficient change to justify adding it
back to the menu again by unsetting it as expermental.

Wrt being permanently removed, I have a suspicion that removing the
feature entirely is not risk free in the sense that users profiles that
were created when the feature wasn't marked experimental may include
references to the menu entry, especially if tools->customize was used.

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

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

[Seth Chaiklin (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4bcee02229fbb382c6b2d774caba54d43b58697
Author: Seth Chaiklin 
AuthorDate: Tue Oct 20 21:52:06 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 21 09:50:33 2020 +0200

tdf#137568  grey-out Format - Comments in menu,  when no comments

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

diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index fd9c5a457565..ff104e8544d7 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -803,6 +803,9 @@ void SwTextShell::StateField( SfxItemSet &rSet )
 rSet.InvalidateItem( FN_DELETE_COMMENT );
 rSet.InvalidateItem( FN_HIDE_NOTE );
 }
+// tdf#137568 do not offer comment formating, if no comments 
are present
+if ( !pPostItMgr->HasNotes() )
+rSet.DisableItem( FN_FORMAT_ALL_NOTES );
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/swriter.suppr |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c7a4646177addc67669bab98ab471ea0c1cd2430
Author: Caolán McNamara 
AuthorDate: Tue Oct 20 20:03:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 21 09:46:22 2020 +0200

drop unused suppression

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

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index f3819e587a72..30a915a0e8ec 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -113,7 +113,6 @@ 
sw/uiconfig/swriter/ui/mmsendmails.ui://GtkLabel[@id='errorstatus'] orphan-label
 sw/uiconfig/swriter/ui/mmsalutationpage.ui://GtkLabel[@id='documentindex'] 
orphan-label
 sw/uiconfig/swriter/ui/mmsalutationpage.ui://GtkLabel[@id='femalefi'] 
orphan-label
 sw/uiconfig/swriter/ui/navigatorcontextmenu.ui://GtkMenuItem[@id='800'] 
button-no-label
-sw/uiconfig/swriter/ui/navigatorpanel.ui://GtkSpinButton[@id='spinbutton'] 
no-labelled-by
 sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='filegrouplabel'] 
orphan-label
 
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='clipboardgrouplabel']
 orphan-label
 
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] 
orphan-label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits