[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/src/main/AndroidManifest.xml   
|5 
 android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java 
|   57 ++
 
android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java 
   |   56 +
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |   42 +++
 android/app/src/main/res/values/arrays.xml 
|   53 +
 android/app/src/main/res/values/integers.xml   
|4 
 android/app/src/main/res/values/strings.xml
|   21 +++
 android/app/src/main/res/xml/libreoffice_preferences.xml   
|   41 +++
 8 files changed, 256 insertions(+), 23 deletions(-)

New commits:
commit 7705d5893d10b148716efe4b7bd1bb17d44ee2be
Author: Florin Ciornei 
AuthorDate: Mon Apr 15 16:50:07 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Apr 16 08:52:48 2019 +0200

android: Port Settings from the old app

Change-Id: I283040c518f9a7deb3bd302bc9ed2d11ac560775
Reviewed-on: https://gerrit.libreoffice.org/70790
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/app/src/main/AndroidManifest.xml 
b/android/app/src/main/AndroidManifest.xml
index d13a27cd7..cb302929c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -119,6 +119,11 @@
 
+
+
 
 
 
\ No newline at end of file
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java 
b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
new file mode 100644
index 0..83701f194
--- /dev/null
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
@@ -0,0 +1,57 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.libreoffice.androidapp;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+public class SettingsActivity extends Activity {
+@Override
+protected void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+// Display the fragment as the main content.
+getFragmentManager().beginTransaction()
+.replace(android.R.id.content, new SettingsFragment())
+.commit();
+}
+
+public static class SettingsFragment extends PreferenceFragment implements 
SharedPreferences.OnSharedPreferenceChangeListener {
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+addPreferencesFromResource(R.xml.libreoffice_preferences);
+}
+
+@Override
+public void onResume() {
+super.onResume();
+getPreferenceScreen().getSharedPreferences()
+.registerOnSharedPreferenceChangeListener(this);
+}
+
+@Override
+public void onPause() {
+super.onPause();
+getPreferenceScreen().getSharedPreferences()
+.unregisterOnSharedPreferenceChangeListener(this);
+}
+
+@Override
+public void onSharedPreferenceChanged(SharedPreferences 
sharedPreferences, String key) {
+
SettingsListenerModel.getInstance().changePreferenceState(sharedPreferences, 
key);
+if (key.equals("DISPLAY_LANGUAGE")) {
+getActivity().recreate();
+}
+}
+}
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
new file mode 100644
index 0..89bf93f91
--- /dev/null
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
@@ -0,0 +1,56 @@
+/*
+ *
+ *  * This file is part of the LibreOffice project.
+ *  * This Source Code Form is subject to the terms of the Mozilla Public
+ *  * License, v. 2.0. If a copy of the MPL was not distributed with this
+ *  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+package org.libreoffice.androidapp;
+
+import android.content.SharedPreferences;
+
+public class SettingsListenerModel {
+
+public interface OnSettingsPreferenceChangedListener {
+void settingsPreferenceChanged(SharedPreferences sharedPreferences, 
String key);
+}
+
+private static SettingsListenerModel mInstance;
+ 

[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_bitmap_render_test.mk vcl/qa

[Tomaž Vajngerl (via logerrit)]

 vcl/CppunitTest_vcl_bitmap_render_test.mk|5 +++
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |   34 ++-
 2 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit d7263d05bdcbe7e219664e198154e31a986c68fc
Author: Tomaž Vajngerl 
AuthorDate: Tue Apr 16 13:10:11 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Apr 16 07:20:00 2019 +0200

Test drawing BitmapEx with an alpha channel on a VirtualDevice

This adds a test for drawing a BitmapEx which has an alpha channel
onto a VirtualDevice. Most important is that alpha blending is
done as we expect it (but it is prone to rounding error).

Change-Id: I41a16ca9da98d7a067ada9aafad8c9fc7c6484d5
Reviewed-on: https://gerrit.libreoffice.org/70804
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/CppunitTest_vcl_bitmap_render_test.mk 
b/vcl/CppunitTest_vcl_bitmap_render_test.mk
index 1d66e6a5aae4..3af9c9fafd51 100644
--- a/vcl/CppunitTest_vcl_bitmap_render_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_render_test.mk
@@ -13,6 +13,11 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,vcl_bitmap_render_test, \
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest \
 ))
 
+$(eval $(call gb_CppunitTest_set_include,vcl_bitmap_render_test,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
 $(eval $(call gb_CppunitTest_use_libraries,vcl_bitmap_render_test, \
comphelper \
cppu \
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx 
b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index 531494205c14..5fc6c5b7b53c 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -13,7 +13,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -21,6 +21,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 static OUString const gaDataUrl = "/vcl/qa/cppunit/bitmaprender/data/";
 
 class BitmapRenderTest : public test::BootstrapFixture
@@ -38,13 +41,13 @@ public:
 
 void testTdf104141();
 void testTdf113918();
-void testDrawBitmap32();
+void testDrawAlphaBitmapEx();
 void testTdf116888();
 
 CPPUNIT_TEST_SUITE(BitmapRenderTest);
 CPPUNIT_TEST(testTdf104141);
 CPPUNIT_TEST(testTdf113918);
-CPPUNIT_TEST(testDrawBitmap32);
+CPPUNIT_TEST(testDrawAlphaBitmapEx);
 CPPUNIT_TEST(testTdf116888);
 
 CPPUNIT_TEST_SUITE_END();
@@ -101,7 +104,7 @@ void BitmapRenderTest::testTdf113918()
 CPPUNIT_ASSERT(aColor.GetGreen() > 100);
 }
 
-void BitmapRenderTest::testDrawBitmap32()
+void BitmapRenderTest::testDrawAlphaBitmapEx()
 {
 ScopedVclPtrInstance pVDev;
 pVDev->SetOutputSizePixel(Size(8, 8));
@@ -117,10 +120,29 @@ void BitmapRenderTest::testDrawBitmap32()
 vcl::PngImageReader aPngReader(aFileStream);
 BitmapEx aBitmapEx;
 aPngReader.read(aBitmapEx);
+
+// Check backend capabilities, if the backend support 32-bit bitmap
+auto pBackendCapabilities = 
ImplGetSVData()->mpDefInst->GetBackendCapabilities();
+if (pBackendCapabilities->mbSupportsBitmap32)
+{
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(32), 
aBitmapEx.GetBitmap().GetBitCount());
+}
+else
+{
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), 
aBitmapEx.GetBitmap().GetBitCount());
+CPPUNIT_ASSERT_EQUAL(true, aBitmapEx.IsAlpha());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), 
aBitmapEx.GetAlpha().GetBitCount());
+}
+
+// Check the bitmap has pixels we expect
+CPPUNIT_ASSERT_EQUAL(Color(0xFF, 0x00, 0x00, 0x00), 
aBitmapEx.GetPixelColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(Color(0x00, 0xFF, 0xFF, 0x00), 
aBitmapEx.GetPixelColor(1, 1));
+CPPUNIT_ASSERT_EQUAL(Color(0x7F, 0x00, 0xFF, 0x00), 
aBitmapEx.GetPixelColor(2, 2));
+
 pVDev->DrawBitmapEx(Point(), aBitmapEx);
 
-CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0, 0)));
-CPPUNIT_ASSERT_EQUAL(COL_YELLOW, pVDev->GetPixel(Point(1, 1)));
+CPPUNIT_ASSERT_EQUAL(Color(0x00, 0xFF, 0xFF, 0xFF), 
pVDev->GetPixel(Point(0, 0)));
+CPPUNIT_ASSERT_EQUAL(Color(0x00, 0xFF, 0xFF, 0x00), 
pVDev->GetPixel(Point(1, 1)));
 
 // sometimes on Windows we get rounding error in blending so let's ignore this 
on Windows for now.
 #if !defined(_WIN32)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/CppunitTest_vcl_bitmap_test.mk |1 
 vcl/qa/cppunit/BitmapExTest.cxx|   74 +
 vcl/source/gdi/bitmapex.cxx|   17 +---
 3 files changed, 85 insertions(+), 7 deletions(-)

New commits:
commit 8d65b2bafa1ee000b2722c3c5e6d45a62b74c196
Author: Tomaž Vajngerl 
AuthorDate: Tue Apr 16 12:06:09 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Apr 16 06:52:47 2019 +0200

Add test for BitmapEx GetPixelColor for 24+8 and 32bit Bitmaps

Change-Id: I0c1b8447acd6681d8731c35412b90a00741274fa
Reviewed-on: https://gerrit.libreoffice.org/70803
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk 
b/vcl/CppunitTest_vcl_bitmap_test.mk
index bae00152c77d..3bb293cfc66d 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_bitmap_test))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
 vcl/qa/cppunit/BitmapTest \
+vcl/qa/cppunit/BitmapExTest \
 vcl/qa/cppunit/bitmapcolor \
 ))
 
diff --git a/vcl/qa/cppunit/BitmapExTest.cxx b/vcl/qa/cppunit/BitmapExTest.cxx
new file mode 100644
index ..4b45a3e88972
--- /dev/null
+++ b/vcl/qa/cppunit/BitmapExTest.cxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+namespace
+{
+class BitmapExTest : public CppUnit::TestFixture
+{
+void testGetPixelColor24_8();
+void testGetPixelColor32();
+
+CPPUNIT_TEST_SUITE(BitmapExTest);
+CPPUNIT_TEST(testGetPixelColor24_8);
+CPPUNIT_TEST(testGetPixelColor32);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void BitmapExTest::testGetPixelColor24_8()
+{
+Bitmap aBitmap(Size(3, 3), 24);
+{
+BitmapScopedWriteAccess pWriteAccess(aBitmap);
+pWriteAccess->Erase(Color(0x00, 0x00, 0xFF, 0x00));
+}
+AlphaMask aMask(Size(3, 3));
+{
+AlphaScopedWriteAccess pWriteAccess(aMask);
+pWriteAccess->Erase(Color(0x00, 0xAA, 0xAA, 0xAA));
+}
+
+BitmapEx aBitmapEx(aBitmap, aMask);
+
+CPPUNIT_ASSERT_EQUAL(Color(0xAA, 0x00, 0xFF, 0x00), 
aBitmapEx.GetPixelColor(0, 0));
+}
+
+void BitmapExTest::testGetPixelColor32()
+{
+// Check backend capabilities and return from the test successfully
+// if the backend doesn't support 32-bit bitmap
+auto pBackendCapabilities = 
ImplGetSVData()->mpDefInst->GetBackendCapabilities();
+if (!pBackendCapabilities->mbSupportsBitmap32)
+return;
+
+Bitmap aBitmap(Size(3, 3), 32);
+{
+BitmapScopedWriteAccess pWriteAccess(aBitmap);
+pWriteAccess->Erase(Color(0xAA, 0x00, 0xFF, 0x00));
+}
+
+BitmapEx aBitmapEx(aBitmap);
+
+CPPUNIT_ASSERT_EQUAL(Color(0xAA, 0x00, 0xFF, 0x00), 
aBitmapEx.GetPixelColor(0, 0));
+}
+
+} // namespace
+
+CPPUNIT_TEST_SUITE_REGISTRATION(BitmapExTest);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index a6820872578e..3c0df290b217 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -748,17 +748,20 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, 
sal_Int32 nY) const
 Color BitmapEx::GetPixelColor(sal_Int32 nX, sal_Int32 nY) const
 {
 Bitmap::ScopedReadAccess pReadAccess( const_cast(maBitmap) );
-assert( pReadAccess );
+assert(pReadAccess);
 
-Color aColor = pReadAccess->GetColor( nY, nX ).GetColor();
+Color aColor = pReadAccess->GetColor(nY, nX).GetColor();
 
-if( IsAlpha() )
+if (IsAlpha())
 {
-Bitmap::ScopedReadAccess pAlphaReadAccess( 
const_cast(maMask).AcquireReadAccess(), const_cast(maMask) );
-aColor.SetTransparency( pAlphaReadAccess->GetPixel( nY, nX 
).GetIndex() );
+AlphaMask aAlpha = GetAlpha();
+AlphaMask::ScopedReadAccess pAlphaReadAccess(aAlpha);
+aColor.SetTransparency(pAlphaReadAccess->GetPixel(nY, nX).GetIndex());
+}
+else if (maBitmap.GetBitCount() != 32)
+{
+aColor.SetTransparency(0);
 }
-else
-aColor.SetTransparency( 0 );
 return aColor;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[John Frankish]

> > $ rm -rf /home/tc/.config/libreoffice
> > 
> > $ libreoffice
> > Gtk-Message: GtkDialog mapped without a transient parent. This is 
> > discouraged.
> > LibreOffice 6.2 - Fatal Error: The application cannot be started.
> > component context fails to supply service 
> > com.sun.star.ui.ModuleUIConfigurationManager of type 
> > com.sun.star.ui.XModuleUIConfigurationManager2: an error occurred 
> > during file opening
> > 
> The `strace -f libreoffice` output following the `rm -rf ...` would be useful.
> 
Sorry, I should have thought of that.

Strace log attached



libreoffice.log1.tar.xz
Description: libreoffice.log1.tar.xz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/backendtest vcl/CppunitTest_vcl_backend_test.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/qa

[Tomaž Vajngerl (via logerrit)]

 vcl/CppunitTest_vcl_backend_test.mk  |   49 +++
 vcl/Library_vcl.mk   |2 
 vcl/Module_vcl.mk|1 
 vcl/backendtest/VisualBackendTest.cxx|   12 
 vcl/backendtest/outputdevice/common.cxx  |   16 -
 vcl/backendtest/outputdevice/line.cxx|4 
 vcl/backendtest/outputdevice/pixel.cxx   |4 
 vcl/backendtest/outputdevice/polygon.cxx |6 
 vcl/backendtest/outputdevice/polyline.cxx|4 
 vcl/backendtest/outputdevice/polyline_b2d.cxx|   50 +++
 vcl/backendtest/outputdevice/polypolygon.cxx |   10 
 vcl/backendtest/outputdevice/polypolygon_b2d.cxx |   65 
 vcl/backendtest/outputdevice/rectangle.cxx   |8 
 vcl/inc/test/outputdevice.hxx|   33 +-
 vcl/qa/cppunit/BackendTest.cxx   |  364 +++
 15 files changed, 595 insertions(+), 33 deletions(-)

New commits:
commit 3083fe569f96bf0289da1e9d0ef7da15ab22e2f6
Author: Tomaž Vajngerl 
AuthorDate: Mon Apr 15 21:52:46 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Apr 16 03:48:28 2019 +0200

Add backend tests as CPPUNIT tests

This (finally) adds backend tests as CPPUNIT tests too. In the
future they'll also be added into LibreOffice directly as a way
to test if the backend is OK, which will be useful especially
for the OpenGL backend, which draw quality depends on the driver.

Currently all the tests are ignored because of the bugs in the
backend, which need to be addressed first and tests then can
be enabled one by one.

The main reason for the test is to identify issues when drawing
is done at a wrong position, which is a very common problem. Also
other types of tests will be added in time, which will have a big
role in the refactoring of VCL that will happen in the future.

Change-Id: I92237d47d49fa0db01b73b8bc39f7a621b65961e
Reviewed-on: https://gerrit.libreoffice.org/70769
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/CppunitTest_vcl_backend_test.mk 
b/vcl/CppunitTest_vcl_backend_test.mk
new file mode 100644
index ..f146cb6238fe
--- /dev/null
+++ b/vcl/CppunitTest_vcl_backend_test.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_backend_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_backend_test, \
+vcl/qa/cppunit/BackendTest \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_backend_test, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   svt \
+   test \
+   tl \
+   unotest \
+   vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_backend_test))
+$(eval $(call gb_CppunitTest_use_ure,vcl_backend_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_backend_test))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_backend_test,\
+boost_headers\
+))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_backend_test,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_components,vcl_backend_test,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+ucb/source/core/ucb1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_backend_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 242af6a996fb..5b7733f6755f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -446,7 +446,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/backendtest/outputdevice/pixel \
 vcl/backendtest/outputdevice/polygon \
 vcl/backendtest/outputdevice/polypolygon \
+vcl/backendtest/outputdevice/polypolygon_b2d \
 vcl/backendtest/outputdevice/polyline \
+vcl/backendtest/outputdevice/polyline_b2d \
 vcl/backendtest/outputdevice/rectangle \
 ))
 
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 7bfd4bed1cc9..314b54a7d520 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -209,6 +209,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_apitests \
CppunitTest_vcl_png_test \
CppunitTest_vcl_widget_definition_reader_test \
+   CppunitTest_vcl_backend_test \
 ))
 
 ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
diff --git a/vcl/backendtest/VisualBackendTest.cxx 
b/vcl/backendtest/VisualBackendTest.cxx
index b06610493073..398e5e2d3643 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -186,7 +186,7 @@ public:
 aRectangle = aRegions[index++];
 {
 vcl::test::OutputDeviceTestRect aOutDevTest;
-

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

[Michael Stahl (via logerrit)]

 sw/inc/txtfld.hxx|2 -
 sw/source/core/doc/DocumentFieldsManager.cxx |4 ++-
 sw/source/core/fields/expfld.cxx |   32 ---
 sw/source/core/txtnode/atrfld.cxx|8 +-
 4 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 5ed6c4ade72fc13b475e795769a5049ea9765048
Author: Michael Stahl 
AuthorDate: Mon Apr 15 15:03:14 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 16 00:37:31 2019 +0200

sw: fix recursive SwTextInputField::LockNotifyContentChange

(related: tdf#123968)

The assertion added in commit 742baabbe4d077e1ba913a7989300908f4637ac7
is triggered during ODF import of import fields associated with user
field types; there is a 3 level recursion of the SwUserFieldType for one
variable calling the SwInputFieldType calling SwUserFieldType of another
variable...

Change-Id: I54fc56733c7375cfdb6439b02cf21c4d852c2b4c
Reviewed-on: https://gerrit.libreoffice.org/70768
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2eb92eaea9ad74b1488246af3c334c3829af36a1)
Reviewed-on: https://gerrit.libreoffice.org/70785
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 11c13edeedc9..38ca9caa6251 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -87,7 +87,7 @@ public:
 
 virtual ~SwTextInputField() override;
 
-void LockNotifyContentChange();
+bool LockNotifyContentChange();
 void UnlockNotifyContentChange();
 virtual void NotifyContentChange( SwFormatField& rFormatField ) override;
 
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 238e4ba71cf0..264ac6352f64 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1258,7 +1258,9 @@ void DocumentFieldsManager::UpdateExpFieldsImpl(
 : dynamic_cast(pTextField));
 if (pInputField)
 {
-pInputField->LockNotifyContentChange();
+bool const tmp = pInputField->LockNotifyContentChange();
+(void) tmp;
+assert(tmp && "should not be locked here?");
 }
 ::comphelper::ScopeGuard g([pInputField]()
 {
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 6a3bd6efb9e2..c9aceb9d9aaa 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1263,23 +1263,29 @@ void SwInputField::applyFieldContent( const OUString& 
rNewFieldContent )
 if( pUserTyp )
 {
 pUserTyp->SetContent( rNewFieldContent );
-
-// trigger update of the corresponding User Fields and other 
related Input Fields
-if ( GetFormatField() != nullptr )
+if (!pUserTyp->IsModifyLocked())
 {
-SwTextInputField* pTextInputField = dynamic_cast< 
SwTextInputField* >(GetFormatField()->GetTextField());
-if ( pTextInputField != nullptr )
+// trigger update of the corresponding User Fields and other
+// related Input Fields
+bool bUnlock(false);
+if (GetFormatField() != nullptr)
 {
-pTextInputField->LockNotifyContentChange();
+SwTextInputField *const pTextInputField =
+
dynamic_cast(GetFormatField()->GetTextField());
+if (pTextInputField != nullptr)
+{
+bUnlock = pTextInputField->LockNotifyContentChange();
+}
 }
-}
-pUserTyp->UpdateFields();
-if ( GetFormatField() != nullptr )
-{
-SwTextInputField* pTextInputField = dynamic_cast< 
SwTextInputField* >(GetFormatField()->GetTextField());
-if ( pTextInputField != nullptr )
+pUserTyp->UpdateFields();
+if (bUnlock)
 {
-pTextInputField->UnlockNotifyContentChange();
+SwTextInputField *const pTextInputField =
+
dynamic_cast(GetFormatField()->GetTextField());
+if (pTextInputField != nullptr)
+{
+pTextInputField->UnlockNotifyContentChange();
+}
 }
 }
 }
diff --git a/sw/source/core/txtnode/atrfld.cxx 
b/sw/source/core/txtnode/atrfld.cxx
index e32003ae1ba4..96f33d243eaa 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -564,10 +564,14 @@ SwTextInputField::~SwTextInputField()
 {
 }
 
-void SwTextInputField::LockNotifyContentChange()
+bool SwTextInputField::LockNotifyContentChange()
 {
-

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |   51 
 sw/source/core/undo/undel.cxx   |6 ++--
 sw/source/core/undo/undobj.cxx  |   18 +---
 3 files changed, 63 insertions(+), 12 deletions(-)

New commits:
commit 7bba93a99ebb4250f884a68a50aa1912d96f4ba8
Author: Michael Stahl 
AuthorDate: Fri Apr 12 18:10:49 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 16 00:37:19 2019 +0200

tdf#109376 sw: fix SwUndoDelete with end pos on SwTableNode crash

Commit 6ff263b837831d46d0c215963b70543a9ea5bd2a added a check in
SwUndoSaveContent::DelContentIndex() to avoid moving the anchor of a
FLY_AT_PARA if its new position would be a table node, because
SwFlyAtContentFrame::Modify() requires a SwTextNode to be the anchor.
However, that doesn't actually avoid moving the anchor - later,
SwNodes::RemoveNode() relocates the anchor to the next node regardless
of type!

It's probably better to just delete the fly in the situation when the
end position is a SwTableNode, which fixes the reported crash.

Unfortunately on Redo, the SwUndoDelete::UndoImpl() does not recreate
the nodes correctly, hence the fly then is inserted on the wrong node,
which later crashes again.

The problem is that due to the table node, a dummy SwTextNode is inserted,
which should be at the end of the range, but ends up at the start due to
an erroneous ++aPos.nNode; - the result is that the fly is inserted on
the dummy node and is immediately deleted again, triggering another
assert.  If there is a dummy node, it also doesn't make sense to call
SplitNode().

Yet another problem is that in SwUndoDelete::UndoImpl(), the frames for
the moved text nodes are not created, because the first node is skipped
with the wrong assumption that it already has frames.

Reportedly this started to crash with commit
e07feb9457f2ffb373ae69b73dda290140e4005f, previously it was just wrong.

Reviewed-on: https://gerrit.libreoffice.org/70683
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 80b73dcc06c671a49fbf238be58c1cd086c5c5f9)

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 2344aa743248..ba6caf3f8222 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -22,6 +22,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 namespace
@@ -37,6 +39,7 @@ public:
 void testRedlineInHiddenSection();
 void testTdf101534();
 void testTdf54819();
+void testTdf109376();
 void testTdf108687_tabstop();
 void testTdf119571();
 void testTdf119019();
@@ -52,6 +55,7 @@ public:
 CPPUNIT_TEST(testRedlineInHiddenSection);
 CPPUNIT_TEST(testTdf101534);
 CPPUNIT_TEST(testTdf54819);
+CPPUNIT_TEST(testTdf109376);
 CPPUNIT_TEST(testTdf108687_tabstop);
 CPPUNIT_TEST(testTdf119571);
 CPPUNIT_TEST(testTdf119019);
@@ -251,6 +255,53 @@ void SwUiWriterTest2::testTdf54819()
  getProperty(getParagraph(1), 
"ParaStyleName"));
 }
 
+void SwUiWriterTest2::testTdf109376()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+// need 2 paragraphs to get to the bMoveNds case
+pWrtShell->Insert("foo");
+pWrtShell->SplitNode();
+pWrtShell->Insert("bar");
+pWrtShell->SplitNode();
+pWrtShell->StartOfSection(false);
+
+// add AT_PARA fly at 1st to be deleted node
+SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
+anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
+SfxItemSet flySet(pDoc->GetAttrPool(),
+  svl::Items{});
+flySet.Put(anchor);
+SwFormatFrameSize size(ATT_MIN_SIZE, 1000, 1000);
+flySet.Put(size); // set a size, else we get 1 char per line...
+SwFrameFormat const* pFly = pWrtShell->NewFlyFrame(flySet, 
/*bAnchValid=*/true);
+CPPUNIT_ASSERT(pFly != nullptr);
+
+pWrtShell->SttEndDoc(false);
+SwInsertTableOptions tableOpt(SwInsertTableFlags::DefaultBorder, 0);
+const SwTable& rTable = pWrtShell->InsertTable(tableOpt, 1, 1);
+
+pWrtShell->StartOfSection(false);
+SwPaM pam(*pWrtShell->GetCursor()->GetPoint());
+pam.SetMark();
+pam.GetPoint()->nNode = *rTable.GetTableNode();
+pam.GetPoint()->nContent.Assign(nullptr, 0);
+pam.Exchange(); // same selection direction as in doc compare...
+
+// this used to assert/crash with m_pAnchoredFlys mismatch because the
+// fly was not deleted but its anchor was moved to the SwTableNode
+pDoc->getIDocumentContentOperations().DeleteRange(pam);
+CPPUNIT_ASSERT_EQUAL(size_t(0), pWrtShell->GetFlyCou

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/mgetempl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e160a29333af39151bf4ea520e1cc9e184ac3a8f
Author: Caolán McNamara 
AuthorDate: Mon Apr 15 19:59:23 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 16 00:27:45 2019 +0200

tdf#124730 an attempt to remove entry that isn't there

Change-Id: If382f0419c8ea0a3b99c85942c05ee1e5a627e76
Reviewed-on: https://gerrit.libreoffice.org/70796
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 90a66282d5d3..deb5f01f136e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -281,7 +281,9 @@ void SfxManageStyleSheetPage::UpdateName_Impl( 
weld::ComboBox* pBox,
 {
 // it is the current entry, which name was modified
 const bool bSelect = pBox->get_active_text() == aBuf;
-pBox->remove_text(aBuf);
+int nOldIndex = pBox->find_text(aBuf);
+if (nOldIndex != -1)
+pBox->remove(nOldIndex);
 pBox->append_text(rNew);
 
 if (bSelect)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 extensions/uiconfig/sbibliography/menubar/menubar.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25a28cee10736e8a72b40b5ab2d11dea8d5254c3
Author: andreas kainz 
AuthorDate: Sun Apr 14 03:41:46 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 22:50:57 2019 +0200

tdf#124649 bibliography menubar: show icons for most importent items

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

diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml 
b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index b502c396e6ff..898d893a18b9 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -39,8 +39,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/mgetempl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 32304eb0079079fe263b860573fa010656ab13c9
Author: Caolán McNamara 
AuthorDate: Mon Apr 15 19:59:23 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 15 22:24:50 2019 +0200

tdf#124730 an attempt to remove entry that isn't there

Change-Id: If382f0419c8ea0a3b99c85942c05ee1e5a627e76
Reviewed-on: https://gerrit.libreoffice.org/70795
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 67eb96db1cd8..836ca6de1164 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -282,7 +282,9 @@ void SfxManageStyleSheetPage::UpdateName_Impl( 
weld::ComboBox* pBox,
 {
 // it is the current entry, which name was modified
 const bool bSelect = pBox->get_active_text() == aBuf;
-pBox->remove_text(aBuf);
+int nOldIndex = pBox->find_text(aBuf);
+if (nOldIndex != -1)
+pBox->remove(nOldIndex);
 pBox->append_text(rNew);
 
 if (bSelect)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/gradientpage.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fad018d60d628355528deb0b0f8b3c396a691d69
Author: Caolán McNamara 
AuthorDate: Mon Apr 15 20:07:20 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 15 22:23:54 2019 +0200

ensure gtk creates a default label widget for the MenuButtons

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

diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index ba34727e60bc..75eca7e4194e 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -454,6 +454,7 @@
 False
 0
 True
+
 
   
 
@@ -485,6 +486,7 @@
 False
 0
 True
+
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 dbaccess/uiconfig/dbapp/menubar/menubar.xml  |   29 +++
 dbaccess/uiconfig/dbquery/menubar/menubar.xml|   17 +++--
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml |   24 ++-
 dbaccess/uiconfig/dbtable/menubar/menubar.xml|   21 
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml|   21 
 5 files changed, 59 insertions(+), 53 deletions(-)

New commits:
commit 4d2b9097494a1ba1b018f62f2e74b6ec41bb6137
Author: andreas kainz 
AuthorDate: Sun Apr 14 04:06:08 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 21:20:06 2019 +0200

tdf#14649 dbaccess menubar: show icons for most importent items

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

diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index a394672faee5..9b254110b9af 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -24,23 +24,23 @@
   
   
   
-  
+  
   
   
   
-  
+  
   
-  
-  
-  
+  
+  
+  
   
   
   
 
-  
-  
+  
+  
   
-  
+  
 
   
   
@@ -56,7 +56,7 @@
   
   
   
-  
+  
   
   
   
@@ -86,8 +86,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
@@ -128,11 +128,12 @@
   
   
   
+  
+  
 
   
-  
-  
-  
+  
+  
   
 
   
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index d6f562cef876..a7c26ead641f 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -23,15 +23,15 @@
   
   
   
-  
+  
   
   
   
-  
+  
   
-  
-  
-  
+  
+  
+  
   
   
 
@@ -82,11 +82,12 @@
   
   
   
+  
+  
 
   
-  
-  
-  
+  
+  
   
 
   
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index f0c1ab3776ea..7753a9d57b7d 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -24,14 +24,14 @@
   
   
   
-  
+  
   
   
-  
+  
   
-  
-  
-  
+  
+  
+  
   
   
 
@@ -44,8 +44,8 @@
   
   
 
-  
-  
+  
+  
 
   
   
@@ -59,17 +59,19 @@
   
 
   
-  
+  2
   
   
   
   
   
+  
+  
+  
 
   
-  
-  
-  
+  
+  
   
 
   
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index d68d6705cd7c..7a255d12214b 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -24,15 +24,15 @@
   
   
   
-  
+  
   
   
   
-  
+  
   
-  
-  
-  
+  
+  
+  
   
   
 
@@ -49,8 +49,8 @@
   
   
 
-  
-  
+  
+  
 
   
   
@@ -66,11 +66,12 @@
   
   
   
+  
+  
 
   
-  
-  
-  
+  
+  
   
 
   
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index e42874e2762c..cdd892b5baa5 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -24,15 +24,15 @@
   
   
   
-  
+  
   
   
   
-  
+  
   
-  
-  
-  
+  
+  
+  
   
   
 
@@ -56,8 +56,8 @@
   
   
 
-  
-  
+  
+  
 
   
   
@@ -91,11 +91,12 @@
   
   
   
+  
+  
 
   
-  
-  
-  
+  
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sw/uiconfig/sglobal/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dbbf2ef3640c13704ed0f1d3d8b0aae609975cbf
Author: andreas kainz 
AuthorDate: Sun Apr 14 04:29:56 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 21:13:35 2019 +0200

tdf#124665 ShadowCursor moved to Edit Mode

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

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index c81d40f1bcc6..b139caf3829e 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -116,7 +116,6 @@
 
   
   
-  
   
   
   
@@ -165,6 +164,7 @@
   
   
   
+  
   
 
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index fd9c9f85927d..d077ffa776af 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -116,7 +116,6 @@
 
   
   
-  
   
   
   
@@ -165,6 +164,7 @@
   
   
   
+  
   
 
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 88d877f250ae..a8009a00bc86 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -116,7 +116,6 @@
 
   
   
-  
   
   
   
@@ -165,6 +164,7 @@
   
   
   
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 framework/uiconfig/startmodule/menubar/menubar.xml |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 683d71b35331868e43447c5209b07f25fdbe1186
Author: andreas kainz 
AuthorDate: Sun Apr 14 03:59:09 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 21:12:43 2019 +0200

tdf#124649 framework menubar: show icons for most importent items

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

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml 
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 70d49f7e4359..96ac15d10f81 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -21,20 +21,20 @@
 
 
 
-
+
 
 
-
+
 
 
-
-
+
+
 
 
 
 
 
-
+
 
 
 
@@ -51,8 +51,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 chart2/uiconfig/menubar/menubar.xml |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7188a4d8b2ace8b428968f3ff73a3d74cd4a736d
Author: andreas kainz 
AuthorDate: Sun Apr 14 03:35:10 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 21:11:41 2019 +0200

tdf#124649 chart2 menubar: show icons for most importent items

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

diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index 7172dcf373f5..105d8c4fae7c 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -24,7 +24,7 @@
   
   
   
-  
+  
   
   
   
@@ -45,7 +45,7 @@
 
   
   
-  
+  
   
   
 
@@ -110,16 +110,16 @@
 
   
   
-
-
-
+
+
+
   
 
 
 
   
-  
-  
+  
+  
   
 
   
@@ -141,8 +141,8 @@
   
 
   
-  
-  
+  
+  
   
 
   
___
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 sc/uiconfig

[andreas kainz (via logerrit)]

 icon-themes/colibre/cmd/lc_deletecell.png  
|binary
 icon-themes/colibre/cmd/sc_accent1cellstyles.png   
|binary
 icon-themes/colibre/cmd/sc_accent2cellstyles.png   
|binary
 icon-themes/colibre/cmd/sc_accent3cellstyles.png   
|binary
 icon-themes/colibre/cmd/sc_deletecell.png  
|binary
 icon-themes/colibre/cmd/sc_errorcellstyles.png 
|binary
 icon-themes/colibre/cmd/sc_warningcellstyles.png   
|binary
 icon-themes/colibre/links.txt  
|5 
 icon-themes/colibre_svg/cmd/lc_deletecell.svg  
|   23 +
 icon-themes/colibre_svg/cmd/sc_accent1cellstyles.svg   
|   13 
 icon-themes/colibre_svg/cmd/sc_accent2cellstyles.svg   
|   13 
 icon-themes/colibre_svg/cmd/sc_accent3cellstyles.svg   
|   13 
 icon-themes/colibre_svg/cmd/sc_deletecell.svg  
|   17 
 icon-themes/colibre_svg/cmd/sc_errorcellstyles.svg 
|   10 
 icon-themes/colibre_svg/cmd/sc_flowchartshapes.flowchart-sequential-access.svg 
|2 
 icon-themes/colibre_svg/cmd/sc_warningcellstyles.svg   
|   10 
 sc/uiconfig/scalc/menubar/menubar.xml  
|  208 --
 17 files changed, 203 insertions(+), 111 deletions(-)

New commits:
commit 48215d7be1e2f94711e947ffb2922e6dd791d062
Author: andreas kainz 
AuthorDate: Sun Apr 14 03:28:45 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 21:11:23 2019 +0200

tdf#124649 sc menubar: show icons for most importent items

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

diff --git a/icon-themes/colibre/cmd/lc_deletecell.png 
b/icon-themes/colibre/cmd/lc_deletecell.png
new file mode 100644
index ..fec89f69e6cb
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_deletecell.png differ
diff --git a/icon-themes/colibre/cmd/sc_accent1cellstyles.png 
b/icon-themes/colibre/cmd/sc_accent1cellstyles.png
new file mode 100644
index ..1e65b9194d7f
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_accent1cellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_accent2cellstyles.png 
b/icon-themes/colibre/cmd/sc_accent2cellstyles.png
new file mode 100644
index ..cbaaecca359f
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_accent2cellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_accent3cellstyles.png 
b/icon-themes/colibre/cmd/sc_accent3cellstyles.png
new file mode 100644
index ..809ddb2555d9
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_accent3cellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_deletecell.png 
b/icon-themes/colibre/cmd/sc_deletecell.png
new file mode 100644
index ..ec3f2bb51564
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_deletecell.png differ
diff --git a/icon-themes/colibre/cmd/sc_errorcellstyles.png 
b/icon-themes/colibre/cmd/sc_errorcellstyles.png
new file mode 100644
index ..397d6e2dafc6
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_errorcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_warningcellstyles.png 
b/icon-themes/colibre/cmd/sc_warningcellstyles.png
new file mode 100644
index ..2586b82cb741
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_warningcellstyles.png 
differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index ea76a4a2a1ba..421c508b0291 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -356,7 +356,6 @@ cmd/lc_dbreportdelete.png cmd/lc_delete.png
 cmd/lc_dbquerydelete.png cmd/lc_delete.png
 cmd/lc_dbformdelete.png cmd/lc_delete.png
 cmd/lc_dbclearquery.png cmd/lc_delete.png
-cmd/lc_deletecell.png cmd/lc_delete.png
 cmd/sc_deleteprintarea.png cmd/sc_delete.png
 cmd/sc_deleterecord.png cmd/sc_delete.png
 cmd/sc_dbtabledelete.png cmd/sc_delete.png
@@ -364,7 +363,6 @@ cmd/sc_dbreportdelete.png cmd/sc_delete.png
 cmd/sc_dbquerydelete.png cmd/sc_delete.png
 cmd/sc_dbformdelete.png cmd/sc_delete.png
 cmd/sc_dbclearquery.png cmd/sc_delete.png
-cmd/sc_deletecell.png cmd/sc_delete.png
 
 # Folder
 cmd/lc_dbtableopen.png cmd/lc_open.png
@@ -625,8 +623,6 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png
 # calc menu entries
 cmd/lc_functionbox.png cmd/lc_dbviewfunctions.png
 cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
-cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
-cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
 cmd/lc_functiondialog.png cmd/lc_dbviewfunctions.png
 cmd/sc_

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

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 110ee112e17091cc8ca9b16ac73d4bfae286c91c
Author: Michael Meeks 
AuthorDate: Mon Apr 15 13:16:53 2019 +0100
Commit: Michael Meeks 
CommitDate: Mon Apr 15 20:54:55 2019 +0200

lok: rename - emitted as events not on stdout now.

Change-Id: Ie57c34eff1d917fada4e10e4b88b27adf8a34d1a
Reviewed-on: https://gerrit.libreoffice.org/70788
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e6feceb595b2..327be8ab2bdd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4531,7 +4531,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 
 // Did we do a pre-initialize
 static bool bPreInited = false;
-static bool bProfileZones = getenv("SAL_PROFILEZONE_STDOUT") != nullptr;
+static bool bProfileZones = getenv("SAL_PROFILEZONE_EVENTS") != nullptr;
 
 // What stage are we at ?
 if (pThis == nullptr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

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

New commits:
commit 304425807e9172ac7a85d5f17fceba2735218409
Author: Henry Castro 
AuthorDate: Tue Apr 9 16:33:40 2019 -0400
Commit: Henry Castro 
CommitDate: Mon Apr 15 20:49:38 2019 +0200

sw lok: fix "Cannot deselect the shape after inserting the first in a...

document"

Change-Id: I976318fe299306b65190b4f5ae0ed2565830c6f7
Reviewed-on: https://gerrit.libreoffice.org/70475
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-by: Henry Castro 

diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index 00b722710caa..05ac5537e2cc 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -347,6 +347,10 @@ void SwView::ExecDraw(SfxRequest& rReq)
 {
 m_pWrtShell->GotoObj(true);
 }
+else if (dynamic_cast(pTempFuncPtr))
+{
+pTempFuncPtr->CreateDefaultObject();
+}
 else
 {
 pTempFuncPtr->CreateDefaultObject();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/source/filter/ww8/ww8atr.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6340daac7b99c65249363a4bb61c492de31ef5d6
Author: Stephan Bergmann 
AuthorDate: Mon Apr 15 18:32:01 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 15 18:32:01 2019 +0200

Revert broken loplugin:sequentialassign change

Reverting part of 1123a47c9771e0f4a680316c034e9878919a85d5
"loplugin:sequentialassign in sw" that had caused e.g. 
CppunitTest_chart2_export
to fail in UBSan builds like

> /sw/source/core/layout/frmtool.cxx:3540:77: runtime error: signed integer 
overflow: -47572123069180 * -47572123069180 cannot be represented in type 'long'
> #0 0x2b44b168eeaf in GetFrameOfModify(SwRootFrame const*, SwModify 
const&, SwFrameType, SwPosition const*, std::pair const*) 
/sw/source/core/layout/frmtool.cxx:3540:77
> #1 0x2b44b07eb3f0 in SwContentNode::FindLayoutRect(bool, Point 
const*) const /sw/source/core/docnode/node.cxx:1169:60
> #2 0x2b45266573da in 
AttributeOutputBase::TextFlyContent(SwFormatFlyCnt const&) 
/sw/source/filter/ww8/ww8atr.cxx:3229:34
> #3 0x2b45265ecf49 in AttributeOutputBase::OutputItem(SfxPoolItem 
const&) /sw/source/filter/ww8/ww8atr.cxx:5258:13

().

Change-Id: I580f6fb3fb2f561b1cf76f8cf113bfe20aead844

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 160e0f931115..528634646659 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3225,7 +3225,8 @@ void AttributeOutputBase::TextFlyContent( const 
SwFormatFlyCnt& rFlyContent )
 {
 if ( auto pTextNd = dynamic_cast< const SwContentNode *>( 
GetExport().m_pOutFormatNode )  )
 {
-Point aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos();
+Point aLayPos;
+aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos();
 
 SwPosition aPos( *pTextNd );
 ww8::Frame aFrame( *rFlyContent.GetFrameFormat(), aPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[Stephan Bergmann]

On 15/04/2019 17:13, John Frankish wrote:

$ rm -rf /home/tc/.config/libreoffice

$ libreoffice
Gtk-Message: GtkDialog mapped without a transient parent. This is discouraged.
LibreOffice 6.2 - Fatal Error: The application cannot be started.
component context fails to supply service 
com.sun.star.ui.ModuleUIConfigurationManager of type 
com.sun.star.ui.XModuleUIConfigurationManager2: an error occurred during file 
opening


The `strace -f libreoffice` output following the `rm -rf ...` would be 
useful.

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

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

[Tor Lillqvist (via logerrit)]

 extensions/source/ole/unoconversionutilities.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6d54ce9155c73b6b97c437234f97f4558166b69d
Author: Tor Lillqvist 
AuthorDate: Mon Apr 15 15:53:09 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Apr 15 15:53:09 2019 +0300

Turn an incoming VT_NULL when a STRING is wanted into an empty BSTR

Might help in some cases in the customer application.

Change-Id: Icdc13780d4623e9df8bc057760c1295d7d6ffd61

diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index 771a15cc48b7..83066f338ea5 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -433,6 +433,8 @@ void UnoConversionUtilities::variantToAny( const 
VARIANTARG* pArg, Any& rAny,
 bFail = true;
 break;
 case TypeClass_STRING:  // UString
+if(var.vt == VT_NULL)
+var = CComBSTR("");
 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_BSTR)))
 variantToAny( & var, rAny);
 else if (hr == DISP_E_TYPEMISMATCH)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jens Carl (via logerrit)]

 sc/qa/extras/scheaderfieldsobj.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8f13b0d3f1d72aab85665bccf409a3d6fdeb4272
Author: Jens Carl 
AuthorDate: Mon Apr 15 03:56:26 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 15 17:20:35 2019 +0200

Rename ScCellFieldsObj to ScHeaderFieldsObj

Correct class name to mirror the name of the object we are testing
against.

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

diff --git a/sc/qa/extras/scheaderfieldsobj.cxx 
b/sc/qa/extras/scheaderfieldsobj.cxx
index e38e88fc0080..c105d3a56437 100644
--- a/sc/qa/extras/scheaderfieldsobj.cxx
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -33,18 +33,18 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScCellFieldsObj : public CalcUnoApiTest,
-public apitest::XEnumerationAccess,
-public apitest::XRefreshable
+class ScHeaderFieldsObj : public CalcUnoApiTest,
+  public apitest::XEnumerationAccess,
+  public apitest::XRefreshable
 {
 public:
-ScCellFieldsObj();
+ScHeaderFieldsObj();
 
 virtual uno::Reference init() override;
 virtual void setUp() override;
 virtual void tearDown() override;
 
-CPPUNIT_TEST_SUITE(ScCellFieldsObj);
+CPPUNIT_TEST_SUITE(ScHeaderFieldsObj);
 
 // XEnumerationAccess
 CPPUNIT_TEST(testCreateEnumeration);
@@ -58,12 +58,12 @@ private:
 uno::Reference m_xComponent;
 };
 
-ScCellFieldsObj::ScCellFieldsObj()
+ScHeaderFieldsObj::ScHeaderFieldsObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
-uno::Reference ScCellFieldsObj::init()
+uno::Reference ScHeaderFieldsObj::init()
 {
 uno::Reference xDoc(m_xComponent, 
uno::UNO_QUERY_THROW);
 
@@ -87,20 +87,20 @@ uno::Reference ScCellFieldsObj::init()
 return xTFS->getTextFields();
 }
 
-void ScCellFieldsObj::setUp()
+void ScHeaderFieldsObj::setUp()
 {
 CalcUnoApiTest::setUp();
 // create calc document
 m_xComponent = loadFromDesktop("private:factory/scalc");
 }
 
-void ScCellFieldsObj::tearDown()
+void ScHeaderFieldsObj::tearDown()
 {
 closeDocument(m_xComponent);
 CalcUnoApiTest::tearDown();
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScHeaderFieldsObj);
 
 } // namespace sc_apitest
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[jonathon]

On 4/15/19 12:26 PM, Eike Rathke wrote:
> Hi jonathon,
> 
> On Saturday, 2019-04-13 16:01:43 +, jonathon wrote:
> 
>> Does this mean that if a person is given a dictionary for, say, Ferangi,
>> as an extension, upon installing it, they won't need to make any other
>> changes, to be able to select Ferangi as the document language?
> 
> That's the purpose..
> It should be selectable as paragraph and character attribution in
> a document for spell-checking purposes.
> 
> Adding arbitrary dictionary languages (as long as they strictly follow
> the BCP 47 language tag specification) works since quite a while (2014?)
> already. New(er) in the mentioned mechanism is the ability to add
> a language also to the CTL or CJK sections where previously it was only
> possible to add to the (misnamed) "Western" section, and give the
> language list entries a proper UI name instead of showing just the
> language tag.
> 
> Note however that such extension language can't be set as default
> language for all documents under Tools -> Options -> Languages.


Thanks.
I wasn't aware that that functionality was present.

I'll play with over the next month or so, then write about in my
long-neglected blog.

jonathon

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

RE: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[John Frankish]

> > Strace log attached.
> > 
> I guess the problem shows in lines like
> 
> 10691 access("/home/tc/.config/libreoffice/4/user/config/soffice.cfg", 
> F_OK) = -1 ENOENT (No such file or directory)
> 
> There is previous lines like
>
> 10691 mkdir("/home/tc/.config/libreoffice/4/user/psprint", 0777) = -1 
> EEXIST (File exists)
> 
> indicating that the user profile at ~/.config/libreoffice/4/ is present in 
> general
> (so has been generated by a previous run of soffice), but lacks important 
> parts like the
> user/config/soffice.cfg/ sub-dir.  What happens if you `rm -fr 
> ~/.config/libreoffice`
> before running soffice again?
> 
Thanks for the reply.

This distro (tinycorelinux) works like a live CD, so nothing is saved on reboot 
- it seems libreoffice-6.2.2.2 is creating the folders/files you mention:

$ ls -a /home/tc/.config
./   ../  gtk-3.0/

$ libreoffice
Gtk-Message: GtkDialog mapped without a transient parent. This is discouraged.
LibreOffice 6.2 - Fatal Error: The application cannot be started. 
component context fails to supply service 
com.sun.star.ui.ModuleUIConfigurationManager of type 
com.sun.star.ui.XModuleUIConfigurationManager2: an error occurred during file 
opening

$ ls -a /home/tc/.config/libreoffice
./  ../ 4/

$ libreoffice --version
LibreOffice 6.2.2.2 20(Build:2)

$ rm -rf /home/tc/.config/libreoffice

$ libreoffice
Gtk-Message: GtkDialog mapped without a transient parent. This is discouraged.
LibreOffice 6.2 - Fatal Error: The application cannot be started. 
component context fails to supply service 
com.sun.star.ui.ModuleUIConfigurationManager of type 
com.sun.star.ui.XModuleUIConfigurationManager2: an error occurred during file 
opening

$ ls -a /home/tc/.config/libreoffice
./  ../ 4/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Changes to 'private/mcecchetti/accessibility/paragraph'

[Marco Cecchetti (via logerrit)]

New branch 'private/mcecchetti/accessibility/paragraph' available with the 
following commits:
commit 0a9faf8014747c5b1bc5f2ff0c5b1c254b600ed6
Author: Marco Cecchetti 
Date:   Mon Apr 15 17:01:09 2019 +0200

[DRAFT] - lok: AT - get current paragraph with formatting

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

Re: how to add .cxx file to be compiled and linked

[Regis Perdreau]

Ok, thanks.  It works...


Régis Perdreau



Le lun. 15 avr. 2019 à 16:39, Stephan Bergmann  a
écrit :

> On 15/04/2019 16:31, Regis Perdreau wrote:
> > I have added a file in, for example,  like
> > core/slideshow/engine/slide/test.cxx  with a method in it.
> > I have add with 'git add' to my work local branch repository
> > I expect that it will be compiled like the other files...but ... it
> > seems to be ignored
> > and  the linker fails because a method description is missing (include
> > test.hxx is ok)
> > Is there any something simple that i have forgotten ?
>
> You must add it to the gb_Library_add_exception_objects of some
> Library_*.mk, presumably slideshow/Library_slideshow.mk in your case.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: how to add .cxx file to be compiled and linked

[Stephan Bergmann]

On 15/04/2019 16:31, Regis Perdreau wrote:
I have added a file in, for example,  like 
core/slideshow/engine/slide/test.cxx  with a method in it.

I have add with 'git add' to my work local branch repository
I expect that it will be compiled like the other files...but ... it 
seems to be ignored
and  the linker fails because a method description is missing (include 
test.hxx is ok)

Is there any something simple that i have forgotten ?


You must add it to the gb_Library_add_exception_objects of some 
Library_*.mk, presumably slideshow/Library_slideshow.mk in your case.

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

Re: Chance of Colour Underlining

[Miklos Vajna]

Hi,

On Sun, Apr 14, 2019 at 04:49:56PM +, Andrew Williams 
 wrote:
> How do I chance the underling under the wording from black to red, please 

What you probably want is Format -> Character -> Underline color.

But please next time go to https://ask.libreoffice.org/ and post such
questions there, not to this development list, unless you want to
discuss code.

Thanks,

Miklos


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

how to add .cxx file to be compiled and linked

[Regis Perdreau]

Hi,

I have added a file in, for example,  like
core/slideshow/engine/slide/test.cxx  with a method in it.
I have add with 'git add' to my work local branch repository
I expect that it will be compiled like the other files...but ... it seems
to be ignored
and  the linker fails because a method description is missing (include
test.hxx is ok)
Is there any something simple that i have forgotten ?

I'm a bit stuck at this moment.

Régis Perdreau
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl (via logerrit)]

 sw/inc/txtfld.hxx|2 -
 sw/source/core/doc/DocumentFieldsManager.cxx |4 ++-
 sw/source/core/fields/expfld.cxx |   32 ---
 sw/source/core/txtnode/atrfld.cxx|8 +-
 4 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 2eb92eaea9ad74b1488246af3c334c3829af36a1
Author: Michael Stahl 
AuthorDate: Mon Apr 15 15:03:14 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 15 16:05:06 2019 +0200

sw: fix recursive SwTextInputField::LockNotifyContentChange

(related: tdf#123968)

The assertion added in commit 742baabbe4d077e1ba913a7989300908f4637ac7
is triggered during ODF import of import fields associated with user
field types; there is a 3 level recursion of the SwUserFieldType for one
variable calling the SwInputFieldType calling SwUserFieldType of another
variable...

Change-Id: I54fc56733c7375cfdb6439b02cf21c4d852c2b4c
Reviewed-on: https://gerrit.libreoffice.org/70768
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 11c13edeedc9..38ca9caa6251 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -87,7 +87,7 @@ public:
 
 virtual ~SwTextInputField() override;
 
-void LockNotifyContentChange();
+bool LockNotifyContentChange();
 void UnlockNotifyContentChange();
 virtual void NotifyContentChange( SwFormatField& rFormatField ) override;
 
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 9f05f74f2785..4ef15a9f56e4 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1275,7 +1275,9 @@ void DocumentFieldsManager::UpdateExpFieldsImpl(
 : dynamic_cast(pTextField));
 if (pInputField)
 {
-pInputField->LockNotifyContentChange();
+bool const tmp = pInputField->LockNotifyContentChange();
+(void) tmp;
+assert(tmp && "should not be locked here?");
 }
 ::comphelper::ScopeGuard g([pInputField]()
 {
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 62a31891396e..9c90867d5924 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1261,23 +1261,29 @@ void SwInputField::applyFieldContent( const OUString& 
rNewFieldContent )
 if( pUserTyp )
 {
 pUserTyp->SetContent( rNewFieldContent );
-
-// trigger update of the corresponding User Fields and other 
related Input Fields
-if ( GetFormatField() != nullptr )
+if (!pUserTyp->IsModifyLocked())
 {
-SwTextInputField* pTextInputField = dynamic_cast< 
SwTextInputField* >(GetFormatField()->GetTextField());
-if ( pTextInputField != nullptr )
+// trigger update of the corresponding User Fields and other
+// related Input Fields
+bool bUnlock(false);
+if (GetFormatField() != nullptr)
 {
-pTextInputField->LockNotifyContentChange();
+SwTextInputField *const pTextInputField =
+
dynamic_cast(GetFormatField()->GetTextField());
+if (pTextInputField != nullptr)
+{
+bUnlock = pTextInputField->LockNotifyContentChange();
+}
 }
-}
-pUserTyp->UpdateFields();
-if ( GetFormatField() != nullptr )
-{
-SwTextInputField* pTextInputField = dynamic_cast< 
SwTextInputField* >(GetFormatField()->GetTextField());
-if ( pTextInputField != nullptr )
+pUserTyp->UpdateFields();
+if (bUnlock)
 {
-pTextInputField->UnlockNotifyContentChange();
+SwTextInputField *const pTextInputField =
+
dynamic_cast(GetFormatField()->GetTextField());
+if (pTextInputField != nullptr)
+{
+pTextInputField->UnlockNotifyContentChange();
+}
 }
 }
 }
diff --git a/sw/source/core/txtnode/atrfld.cxx 
b/sw/source/core/txtnode/atrfld.cxx
index 66ccc2670f73..3e7ffb0604fa 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -557,10 +557,14 @@ SwTextInputField::~SwTextInputField()
 {
 }
 
-void SwTextInputField::LockNotifyContentChange()
+bool SwTextInputField::LockNotifyContentChange()
 {
-assert(!m_bLockNotifyContentChange); // not nestable
+if (m_bLockNotifyContentChange)
+{
+return false;
+}
 m_bLockNotifyContentChange = true;
+return true;
 }
 
 voi

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 19ddbc1fc5e80a535e0f313d4491f7ae8441df57
Author: Stephan Bergmann 
AuthorDate: Mon Apr 15 15:53:45 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 15 15:53:45 2019 +0200

Fix --enable-gtk3-kde5 build

...after 639df4d76d545ca23021f69a9d738a9a92c148cd "use more 
std::make_unique"

Change-Id: Iae8c84d33b36c9bc9208d0edcbff50bed9abca77

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 47289d49cf27..1e0eacd7ff48 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -214,7 +214,7 @@ FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker, 
QObject* parent)
 // read IPC commands and their args in a separate thread, so this does not 
block everything else;
 // 'commandReceived' signal is emitted every time a command and its args 
have been read;
 // thread will run until the filepicker process is terminated
-m_ipcReaderThread = std::make_unique{ readCommands, this };
+m_ipcReaderThread = std::make_unique(readCommands, this);
 }
 
 FilePickerIpc::~FilePickerIpc()
___
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 sd/uiconfig

[andreas kainz (via logerrit)]

 icon-themes/colibre/links.txt|4 
 icon-themes/colibre_svg/cmd/lc_dismantle.svg |9 +
 icon-themes/colibre_svg/cmd/sc_dismantle.svg |9 +
 sd/uiconfig/sdraw/menubar/menubar.xml|  126 +++
 sd/uiconfig/simpress/menubar/menubar.xml |  145 +--
 5 files changed, 156 insertions(+), 137 deletions(-)

New commits:
commit 481a12574f04e86c9bd1adc5f2f6fe766dcb542a
Author: andreas kainz 
AuthorDate: Sat Apr 13 22:07:19 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 15 15:32:29 2019 +0200

tdf#124649 sd menubars: show icons for most importent items

Change-Id: I71c0802ab3a265734c3fad253c8107dbb0a1749b
Reviewed-on: https://gerrit.libreoffice.org/70721
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 5994341c2371..ea76a4a2a1ba 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -871,7 +871,6 @@ cmd/lc_setobjecttobackground.png cmd/lc_sendtoback.png
 cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png
 
 # Calc
-cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png
 cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
 cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
 cmd/sc_printrangesmenu.png cmd/sc_defineprintarea.png
@@ -953,6 +952,7 @@ cmd/lc_setoptimalcolumnwidthdirect.png 
cmd/lc_setoptimalcolumnwidth.png
 cmd/sc_setoptimalcolumnwidthdirect.png cmd/sc_setoptimalcolumnwidth.png
 cmd/lc_starchartdialog.png cmd/lc_insertobjectdialog.png
 cmd/sc_starchartdialog.png cmd/sc_insertobjectdialog.png
+cmd/sc_tablemenu.png cmd/sc_inserttable.png
 
 # Help
 cmd/lc_absoluterecord.png cmd/lc_helpindex.png
@@ -1055,6 +1055,7 @@ cmd/lc_lastslide.png cmd/lc_lastrecord.png
 cmd/lc_previousslide.png cmd/lc_prevrecord.png
 cmd/lc_nextslide.png cmd/lc_nextrecord.png
 cmd/lc_slidesetup.png cmd/lc_pagesetup.png
+cmd/lc_insertpagefield.png cmd/lc_insertpagenumberfield.png
 
 cmd/sc_insertslide.png cmd/sc_insertpage.png
 cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png
@@ -1077,6 +1078,7 @@ cmd/sc_insertdatefieldfix.png cmd/sc_datefield.png
 cmd/sc_insertdatefieldvar.png cmd/sc_datefield.png
 cmd/sc_inserttimefieldfix.png cmd/sc_timefield.png
 cmd/sc_inserttimefieldvar.png cmd/sc_timefield.png
+cmd/sc_insertpagefield.png cmd/sc_insertpagenumberfield.png
 
 # dbaccess
 # ==
diff --git a/icon-themes/colibre_svg/cmd/lc_dismantle.svg 
b/icon-themes/colibre_svg/cmd/lc_dismantle.svg
new file mode 100644
index ..2bf3e9a48736
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_dismantle.svg
@@ -0,0 +1,9 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+  
+  
+
diff --git a/icon-themes/colibre_svg/cmd/sc_dismantle.svg 
b/icon-themes/colibre_svg/cmd/sc_dismantle.svg
new file mode 100644
index ..475b3976089c
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_dismantle.svg
@@ -0,0 +1,9 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 16 16">
+ 
+
+
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 8b91addfd263..0b438bf0b38e 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -21,58 +21,58 @@
 
   
   
-  
+  
   
   
   
-  
+  
   
   
-  
-  
+  
+  
   
-  
+  
   
   
   
-  
-  
+  
+  
   
   
-  
   
-  
-  
+  
+  
+  
   
-  
-  
-  
+  
+  
+  
   
   
   
 
-  
-  
+  
+  
 
   
   
 
-  
-  
+  
+  
 
   
+  
   
-  
   
-  
+  
   
+  
   
 
-  
-  
+  
+  
 
   
-  
   
   
 
@@ -93,20 +93,20 @@
   
   
   
-  
+  
   
   
-  
+  
   
-  
-  
+  
+  
   
-  
-  
-  
-  
+  
+  
+  
+  
   
-  
+  
 
   
   
@@ -115,10 +115,10 @@
   
   
   
-  
+  
   
-  
-  
+  
+  
   
   
   
@@ -142,7 +142,7 @@
 
   
   
-  
+  
   
 
   
@@ -204,15 +204,15 @@
   
   
   
-  
+  
   
   
   
-  
-  
+  
+  
   
   
-  
+  
   
 
   
@@ -346,7 +346,7 @@
 
   
   
-  
+  
   
 
   
@@ -361,7 +361,7 @@
   
   
   
-  
+  
   
 
   
@@ -422,30 +422,29 @@
   
   
   
-  
-  
+  
+  
 
   
   
 
   

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

[Luboš Luňák (via logerrit)]

 vcl/opengl/shaders/areaScaleFragmentShader.glsl |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b9d101e9f96c2e9fc698cb0f84508e346a976060
Author: Luboš Luňák 
AuthorDate: Wed Apr 3 11:02:48 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon Apr 15 15:27:00 2019 +0200

restore code comments

These got removed in d115a235bf3ff5366 for some reason.

Change-Id: I27eadc7f9f874f420ab0273e0ef2b62af57f6c4a

diff --git a/vcl/opengl/shaders/areaScaleFragmentShader.glsl 
b/vcl/opengl/shaders/areaScaleFragmentShader.glsl
index e16133682ba2..07945e3ebe44 100644
--- a/vcl/opengl/shaders/areaScaleFragmentShader.glsl
+++ b/vcl/opengl/shaders/areaScaleFragmentShader.glsl
@@ -127,9 +127,16 @@ void main(void)
 int dx = int( tex_coord.s * xdestconvert );
 int dy = int( tex_coord.t * ydestconvert );
 
+// How much each column/row will contribute to the resulting pixel.
+// Note: These values are always the same for the same X (or Y),
+// so they could be precalculated in C++ and passed to the shader,
+// but GLSL has limits on the size of uniforms passed to it,
+// so it'd need something like texture buffer objects from newer
+// GLSL versions, and it seems the hassle is not really worth it.
 float xratio[ 16 + 2 ];
 float yratio[ 16 + 2 ];
 
+// For finding the first and last source pixel.
 int xpixel[ 16 + 2 ];
 int ypixel[ 16 + 2 ];
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/deletepivottable.png  |binary
 icon-themes/elementary/cmd/32/documentation.png |binary
 icon-themes/elementary/cmd/32/errorcellstyles.png   |binary
 icon-themes/elementary/cmd/32/getinvolved.png   |binary
 icon-themes/elementary/cmd/32/linkdialog.png|binary
 icon-themes/elementary/cmd/32/safemode.png  |binary
 icon-themes/elementary/cmd/32/show.png  |binary
 icon-themes/elementary/cmd/32/showlicense.png   |binary
 icon-themes/elementary/cmd/32/warningcellstyles.png |binary
 icon-themes/elementary/cmd/lc_deletepivottable.png  |binary
 icon-themes/elementary/cmd/lc_documentation.png |binary
 icon-themes/elementary/cmd/lc_errorcellstyles.png   |binary
 icon-themes/elementary/cmd/lc_getinvolved.png   |binary
 icon-themes/elementary/cmd/lc_linkdialog.png|binary
 icon-themes/elementary/cmd/lc_safemode.png  |binary
 icon-themes/elementary/cmd/lc_show.png  |binary
 icon-themes/elementary/cmd/lc_showlicense.png   |binary
 icon-themes/elementary/cmd/lc_warningcellstyles.png |binary
 icon-themes/elementary/cmd/sc_accent1cellstyles.png |binary
 icon-themes/elementary/cmd/sc_accent2cellstyles.png |binary
 icon-themes/elementary/cmd/sc_accent3cellstyles.png |binary
 icon-themes/elementary/cmd/sc_auditmenu.png |binary
 icon-themes/elementary/cmd/sc_columnmenu.png|binary
 icon-themes/elementary/cmd/sc_dataform.png  |binary
 icon-themes/elementary/cmd/sc_deletepivottable.png  |binary
 icon-themes/elementary/cmd/sc_documentation.png |binary
 icon-themes/elementary/cmd/sc_errorcellstyles.png   |binary
 icon-themes/elementary/cmd/sc_getinvolved.png   |binary
 icon-themes/elementary/cmd/sc_linkdialog.png|binary
 icon-themes/elementary/cmd/sc_rowmenu.png   |binary
 icon-themes/elementary/cmd/sc_safemode.png  |binary
 icon-themes/elementary/cmd/sc_show.png  |binary
 icon-themes/elementary/cmd/sc_showlicense.png   |binary
 icon-themes/elementary/cmd/sc_warningcellstyles.png |binary
 icon-themes/elementary/links.txt|   47 +++
 icon-themes/elementary_svg/cmd/32/deletepivottable.svg  |1 
 icon-themes/elementary_svg/cmd/32/documentation.svg |1 
 icon-themes/elementary_svg/cmd/32/errorcellstyles.svg   |1 
 icon-themes/elementary_svg/cmd/32/getinvolved.svg   |1 
 icon-themes/elementary_svg/cmd/32/linkdialog.svg|1 
 icon-themes/elementary_svg/cmd/32/safemode.svg  |1 
 icon-themes/elementary_svg/cmd/32/scan.svg  |2 
 icon-themes/elementary_svg/cmd/32/show.svg  |1 
 icon-themes/elementary_svg/cmd/32/showlicense.svg   |1 
 icon-themes/elementary_svg/cmd/32/warningcellstyles.svg |1 
 icon-themes/elementary_svg/cmd/lc_deletepivottable.svg  |1 
 icon-themes/elementary_svg/cmd/lc_documentation.svg |1 
 icon-themes/elementary_svg/cmd/lc_errorcellstyles.svg   |1 
 icon-themes/elementary_svg/cmd/lc_getinvolved.svg   |1 
 icon-themes/elementary_svg/cmd/lc_linkdialog.svg|1 
 icon-themes/elementary_svg/cmd/lc_safemode.svg  |1 
 icon-themes/elementary_svg/cmd/lc_show.svg  |1 
 icon-themes/elementary_svg/cmd/lc_showlicense.svg   |1 
 icon-themes/elementary_svg/cmd/lc_warningcellstyles.svg |1 
 icon-themes/elementary_svg/cmd/sc_accent1cellstyles.svg |4 
 icon-themes/elementary_svg/cmd/sc_accent2cellstyles.svg |4 
 icon-themes/elementary_svg/cmd/sc_accent3cellstyles.svg |4 
 icon-themes/elementary_svg/cmd/sc_auditmenu.svg |1 
 icon-themes/elementary_svg/cmd/sc_columnmenu.svg|1 
 icon-themes/elementary_svg/cmd/sc_dataform.svg  |1 
 icon-themes/elementary_svg/cmd/sc_deletepivottable.svg  |1 
 icon-themes/elementary_svg/cmd/sc_documentation.svg |1 
 icon-themes/elementary_svg/cmd/sc_errorcellstyles.svg   |1 
 icon-themes/elementary_svg/cmd/sc_getinvolved.svg   |1 
 icon-themes/elementary_svg/cmd/sc_linkdialog.svg   

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

[heiko tietze (via logerrit)]

 dbaccess/source/core/dataaccess/datasource.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2c84c14bd0baa09e134b6ad211492f730eaf6549
Author: heiko tietze 
AuthorDate: Tue Apr 2 09:27:29 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon Apr 15 15:18:01 2019 +0200

Suppress migration dialog during unit test run

Change-Id: Ib148673235367081282c346d9b6d4ba9f795b877
Reviewed-on: https://gerrit.libreoffice.org/70120
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-by: Heiko Tietze 

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index f6a3decb4db1..0935fcf77bb5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -616,7 +616,8 @@ Reference< XConnection > 
ODatabaseSource::buildLowLevelConnection(const OUString
 Reference const xPropSet(xRootStorage, 
UNO_QUERY_THROW);
 sal_Int32 nOpenMode(0);
 if ((xPropSet->getPropertyValue("OpenMode") >>= nOpenMode)
-&& (nOpenMode & css::embed::ElementModes::WRITE))
+&& (nOpenMode & css::embed::ElementModes::WRITE)
+&& (!Application::IsHeadlessModeEnabled()))
 {
 MigrationWarnDialog 
aWarnDlg(GetFrameWeld(m_pImpl->getModel_noCreate()));
 bNeedMigration = aWarnDlg.run() == RET_OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit ed4cb70b6e46ad594f3cef80524e91f0621e09fd
Author: Olivier Hallot 
AuthorDate: Thu Apr 11 19:12:38 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Apr 15 15:15:53 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#122162 Keyboard shortcuts in table not valid

Deleted page source/text/swriter/guide/table_cells.xhp because
keyboard shortcuts were deleted.

All references to this page removed too.

Change-Id: Iafedfcdaeb93d5ad2824bd9212526a8bbee20922
Reviewed-on: https://gerrit.libreoffice.org/70614
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7d80346111e3..2876d94eb8de 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7d80346111e3945a8ec6cf5bbf5258eb7402d76d
+Subproject commit 2876d94eb8de71136de6239dd5387a79002a6acc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 AllLangHelp_swriter.mk|1 
 source/auxiliary/swriter.tree |1 
 source/text/swriter/guide/main.xhp|1 
 source/text/swriter/guide/table_cellmerge.xhp |3 -
 source/text/swriter/guide/table_cells.xhp |   75 --
 source/text/swriter/guide/table_sizing.xhp|3 -
 source/text/swriter/guide/tablemode.xhp   |1 
 7 files changed, 3 insertions(+), 82 deletions(-)

New commits:
commit 2876d94eb8de71136de6239dd5387a79002a6acc
Author: Olivier Hallot 
AuthorDate: Thu Apr 11 19:12:38 2019 -0300
Commit: Olivier Hallot 
CommitDate: Mon Apr 15 15:15:53 2019 +0200

tdf#122162 Keyboard shortcuts in table not valid

Deleted page source/text/swriter/guide/table_cells.xhp because
keyboard shortcuts were deleted.

All references to this page removed too.

Change-Id: Iafedfcdaeb93d5ad2824bd9212526a8bbee20922
Reviewed-on: https://gerrit.libreoffice.org/70614
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index ba34e1582..ca4dd3fe1 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -357,7 +357,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
 helpcontent2/source/text/swriter/guide/stylist_update \
 helpcontent2/source/text/swriter/guide/subscript \
 helpcontent2/source/text/swriter/guide/table_cellmerge \
-helpcontent2/source/text/swriter/guide/table_cells \
 helpcontent2/source/text/swriter/guide/table_delete \
 helpcontent2/source/text/swriter/guide/table_insert \
 helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers \
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index 21cca6728..061e18538 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -85,7 +85,6 @@
 Inserting 
Tables
 Repeating a 
Table Header on a New Page
 Resizing Rows and 
Columns in a Text Table 
-Adding or Deleting a 
Row or Column to a Table Using the Keyboard


 Positioning 
Objects
diff --git a/source/text/swriter/guide/main.xhp 
b/source/text/swriter/guide/main.xhp
index cc24c149b..6a0f0ebd1 100644
--- a/source/text/swriter/guide/main.xhp
+++ b/source/text/swriter/guide/main.xhp
@@ -109,7 +109,6 @@
 
 
 
-
 
 
 
diff --git a/source/text/swriter/guide/table_cellmerge.xhp 
b/source/text/swriter/guide/table_cellmerge.xhp
index 0a6400014..5afd032cd 100644
--- a/source/text/swriter/guide/table_cellmerge.xhp
+++ b/source/text/swriter/guide/table_cellmerge.xhp
@@ -56,6 +56,5 @@
  
   
   
-  

-
\ No newline at end of file
+
diff --git a/source/text/swriter/guide/table_cells.xhp 
b/source/text/swriter/guide/table_cells.xhp
deleted file mode 100644
index 387a4e9d2..0
--- a/source/text/swriter/guide/table_cells.xhp
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-   
-
- 
-   
-
-  
- Adding or Deleting a Row or Column 
to a Table Using the Keyboard
- /text/swriter/guide/table_cells.xhp
-  
-   
-   
-rows; inserting/deleting in tables by 
keyboard
-  columns; inserting/deleting in tables by 
keyboard
-  tables; editing by keyboard
-  keyboard;adding or deleting rows/columns
-  splitting cells;by keyboard
-  merging;cells, by keyboard
-  deleting;rows/columns, by keyboard
-  inserting;rows/columns, by keyboard
-MW changed "adding;" to "inserting;"
-Adding or Deleting a Row or Column to a 
Table Using the Keyboard
-
-  You can 
add or delete rows or columns in tables as well as split or merge table cells 
using the keyboard.
-  
- 
-To 
insert a new row in a table, place the cursor in a table cell, press 
Option
-Alt+Insert, and 
then press the up or down arrow key. You can also move the cursor to the last 
cell in the table, and then press Tab.
- 
- 
-To 
insert a new column, place the cursor in a table cell, press Option
-Alt+Insert, and 
then press the left or right arrow key.
- 
- 
-To 
split a table cell instead of adding a column, press Option
-Alt+Insert, and 
then hold down Command
-Ctrl while you 
press the left or right arrow key.
- 
- 
-To 
delete a row, place the cursor in a table cell, press Option
-Alt+Delete, and 
then press the up or down arrow key.
- 
- 
-To 
delete a column, place the cursor in a table cell, press Option
-Alt+Delete, and 
then press the left or the right arrow key.
- 
- 
-To 
merge a table into an adjacent cell, place the cursor in the cell, press 
Option
-Alt+Delete, hold 
down Command
-Ctrl, and then 
press the left or the right arrow key.
- 
-  
-  
-  
-  
-  
-   
-
\ No newline at end of file
diff --git a/source/text/swriter/guide/table_sizing.xhp 
b/sourc

Re: Tagging text as being in arbitrary complex-script languages

[Eike Rathke]

Hi jonathon,

On Saturday, 2019-04-13 16:01:43 +, jonathon wrote:

> Does this mean that if a person is given a dictionary for, say, Ferangi,
> as an extension, upon installing it, they won't need to make any other
> changes, to be able to select Ferangi as the document language?

That's the purpose..
It should be selectable as paragraph and character attribution in
a document for spell-checking purposes.

Adding arbitrary dictionary languages (as long as they strictly follow
the BCP 47 language tag specification) works since quite a while (2014?)
already. New(er) in the mentioned mechanism is the ability to add
a language also to the CTL or CJK sections where previously it was only
possible to add to the (misnamed) "Western" section, and give the
language list entries a proper UI name instead of showing just the
language tag.

Note however that such extension language can't be set as default
language for all documents under Tools -> Options -> Languages.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

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

[Muzaffer Kadir YILMAZ (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b9e75051807b807a6c9b96433390e09abaf38c24
Author: Muzaffer Kadir YILMAZ 
AuthorDate: Mon Feb 11 15:39:54 2019 +0300
Commit: Michael Stahl 
CommitDate: Mon Apr 15 14:12:17 2019 +0200

tdf#114441 - Convert variables use Tell() function sal_uLong to sal_uInt64

Change-Id: I356d771920f08fedd0843a5482615f787edf4f9f
Reviewed-on: https://gerrit.libreoffice.org/67688
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index bd2008df4a25..5b66db607afb 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -918,7 +918,7 @@ void WW8_WrPlcField::Write( WW8Export& rWrt )
 
 if( pfc && plc )
 {
-sal_uLong nFcStart = rWrt.pTableStrm->Tell();
+sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
 WW8_WrPlc1::Write( *rWrt.pTableStrm );
 *pfc = nFcStart;
 *plc = rWrt.pTableStrm->Tell() - nFcStart;
@@ -967,7 +967,7 @@ void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong 
nCount )
 
 sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
 {
-sal_uLong nCurPos = rStrm.Tell();
+sal_uInt64 nCurPos = rStrm.Tell();
 if( !nEndPos )  // nEndPos == 0 -> next Page
 nEndPos = (nCurPos + 0x1ff) & ~0x1ffUL;
 
@@ -1072,7 +1072,7 @@ void WW8_WrPlcPn::WriteFkps()
 
 void WW8_WrPlcPn::WritePlc()
 {
-sal_uLong nFcStart = rWrt.pTableStrm->Tell();
+sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
 decltype(m_Fkps)::size_type i;
 
 for (i = 0; i < m_Fkps.size(); ++i)
@@ -1382,7 +1382,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc)
 
 void WW8_WrPct::WritePc( WW8Export& rWrt )
 {
-sal_uLong nPctStart;
+sal_uInt64 nPctStart;
 sal_uLong nOldPos, nEndPos;
 
 nPctStart = rWrt.pTableStrm->Tell();// Start piece 
table
@@ -1713,7 +1713,7 @@ void WW8Export::WriteAsStringTable(const 
std::vector& rStrings,
 // FilePos. Used to insert lengths after the fact.
 void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal )
 {
-sal_uLong nOldPos = rStrm.Tell();   // remember Pos
+sal_uInt64 nOldPos = rStrm.Tell();   // remember Pos
 rStrm.Seek( nPos );
 SwWW8Writer::WriteShort( rStrm, nVal );
 rStrm.Seek( nOldPos );
@@ -1721,7 +1721,7 @@ void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong 
nPos, sal_Int16 nVal )
 
 void SwWW8Writer::WriteLong( SvStream& rStrm, sal_uLong nPos, sal_Int32 nVal )
 {
-sal_uLong nOldPos = rStrm.Tell();   // remember Pos
+sal_uInt64 nOldPos = rStrm.Tell();   // remember Pos
 rStrm.Seek( nPos );
 SwWW8Writer::WriteLong( rStrm, nVal );
 rStrm.Seek( nOldPos );
@@ -1814,7 +1814,7 @@ void WW8Export::WriteStringAsPara( const OUString& rText )
 aArr.push_back( 1 );
 }
 
-sal_uLong nPos = Strm().Tell();
+sal_uInt64 nPos = Strm().Tell();
 m_pPapPlc->AppendFkpEntry( nPos, aArr.size(), aArr.data() );
 m_pChpPlc->AppendFkpEntry( nPos );
 }
@@ -3847,7 +3847,7 @@ void WW8Export::WriteFormData( const 
::sw::mark::IFieldmark& rFieldmark )
 ffname = aName.copy(0, nLen);
 }
 
-sal_uLong nDataStt = pDataStrm->Tell();
+sal_uInt64 nDataStt = pDataStrm->Tell();
 m_pChpPlc->AppendFkpEntry(Strm().Tell());
 
 WriteChar(0x01);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4506a8993d2d4d2d7c615cecec16f05a4e3503f5
Author: Michael Stahl 
AuthorDate: Fri Apr 12 12:52:31 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 15 14:10:50 2019 +0200

ucb: xmlns typo

Change-Id: I3c26cc881ac6d157464ccdff5d71683fd7b1de4a
Reviewed-on: https://gerrit.libreoffice.org/70682
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index 7982a7322fa9..39a471fee893 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -111,7 +111,7 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 /* <*propname* xmlns="*propns*" /> */
 aBuffer.append( "<" );
 aBuffer.append( thePropName.name );
-aBuffer.append( " xmlnx=\"" );
+aBuffer.append( " xmlns=\"" );
 aBuffer.append( thePropName.nspace );
 aBuffer.append( "\"/>" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Chance of Colour Underlining

[Andrew Williams]

How do I chance the underling under the wording from black to red, please 

Thanks in advance
Andrew WilliamsUnited Kingdom
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: canvas/source cppcanvas/source drawinglayer/source filter/source sd/source svx/inc svx/source sw/source

[Tomaž Vajngerl (via logerrit)]

 canvas/source/vcl/impltools.cxx   |1 -
 cppcanvas/source/mtfrenderer/implrenderer.cxx |2 +-
 drawinglayer/source/tools/wmfemfhelper.cxx|2 +-
 filter/source/flash/swfwriter1.cxx|1 -
 filter/source/graphicfilter/icgm/bundles.hxx  |1 -
 filter/source/graphicfilter/icgm/main.hxx |1 -
 filter/source/msfilter/util.cxx   |2 +-
 sd/source/ui/sidebar/SlideBackground.cxx  |1 -
 svx/inc/pch/precompiled_svx.hxx   |1 -
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |1 -
 svx/source/xoutdev/xattrbmp.cxx   |1 -
 sw/source/filter/ww8/wrtww8.cxx   |1 -
 sw/source/filter/ww8/ww8atr.cxx   |1 -
 13 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 98272c886b9f7df1670f4ba38d951fc5937a8e89
Author: Tomaž Vajngerl 
AuthorDate: Mon Apr 15 16:39:41 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Apr 15 12:32:52 2019 +0200

remove or change salbtype.hxx includes with the specific one

We probably don't need salbtype.hxx include, but if we do we can
now change it with a more specific one - namely BitmapPalette.hxx
in most cases. This doesn't yet touch the includes in VCL.

Change-Id: Ie3067ccb2eec425650b41ce7fca48e368215f489
Reviewed-on: https://gerrit.libreoffice.org/70761
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 2ccc4e2c4139..71501e744040 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -45,7 +45,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e4b94d86cd1b..241edaa17bb2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -52,12 +52,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index 3db26a755c3b..40ce19383f50 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index 68c4135e0c27..09c46a88a126 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -36,7 +36,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx 
b/filter/source/graphicfilter/icgm/bundles.hxx
index 80910adda578..1f9bf7bb29df 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include "cgmtypes.hxx"
-#include 
 #include 
 #include 
 
diff --git a/filter/source/graphicfilter/icgm/main.hxx 
b/filter/source/graphicfilter/icgm/main.hxx
index 508c8f3ebf6b..3d02d5b1f68d 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -22,7 +22,6 @@
 
 #include "cgm.hxx"
 
-#include 
 #include 
 #include "bundles.hxx"
 #include "bitmap.hxx"
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 53b5d8a810c0..4342eed296f7 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -14,7 +14,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 4789890abce0..e140049a0f2e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -66,7 +66,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 1915ff143fd7..e5f7944c8a90 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -123,7 +123,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 3df26b91e0f6..1f3b439289e8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 140718bd056f..9a2d47d631ff 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -35,7 +35,6 @@
 #include 
 #include 
 

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |   51 
 sw/source/core/undo/undel.cxx   |6 ++--
 sw/source/core/undo/undobj.cxx  |   18 +---
 3 files changed, 63 insertions(+), 12 deletions(-)

New commits:
commit 80b73dcc06c671a49fbf238be58c1cd086c5c5f9
Author: Michael Stahl 
AuthorDate: Fri Apr 12 18:10:49 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 15 12:27:41 2019 +0200

tdf#109376 sw: fix SwUndoDelete with end pos on SwTableNode crash

Commit 6ff263b837831d46d0c215963b70543a9ea5bd2a added a check in
SwUndoSaveContent::DelContentIndex() to avoid moving the anchor of a
FLY_AT_PARA if its new position would be a table node, because
SwFlyAtContentFrame::Modify() requires a SwTextNode to be the anchor.
However, that doesn't actually avoid moving the anchor - later,
SwNodes::RemoveNode() relocates the anchor to the next node regardless
of type!

It's probably better to just delete the fly in the situation when the
end position is a SwTableNode, which fixes the reported crash.

Unfortunately on Redo, the SwUndoDelete::UndoImpl() does not recreate
the nodes correctly, hence the fly then is inserted on the wrong node,
which later crashes again.

The problem is that due to the table node, a dummy SwTextNode is inserted,
which should be at the end of the range, but ends up at the start due to
an erroneous ++aPos.nNode; - the result is that the fly is inserted on
the dummy node and is immediately deleted again, triggering another
assert.  If there is a dummy node, it also doesn't make sense to call
SplitNode().

Yet another problem is that in SwUndoDelete::UndoImpl(), the frames for
the moved text nodes are not created, because the first node is skipped
with the wrong assumption that it already has frames.

Reportedly this started to crash with commit
e07feb9457f2ffb373ae69b73dda290140e4005f, previously it was just wrong.

Change-Id: I5094638e34c6ed52c836e57691d377b8cd1608f9
Reviewed-on: https://gerrit.libreoffice.org/70683
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index ddebd9a1a662..f58819aee41c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -49,6 +51,7 @@ public:
 void testTdf47471_paraStyleBackground();
 void testTdf101534();
 void testTdf54819();
+void testTdf109376();
 void testTdf64242_optimizeTable();
 void testTdf108687_tabstop();
 void testTdf119571();
@@ -79,6 +82,7 @@ public:
 CPPUNIT_TEST(testTdf47471_paraStyleBackground);
 CPPUNIT_TEST(testTdf101534);
 CPPUNIT_TEST(testTdf54819);
+CPPUNIT_TEST(testTdf109376);
 CPPUNIT_TEST(testTdf64242_optimizeTable);
 CPPUNIT_TEST(testTdf108687_tabstop);
 CPPUNIT_TEST(testTdf119571);
@@ -343,6 +347,53 @@ void SwUiWriterTest2::testTdf54819()
  getProperty(getParagraph(1), 
"ParaStyleName"));
 }
 
+void SwUiWriterTest2::testTdf109376()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+// need 2 paragraphs to get to the bMoveNds case
+pWrtShell->Insert("foo");
+pWrtShell->SplitNode();
+pWrtShell->Insert("bar");
+pWrtShell->SplitNode();
+pWrtShell->StartOfSection(false);
+
+// add AT_PARA fly at 1st to be deleted node
+SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
+anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
+SfxItemSet flySet(pDoc->GetAttrPool(),
+  svl::Items{});
+flySet.Put(anchor);
+SwFormatFrameSize size(ATT_MIN_SIZE, 1000, 1000);
+flySet.Put(size); // set a size, else we get 1 char per line...
+SwFrameFormat const* pFly = pWrtShell->NewFlyFrame(flySet, 
/*bAnchValid=*/true);
+CPPUNIT_ASSERT(pFly != nullptr);
+
+pWrtShell->SttEndDoc(false);
+SwInsertTableOptions tableOpt(SwInsertTableFlags::DefaultBorder, 0);
+const SwTable& rTable = pWrtShell->InsertTable(tableOpt, 1, 1);
+
+pWrtShell->StartOfSection(false);
+SwPaM pam(*pWrtShell->GetCursor()->GetPoint());
+pam.SetMark();
+pam.GetPoint()->nNode = *rTable.GetTableNode();
+pam.GetPoint()->nContent.Assign(nullptr, 0);
+pam.Exchange(); // same selection direction as in doc compare...
+
+// this used to assert/crash with m_pAnchoredFlys mismatch because the
+// fly was not deleted but its anchor was moved to the SwTableNode
+pDoc->getIDocumentContentOperations().DeleteRange(pam);
+CPPUNIT_ASSERT_EQUAL(size_t(0), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
+rUndoManager.Undo();
+CPPUNIT_ASSERT_EQUAL(size_t(1), p

[Libreoffice-commits] core.git: chart2/source editeng/source include/editeng include/IwyuFilter_include.yaml sc/inc sc/qa sc/source sd/qa sd/source starmath/source svx/source sw/source

[Gabor Kelemen (via logerrit)]

 chart2/source/controller/main/DrawCommandDispatch.cxx   |1 
 editeng/source/accessibility/AccessibleContextBase.cxx  |3 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |3 
 editeng/source/accessibility/AccessibleImageBullet.cxx  |1 
 editeng/source/editeng/editundo.hxx |1 
 editeng/source/editeng/eerdll.cxx   |1 
 editeng/source/items/CustomPropertyField.cxx|1 
 editeng/source/items/frmitems.cxx   |1 
 editeng/source/misc/hangulhanja.cxx |1 
 editeng/source/outliner/outliner.cxx|1 
 editeng/source/rtf/rtfitem.cxx  |1 
 include/IwyuFilter_include.yaml |   67 
 include/editeng/AccessibleComponentBase.hxx |4 
 include/editeng/AccessibleContextBase.hxx   |   13 --
 include/editeng/AccessibleEditableTextPara.hxx  |   13 +-
 include/editeng/AccessibleImageBullet.hxx   |8 -
 include/editeng/AccessibleParaManager.hxx   |5 
 include/editeng/AccessibleStaticTextBase.hxx|3 
 include/editeng/CustomPropertyField.hxx |4 
 include/editeng/adjustitem.hxx  |6 -
 include/editeng/autokernitem.hxx|2 
 include/editeng/blinkitem.hxx   |2 
 include/editeng/borderline.hxx  |4 
 include/editeng/boxitem.hxx |3 
 include/editeng/brushitem.hxx   |2 
 include/editeng/cmapitem.hxx|2 
 include/editeng/colritem.hxx|2 
 include/editeng/crossedoutitem.hxx  |3 
 include/editeng/editdata.hxx|9 -
 include/editeng/editeng.hxx |   10 -
 include/editeng/editobj.hxx |4 
 include/editeng/editstat.hxx|2 
 include/editeng/editview.hxx|   16 +-
 include/editeng/edtdlg.hxx  |   14 +-
 include/editeng/emphasismarkitem.hxx|4 
 include/editeng/escapementitem.hxx  |4 
 sc/inc/autoform.hxx |1 
 sc/qa/unit/subsequent_filters-test.cxx  |1 
 sc/qa/unit/ucalc.cxx|2 
 sc/source/core/data/attarray.cxx|1 
 sc/source/core/data/dpoutput.cxx|1 
 sc/source/core/data/patattr.cxx |1 
 sc/source/core/data/stlpool.cxx |1 
 sc/source/core/tool/autoform.cxx|1 
 sc/source/filter/excel/xestyle.cxx  |1 
 sc/source/filter/excel/xistyle.cxx  |1 
 sc/source/filter/html/htmlpars.cxx  |1 
 sc/source/filter/lotus/lotattr.cxx  |1 
 sc/source/filter/oox/stylesbuffer.cxx   |1 
 sc/source/filter/oox/worksheethelper.cxx|1 
 sc/source/filter/xml/xmlcelli.cxx   |1 
 sc/source/ui/drawfunc/drtxtob.cxx   |1 
 sc/source/ui/drawfunc/drtxtob2.cxx  |1 
 sc/source/ui/pagedlg/tphfedit.cxx   |1 
 sc/source/ui/unoobj/cellsuno.cxx|1 
 sc/source/ui/view/gridwin.cxx   |1 
 sc/source/ui/view/gridwin4.cxx  |1 
 sc/source/ui/view/tabvwsh4.cxx  |1 
 sc/source/ui/view/tabvwsh8.cxx  |1 
 sc/source/ui/view/viewfun2.cxx  |1 
 sd/qa/unit/export-tests-ooxml1.cxx  |1 
 sd/qa/unit/import-tests.cxx |1 
 sd/qa/unit/tiledrendering/tiledrendering.cxx|2 
 sd/source/filter/html/htmlex.cxx|1 
 sd/source/ui/view/drtxtob.cxx   |1 
 sd/source/ui/view/drtxtob1.cxx  |1 
 sd/source/ui/view/drviews2.cxx  |1 
 starmath/source/edit.cxx|1 
 starmath/source/view.cxx|1 
 svx/source/accessibility/AccessibleShape.cxx|1 
 svx/source/accessibility/AccessibleTextHelper.cxx   |1 
 svx/source/accessibility/ChildrenManagerImpl.cxx|1 
 svx/so

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

[Miklos Vajna (via logerrit)]

 vcl/inc/unx/gtk/gtkgdi.hxx   |2 
 vcl/unx/gtk/salnativewidgets-gtk.cxx |  122 ---
 2 files changed, 58 insertions(+), 66 deletions(-)

New commits:
commit b0da0a45a6453a0ddebded83ae8401e7f3cccde3
Author: Miklos Vajna 
AuthorDate: Mon Apr 15 09:43:43 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 15 11:47:39 2019 +0200

Related: tdf#97822 vcl opengl gtk2: fix missing slider widget

This had the same problem as the list node widget, fixed in commit
fb9c7e31f888a301fecb5257635e12ce7b907d14 (tdf#97822 vcl opengl gtk2: fix
missing list node widget, 2019-04-12). Render output was missing in the
GL / SAL_GTK_USE_PIXMAPPAINT=1 case.

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

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 8187bdb5a043..87f1d0e14c3a 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -381,7 +381,7 @@ protected:
 bool NWPaintGTKProgress(
 const tools::Rectangle& rControlRectangle,
 const ImplControlValue& aValue );
-bool NWPaintGTKSlider( ControlPart nPart,
+bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlPart nPart,
const tools::Rectangle& rControlRectangle,
ControlState nState, const ImplControlValue& aValue 
);
 bool NWPaintGTKListNode( GdkDrawable* gdkDrawable,
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 759fd14a2a3b..b965705eaa1c 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -1026,7 +1026,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
 }
 else if( nType == ControlType::Slider )
 {
-return NWPaintGTKSlider( nPart, aCtrlRect, nState, aValue );
+return NWPaintGTKSlider(pDrawable, nPart, aCtrlRect, nState, aValue);
 }
 else if( nType == ControlType::WindowBackground )
 {
@@ -3459,7 +3459,57 @@ bool GtkSalGraphics::NWPaintGTKProgress(
 return true;
 }
 
+namespace
+{
+void NWPaintGTKSliderReal(SalX11Screen nXScreen, GdkDrawable* gdkDrawable, 
ControlPart nPart,
+  const tools::Rectangle& rControlRectangle, 
ControlState nState,
+  const ImplControlValue& rValue)
+{
+gint w, h;
+w = rControlRectangle.GetWidth();
+h = rControlRectangle.GetHeight();
+
+const SliderValue* pVal = static_cast(&rValue);
+
+GtkWidget* pWidget = (nPart == ControlPart::TrackHorzArea)
+ ? GTK_WIDGET(gWidgetData[nXScreen].gHScale)
+ : GTK_WIDGET(gWidgetData[nXScreen].gVScale);
+const gchar* pDetail = (nPart == ControlPart::TrackHorzArea) ? "hscale" : 
"vscale";
+GtkOrientation eOri = (nPart == ControlPart::TrackHorzArea) ? 
GTK_ORIENTATION_HORIZONTAL
+: 
GTK_ORIENTATION_VERTICAL;
+gint slider_width = 10;
+gint slider_length = 10;
+gint trough_border = 0;
+gtk_widget_style_get(pWidget, "slider-width", &slider_width, 
"slider-length", &slider_length,
+ "trough-border", &trough_border, nullptr);
+
+GtkStateType eState
+= (nState & ControlState::ENABLED) ? GTK_STATE_NORMAL : 
GTK_STATE_INSENSITIVE;
+if (nPart == ControlPart::TrackHorzArea)
+{
+gtk_paint_box(pWidget->style, gdkDrawable, eState, GTK_SHADOW_IN, 
nullptr, pWidget,
+  "trough", 0, (h - slider_width - 2 * trough_border) / 2, 
w,
+  slider_width + 2 * trough_border);
+gint x
+= (w - slider_length + 1) * (pVal->mnCur - pVal->mnMin) / 
(pVal->mnMax - pVal->mnMin);
+gtk_paint_slider(pWidget->style, gdkDrawable, eState, GTK_SHADOW_OUT, 
nullptr, pWidget,
+ pDetail, x, (h - slider_width) / 2, slider_length, 
slider_width, eOri);
+}
+else
+{
+gtk_paint_box(pWidget->style, gdkDrawable, eState, GTK_SHADOW_IN, 
nullptr, pWidget,
+  "trough", (w - slider_width - 2 * trough_border) / 2, 0,
+  slider_width + 2 * trough_border, h);
+gint y
+= (h - slider_length + 1) * (pVal->mnCur - pVal->mnMin) / 
(pVal->mnMax - pVal->mnMin);
+gtk_paint_slider(pWidget->style, gdkDrawable, eState, GTK_SHADOW_OUT, 
nullptr, pWidget,
+ pDetail, (w - slider_width) / 2, y, slider_width, 
slider_length, eOri);
+}
+}
+}
+
 bool GtkSalGraphics::NWPaintGTKSlider(
+GdkDrawable* gdkDrawable,
 ControlPart nPart,
 const tools::Rectangle& rControlRectangle,
 ControlState nState, const ImplControlValue& rValue )
@@ -3467,73 +3517,15 @@ bool GtkSalGraphics::NWPaintGTKSlide

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 977b362ec73cde1942f3052e5e2d0fa9882b062b
Author: Caolán McNamara 
AuthorDate: Fri Apr 12 15:59:02 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Apr 15 11:37:31 2019 +0200

rhbz#1699347 __glibcxx_requires_subscript enabled in fedora release builds

and so triggering a crash and exit on trying to get address of 0th element 
of a
0 len vector

Change-Id: I205478b6c2878d3758d91812db46fe8ad58e37df
Reviewed-on: https://gerrit.libreoffice.org/70673
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 2e9f77b1a063..4ccbd77d9c1c 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5870,7 +5870,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 
nWrdLen )
 const ExtTextInputAttr nVal = ExtTextInputAttr::DottedUnderline |
 ExtTextInputAttr::Highlight;
 const std::vector aAttrs( nL, nVal );
-CommandExtTextInputData aCETID( sStr, &aAttrs[0], nL,
+CommandExtTextInputData aCETID( sStr, aAttrs.data(), nL,
 0, false );
 
 //fdo#33092. If the current input language is the default
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[Stephan Bergmann]

On 15/04/2019 10:35, John Frankish wrote:

Strace log attached.


I guess the problem shows in lines like


10691 access("/home/tc/.config/libreoffice/4/user/config/soffice.cfg", F_OK) = 
-1 ENOENT (No such file or directory)


There is previous lines like


10691 mkdir("/home/tc/.config/libreoffice/4/user/psprint", 0777) = -1 EEXIST 
(File exists)


indicating that the user profile at ~/.config/libreoffice/4/ is present 
in general (so has been generated by a previous run of soffice), but 
lacks important parts like the user/config/soffice.cfg/ sub-dir.  What 
happens if you `rm -fr ~/.config/libreoffice` before running soffice again?

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

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

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx  |   36 +++
 include/LibreOfficeKit/LibreOfficeKitEnums.h |6 
 libreofficekit/source/gtk/lokdocview.cxx |2 +
 3 files changed, 44 insertions(+)

New commits:
commit 35aff9067796ee7b108ffee88126f837b573d3c1
Author: Michael Meeks 
AuthorDate: Fri Apr 12 21:16:38 2019 +0100
Commit: Michael Meeks 
CommitDate: Mon Apr 15 11:36:28 2019 +0200

lok: emit ProfileZone data in messages when requested.

Change-Id: I42a773e2d5b8e4deeafa8eeb2785913db36a47d7
Reviewed-on: https://gerrit.libreoffice.org/70688
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 279232e07c99..e6feceb595b2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -4495,6 +4496,31 @@ static void preloadData()
 rtl::Bootstrap::set("UserInstallation", sUserPath);
 }
 
+class ProfileZoneDumper : public AutoTimer
+{
+static const int dumpTimeoutMS = 5000;
+public:
+ProfileZoneDumper() : AutoTimer( "zone dumper" )
+{
+SetTimeout(dumpTimeoutMS);
+Start();
+}
+virtual void Invoke() override
+{
+css::uno::Sequence aEvents =
+comphelper::ProfileRecording::getRecordingAndClear();
+OStringBuffer aOutput;
+for (auto &s : aEvents)
+{
+aOutput.append(OUStringToOString(s, RTL_TEXTENCODING_UTF8));
+aOutput.append("\n");
+}
+OString aChunk = aOutput.makeStringAndClear();
+if (gImpl && gImpl->mpCallback)
+gImpl->mpCallback(LOK_CALLBACK_PROFILE_FRAME, aChunk.getStr(), 
gImpl->mpCallbackData);
+}
+};
+
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const 
char* pUserProfileUrl)
 {
 enum {
@@ -4505,6 +4531,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 
 // Did we do a pre-initialize
 static bool bPreInited = false;
+static bool bProfileZones = getenv("SAL_PROFILEZONE_STDOUT") != nullptr;
 
 // What stage are we at ?
 if (pThis == nullptr)
@@ -4519,6 +4546,15 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 if (bInitialized)
 return 1;
 
+// Turn profile zones on early
+if (bProfileZones && eStage == SECOND_INIT)
+{
+comphelper::ProfileRecording::startRecording(true);
+new ProfileZoneDumper();
+}
+
+comphelper::ProfileZone aZone("lok-init");
+
 if (eStage == PRE_INIT)
 rtl_alloc_preInit(true);
 else if (eStage == SECOND_INIT)
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 1d55ce8583b3..ef24828988f7 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -610,6 +610,12 @@ typedef enum
  * On-load notification of the document signature status.
  */
 LOK_CALLBACK_SIGNATURE_STATUS = 40,
+
+/**
+ * Profiling tracing information single string of multiple lines
+ * containing   and zone start/stop information
+ */
+LOK_CALLBACK_PROFILE_FRAME = 41
 }
 LibreOfficeKitCallbackType;
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 1221b056c2a3..36601e385173 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -448,6 +448,8 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_CONTEXT_CHANGED";
 case LOK_CALLBACK_SIGNATURE_STATUS:
 return "LOK_CALLBACK_SIGNATURE_STATUS";
+case LOK_CALLBACK_PROFILE_FRAME:
+return "LOK_CALLBACK_PROFILE_FRAME";
 }
 g_assert(false);
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk

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

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   25 ++
 svx/Library_svx.mk   |1 
 svx/UIConfig_svx.mk  |1 
 svx/source/sidebar/PanelFactory.cxx  |5 
 svx/source/sidebar/lists/ListsPropertyPanel.cxx  |   64 +
 svx/source/sidebar/lists/ListsPropertyPanel.hxx  |   52 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx   |6 
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx   |1 
 svx/uiconfig/ui/sidebarlists.ui  |  136 +++
 svx/uiconfig/ui/sidebarparagraph.ui  |   63 -
 10 files changed, 286 insertions(+), 68 deletions(-)

New commits:
commit c6f5ee192887224de5dabfa86f2103822922bf89
Author: Gülşah Köse 
AuthorDate: Wed Apr 3 21:23:30 2019 +0300
Commit: Andras Timar 
CommitDate: Mon Apr 15 11:24:43 2019 +0200

Add new list panel to Impress Properties deck

Change-Id: Idb3a4dee104b2df0283852efcecbd0b25a765d5a
Reviewed-on: https://gerrit.libreoffice.org/70276
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Andras Timar 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 6f162ee14880..5d3c698d975c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1094,6 +1094,31 @@
 
   
 
+  
+
+  Lists
+
+
+  ListsPropertyPanel
+
+
+  PropertyDeck
+
+
+  
+DrawImpress,DrawText,   visible ;
+DrawImpress,Table,  visible ;
+DrawImpress,TextObject, hidden  ;
+  
+
+
+  
private:resource/toolpanel/SvxPanelFactory/ListsPropertyPanel
+
+
+  300
+
+  
+
   
 
   Wrap
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index b8043c4019fe..4677f3b475f4 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -187,6 +187,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/sidebar/text/TextUnderlinePopup \
 svx/source/sidebar/text/TextPropertyPanel \
 svx/source/sidebar/styles/StylesPropertyPanel \
+svx/source/sidebar/lists/ListsPropertyPanel \
 svx/source/sidebar/paragraph/ParaLineSpacingControl \
 svx/source/sidebar/paragraph/ParaLineSpacingPopup \
 svx/source/sidebar/paragraph/ParaPropertyPanel \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a7cb36f70587..9f6a55c266e3 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebargraphic \
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
+   svx/uiconfig/ui/sidebarlists \
svx/uiconfig/ui/sidebarpossize \
svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
diff --git a/svx/source/sidebar/PanelFactory.cxx 
b/svx/source/sidebar/PanelFactory.cxx
index 4eb6270dab2f..deabe5f4adb2 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -20,6 +20,7 @@
 #include "text/TextPropertyPanel.hxx"
 #include "styles/StylesPropertyPanel.hxx"
 #include "paragraph/ParaPropertyPanel.hxx"
+#include "lists/ListsPropertyPanel.hxx"
 #include "area/AreaPropertyPanel.hxx"
 #include "shadow/ShadowPropertyPanel.hxx"
 #include "graphic/GraphicPropertyPanel.hxx"
@@ -131,6 +132,10 @@ Reference SAL_CALL 
PanelFactory::createUIElement (
 {
 pControl = ParaPropertyPanel::Create(pParentWindow, xFrame, pBindings, 
xSidebar);
 }
+else if (rsResourceURL.endsWith("/ListsPropertyPanel"))
+{
+pControl = ListsPropertyPanel::Create(pParentWindow, xFrame);
+}
 else if (rsResourceURL.endsWith("/AreaPropertyPanel"))
 {
 pControl = AreaPropertyPanel::Create(pParentWindow, xFrame, pBindings);
diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx 
b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
new file mode 100644
index ..f739a066b711
--- /dev/null
+++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. Se

[Libreoffice-commits] online.git: android/app android/.gitignore

[Libreoffice Gerrit user]

 android/.gitignore |1 
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |   37 
+-
 android/app/src/main/res/values/strings.xml|1 
 3 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 97d659d480ad7fed0583f9fad705e5781b66c539
Author: kaishu-sahu 
AuthorDate: Mon Apr 15 12:19:35 2019 +0530
Commit: Jan Holesovsky 
CommitDate: Mon Apr 15 11:18:11 2019 +0200

android: Update handling of the storage permission.

If the user does these steps: install -> open a document(from app's file 
manager) -> close the app -> remove storage permission
-> open the document from the launcher shortcuts, he/she gets an error(from 
loolwsd).Expected behaviour should be to ask for
storage permission. Same behaviour can be observed if the user tries to 
open the document via file uri provided by 3rd party
file managers on api < 24.

Change-Id: Idfc3d55a81ccd269a2251aef57935eff2569ea94
Reviewed-on: https://gerrit.libreoffice.org/70759
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/.gitignore b/android/.gitignore
index 290fd83d8..6e50fa55a 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -6,6 +6,7 @@
 /app/src/main/assets/etc/
 /app/src/main/assets/example.odt
 /app/src/main/assets/license.txt
+/app/src/main/assets/license.html
 /app/src/main/assets/notice.txt
 /app/src/main/assets/program/
 /app/src/main/assets/share/
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java 
b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index fd1431939..127b122e4 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -9,9 +9,11 @@
 
 package org.libreoffice.androidapp;
 
+import android.Manifest;
 import android.content.ContentResolver;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
 import android.os.Build;
@@ -45,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
 final static String TAG = "MainActivity";
 
 private static final String ASSETS_EXTRACTED_PREFS_KEY = 
"ASSETS_EXTRACTED";
-private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 777;
+private static final int PERMISSION_READ_EXTERNAL_STORAGE = 777;
 
 private File mTempFile = null;
 
@@ -56,7 +58,7 @@ public class MainActivity extends AppCompatActivity {
 private WebView mWebView;
 
 private boolean isDocEditable = false;
-private boolean isDocDebuggable = true;
+private boolean isDocDebuggable = BuildConfig.DEBUG;
 
 private static boolean copyFromAssets(AssetManager assetManager,
   String fromAssetPath, String 
targetDir) {
@@ -184,8 +186,37 @@ public class MainActivity extends AppCompatActivity {
 WebView.setWebContentsDebuggingEnabled(true);
 }
 }
+}
+
 
-loadDocument();
+@Override
+protected void onStart() {
+super.onStart();
+if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.READ_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
+Log.i(TAG, "asking for read storage permission");
+ActivityCompat.requestPermissions(this,
+new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+PERMISSION_READ_EXTERNAL_STORAGE);
+} else {
+loadDocument();
+}
+}
+
+@Override
+public void onRequestPermissionsResult(int requestCode, @NonNull String[] 
permissions, @NonNull int[] grantResults) {
+switch (requestCode) {
+case PERMISSION_READ_EXTERNAL_STORAGE:
+if (permissions.length > 0 && grantResults[0] == 
PackageManager.PERMISSION_GRANTED) {
+loadDocument();
+} else {
+Toast.makeText(this, 
getString(R.string.storage_permission_required), Toast.LENGTH_SHORT).show();
+finish();
+break;
+}
+break;
+default:
+super.onRequestPermissionsResult(requestCode, permissions, 
grantResults);
+}
 }
 
 private boolean copyFileToTemp() {
diff --git a/android/app/src/main/res/values/strings.xml 
b/android/app/src/main/res/values/strings.xml
index fb98b77cb..5b94ca5c6 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
 This file is read-only, saving is 
disabled.
 A file with this name already exists, 
and it will be overwritten.
 File creation failed
+Storage permissi

Re: libreoffice-6.2.2.2 compiling "--with-system-gpgmepp" fails

[Tor Lillqvist]

>
>
> Yes, things work without "--with-system-gpgmepp", but is seems a pity to
> have libreoffice compile gpgme in statically when it is available on the
> system.
>
>
If you are building just for yourself, for development, why worry? Let the
packagers/distributors/vendors worry about that.

(Sure, I try to use as many system libs as possible myself, too, just to
make the build proceed a bit faster, but if there is the slightest problem
with one of them, I add a --without-system-foo switch to my autogen.input
and get on with what I am actually doing.)

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

[Libreoffice-commits] core.git: vcl/backendtest vcl/inc vcl/source vcl/unx vcl/workben

[Noel Grandin (via logerrit)]

 vcl/backendtest/VisualBackendTest.cxx|4 +---
 vcl/inc/opengl/watchdog.hxx  |3 +--
 vcl/source/control/edit.cxx  |9 +++--
 vcl/source/filter/graphicfilter.cxx  |4 +---
 vcl/source/gdi/print2.cxx|3 +--
 vcl/source/image/ImplImageTree.cxx   |4 +---
 vcl/source/outdev/wallpaper.cxx  |3 +--
 vcl/source/treelist/svimpbox.cxx |3 +--
 vcl/source/treelist/treelistbox.cxx  |3 +--
 vcl/source/window/decoview.cxx   |3 +--
 vcl/source/window/dndeventdispatcher.cxx |4 +---
 vcl/source/window/mouse.cxx  |4 +---
 vcl/source/window/paint.cxx  |3 +--
 vcl/source/window/printdlg.cxx   |3 +--
 vcl/source/window/syswin.cxx |3 +--
 vcl/source/window/winproc.cxx|2 +-
 vcl/unx/generic/dtrans/X11_selection.cxx |6 ++
 vcl/unx/generic/gdi/gdiimpl.cxx  |4 +---
 vcl/unx/generic/print/common_gfx.cxx |4 +---
 vcl/unx/generic/print/printerjob.cxx |4 +---
 vcl/unx/generic/printer/ppdparser.cxx|3 +--
 vcl/unx/gtk/a11y/atkcomponent.cxx|3 +--
 vcl/unx/gtk/a11y/atklistener.cxx |7 ++-
 vcl/unx/gtk/salnativewidgets-gtk.cxx |   13 -
 vcl/workben/svpclient.cxx|3 +--
 25 files changed, 32 insertions(+), 73 deletions(-)

New commits:
commit 4c4d9a482b93440fd3388ffa1715e66d1f391fea
Author: Noel Grandin 
AuthorDate: Sun Apr 14 16:41:42 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Apr 15 11:02:53 2019 +0200

loplugin:sequentialassign in vcl

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

diff --git a/vcl/backendtest/VisualBackendTest.cxx 
b/vcl/backendtest/VisualBackendTest.cxx
index 366005a5b198..b06610493073 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -545,9 +545,7 @@ protected:
 try
 {
 uno::Reference xComponentContext = 
::cppu::defaultBootstrap_InitialComponentContext();
-uno::Reference xMSF;
-
-xMSF = 
uno::Reference(xComponentContext->getServiceManager(),
 uno::UNO_QUERY);
+uno::Reference xMSF = 
uno::Reference(xComponentContext->getServiceManager(),
 uno::UNO_QUERY);
 
 if (!xMSF.is())
 Application::Abort("Bootstrap failure - no service manager");
diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index d37066e80e0c..dc7a16cb8c21 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -45,8 +45,7 @@ public:
 
 WatchdogTimingsValues const & getWatchdogTimingsValues(WatchdogTimingMode 
eMode)
 {
-size_t index = 0;
-index = (eMode == WatchdogTimingMode::SHADER_COMPILE) ? 1 : 0;
+size_t index = (eMode == WatchdogTimingMode::SHADER_COMPILE) ? 1 : 0;
 index = mbRelaxed ? index + 2 : index;
 
 return maTimingValues[index];
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a4302902a3c8..72cb09c30924 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -743,8 +743,7 @@ void Edit::ImplDelete( const Selection& rSelection, 
sal_uInt8 nDirection, sal_uI
 
 OUString Edit::ImplGetValidString( const OUString& rString )
 {
-OUString aValidString( rString );
-aValidString = aValidString.replaceAll("\n", "").replaceAll("\r", "");
+OUString aValidString = rString.replaceAll("\n", "").replaceAll("\r", "");
 aValidString = aValidString.replace('\t', ' ');
 return aValidString;
 }
@@ -1033,15 +1032,13 @@ void Edit::ImplPaintBorder(vcl::RenderContext const & 
rRenderContext)
 aClipRgn.Move(xNew - aBounds.Left(), 0);
 
 // move offset of border window
-Point aBorderOffs;
-aBorderOffs = 
pBorder->ScreenToOutputPixel(OutputToScreenPixel(aBorderOffs));
+Point aBorderOffs = 
pBorder->ScreenToOutputPixel(OutputToScreenPixel(aBorderOffs));
 aClipRgn.Move(aBorderOffs.X(), aBorderOffs.Y());
 }
 else
 {
 // normal case
-Point aBorderOffs;
-aBorderOffs = 
pBorder->ScreenToOutputPixel(OutputToScreenPixel(aBorderOffs));
+Point aBorderOffs = 
pBorder->ScreenToOutputPixel(OutputToScreenPixel(aBorderOffs));
 aClipRgn.Move(aBorderOffs.X(), aBorderOffs.Y());
 }
 
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 70b6056c15f4..920c64160b55 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2145,9 +2145,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlimport/data/tdf124670.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |   10 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   31 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |   15 +++-
 4 files changed, 27 insertions(+), 29 deletions(-)

New commits:
commit 7b6c9c2f52ef80876d494ef966a3ee088c81bcd5
Author: Mike Kaganski 
AuthorDate: Sun Apr 14 00:46:15 2019 +0300
Commit: Michael Stahl 
CommitDate: Mon Apr 15 11:00:56 2019 +0200

tdf#124670: xml:space attribute may be specified for w:document root element

Treat xml:space specially in OOXMLFastContextHandler::startFastElement,
to allow this attribute to be handled for any element.

Change-Id: I81bd1e0642940ffdfc03d6c65d0ce9f421206c5e
Reviewed-on: https://gerrit.libreoffice.org/70723
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/70725
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf124670.docx 
b/sw/qa/extras/ooxmlimport/data/tdf124670.docx
new file mode 100644
index ..d804efa5a990
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf124670.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 991573fd40af..a74501cd708c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -330,6 +330,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf121440, "tdf121440.docx")
 getProperty(getRun(getParagraph(1), 1), "CharEscapement"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf124670, "tdf124670.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+// We need to take xml:space attribute into account, even in w:document 
element
+uno::Reference paragraph = getParagraph(1);
+CPPUNIT_ASSERT_EQUAL(
+OUString("You won't believe, but that's how it was in markup of 
original  bugdoc!"),
+paragraph->getString());
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index ff3da8a3ba5a..be825d2f01d3 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -144,6 +144,13 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
 {
+// Set xml:space value early, to allow child contexts use it when dealing 
with strings.
+if (Attribs && Attribs->hasAttribute(oox::NMSP_xml | oox::XML_space))
+{
+mbPreserveSpace = Attribs->getValue(oox::NMSP_xml | oox::XML_space) == 
"preserve";
+mbPreserveSpaceSet = true;
+}
+
 if (oox::getNamespace(Element) == NMSP_mce)
 m_bDiscardChildren = prepareMceContext(Element, Attribs);
 
@@ -881,6 +888,8 @@ bool OOXMLFastContextHandler::IsPreserveSpace() const
 {
 // xml:space attribute applies to all elements within the content of the 
element where it is specified,
 // unless overridden with another instance of the xml:space attribute
+if (mbPreserveSpaceSet)
+return mbPreserveSpace;
 if (mpParent)
 return mpParent->IsPreserveSpace();
 return false; // default value
@@ -893,9 +902,7 @@ bool OOXMLFastContextHandler::IsPreserveSpace() const
 OOXMLFastContextHandlerStream::OOXMLFastContextHandlerStream
 (OOXMLFastContextHandler * pContext)
 : OOXMLFastContextHandler(pContext),
-  mpPropertySetAttrs(new OOXMLPropertySet),
-  mbPreserveSpace(false),
-  mbPreserveSpaceSet(false)
+  mpPropertySetAttrs(new OOXMLPropertySet)
 {
 }
 
@@ -906,14 +913,7 @@ 
OOXMLFastContextHandlerStream::~OOXMLFastContextHandlerStream()
 void OOXMLFastContextHandlerStream::newProperty(Id nId,
 const OOXMLValue::Pointer_t& 
pVal)
 {
-if (nId == NS_ooxml::LN_CT_Text_space)
-{
-// Set  value early, to allow
-// child contexts use it when dealing with strings
-mbPreserveSpace = pVal->getString() == "preserve";
-mbPreserveSpaceSet = true;
-}
-else if (nId != 0x0)
+if (nId != 0x0)
 {
 mpPropertySetAttrs->add(nId, pVal, OOXMLProperty::ATTRIBUTE);
 }
@@ -943,15 +943,6 @@ void OOXMLFastContextHandlerStream::handleHyperlink()
 aHyperlinkHandler.writetext();
 }
 
-bool OOXMLFastContextHandlerStream::IsPreserveSpace() const
-{
-// xml:space attribute applies to all elements within the content of the 
element where it is specified,
-// unless overridden with another instance of the xml:space attribute
-if (mbPreserveSpaceSet)
-return mbPreserveSpace;
-return OOXMLFastContextHandler::IsPreserveSpace();
-}
-
 /*
   class OOX

RE: libreoffice-6.2.2.2 compiling "--with-system-gpgmepp" fails

[John Frankish]

> Don't do that then?
> 
Yes, things work without "--with-system-gpgmepp", but is seems a pity to have 
libreoffice compile gpgme in statically when it is available on the system.

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

Re: libreoffice-6.2.2.2 compiling "--with-system-gpgmepp" fails

[Tor Lillqvist]

Don't do that then?

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

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

[Miklos Vajna (via logerrit)]

 sw/source/uibase/inc/content.hxx   |   38 ++--
 sw/source/uibase/utlui/content.cxx |  286 ++---
 2 files changed, 162 insertions(+), 162 deletions(-)

New commits:
commit 256480b8b80769149652bb62f401672ee8fafe1f
Author: Miklos Vajna 
AuthorDate: Mon Apr 15 09:06:13 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 15 10:36:00 2019 +0200

sw: prefix members of SwContentType

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

diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 83c73f7b84b2..d141a2a9a3c4 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -138,18 +138,18 @@ public:
 */
 class SwContentType : public SwTypeNumber
 {
-SwWrtShell* pWrtShell;
+SwWrtShell* m_pWrtShell;
 std::unique_ptr
-pMember;// array for content
-OUString const  sContentTypeName;   // name of content type
-OUString const  sSingleContentTypeName; // name of content type, 
singular
-OUStringsTypeToken; // attachment for URL
-size_t  nMemberCount;   // content count
-ContentTypeId const nContentType;   // content type's Id
-sal_uInt8   nOutlineLevel;
-boolbDataValid :1;
-boolbEdit:  1;  // can this type be edited?
-boolbDelete:1;  // can this type be deleted?
+m_pMember;// array for content
+OUString const  m_sContentTypeName;   // name of content type
+OUString const  m_sSingleContentTypeName; // name of content type, 
singular
+OUStringm_sTypeToken; // attachment for URL
+size_t  m_nMemberCount;   // content count
+ContentTypeId const m_nContentType;   // content type's Id
+sal_uInt8   m_nOutlineLevel;
+boolm_bDataValid :1;
+boolm_bEdit:  1;  // can this type be edited?
+boolm_bDelete:1;  // can this type be deleted?
 protected:
 static OUString RemoveNewline(const OUString&);
 public:
@@ -161,25 +161,25 @@ public:
 /** Fill the List of contents */
 voidFillMemberList(bool* pbLevelChanged = nullptr);
 size_t  GetMemberCount() const
-{return nMemberCount;};
-ContentTypeId   GetType() const {return nContentType;}
+{return m_nMemberCount;};
+ContentTypeId   GetType() const {return m_nContentType;}
 
 /** Deliver content, for that if necessary fill the list */
 const SwContent*GetMember(size_t nIndex);
-const OUString& GetName() {return sContentTypeName;}
-const OUString& GetSingleName() const {return 
sSingleContentTypeName;}
-const OUString& GetTypeToken() const{return sTypeToken;}
+const OUString& GetName() {return m_sContentTypeName;}
+const OUString& GetSingleName() const {return 
m_sSingleContentTypeName;}
+const OUString& GetTypeToken() const{return m_sTypeToken;}
 
 voidSetOutlineLevel(sal_uInt8 nNew)
 {
-nOutlineLevel = nNew;
+m_nOutlineLevel = nNew;
 Invalidate();
 }
 
 voidInvalidate(); // only nMemberCount is read again
 
-boolIsEditable() const {return bEdit;}
-boolIsDeletable() const {return bDelete;}
+boolIsEditable() const {return m_bEdit;}
+boolIsDeletable() const {return m_bDelete;}
 };
 
 #endif
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 20eb11b1450a..7ef2e0e48f93 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -267,15 +267,15 @@ namespace
 
 SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, 
sal_uInt8 nLevel) :
 SwTypeNumber(CTYPE_CTT),
-pWrtShell(pShell),
-sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[static_cast(nType)])),
-
sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[static_cast(nType)])),
-nMemberCount(0),
-nContentType(nType),
-nOutlineLevel(nLevel),
-bDataValid(false),
-bEdit(false),
-bDelete(true)
+m_pWrtShell(pShell),
+m_sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[static_cast(nType)])),
+
m_sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[static_cast(nType)])),
+m_nMemberCount(0),
+m_nContentType(nType),
+m_nOutlineLevel(nLevel),
+

RE: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[John Frankish]

> > Libreoffice-6.2.2.2 compiles on a 32-bit linux system, but will not run.
> > 
> > Strace does not show anything obvious - is there a way to debug the 
> > following error?
> >
> > LibreOffice 6.2 - Fatal Error: The application cannot be started.
> > component context fails to supply service 
> > com.sun.star.ui.ModuleUIConfigurationManager of type 
> > com.sun.star.ui.XModuleUIConfigurationManager2: an error occurred 
> > during file opening
> >
> That's an atypical combination of "component context fails to supply service 
> ..."
> (thrown from generated code, presumably during
> css::ui::ModuleUIConfigurationManager::createDefault in
> ModuleUIConfigurationManagerSupplier::getUIConfigurationManager,
> framework/source/uiconfiguration/moduleuicfgsupplier.cxx) and "an error 
> occurred
> during file opening" (the underlying error, generated in 
> fileaccess::throw_handler,
> ucb/source/ucp/file/filglob.cxx) errors. 
> Maybe an `strace -f` output would tell more after all---if you can put it 
> somewhere I can have a look.
> 
> Another place that might be useful to debug is the 
> ModuleUIConfigurationManager
> constructor in 
> framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx,
> if it is reached at all.  Also, configuring the build with --enable-debug or 
> even --enable-dbgutil
> (where adding at least the latter requires a from-scratch rebuild via `make 
> clean`, though)
> might give further useful stderr output.
> 
> What's the configure switches for your build?
> 
Strace log attached.

The configure switches were:

CC="gcc -flto -fuse-linker-plugin -march=i486 -mtune=i686 -Os -pipe" CXX="g++ 
-flto -fuse-linker-plugin -march=i486 -mtune=i686 -Os -pipe" ./configure 
--prefix=/usr/local --localstatedir=/var --without-help --without-myspell-dicts 
--without-fonts --without-java --without-junit --without-system-dicts 
--disable-odk --disable-firebird-sdbc --enable-release-build=yes 
--enable-python=system --with-parallelism=4 --disable-extensions 
--without-doxygen --disable-postgresql-sdbc --with-system-apr 
--with-system-bluez --with-system-boost --with-system-cairo 
--with-system-clucene --with-system-curl --with-system-epoxy 
--with-system-expat --with-system-glm --with-system-graphite 
--with-system-harfbuzz --with-system-hunspell --with-system-icu 
--with-system-jpeg --with-system-lcms2 --with-system-libatomic_ops 
--with-system-libexttextcat --with-system-libpng --with-system-libxml 
--with-system-neon --with-system-nss -with-system-odbc --with-system-openldap 
--with-system-openssl --with-system-poppler --with-system-postgresql 
--with-system-redland --with-system-sane --with-system-serf 
--with-system-xmlsec --with-system-zlib



libreoffice.log.tar.xz
Description: libreoffice.log.tar.xz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: libreoffice-6.2.2.2 compiling "--with-system-gpgmepp" fails

[John Frankish]

> > Using libreoffice-6.2.2.2, gpgme-1.9.0 and gcc-8.2.0
> > 
> > After copying gpgme headers from include/gpgme++ to include to allow 
> > compiling to progress, make fails with:
> >
> Needs a bit more background - internal gpgme is 1.9.0, too; and e.g. debian 
> is successfully building
> against system-gpgmepp.
> 
> Generally - if you pick non-standard build options, it is usually expected 
> that you fix possible issues
> yourself (and we'd be glad to include any patches for that, of course).
> 
Some more background.

./configure finds the gpgme headers under include/gpgme++:

checking which gpgmepp to use... external
checking gpgme++/gpgmepp_version.h usability... yes
checking gpgme++/gpgmepp_version.h presence... yes
checking for gpgme++/gpgmepp_version.h... yes
checking for progress_callback in -lgpgmepp... yes
checking gpgme.h usability... yes
checking gpgme.h presence... yes
checking for gpgme.h... yes

..but make looks for them under include:

/mnt/sdc8/usr/src/libreoffice-6.2.2.2/comphelper/source/misc/docpasswordhelper.cxx:42:11:
 fatal error: context.h: No such file or directory
 # include 
   ^~~
compilation terminated.
make[1]: *** 
[/mnt/sdc8/usr/src/libreoffice-6.2.2.2/solenv/gbuild/LinkTarget.mk:293: 
/mnt/sdc8/usr/src/libreoffice-6.2.2.2/workdir/CxxObject/comphelper/source/misc/docpasswordhelper.o]
 Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:286: build] Error 2
Command exited with non-zero status 2

#if HAVE_FEATURE_GPGME
# include 
# include 
# include 
# include 
#endif

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

[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - loleaflet/css

[Libreoffice Gerrit user]

 loleaflet/css/menubar.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05d8b47fd7796808a637ab0fbe2a99f8771ee4d1
Author: Samuel Mehrbrodt 
AuthorDate: Mon Apr 15 10:24:04 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Apr 15 10:24:04 2019 +0200

Fix menubar bg with logo added

Change-Id: If70ccd49adcd501376ab213521774b1f0f5a352c

diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 84605a378..2253047fc 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -15,7 +15,7 @@
 height: 30px; /* on mouseover menubar items, border emerges */
 background: #efefef;
 position: static;
-margin-left: 10px;
+padding-left: 10px;
 width: auto;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: bug 74702 - Issue with bool OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

[Kaganski Mike]

On 15.04.2019 10:44, Adrien Ollier wrote:
> And what is written is not really equivalent to what you wrote because 
> if AcquireGraphics() is false, there is not a second check for mpGraphics

Also note that when AcquireGraphics() is false (telling it could not 
acquire mpGraphics successfully), we return false. It returning true 
means that now mpGraphics is non-nullptr, and then we proceed.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   97 +---
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |3 
 sd/qa/unit/import-tests-smartart.cxx|   25 -
 3 files changed, 71 insertions(+), 54 deletions(-)

New commits:
commit 5218009f4b3f1f619d12151fc76ec14a12c6d89e
Author: Grzegorz Araminowicz 
AuthorDate: Thu Apr 11 14:56:37 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 15 09:51:44 2019 +0200

SmartArt: better detecting connector arrow type

* basing on provided conn alg params
* also moved setting arrow direction from getConnectorType() to algorithms

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 7686ddf2413c..96e305b46a00 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -84,56 +84,6 @@ sal_Int32 getPropertyFromConstraint(sal_Int32 nConstraint)
 return 0;
 }
 
-/// Determines the connector shape type from a linear alg.
-sal_Int32 getConnectorType(const oox::drawingml::LayoutNode* pNode)
-{
-sal_Int32 nType = oox::XML_rightArrow;
-
-if (!pNode)
-return nType;
-
-// This is cheaper than visiting the whole sub-tree.
-if (pNode->getName().startsWith("hierChild"))
-return oox::XML_bentConnector3;
-
-for (const auto& pChild : pNode->getChildren())
-{
-auto pAlgAtom = dynamic_cast(pChild.get());
-if (!pAlgAtom)
-continue;
-
-switch (pAlgAtom->getType())
-{
-case oox::XML_lin:
-{
-sal_Int32 nDir = oox::XML_fromL;
-if (pAlgAtom->getMap().count(oox::XML_linDir))
-nDir = pAlgAtom->getMap().find(oox::XML_linDir)->second;
-
-switch (nDir)
-{
-case oox::XML_fromL:
-nType = oox::XML_rightArrow;
-break;
-case oox::XML_fromR:
-nType = oox::XML_leftArrow;
-break;
-}
-break;
-}
-case oox::XML_hierChild:
-{
-// TODO  should be able
-// to customize this.
-nType = oox::XML_bentConnector3;
-break;
-}
-}
-}
-
-return nType;
-}
-
 /**
  * Determines if pShape is (or contains) a presentation of a data node of type
  * nType.
@@ -493,6 +443,30 @@ void AlgAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
+sal_Int32 AlgAtom::getConnectorType()
+{
+sal_Int32 nConnRout = 0;
+sal_Int32 nBegSty = 0;
+sal_Int32 nEndSty = 0;
+if (maMap.count(oox::XML_connRout))
+nConnRout = maMap.find(oox::XML_connRout)->second;
+if (maMap.count(oox::XML_begSty))
+nBegSty = maMap.find(oox::XML_begSty)->second;
+if (maMap.count(oox::XML_endSty))
+nEndSty = maMap.find(oox::XML_endSty)->second;
+
+if (nConnRout == oox::XML_bend)
+return oox::XML_bentConnector3;
+if (nBegSty == oox::XML_arr && nEndSty == oox::XML_arr)
+return oox::XML_leftRightArrow;
+if (nBegSty == oox::XML_arr)
+return oox::XML_leftArrow;
+if (nEndSty == oox::XML_arr)
+return oox::XML_rightArrow;
+
+return oox::XML_rightArrow;
+}
+
 void AlgAtom::layoutShape( const ShapePtr& rShape,
const std::vector& rOwnConstraints )
 {
@@ -624,7 +598,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 {
 // There is no shape type "conn", replace it by an arrow based
 // on the direction of the parent linear layout.
-sal_Int32 nType = getConnectorType(pParent);
+sal_Int32 nType = getConnectorType();
 
 rShape->setSubType(nType);
 rShape->getCustomShapeProperties()->setShapePresetType(nType);
@@ -695,6 +669,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 (rShape->getSize().Width - aChildSize.Width) / 2,
 (rShape->getSize().Height - aChildSize.Height) / 2);
 const sal_Int32 nConnectorRadius = nRadius * 
cos(basegfx::deg2rad(nSpanAngle/nShapes));
+const sal_Int32 nConnectorAngle = nSpanAngle > 0 ? 0 : 180;
 
 sal_Int32 idx = 0;
 for (auto & aCurrShape : rShape->getChildren())
@@ -715,10 +690,13 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aCurrShape->setSize(aCurrSize);
 aCurrShape->setChildSize(aCurrSize);
 
+if (nRotationPath == XML_alongPath)
+aCurrShape->setRotation(fAngle * PER_DEGREE);

Re: bug 74702 - Issue with bool OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

[Kaganski Mike]

On 15.04.2019 10:44, Adrien Ollier wrote:
> OutputDevice::AcquireGraphics() is a pure virtual function, so we cannot 
> know in the general case what it does.
> And what is written is not really equivalent to what you wrote because 
> if AcquireGraphics() is false, there is not a second check for 
> mpGraphics. That's why it is an issue.

AcquireGraphics() is not just "any function". Despite someone could of 
course implement it to play poker, its purpose is to acquire mpGraphics 
and return if it succeeded. Failing that is programmer's error breaking 
contract. There's no use to introduce that kind of checks here. Please 
see existing implementations, like VirtualDevice::AcquireGraphics() in 
vcl/source/gdi/virdev.cxx.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 xmloff/source/style/TransGradientStyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 504a9575e7bebe29528c60686a6ad64f9ba81c8b
Author: Miklos Vajna 
AuthorDate: Mon Apr 15 09:37:33 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 15 09:38:51 2019 +0200

xmloff: fix loplugin:simplifyconstruct warning

Change-Id: Iab32f67f911157c5d7c0db8f36ea638576cfd0bf

diff --git a/xmloff/source/style/TransGradientStyle.cxx 
b/xmloff/source/style/TransGradientStyle.cxx
index fb24ef79610e..3de8ce2a4eee 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -248,7 +248,7 @@ void XMLTransGradientStyleExport::exportXML(
 }
 
 // Transparency start
-Color aColor = Color(aGradient.StartColor);
+Color aColor(aGradient.StartColor);
 sal_Int32 aStartValue = 100 - 
static_cast(((aColor.GetRed() + 1) * 100) / 255);
 ::sax::Converter::convertPercent( aOut, aStartValue );
 aStrValue = aOut.makeStringAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: bug 74702 - Issue with bool OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

[Kaganski Mike]

On 15.04.2019 10:33, Adrien Ollier wrote:
> Hello everybody,
> 
> working on bug #74702 
>  led me to 
> read file core/vcl/source/outdev/nativecontrols.cxx.
> 
> I think there is an issue here:
> 
> 
> 
> If mpGraphics == nullptr and AcquireGraphics() == false, then the second 
> if does not return false and we execute the instruction of the return 
> statement but this will lead to a crash (because mpGraphics is false in 
> this scenario).

No, please check what AcquireGraphics() does. Namely, it is used here to 
acquire mpGraphics when it's not yet available. In fact, lines 166-167 
are equivalent to this: "if (!mpGraphics) AcquireGraphics(); if 
(!mpGraphics) return false;"

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: bug 74702 - Issue with bool OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

[Adrien Ollier]

errata


De : Adrien Ollier
Envoyé : lundi 15 avril 2019 09:33
À : libreoffice@lists.freedesktop.org
Objet : bug 74702 - Issue with bool 
OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

Hello everybody,

working on bug 
#74702 led me to 
read file core/vcl/source/outdev/nativecontrols.cxx.

I think there is an issue here:

[cid:679fb8e4-9553-43c2-8c2b-0c2e2a238558]

If mpGraphics == nullptr and AcquireGraphics() == false, then the second if 
does not return false and we execute the instruction of the return statement 
but this will lead to a crash (because mpGraphics is false nullptr in this 
scenario).

If the second if is correct, then the last instruction sould be:
​return mpGraphics ? mpGraphics->IsSupported(nType, nPart) : false;

What do you think about that ? Do you agree with me ?

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

bug 74702 - Issue with bool OutputDevice::IsNativeControlSupported(ControlType, ControlPart)

[Adrien Ollier]

Hello everybody,

working on bug 
#74702 led me to 
read file core/vcl/source/outdev/nativecontrols.cxx.

I think there is an issue here:

[cid:679fb8e4-9553-43c2-8c2b-0c2e2a238558]

If mpGraphics == nullptr and AcquireGraphics() == false, then the second if 
does not return false and we execute the instruction of the return statement 
but this will lead to a crash (because mpGraphics is false in this scenario).

If the second if is correct, then the last instruction sould be:
​return mpGraphics ? mpGraphics->IsSupported(nType, nPart) : false;

What do you think about that ? Do you agree with me ?

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

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx |   28 ++
 chart2/qa/extras/data/xlsx/testCombinedChartAxis.xlsx |binary
 oox/source/drawingml/chart/plotareaconverter.cxx  |   34 +++---
 3 files changed, 58 insertions(+), 4 deletions(-)

New commits:
commit 11473832b5717cb3222ce72baee885bc9e8e2386
Author: Balazs Varga 
AuthorDate: Tue Apr 9 16:12:35 2019 +0200
Commit: László Németh 
CommitDate: Mon Apr 15 09:12:59 2019 +0200

tdf#114181 XLSX combined chart: fix swapped primary and secondary axes etc.

In combined charts, now X category axis crosses the Y axis at the right
place, all data series are attached to the right Y axis, and the
Y major grid isn't lost.

Note: Let's check which axis is attached to the first charttype
(in case of combined chart, the first one is a column chart) and create
that axis first. In OOXML standard, the first CT_valAx tag contains the
axID of the primary axis and the second CT_valAx tag contains the axID
of the secondary axis.


Change-Id: Ib123f95ec41ef5dbbf0599efd7a646f4640a9b70
Reviewed-on: https://gerrit.libreoffice.org/70464
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 47d1ce481a77..475b5bbe2209 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -102,6 +102,7 @@ public:
 void testAxisTitleDefaultRotationXLSX();
 void testSecondaryAxisTitleDefaultRotationXLSX();
 void testAxisTitleRotationXLSX();
+void testCombinedChartAttachedAxisXLSX();
 
 void testTdf90510(); // Pie chart label placement settings(XLS)
 void testTdf109858(); // Pie chart label placement settings(XLSX)
@@ -182,6 +183,7 @@ public:
 CPPUNIT_TEST(testAxisTitleDefaultRotationXLSX);
 CPPUNIT_TEST(testSecondaryAxisTitleDefaultRotationXLSX);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
+CPPUNIT_TEST(testCombinedChartAttachedAxisXLSX);
 CPPUNIT_TEST(testTdf90510);
 CPPUNIT_TEST(testTdf109858);
 CPPUNIT_TEST(testTdf73);
@@ -1399,6 +1401,32 @@ void Chart2ImportTest::testAxisTitleRotationXLSX()
 
 }
 
+void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "testCombinedChartAxis.xlsx");
+Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+// First series
+Reference xSeries = getDataSeriesFromDoc(xChartDoc, 
0);
+CPPUNIT_ASSERT(xSeries.is());
+
+Reference xPropSet(xSeries, uno::UNO_QUERY_THROW);
+sal_Int32 nAxisIndex = -1;
+// First series (column chart) should be attached to secondary axis!
+uno::Any aAny = xPropSet->getPropertyValue("AttachedAxisIndex");
+CPPUNIT_ASSERT(aAny >>= nAxisIndex);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nAxisIndex);
+
+// Second series
+xSeries = getDataSeriesFromDoc(xChartDoc, 0, 1);
+CPPUNIT_ASSERT(xSeries.is());
+
+xPropSet.set(xSeries, uno::UNO_QUERY_THROW);
+// Second series (line chart) should be attached to primary axis!
+aAny = xPropSet->getPropertyValue("AttachedAxisIndex");
+CPPUNIT_ASSERT(aAny >>= nAxisIndex);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex);
+}
+
 void Chart2ImportTest::testInternalDataProvider() {
 uno::Reference< chart2::XChartDocument > 
xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/odp/", "chart.odp"), 
uno::UNO_QUERY_THROW);
 const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = 
xChartDoc->getDataProvider();
diff --git a/chart2/qa/extras/data/xlsx/testCombinedChartAxis.xlsx 
b/chart2/qa/extras/data/xlsx/testCombinedChartAxis.xlsx
new file mode 100644
index ..47f8246e23cd
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/testCombinedChartAxis.xlsx differ
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx 
b/oox/source/drawingml/chart/plotareaconverter.cxx
index f3a4b8ebe493..8afdfda365ea 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -335,12 +335,36 @@ void PlotAreaConverter::convertFromModel( View3DModel& 
rView3DModel )
 // store all axis models in a map, keyed by axis identifier
 typedef ModelMap< sal_Int32, AxisModel > AxisMap;
 AxisMap aAxisMap;
+std::vectorrValAxisIds;
+std::vectorrRealValAxisIds;
+
+for (auto const& atypeGroup : mrModel.maTypeGroups)
+{
+if (atypeGroup->maAxisIds.size() > 1)
+{
+// let's collect which axId belongs to the Y Axis according to 
maTypeGroups
+rRealValAxisIds.push_back(atypeGroup->maAxisIds[1]);
+}
+}
+
 for (auto const& axis : mrModel.maAxes)
 {
 OSL_ENSURE( axis->mnAxisId >= 0, "PlotAreaConverter::convertFromModel 
- invalid axis identifier" );
 OSL_ENSURE( !aAxisMap.has( axis->mnAxisId ), 
"PlotAreaConverter::convertFromModel - axis

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

[Libreoffice Gerrit user]

 loleaflet/html/loleaflet.html.m4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 184654581c82be479f2c278d5c23d1d0b81f812a
Author: Samuel Mehrbrodt 
AuthorDate: Fri Apr 12 15:53:46 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Apr 15 09:11:26 2019 +0200

Branding: Add container for custom logo in about dialog

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

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 242af92f5..7ef44f036 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -171,6 +171,7 @@ ifelse(MOBILEAPP,[true],
 
 
   LibreOffice Online
+  
   
   
   LOOLWSD
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits