date:20190529

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

2019-05-29 Thread Jan-Marek Glogowski (via logerrit)

 vcl/qt5/Qt5Menu.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ed200895d4a2bc31ca99d4e41abaae7dce73ffa1
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 19:45:24 2019 +0200
Commit: Katarina Behrens 
CommitDate: Thu May 30 08:53:31 2019 +0200

tdf#125548 Qt5 no focus for the menu bar button

You can't tab into the menu bar, but if you add a corner widget,
it will be enlisted in the parent's focus chain! Interestingly
the menu bar even is considered to have the focus, if the widget
is focused, and will handle key events, but this can probably be
considered consistent.

So this just denies the button any focus, as this is a mouse-only
widget, and clicking it will close the document window.

Change-Id: I3c48d85ca56b6a54daf01f444dddc736e7ebb8e7
Reviewed-on: https://gerrit.libreoffice.org/73186
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit f6e7dbccf063767c2ac87c6460bd1004df742081)
Reviewed-on: https://gerrit.libreoffice.org/73191
Reviewed-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 47613988beac..0eeafb89f85d 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -622,6 +622,7 @@ void Qt5Menu::ShowCloseButton(bool bShow)
 pButton = new QPushButton(mpQMenuBar);
 pButton->setIcon(aIcon);
 pButton->setFlat(true);
+pButton->setFocusPolicy(Qt::NoFocus);
 pButton->setToolTip(toQString(VclResId(SV_HELPTEXT_CLOSEDOCUMENT)));
 mpQMenuBar->setCornerWidget(pButton, Qt::TopRightCorner);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Libreoffice Gerrit user

 wsd/DocumentBroker.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2827d50ee7e6e9fb35bc32fdeddd193d20e54158
Author: Miklos Vajna 
AuthorDate: Thu May 30 08:43:39 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 30 08:43:45 2019 +0200

wsd: avoid unnecessary copy initialization in DocumentBroker

'filename' was copy-constructed from a const reference, no need to make a
copy.

Change-Id: I2ad86a1a524359c3bd50975484d7742558e88dfd

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 51ca64927..fefe15ccd 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -902,7 +902,7 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 else if (isRename)
 {
 // encode the name
-const std::string filename = storageSaveResult.getSaveAsName();
+const std::string& filename = storageSaveResult.getSaveAsName();
 const std::string url = 
Poco::URI(storageSaveResult.getSaveAsUrl()).toString();
 std::string encodedName;
 Poco::URI::encode(filename, "", encodedName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - offapi/com solenv/bin sw/inc sw/qa sw/source xmloff/inc xmloff/source xmloff/util

2019-05-29 Thread Miklos Vajna (via logerrit)

 offapi/com/sun/star/text/CellProperties.idl |8 ++
 solenv/bin/native-code.py   |1 
 sw/inc/cmdid.h  |1 
 sw/inc/unoprnms.hxx |1 
 sw/inc/unotbl.hxx   |1 
 sw/qa/extras/odfexport/data/user-field-decl.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx|8 ++
 sw/source/core/unocore/unomap.cxx   |1 
 sw/source/core/unocore/unotbl.cxx   |   23 +++
 sw/source/filter/xml/xmlfmte.cxx|1 
 xmloff/inc/facreg.hxx   |5 
 xmloff/source/core/facreg.cxx   |1 
 xmloff/source/draw/sdxmlimp.cxx |   11 -
 xmloff/source/text/txtflde.cxx  |   29 +++-
 xmloff/util/xo.component|5 +++-
 15 files changed, 87 insertions(+), 9 deletions(-)

New commits:
commit 69236a7aa17da34399e4d204ddb659d67a51fbf4
Author: Miklos Vajna 
AuthorDate: Wed May 29 21:29:30 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 30 08:43:32 2019 +0200

xmloff: create XMLDrawContentImportOasis instances with an uno constructor

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 405f98fd71d3..9545c5ef9108 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -264,6 +264,7 @@ core_constructor_list = [
 "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation",
+"com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index feade0f8d5b3..d59e5d463e65 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -83,11 +83,6 @@ css::uno::Reference 
XMLImpressSettingsExportOOO_createInst
 css::uno::Reference const & rSMgr);
 
 // draw oasis import
-OUString XMLDrawContentImportOasis_getImplementationName() throw();
-css::uno::Sequence 
XMLDrawContentImportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLDrawContentImportOasis_createInstance(
-css::uno::Reference const & rSMgr);
 OUString XMLDrawMetaImportOasis_getImplementationName() throw();
 css::uno::Sequence XMLDrawMetaImportOasis_getSupportedServiceNames() 
throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 994bcbb67f3c..446dfadbed10 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -72,7 +72,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 else SINGLEFACTORY( XMLImpressSettingsExportOOO )
 
 // draw oasis import
-else SINGLEFACTORY( XMLDrawContentImportOasis )
 else SINGLEFACTORY( XMLDrawMetaImportOasis )
 else SINGLEFACTORY( XMLDrawSettingsImportOasis )
 
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 6871c537918f..ac40ce2c6b29 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -297,10 +297,19 @@ 
com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation(uno::XComponent
  | 
SvXMLImportFlags::MASTERSTYLES));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawContentImportOasis", 
true,
+ SvXMLImportFlags::AUTOSTYLES | 
SvXMLImportFlags::CONTENT
+ | SvXMLImportFlags::SCRIPTS
+ | SvXMLImportFlags::FONTDECLS));
+}
+
 SERVICE( XMLImpressStylesImportOasis, 
"com.sun.star.comp.Impress.XMLOasisStylesImporter", 
"XMLImpressStylesImportOasis", false, 
SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES
 )
 
 SERVICE( XMLImpressContentImportOasis, 
"com.sun.star.comp.Impress.XMLOasisContentImporter", 
"XMLImpressContentImportOasis", false, 
SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS
 )
-SERVICE( XMLDrawContentImportOasis, 
"com.sun.star.comp.Draw.XMLOasisContentImporter", 
"XMLImpressContentImportOasis", true, 
SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXML

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

2019-05-29 Thread Zdeněk Crhonek (via logerrit)

 sw/qa/uitest/writer_tests/data/tdf120731.odt |binary
 sw/qa/uitest/writer_tests6/tdf120731.py  |   36 +++
 2 files changed, 36 insertions(+)

New commits:
commit 18d0d8541432782e9bf761992a8bda5d29ee6564
Author: Zdeněk Crhonek 
AuthorDate: Wed May 29 21:49:09 2019 +0200
Commit: Zdenek Crhonek 
CommitDate: Thu May 30 07:02:41 2019 +0200

uitest for bug tdf#120731

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

diff --git a/sw/qa/uitest/writer_tests/data/tdf120731.odt 
b/sw/qa/uitest/writer_tests/data/tdf120731.odt
new file mode 100644
index ..30638ec2c5d1
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/tdf120731.odt differ
diff --git a/sw/qa/uitest/writer_tests6/tdf120731.py 
b/sw/qa/uitest/writer_tests6/tdf120731.py
new file mode 100644
index ..5521a2776be5
--- /dev/null
+++ b/sw/qa/uitest/writer_tests6/tdf120731.py
@@ -0,0 +1,36 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+def get_url_for_data_file(file_name):
+   return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 120731 - Crash cuilo!makeAutoCorrEdit when open character dialog with 
large amount of text selected
+
+class tdf120731(UITestCase):
+   def test_tdf120731_crash_open_char_dialog(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf120731.odt"))
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.xUITest.executeCommand(".uno:SelectAll")
+self.ui_test.execute_dialog_through_command(".uno:FontDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xOK = xDialog.getChild("ok")
+xOK.executeAction("CLICK", tuple())
+self.assertEqual(document.Text.String[0:5], "Lorem")
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Jim Raykowski (via logerrit)

 sfx2/source/sidebar/SidebarDockingWindow.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8234b277d3fc8a52b18715e8e245580254a1610b
Author: Jim Raykowski 
AuthorDate: Wed May 29 16:48:52 2019 -0800
Commit: Jim Raykowski 
CommitDate: Thu May 30 06:09:54 2019 +0200

Don't pass escape key event to SfxDockingWindow from sidebar

...docking window

Missed this in recent rework concerning key input events in
SidebarDockingWindow, tdf#125525 Allow shortcut keys from sidebar
docking window.

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

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1784180a9e9f..085ea813fa0f 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -140,6 +140,7 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
 case KEY_DELETE:
 case KEY_INSERT:
 case KEY_RETURN:
+case KEY_ESCAPE:
 {
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Jan-Marek Glogowski (via logerrit)

 vcl/qt5/Qt5Menu.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6e7dbccf063767c2ac87c6460bd1004df742081
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 19:45:24 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu May 30 02:09:32 2019 +0200

tdf#125548 Qt5 no focus for the menu bar button

You can't tab into the menu bar, but if you add a corner widget,
it will be enlisted in the parent's focus chain! Interestingly
the menu bar even is considered to have the focus, if the widget
is focused, and will handle key events, but this can probably be
considered consistent.

So this just denies the button any focus, as this is a mouse-only
widget, and clicking it will close the document window.

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

diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 733b1505b49c..435cc53363d4 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -631,6 +631,7 @@ void Qt5Menu::ShowCloseButton(bool bShow)
 pButton = new QPushButton(mpQMenuBar);
 pButton->setIcon(aIcon);
 pButton->setFlat(true);
+pButton->setFocusPolicy(Qt::NoFocus);
 pButton->setToolTip(toQString(VclResId(SV_HELPTEXT_CLOSEDOCUMENT)));
 mpQMenuBar->setCornerWidget(pButton, Qt::TopRightCorner);
 maCloseButtonConnection
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ABANDONED] Re: Build fail on Libgpg-error on Windows with gawk 5.0

2019-05-29 Thread Sophia Schröder

Downgrading gawk to 4.2.1 is the best way to let it work ootb.

Am 27.05.2019 um 17:58 schrieb Luke Benes:
> This long weekend, I attempted to update the patch for libgpg-error-1.36. 
> This went well until I hit a new file in 1.36, sysutils.c, which makes use of 
>  a UNIX header .  Thorsten converted this to a win32's  in 
> other files,[1] but following his example didn't work for me here.
>
> We really need to get libgpg-error updated so that anyone upgrading LODE or 
> doing a new install can have a working Windows build.  Unfortunately, I'm out 
> of time for this week, so someone else is going to have to take over from 
> here. I'd be glad to share my patch if you want to save a few min. 
>
> -Luke
>
> [1] https://cgit.freedesktop.org/libreoffice/core/commit/?id=4be15fdd7974
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Kindly Regards / Mit freundlichen Grüßen

Sophia Schröder
www.libreoffice.org
German Language Team
Help Files Debugger
IRC@freenode: SophiaS




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

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

2019-05-29 Thread Ilhan Yesil (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |2 +-
 sw/source/filter/ww8/docxexport.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7869bf3d5e71f5c5acfeb83f1695f643d57dd2f9
Author: Ilhan Yesil 
AuthorDate: Thu May 23 17:52:04 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 30 00:08:14 2019 +0200

tdf#125103 Writer: input fields will be exported to docx

Changed the solution https://gerrit.libreoffice.org/#/c/70786/
of Vasily sligthly, so MS Office can recognize fields still
as fields.

Reviewed-on: https://gerrit.libreoffice.org/72868
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 
(cherry picked from commit 62d156ef0daccd2680161ef8b9b99d8a7bc0)

Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
Reviewed-on: https://gerrit.libreoffice.org/73100
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 25fc6b4d69f7..cddb19256f2e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -777,7 +777,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextInput, "textinput.odt")
 if (!pXmlDoc)
 return;
 // Ensure we have a formfield
-assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FORMTEXT ");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FILLIN \"\"");
 // and it's content is not gone
 assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[5]/w:t", 
"SomeText");
 }
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index e4a2d274544e..cce452fe409c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -378,8 +378,8 @@ void DocxExport::DoComboBox(const OUString& rName,
 void DocxExport::DoFormText(const SwInputField* pField)
 {
 assert(pField);
-const OUString sStr = FieldString(ww::eFORMTEXT);
-OutputField(pField, ww::eFORMTEXT, sStr);
+const OUString sStr = FieldString(ww::eFILLIN) + "\"" + pField->GetPar2() 
+ "\"";
+OutputField(pField, ww::eFILLIN, sStr);
 }
 
 OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & 
xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread andreas kainz (via logerrit)

 sc/uiconfig/scalc/ui/notebookbar.ui|  765 +---
 sd/uiconfig/sdraw/ui/notebookbar.ui|  915 +++-
 sd/uiconfig/simpress/ui/notebookbar.ui | 1220 +
 sw/uiconfig/swriter/ui/notebookbar.ui  |  158 
 4 files changed, 2026 insertions(+), 1032 deletions(-)

New commits:
commit 2574ce0f2dc711e71b4799bbd76d5d8b6ec04300
Author: andreas kainz 
AuthorDate: Wed May 29 19:07:31 2019 +0200
Commit: andreas_kainz 
CommitDate: Wed May 29 22:51:01 2019 +0200

NB tabbed layout update in all apps

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9dde161a3c72..9ccc963b09ec 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -8296,6 +8296,19 @@
 1
   
 
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+center
+True
 
   
 True
@@ -8306,7 +8319,7 @@
 
   
 True
-True
+False
 both-horiz
 False
 
@@ -8330,7 +8343,7 @@
 
   
 True
-True
+False
 both-horiz
 False
 
@@ -8358,8 +8371,24 @@
 2
   
 
+
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+center
+True
 
-  
+  
 True
 False
 5
@@ -8370,22 +8399,9 @@
 False
 True
 5
-3
+0
   
 
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-center
-True
 
   
 True
@@ -8421,9 +8437,22 @@
   
 False
 True
-0
+1
   
 
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+False
+center
+True
 
   
 True
@@ -8434,7 +8463,7 @@
 
   
 True
-True
+False
 center
 True
 both-horiz
@@ -8460,7 +8489,7 @@
 
   
 True
-True
+False
 center
 True
 both-horiz
@@ -8487,29 +8516,45 @@
   
 False
 True
-

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

2019-05-29 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk/gtksalframe.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4f0f09f9229635aaa7b51ce45222721f035e990d
Author: Caolán McNamara 
AuthorDate: Wed May 29 15:42:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 29 22:13:32 2019 +0200

tdf#124694 gtk2 GtkFixed takes the max size of all its children...

as its preferred size, causing it to not clip its child, but try and grow
instead to match

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

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 3316bc0705e6..75526e55a59b 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -719,6 +719,23 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
 window_resize(nWidth, nHeight);
 }
 
+// tdf#124694 GtkFixed takes the max size of all its children as its
+// preferred size, causing it to not clip its child, but grow instead.
+
+static void
+ooo_fixed_size_request(GtkWidget*, GtkRequisition* req)
+{
+req->width = 0;
+req->height = 0;
+}
+
+static void
+ooo_fixed_class_init(GtkFixedClass *klass)
+{
+GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+widget_class->size_request = ooo_fixed_size_request;
+}
+
 /*
  * Always use a sub-class of GtkFixed we can tag for a11y. This allows us to
  * utilize GAIL for the toplevel window and toolkit implementation incl.
@@ -736,7 +753,7 @@ ooo_fixed_get_type()
 sizeof (GtkFixedClass),
 nullptr,  /* base init */
 nullptr,  /* base finalize */
-nullptr, /* class init */
+reinterpret_cast(ooo_fixed_class_init), /* class 
init */
 nullptr, /* class finalize */
 nullptr,  /* class data */
 sizeof (GtkFixed), /* instance size */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

2019-05-29 Thread Matthias Seidel (via logerrit)

 wizards/com/sun/star/wizards/ui/DocumentPreview.java |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ed76f39cedcebf942ff926052c5730f124955d0a
Author: Matthias Seidel 
AuthorDate: Wed May 29 19:29:04 2019 +
Commit: Matthias Seidel 
CommitDate: Wed May 29 19:29:04 2019 +

Cleaned up whitespace, fixed typos

diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java 
b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
index d25d469cb51f..a4a678c2a12e 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
@@ -45,7 +45,7 @@ public class DocumentPreview
 {
 
 /**
- * The window in which the preview is showed.
+ * The window in which the preview is shown.
  */
 private XWindow xWindow;
 /**
@@ -67,7 +67,7 @@ public class DocumentPreview
 
 - create new frame with window inside
 - load a component as preview into this frame
- */
+*/
 public DocumentPreview(XMultiServiceFactory xmsf, Object control) throws 
Exception
 {
 
@@ -137,9 +137,9 @@ public class DocumentPreview
 which isn't part of the global frame tree.
 
 Attention:
-a) This frame wont be destroyed by the office. It must be closed by you!
+a) This frame won't be destroyed by the office. It must be closed by you!
 Do so - please call XCloseable::close().
-b) The container window is part of the frame. Dont hold it alive - nor try 
to kill it.
+b) The container window is part of the frame. Don't hold it alive - nor 
try to kill it.
 It will be destroyed inside close().
  */
 public void createPreviewFrame(XMultiServiceFactory xmsf, XControl 
xControl) throws com.sun.star.uno.Exception, 
com.sun.star.lang.IllegalArgumentException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libcdr

2019-05-29 Thread Stephan Bergmann (via logerrit)

 external/libcdr/0001-Add-missing-include.patch.1 |   33 +++
 external/libcdr/ExternalProject_libcdr.mk|2 
 external/libcdr/UnpackedTarball_libcdr.mk|6 ++
 external/libcdr/ubsan.patch  |   64 +++
 4 files changed, 104 insertions(+), 1 deletion(-)

New commits:
commit 4c707b78a705d6cc74061433cd01175283fabb2e
Author: Stephan Bergmann 
AuthorDate: Wed May 29 18:31:57 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 29 21:42:24 2019 +0200

external/libcdr: Avoid UB converting from double to int via unsigned

Opening cdr/fdo53278-4.cdr as obtained by
bin/get-bugzilla-attachments-by-mimetype (i.e., the attachment at
) under
-fsanitize=undefined causes

> CDRPath.cpp:821:34: runtime error: -173.908 is outside the range of 
representable values of type 'unsigned int'
>  #0 in libcdr::CDRPath::writeOut(librevenge::RVNGString&, 
librevenge::RVNGString&, double&) const at 
workdir/UnpackedTarball/libcdr/src/lib/CDRPath.cpp:821:34 
(instdir/program/../program/libwpftdrawlo.so +0x2380015)
>  #1 in 
libcdr::CDRContentCollector::_lineProperties(librevenge::RVNGPropertyList&) at 
workdir/UnpackedTarball/libcdr/src/lib/CDRContentCollector.cpp:1118:17 
(instdir/program/../program/libwpftdrawlo.so +0x2090b54)
>  #2 in libcdr::CDRContentCollector::_flushCurrentPath() at 
workdir/UnpackedTarball/libcdr/src/lib/CDRContentCollector.cpp:240:5 
(instdir/program/../program/libwpftdrawlo.so +0x2070a9e)
>  #3 in libcdr::CDRContentCollector::collectLevel(unsigned int) at 
workdir/UnpackedTarball/libcdr/src/lib/CDRContentCollector.cpp:563:5 
(instdir/program/../program/libwpftdrawlo.so +0x209243d)
>  #4 in libcdr::CDRParser::parseRecord(librevenge::RVNGInputStream*, 
std::vector > const&, unsigned int) 
at workdir/UnpackedTarball/libcdr/src/lib/CDRParser.cpp:514:18 
(instdir/program/../program/libwpftdrawlo.so +0x213bdff)
>  #5 in libcdr::CDRParser::parseRecords(librevenge::RVNGInputStream*, 
std::vector > const&, unsigned int) 
at workdir/UnpackedTarball/libcdr/src/lib/CDRParser.cpp:500:10 
(instdir/program/../program/libwpftdrawlo.so +0x213b93f)
[...]

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

diff --git a/external/libcdr/UnpackedTarball_libcdr.mk 
b/external/libcdr/UnpackedTarball_libcdr.mk
index 0c61c5962385..d53ea59e2bf6 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -16,10 +16,13 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
 
 # * external/libcdr/0001-Add-missing-include.patch.1 is from upstream master 
(see content for
-#   details):
+#   details);
+# * external/libcdr/ubsan.patch is upstream at 
 "Avoid UB
+#   converting from double to int via unsigned":
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
 external/libcdr/libcdr-visibility-win.patch \
 external/libcdr/0001-Add-missing-include.patch.1 \
+external/libcdr/ubsan.patch \
 ))
 
 ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
diff --git a/external/libcdr/ubsan.patch b/external/libcdr/ubsan.patch
new file mode 100644
index ..316c47a45ab9
--- /dev/null
+++ b/external/libcdr/ubsan.patch
@@ -0,0 +1,64 @@
+--- src/lib/CDRPath.cpp
 src/lib/CDRPath.cpp
+@@ -796,7 +796,7 @@ void CDRPath::writeOut(librevenge::RVNGString &path, 
librevenge::RVNGString &vie
+ 
+ 
+   width = qy - py;
+-  viewBox.sprintf("%i %i %i %i", 0, 0, (unsigned)(2540*(qx - px)), 
(unsigned)(2540*(qy - py)));
++  viewBox.sprintf("%i %i %i %i", 0, 0, (int)(2540*(qx - px)), (int)(2540*(qy 
- py)));
+ 
+   for (unsigned i = 0; i < vec.count(); ++i)
+   {
+@@ -804,38 +804,38 @@ void CDRPath::writeOut(librevenge::RVNGString &path, 
librevenge::RVNGString &vie
+ if (vec[i]["librevenge:path-action"]->getStr() == "M")
+ {
+   // 2540 is 2.54*1000, 2.54 in = 1 inch
+-  sElement.sprintf("M%i %i", 
(unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
+-   (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
++  sElement.sprintf("M%i %i", 
(int)((vec[i]["svg:x"]->getDouble()-px)*2540),
++   (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
+   path.append(sElement);
+ }
+ else if (vec[i]["librevenge:path-action"]->getStr() == "L")
+ {
+-  sElement.sprintf("L%i %i", 
(unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
+-   (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
++  sElement.sprintf("L%i %i", 
(int)((vec[i]["svg:x"]->getDouble()-px)*2540),
++   (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
+   path.append(sElement);
+ }

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

2019-05-29 Thread Stephan Bergmann (via logerrit)

 vcl/source/filter/GraphicFormatDetector.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c657b6d617d84bc97d8d527862b83fa1fafa05a4
Author: Stephan Bergmann 
AuthorDate: Wed May 29 17:31:13 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 29 21:41:29 2019 +0200

missing include

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

diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index aba10990c2c7..99c5479a6311 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Jan-Marek Glogowski (via logerrit)

 starmath/inc/ElementsDockingWindow.hxx|3 -
 starmath/source/ElementsDockingWindow.cxx |   88 +++---
 2 files changed, 48 insertions(+), 43 deletions(-)

New commits:
commit 65167c708afb475aa628b8289e78a48abdf37119
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 14:16:33 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed May 29 20:15:14 2019 +0200

SM disable localized characters on element parsing

The special character tokens are localized character names! This
means that at least in German the %mu wasn't replaced in the
example, as the parser expected %my. So tell the parser to expect
non-localized input. And share it for all the parsing.

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

diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index aaa992b97f77..fe86ebd422f6 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -31,6 +31,7 @@
 
 class SmDocShell;
 class SmNode;
+class SmParser;
 
 class SmElement
 {
@@ -107,7 +108,7 @@ class SmElementsControl : public Control
 bool m_bFirstPaintAfterLayout;
 rtl::Reference m_xAccessible;
 
-void addElement(const OUString& aElementVisual, const OUString& 
aElementSource, const OUString& aHelpText);
+void addElement(SmParser &rParser, const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText);
 void addElements(const SmElementDescr aElementsArray[], sal_uInt16 size);
 SmElement* current() const;
 void setCurrentElement(sal_uInt16);
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 45bfb7541099..7491e71823b1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -863,10 +863,11 @@ void SmElementsControl::DoScroll(long nDelta)
 Invalidate();
 }
 
-void SmElementsControl::addElement(const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText)
+void SmElementsControl::addElement(SmParser &rParser, const OUString& 
aElementVisual, const OUString& aElementSource, const OUString& aHelpText)
 {
-assert(maElementList.size() <= SAL_MAX_UINT16);
-auto pNode = SmParser().ParseExpression(aElementVisual);
+// SAL_MAX_UINT16 is invalid, zero is the scrollbar
+assert(maElementList.size() < SAL_MAX_UINT16 - 2);
+auto pNode = rParser.ParseExpression(aElementVisual);
 
 pNode->Prepare(maFormat, *mpDocShell, 0);
 pNode->SetSize(Fraction(10,8));
@@ -895,6 +896,9 @@ void SmElementsControl::setElementSetId(const char* pSetId)
 
 void SmElementsControl::addElements(const SmElementDescr aElementsArray[], 
sal_uInt16 aElementsArraySize)
 {
+SmParser aParser;
+aParser.SetImportSymbolNames(true);
+
 for (sal_uInt16 i = 0; i < aElementsArraySize ; i++)
 {
 const char* pElement = aElementsArray[i].first;
@@ -904,86 +908,86 @@ void SmElementsControl::addElements(const SmElementDescr 
aElementsArray[], sal_u
 } else {
 OUString aElement(OUString::createFromAscii(pElement));
 if (aElement == RID_NEWLINE)
-addElement(OUString(u"\u21B5"), aElement, 
SmResId(pElementHelp));
+addElement(aParser, OUString(u"\u21B5"), aElement, 
SmResId(pElementHelp));
 else if (aElement == RID_SBLANK)
-addElement("\"`\"", aElement, SmResId(pElementHelp));
+addElement(aParser, "\"`\"", aElement, SmResId(pElementHelp));
 else if (aElement == RID_BLANK)
-addElement("\"~\"", aElement, SmResId(pElementHelp));
+addElement(aParser, "\"~\"", aElement, SmResId(pElementHelp));
 else if (aElement == RID_PHANTOMX)
-addElement("\"" + SmResId(STR_HIDE) +"\"", aElement, 
SmResId(pElementHelp));
+addElement(aParser, "\"" + SmResId(STR_HIDE) +"\"", aElement, 
SmResId(pElementHelp));
 else if (aElement == RID_BOLDX)
-addElement("bold B", aElement, SmResId(pElementHelp));
+addElement(aParser, "bold B", aElement, SmResId(pElementHelp));
 else if (aElement == RID_ITALX)
-addElement("ital I", aElement, SmResId(pElementHelp));
+addElement(aParser, "ital I", aElement, SmResId(pElementHelp));
 else if (aElement == RID_SIZEXY)
-addElement("\"" + SmResId(STR_SIZE) + "\"", aElement, 
SmResId(pElementHelp));
+addElement(aParser, "\"" + SmResId(STR_SIZE) + "\"", aElement, 
SmResId(pElementHelp));
 else if (aElement == RID_FONTXY)
-addElement("\"" + SmResId(STR_FONT) + "\"", aElement, 
SmResId(pElementHelp));
+addElement(aParser, "\"" + SmResId(

[Libreoffice-commits] core.git: starmath/inc starmath/Library_sm.mk starmath/source

2019-05-29 Thread Jan-Marek Glogowski (via logerrit)

 starmath/Library_sm.mk  |2 
 starmath/inc/AccessibleSmElement.hxx|  107 +
 starmath/inc/AccessibleSmElementsControl.hxx|  116 ++
 starmath/inc/ElementsDockingWindow.hxx  |   20 +
 starmath/source/AccessibleSmElement.cxx |  290 +++
 starmath/source/AccessibleSmElementsControl.cxx |  457 
 starmath/source/ElementsDockingWindow.cxx   |  155 +++-
 7 files changed, 1136 insertions(+), 11 deletions(-)

New commits:
commit a7e52282e36987f4ca6bed968e87ada6849b10e8
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 26 14:53:33 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed May 29 20:14:38 2019 +0200

tdf#65587 SM implement ElementControl accessibility

This took me ages to implement. I'm still not 100% sure, it works
correct. One main problem was the loop where the ATK listener will
rebuild the list of children based on the current child count.

Then there is the "broken" SPI bridge behaviour. I could actually
test this with the gtk3 backend just fine, if I started LO *after*
the accerciser. Otherwise the displayed tree will be really broken
and the add and remove child events won't be correctly processed,
because some Windows in the hierarchy will return a negative
parent index. And generally the accerciser has various problems,
with most result in Python backtraces an inconsistent app state,
but even SIGSEGV happened a few time. Already have some patches
for the easy reproducible ones.

No idea what will happen on any other setup then Linux with ATK.

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

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index d87039dc8567..9848e103ac23 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -62,6 +62,8 @@ $(eval $(call gb_Library_use_libraries,sm,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sm,\
+starmath/source/AccessibleSmElement \
+starmath/source/AccessibleSmElementsControl \
 starmath/source/ElementsDockingWindow \
 starmath/source/accessibility \
 starmath/source/action \
diff --git a/starmath/inc/AccessibleSmElement.hxx 
b/starmath/inc/AccessibleSmElement.hxx
new file mode 100644
index ..9b168bbee4cb
--- /dev/null
+++ b/starmath/inc/AccessibleSmElement.hxx
@@ -0,0 +1,107 @@
+/* -*- 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. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENT_HXX
+#define INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENT_HXX
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+class SmElementsControl;
+
+typedef ::cppu::ImplHelper3
+AccessibleSmElement_BASE;
+
+class AccessibleSmElement final : public 
comphelper::OAccessibleComponentHelper,
+  public AccessibleSmElement_BASE
+{
+VclPtr m_pSmElementsControl;
+const sal_Int32 m_nIndexInParent; ///< index in the parent XAccessible
+const sal_uInt16 m_nItemId; ///< index in the SmElementsControl
+bool m_bHasFocus;
+sal_Int16 m_nRole;
+
+~AccessibleSmElement() override;
+void SAL_CALL disposing() override;
+css::awt::Rectangle implGetBounds() override;
+
+void testAction(sal_Int32) const;
+
+public:
+explicit AccessibleSmElement(SmElementsControl* pSmElementsControl, 
sal_uInt16 nItemId,
+ sal_Int32 nIndexInParent);
+
+void SetFocus(bool _bFocus);
+bool HasFocus() const { return m_bHasFocus; }
+void ReleaseSmElementsControl() { m_pSmElementsControl = nullptr; }
+sal_uInt16 itemId() const { return m_nItemId; }
+
+DECLARE_XINTERFACE()
+DECLARE_XTYPEPROVIDER()
+
+// XAccessible
+css::uno::Reference
+SAL_CALL getAccessibleContext() override;
+
+// XServiceInfo
+OUString SAL_CALL getImplementationName() override;
+sal_Bool SAL_CALL sup

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

2019-05-29 Thread Jan-Marek Glogowski (via logerrit)

 starmath/inc/strings.hrc  |6 ++
 starmath/source/ElementsDockingWindow.cxx |   10 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 3eba9602197da972b66f2b7cc72b61cbdffe5a52
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 13:12:59 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed May 29 20:13:26 2019 +0200

SM add some help to the examples

This way the example buttons will have a name for better
accessibility, instead of being blank.

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

diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index fc6f9bae05f0..eec600990ba0 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -282,6 +282,12 @@
 #define RID_CATEGORY_OTHERS NC_("RID_CATEGORY_OTHERS", 
"Others" )
 #define RID_CATEGORY_EXAMPLES   NC_("RID_CATEGORY_EXAMPLES", 
"Examples" )
 
+#define RID_EXAMPLE_CIRCUMFERENCE_HELP  
NC_("RID_EXAMPLE_CIRCUMFERENCE_HELP", "Circumference" )
+#define RID_EXAMPLE_MASS_ENERGY_EQUIV_HELP  
NC_("RID_EXAMPLE_MASS_ENERGY_EQUIV_HELP", "Mass–energy equivalence" )
+#define RID_EXAMPLE_PYTHAGOREAN_THEO_HELP   
NC_("RID_EXAMPLE_PYTHAGOREAN_THEO_HELP", "Pythagorean theorem" )
+#define RID_EXAMPLE_A_SIMPLE_SERIES_HELP
NC_("RID_EXAMPLE_A_SIMPLE_SERIES_HELP", "A simple series" )
+#define RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP 
NC_("RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP", "Gauss distribution" )
+
 #define RID_FONTREGULAR NC_("RID_FONTREGULAR", "Standard" )
 #define RID_FONTITALIC  NC_("RID_FONTITALIC", "Italic" )
 #define RID_FONTBOLDNC_("RID_FONTBOLD", "Bold" )
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index ef6876be7caa..d34062ddb158 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -234,11 +234,11 @@ const SmElementDescr SmElementsControl::m_aOthersList[] =
 
 const SmElementDescr SmElementsControl::m_aExamplesList[] =
 {
-{"C=%pi cdot d = 2 cdot %pi cdot r", nullptr},
-{"E=mc^2", nullptr},
-{"a^2 + b^2 = c^2", nullptr},
-{"f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over 
{i!} x^i}", nullptr},
-{"f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over 
{2%sigma^2}}", nullptr},
+{"C=%pi cdot d = 2 cdot %pi cdot r", RID_EXAMPLE_CIRCUMFERENCE_HELP},
+{"E=mc^2", RID_EXAMPLE_MASS_ENERGY_EQUIV_HELP},
+{"a^2 + b^2 = c^2", RID_EXAMPLE_PYTHAGOREAN_THEO_HELP},
+{"f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over 
{i!} x^i}", RID_EXAMPLE_A_SIMPLE_SERIES_HELP},
+{"f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over 
{2%sigma^2}}", RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP},
 };
 
 #define AS_PAIR(a) a, SAL_N_ELEMENTS(a)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly report [20-May , 27 - May] - Improvement to Notebookar

2019-05-29 Thread Sumit Chauhan

Report:-
The backend of the customization feature for the notebookbar is
almost complete. We can now do these tasks,
* Write in registrymodifications.xcu
* Retrieve from registrymodifications.xcu
* Modify the notebookbar*.ui files in user directory i.e changing the
property value.
* Use the notebookbar*.ui files from user directory rather than from shared
directory.

Patch:
 https://gerrit.libreoffice.org/#/c/72698/8
https://gerrit.libreoffice.org/#/c/72313/9

ScreenCast of the features :
https://drive.google.com/file/d/1CARlyDdNEqdrTO4MWjAIx2VehE7HyeRT/view?usp=sharing
(Play in 1.5x for better experience)

The task for this week is to work on the GUI (Notebookbar customization
tab).

Thanks
Sumit Chauhan
IRC Nick: sumitcn
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-05-29 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkframe.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 0c62976b4713156e93aa17b9381e010491a49a24
Author: Caolán McNamara 
AuthorDate: Wed May 29 15:41:15 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 29 18:05:23 2019 +0200

tdf#124694 gtk3 GtkFixed takes the max size of all its children...

as its preferred size, causing it to not clip its child, but grow instead to
match

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 27d186923b6f..c180c077bd19 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -763,11 +763,30 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight 
)
 window_resize(nWidth, nHeight);
 }
 
+// tdf#124694 GtkFixed takes the max size of all its children as its
+// preferred size, causing it to not clip its child, but grow instead.
+
+static void
+ooo_fixed_get_preferred_height(GtkWidget*, gint *minimum, gint *natural)
+{
+*minimum = 0;
+*natural = 0;
+}
+
+static void
+ooo_fixed_get_preferred_width(GtkWidget*, gint *minimum, gint *natural)
+{
+*minimum = 0;
+*natural = 0;
+}
+
 static void
 ooo_fixed_class_init(GtkFixedClass *klass)
 {
 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 widget_class->get_accessible = ooo_fixed_get_accessible;
+widget_class->get_preferred_height = ooo_fixed_get_preferred_height;
+widget_class->get_preferred_width = ooo_fixed_get_preferred_width;
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

2019-05-29 Thread Libreoffice Gerrit user

 net/WebSocketHandler.hpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fc6a316dd4cdf539e7f015978a6313a5ff1ea462
Author: Michael Meeks 
AuthorDate: Wed May 29 13:10:44 2019 +0100
Commit: Michael Meeks 
CommitDate: Wed May 29 15:40:46 2019 +0100

Improve debugging by showing un-masked websocket content.

Change-Id: I0df0b3cc7b13c36ed8afaaec4ed2fe525458a21c

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 3f3f2aac0..30381a7ed 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -360,7 +360,8 @@ public:
 
 LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket frame code " 
<< static_cast(code) <<
 ", fin? " << fin << ", mask? " << hasMask << ", payload 
length: " << payloadLen <<
-", residual socket data: " << socket->getInBuffer().size() << 
" bytes.");
+", residual socket data: " << socket->getInBuffer().size() << 
" bytes, unmasked data: "+
+Util::stringifyHexLine(_wsPayload, 0, std::min((size_t)32, 
_wsPayload.size(;
 
 if (fin)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Xisco Fauli (via logerrit)

 dbaccess/source/core/api/TableDeco.cxx |2 +-
 dbaccess/source/core/inc/TableDeco.hxx |7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ebae54a6fde07a08e0b666b56dbd654691e5c416
Author: Xisco Fauli 
AuthorDate: Wed May 29 11:19:57 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed May 29 16:16:06 2019 +0200

tdf#114596 dbaccess: fix mysterious dataloss bug (part 2)

Same problem as in 96ae2a3300811897c24cccb20f8c2faf382483df

Regression from 497e40ad03c27837978551ba15491c3fb2a0bf53

Change-Id: I00e7bf3559e688e7fbc5429ace2b5c18221c9890
Reviewed-on: https://gerrit.libreoffice.org/73146
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit 58f121ef2e680697e10453add43bab9b771d153a)
Reviewed-on: https://gerrit.libreoffice.org/73153

diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index 69a8169c86ac..821f761d9c23 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -552,7 +552,7 @@ void ODBTableDecorator::refreshColumns()
 OContainerMediator* pMediator = new OContainerMediator( pCol, 
m_xColumnDefinitions );
 m_xColumnMediator = pMediator;
 pCol->setMediator( pMediator );
-m_pColumns = pCol;
+m_pColumns.reset(pCol);
 }
 else
 m_pColumns->reFill(aVector);
diff --git a/dbaccess/source/core/inc/TableDeco.hxx 
b/dbaccess/source/core/inc/TableDeco.hxx
index 5a964e79401d..52d6fb05e0bb 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -71,10 +71,11 @@ namespace dbaccess
 css::uno::Reference< css::sdbc::XDatabaseMetaData >   m_xMetaData;
 css::uno::Reference< css::util::XNumberFormatsSupplier >  
m_xNumberFormats;
 
-// 
+// 
 mutable sal_Int32 
m_nPrivileges;
-// 
-rtl::Reference<::connectivity::sdbcx::OCollection>   m_pColumns;
+// 
+// note: this thing uses the ref-count of "this", see 
OCollection::acquire()!
+std::unique_ptr<::connectivity::sdbcx::OCollection>   m_pColumns;
 
 // IColumnFactory
 virtual OColumn*createColumn(const OUString& _rName) const 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mmeeks/copypaste' - editeng/source

2019-05-29 Thread Michael Meeks (via logerrit)

 editeng/source/editeng/editeng.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7ed6b09149f3e240f65a75ca56b49752a0e54113
Author: Michael Meeks 
AuthorDate: Wed May 29 15:05:58 2019 +0100
Commit: Michael Meeks 
CommitDate: Wed May 29 15:05:58 2019 +0100

lok: don't be prejudiced against a single missing mime-type.

Change-Id: Ic5004c306cbd01071c397ed1a61ef094b439a48f

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 01b00ece1297..baac14b67edf 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2714,6 +2714,9 @@ bool EditEngine::HasValidData( const css::uno::Reference< 
css::datatransfer::XTr
 {
 bool bValidData = false;
 
+if ( comphelper::LibreOfficeKit::isActive())
+return true;
+
 if ( rTransferable.is() )
 {
 // Every application that copies rtf or any other text format also 
copies plain text into the clipboard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/svtools sc/source sd/source sfx2/source sfx2/uiconfig solenv/sanitizers sw/inc sw/source

2019-05-29 Thread Caolán McNamara (via logerrit)

 include/sfx2/dinfdlg.hxx |   80 +++
 include/sfx2/objsh.hxx   |2 
 include/svtools/ctrlbox.hxx  |1 
 sc/source/ui/docshell/docsh.cxx  |   12 -
 sc/source/ui/inc/docsh.hxx   |2 
 sd/source/ui/docshell/docshel4.cxx   |   11 -
 sd/source/ui/inc/DrawDocShell.hxx|3 
 sfx2/source/dialog/dinfdlg.cxx   |  277 ++-
 sfx2/source/doc/objcont.cxx  |   10 
 sfx2/source/doc/objserv.cxx  |   12 -
 sfx2/uiconfig/ui/cmisinfopage.ui |2 
 sfx2/uiconfig/ui/cmisline.ui |   40 +--
 sfx2/uiconfig/ui/custominfopage.ui   |2 
 sfx2/uiconfig/ui/documentpropertiesdialog.ui |  153 +-
 sfx2/uiconfig/ui/linefragment.ui |1 
 solenv/sanitizers/ui/sfx.suppr   |4 
 sw/inc/docsh.hxx |3 
 sw/source/core/bastyp/index.cxx  |2 
 sw/source/uibase/app/docsh2.cxx  |   12 -
 19 files changed, 335 insertions(+), 294 deletions(-)

New commits:
commit aa687b22991e6c674b1d8653d52fbe9a50080174
Author: Caolán McNamara 
AuthorDate: Wed May 29 10:02:58 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 29 14:56:04 2019 +0200

weld SfxDocumentInfoDialog

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

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index e8408e794e09..744be743c7d5 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -242,15 +242,13 @@ public:
 
 // class SfxDocumentInfoDialog ---
 
-class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog
+class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialogController
 {
-private:
-sal_uInt16 m_nDocInfoId;
 protected:
-virtual voidPageCreated( sal_uInt16 nId, SfxTabPage& rPage ) override;
+virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 
 public:
-SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& );
+SfxDocumentInfoDialog(weld::Window* pParent, const SfxItemSet&);
 void AddFontTabPage();
 };
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index d16eb2e1c95b..eaa93afd72da 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -358,7 +358,7 @@ public:
 voidSignScriptingContent(weld::Window* 
pDialogParent);
 DECL_LINK(SignDocumentHandler, Button*, void);
 
-virtual VclPtr CreateDocumentInfoDialog( const 
SfxItemSet& );
+virtual std::unique_ptr 
CreateDocumentInfoDialog(weld::Window* pParent, const SfxItemSet& rItemSet);
 
 ErrCode CallBasic( const OUString& rMacro, const 
OUString& rBasicName,
 SbxArray* pArgs, SbxValue* pRet = nullptr 
);
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ba0b52a120b7..06d96c331c30 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2912,9 +2912,9 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat )
 static_cast(ScPrintFunc( this, pPrinter, i 
).GetTotalPages()) );
 }
 
-VclPtr ScDocShell::CreateDocumentInfoDialog( const 
SfxItemSet &rSet )
+std::unique_ptr 
ScDocShell::CreateDocumentInfoDialog(weld::Window* pParent, const SfxItemSet 
&rSet)
 {
-VclPtr pDlg   = 
VclPtr::Create( nullptr, rSet );
+std::unique_ptr xDlg = 
std::make_unique(pParent, rSet);
 ScDocShell*pDocSh = dynamic_cast< ScDocShell *>( 
SfxObjectShell::Current() );
 
 // Only for statistics, if this Doc is shown; not from the Doc Manager
@@ -2923,12 +2923,10 @@ VclPtr 
ScDocShell::CreateDocumentInfoDialog( const SfxIte
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 ::CreateTabPage ScDocStatPageCreate = 
pFact->GetTabPageCreatorFunc(SID_SC_TP_STAT);
 OSL_ENSURE(ScDocStatPageCreate, "Tabpage create fail!");
-pDlg->AddFontTabPage();
-pDlg->AddTabPage( 42,
-ScResId( STR_DOC_STAT ),
-ScDocStatPageCreate);
+xDlg->AddFontTabPage();
+xDlg->AddTabPage("calcstats", ScResId(STR_DOC_STAT), 
ScDocStatPageCreate);
 }
-return pDlg;
+return xDlg;
 }
 
 vcl::Window* ScDocShell::GetActiveDialogParent()
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 2d8525fd7e41..1a339d3d9552 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -213,7 +213,7 @@ public:
 
 voidSetVisAreaOrSize( const tools::Rectangle& rVisArea );
 
-virtual VclPtr CreateDocumentInfoDialog( const 
SfxItemSet &rSet ) override;
+virtual std::unique_ptr 
CreateDocumentInfoDialog(

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

2019-05-29 Thread Julien Nabet (via logerrit)

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

New commits:
commit fd01ddd3094dd080a455665342316c79dbee8390
Author: Julien Nabet 
AuthorDate: Tue May 28 10:50:27 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed May 29 14:43:20 2019 +0200

tdf#56738: fix encoding in comments in doc files (>= Word 97)

See https://bugs.documentfoundation.org/show_bug.cgi?id=56738#c3

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 04b65f16c3f9..67b25521ff43 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2822,7 +2822,9 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
 rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
 if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
 {
-if (!m_aFontSrcCharSets.empty())
+if (!m_bVer67)
+eSrcCharSet = GetCharSetFromLanguage();
+else if (!m_aFontSrcCharSets.empty())
 eSrcCharSet = m_aFontSrcCharSets.top();
 if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 
&& static_cast(m_nCharFormat) < m_vColl.size() )
 eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Caolán McNamara (via logerrit)

 sfx2/uiconfig/ui/documentinfopage.ui |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1ee156ba9ff0471266e04f5cf7b4ceed1a6b5e87
Author: Caolán McNamara 
AuthorDate: Wed May 29 10:24:35 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 29 14:32:22 2019 +0200

ellipsize over-large locations

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

diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 5c1816ddaf4f..5581cb8cdcab 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -284,10 +284,11 @@
   
 True
 True
-True
 True
-0
+True
+middle
 50
+0
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source editeng/source sw/qa writerfilter/source

2019-05-29 Thread László Németh (via logerrit)

 cui/source/tabpages/chardlg.cxx   |3 +++
 editeng/source/items/textitem.cxx |3 ++-
 sw/qa/extras/ooxmlexport/data/test_tdf120412.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|   11 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 868d9212a1b4cce7faa3eabc047ab7f312c613de
Author: László Németh 
AuthorDate: Wed May 29 11:56:50 2019 +0200
Commit: László Németh 
CommitDate: Wed May 29 14:31:15 2019 +0200

tdf#120412 character formatting UI: allow >100% raising

in superscript/subscript text positions instead of
changing the greater values (eg. imported from DOCX)
to 100% by accident, simply using the character
formatting window.

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

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 9236a26a2dbd..d1340a4463b3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2704,6 +2704,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
 m_nSuperProp = static_cast(sUser.getToken( 0, ';', nIdx 
).toInt32());
 m_nSubProp = static_cast(sUser.getToken( 0, ';', nIdx 
).toInt32());
 
+// tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters)
+m_xHighLowMF->set_max(14400, FieldUnit::PERCENT);
+
 //fdo#75307 validate all the entries and discard all of them if any are
 //out of range
 bool bValid = true;
commit bdfb3edb981ff04f1f3f6dc1ef335e37a0980245
Author: Jozsef Szakacs 
AuthorDate: Wed Mar 13 12:32:20 2019 +0100
Commit: László Németh 
CommitDate: Wed May 29 14:31:03 2019 +0200

tdf#120412 DOCX filter: fix missing superscript

by editeng support of large superscript raising.

Maximal raising of superscript text is 1584 pt in MSO,
while LibreOffice didn't import the values greater
than 100% of the current font height. Using the maximal
percent value of the default 11 pt font, the limit
is 14400% now, fixing most of the import problems.
Greater raisings will be limited to 14400% during the
DOCX import.

Note: the standard doesn't limit the bigger percent
values, see "20.374 style:text-position" and
"18.3.23 percent" in OpenDocument 1.2.

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

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 13c5c04ffbbe..e4ce386c68c9 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1782,7 +1782,8 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 case MID_ESC:
 {
 sal_Int16 nVal = sal_Int16();
-if( (rVal >>= nVal) && (std::abs(nVal) <= 101))
+// tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters)
+if( (rVal >>= nVal) && (std::abs(nVal) <= 14400))
 nEsc = nVal;
 else
 return false;
diff --git a/sw/qa/extras/ooxmlexport/data/test_tdf120412.docx 
b/sw/qa/extras/ooxmlexport/data/test_tdf120412.docx
new file mode 100644
index ..6ce527842c9b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test_tdf120412.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 3b1250f11fd9..9cb85a8d11f0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -203,6 +203,17 @@ DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly, 
"textbox-wpg-only.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(100), 
getProperty(getRun(getParagraphOfText(1, xText), 1), 
"CharEscapementHeight"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFontEsc, "test_tdf120412.docx")
+{
+xmlDocPtr pXmlDoc =parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// don't lose the run with superscript formatting
+assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 2);
+// raising is greater, than 100%
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r[2]/w:rPr/w:position","val", "24");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")
 {
 // Make sure that we read the primary branch, if wpg is requested as a 
feature.
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index cc7b7c720e05..6276d56a1b01 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2839,6 +2839,8 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 nEscapement = ( nIntValue

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

2019-05-29 Thread Stephan Bergmann (via logerrit)

 external/zlib/UnpackedTarball_zlib.mk |6 ++
 external/zlib/ubsan.patch |   11 +++
 2 files changed, 17 insertions(+)

New commits:
commit bdc74dc279946abfdcca409edc96e985699eb368
Author: Stephan Bergmann 
AuthorDate: Wed May 29 10:42:40 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 29 14:08:21 2019 +0200

Avoid -fsanitize=nullability in external/zlib

...as seen during CppunitTest_sw_layoutwriter:

> testUserFieldTypeLanguage::TestBody finished in: 1271ms
[...]
> workdir/UnpackedTarball/zlib/trees.c:873:42: runtime error: null pointer 
passed as argument 2, which is declared to never be null
> /usr/include/string.h:43:28: note: nonnull attribute specified here
>  #0 in _tr_stored_block at workdir/UnpackedTarball/zlib/trees.c:873:5
>  #1 in deflate at workdir/UnpackedTarball/zlib/deflate.c:1025:17
>  #2 in ZipUtils::ThreadedDeflater::Task::doWork() at 
package/source/zipapi/ThreadedDeflater.cxx:163:15
[...]

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

diff --git a/external/zlib/UnpackedTarball_zlib.mk 
b/external/zlib/UnpackedTarball_zlib.mk
index fa476b918b7c..e74039d25089 100644
--- a/external/zlib/UnpackedTarball_zlib.mk
+++ b/external/zlib/UnpackedTarball_zlib.mk
@@ -16,4 +16,10 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\
cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate 
inftrees trees zutil) x64 \
 ))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,zlib, \
+external/zlib/ubsan.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch
new file mode 100644
index ..2d7ff8d67967
--- /dev/null
+++ b/external/zlib/ubsan.patch
@@ -0,0 +1,11 @@
+--- trees.c
 trees.c
+@@ -870,7 +870,7 @@
+ bi_windup(s);/* align on byte boundary */
+ put_short(s, (ush)stored_len);
+ put_short(s, (ush)~stored_len);
+-zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
++if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, 
stored_len);
+ s->pending += stored_len;
+ #ifdef ZLIB_DEBUG
+ s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Miklos Vajna (via logerrit)

 vcl/source/window/menufloatingwindow.cxx |   36 +++
 1 file changed, 23 insertions(+), 13 deletions(-)

New commits:
commit 3c40f60c1693e477d0bb85b549b30a56a8ab9378
Author: Miklos Vajna 
AuthorDate: Tue May 21 17:45:05 2019 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed May 29 13:55:39 2019 +0200

tdf#125415 vcl menu floating window: avoid flicker

This is similar to e8d5b8beb5958147235ff955ed38c47b51d860ff (tdf#113714
vcl menu bar window: avoid flicker, 2019-05-20), except that was for the
menu bar window, and this is for the floating window opening from that
one.

(cherry picked from commit c04169c586ef1d55b1d0ac469bb4fbd4f50bd08a)

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

diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 2db8caab9aba..9debcff5e5b4 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, 
WinBits nStyle ) :
@@ -1206,32 +1207,41 @@ void MenuFloatingWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::
 if (!pMenu)
 return;
 
-rRenderContext.Push( PushFlags::CLIPREGION );
-rRenderContext.SetClipRegion(vcl::Region(rPaintRect));
+// Make sure that all actual rendering happens in one go to avoid flicker.
+ScopedVclPtrInstance pBuffer;
+pBuffer->SetOutputSizePixel(GetOutputSizePixel(), false);
+pBuffer->DrawOutDev(Point(0, 0), GetOutputSizePixel(), Point(0, 0), 
GetOutputSizePixel(),
+rRenderContext);
+
+pBuffer->Push(PushFlags::CLIPREGION);
+pBuffer->SetClipRegion(vcl::Region(rPaintRect));
 
 if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, 
ControlPart::Entire))
 {
-rRenderContext.SetClipRegion();
+pBuffer->SetClipRegion();
 long nX = 0;
 Size aPxSize(GetOutputSizePixel());
 aPxSize.AdjustWidth( -nX );
 ImplControlValue aVal(pMenu->nTextPos - GUTTERBORDER);
-rRenderContext.DrawNativeControl(ControlType::MenuPopup, 
ControlPart::Entire,
- tools::Rectangle(Point(nX, 0), 
aPxSize),
- ControlState::ENABLED, aVal, 
OUString());
-InitMenuClipRegion(rRenderContext);
+pBuffer->DrawNativeControl(ControlType::MenuPopup, ControlPart::Entire,
+   tools::Rectangle(Point(nX, 0), aPxSize), 
ControlState::ENABLED,
+   aVal, OUString());
+InitMenuClipRegion(*pBuffer);
 }
 if (IsScrollMenu())
 {
-ImplDrawScroller(rRenderContext, true);
-ImplDrawScroller(rRenderContext, false);
+ImplDrawScroller(*pBuffer, true);
+ImplDrawScroller(*pBuffer, false);
 }
-
rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetMenuColor());
-pMenu->ImplPaint(rRenderContext, GetOutputSizePixel(), nScrollerHeight, 
ImplGetStartY());
+
pBuffer->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetMenuColor());
+pMenu->ImplPaint(*pBuffer, GetOutputSizePixel(), nScrollerHeight, 
ImplGetStartY());
 if (nHighlightedItem != ITEMPOS_INVALID)
-RenderHighlightItem(rRenderContext, nHighlightedItem);
+RenderHighlightItem(*pBuffer, nHighlightedItem);
+
+pBuffer->Pop();
 
-rRenderContext.Pop();
+rRenderContext.DrawOutDev(Point(0, 0), GetOutputSizePixel(), Point(0, 0), 
GetOutputSizePixel(),
+  *pBuffer);
 }
 
 void MenuFloatingWindow::ImplDrawScroller(vcl::RenderContext& rRenderContext, 
bool bUp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Miklos Vajna (via logerrit)

 vcl/source/window/menubarwindow.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2a1d0f3b926b6d7921849093b031f457db4cbc8a
Author: Miklos Vajna 
AuthorDate: Tue May 21 12:27:17 2019 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed May 29 13:53:49 2019 +0200

tdf#125413 vcl menu bar window: fix non-NWF background

Windows (by default) and gtk3 paints its own background, but e.g. the
Linux gen backend does not; so make sure that we not only copy from the
buffer, but also initialize it.

This restores the gradient background of the main menu with the Linux
gen backend.

(cherry picked from commit a2da909adfe07d5a093485cc28283f5c100946ba)

Change-Id: I5ce8cc734f64bc1d57d343caf22071e6aa63a69f
Reviewed-on: https://gerrit.libreoffice.org/72685
Tested-by: Xisco Faulí 
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 66444c082153..ccee51895c3e 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -920,6 +920,9 @@ void MenuBarWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::Recta
 // Make sure that all actual rendering happens in one go to avoid flicker.
 ScopedVclPtrInstance pBuffer;
 pBuffer->SetOutputSizePixel(aOutputSize, false);
+// Copy the current state to the buffer.
+pBuffer->DrawOutDev(Point(0, 0), GetOutputSizePixel(), Point(0, 0), 
GetOutputSizePixel(),
+rRenderContext);
 
 if (rRenderContext.IsNativeControlSupported(ControlType::Menubar, 
ControlPart::Entire))
 {
@@ -963,6 +966,7 @@ void MenuBarWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::Recta
 pBuffer->Pop();
 }
 
+// Copy the current state from the buffer.
 rRenderContext.DrawOutDev(Point(0, 0), GetOutputSizePixel(), Point(0, 0), 
GetOutputSizePixel(),
   *pBuffer);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Miklos Vajna (via logerrit)

 vcl/source/window/menubarwindow.cxx |   36 ++--
 1 file changed, 22 insertions(+), 14 deletions(-)

New commits:
commit 0be7366d87fb2b2c7e3d2091dbfe17660bce057f
Author: Miklos Vajna 
AuthorDate: Mon May 20 18:30:08 2019 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed May 29 13:53:16 2019 +0200

tdf#113714 vcl menu bar window: avoid flicker

Regression from commit 458a827e96523ac52d021f1fd3653b5a734940c0 (further
refactor Menu to use RenderContext, 2015-05-15), if we do full paint
instead of incremental paint, then need to ensure that an intermediate
state is not painted.

Paint happens at idle time by default on Windows (OpenGL) and also on
Linux (gtk3), but some other backends like Windows GDI had flicker, this
fixes the problem.

(cherry picked from commit e8d5b8beb5958147235ff955ed38c47b51d860ff)

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

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 25ab264bc9d9..66444c082153 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -916,47 +917,54 @@ void MenuBarWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::Recta
 return;
 }
 
+// Make sure that all actual rendering happens in one go to avoid flicker.
+ScopedVclPtrInstance pBuffer;
+pBuffer->SetOutputSizePixel(aOutputSize, false);
+
 if (rRenderContext.IsNativeControlSupported(ControlType::Menubar, 
ControlPart::Entire))
 {
 MenubarValue aMenubarValue;
 aMenubarValue.maTopDockingAreaHeight = 
ImplGetTopDockingAreaHeight(this);
 
 if (!rStyleSettings.GetPersonaHeader().IsEmpty())
-Erase(rRenderContext);
+Erase(*pBuffer);
 else
 {
 tools::Rectangle aCtrlRegion( Point(), aOutputSize );
 
-rRenderContext.DrawNativeControl(ControlType::Menubar, 
ControlPart::Entire, aCtrlRegion,
- ControlState::ENABLED, 
aMenubarValue, OUString());
+pBuffer->DrawNativeControl(ControlType::Menubar, 
ControlPart::Entire, aCtrlRegion,
+   ControlState::ENABLED, aMenubarValue, 
OUString());
 }
 
-ImplAddNWFSeparator(rRenderContext, aOutputSize, aMenubarValue);
+ImplAddNWFSeparator(*pBuffer, aOutputSize, aMenubarValue);
 }
 
 // shrink the area of the buttons
 aOutputSize.AdjustWidth( -(aCloseBtn->GetSizePixel().Width()) );
 
-rRenderContext.SetFillColor(rStyleSettings.GetMenuColor());
-pMenu->ImplPaint(rRenderContext, aOutputSize, 0);
+pBuffer->SetFillColor(rStyleSettings.GetMenuColor());
+pMenu->ImplPaint(*pBuffer, aOutputSize, 0);
 
 if (nHighlightedItem != ITEMPOS_INVALID && pMenu && 
!pMenu->GetItemList()->GetDataFromPos(nHighlightedItem)->bHiddenOnGUI)
-HighlightItem(rRenderContext, nHighlightedItem);
+HighlightItem(*pBuffer, nHighlightedItem);
 else if (ImplGetSVData()->maNWFData.mbRolloverMenubar && nRolloveredItem 
!= ITEMPOS_INVALID)
-HighlightItem(rRenderContext, nRolloveredItem);
+HighlightItem(*pBuffer, nRolloveredItem);
 
 // in high contrast mode draw a separating line on the lower edge
 if (!rRenderContext.IsNativeControlSupported( ControlType::Menubar, 
ControlPart::Entire) &&
 rStyleSettings.GetHighContrastMode())
 {
-rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::MAPMODE);
-rRenderContext.SetLineColor(COL_WHITE);
-rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
+pBuffer->Push(PushFlags::LINECOLOR | PushFlags::MAPMODE);
+pBuffer->SetLineColor(COL_WHITE);
+pBuffer->SetMapMode(MapMode(MapUnit::MapPixel));
 Size aSize = GetSizePixel();
-rRenderContext.DrawLine(Point(0, aSize.Height() - 1),
-Point(aSize.Width() - 1, aSize.Height() - 1));
-rRenderContext.Pop();
+pBuffer->DrawLine(Point(0, aSize.Height() - 1),
+  Point(aSize.Width() - 1, aSize.Height() - 1));
+pBuffer->Pop();
 }
+
+rRenderContext.DrawOutDev(Point(0, 0), GetOutputSizePixel(), Point(0, 0), 
GetOutputSizePixel(),
+  *pBuffer);
 }
 
 void MenuBarWindow::Resize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Tor Lillqvist (via logerrit)

 include/sal/log-areas.dox |1 +
 vcl/ios/DataFlavorMapping.cxx |   21 +++--
 vcl/ios/DataFlavorMapping.hxx |4 
 vcl/ios/iOSTransferable.cxx   |   12 
 4 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 0e296d25e736038e76eab1f64aacff6d1aa3e7b1
Author: Tor Lillqvist 
AuthorDate: Wed May 29 13:50:14 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 14:07:35 2019 +0300

The iOS DataFlavorMapper::getAllSupportedPboardTypes() is unused

Change-Id: Icc72fca62e189559956abc0ebbca9ce196a02073

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index a330209a2d36..fab611349c8a 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -568,16 +568,4 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* 
types) const
 return flavors;
 }
 
-NSArray* DataFlavorMapper::getAllSupportedPboardTypes()
-{
-NSMutableArray* array = [[NSMutableArray alloc] 
initWithCapacity:SIZE_FLAVOR_MAP];
-
-for (sal_uInt32 i = 0; i < SIZE_FLAVOR_MAP; i++)
-{
-[array addObject:flavorMap[i].SystemFlavor];
-}
-
-return [array autorelease];
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/ios/DataFlavorMapping.hxx b/vcl/ios/DataFlavorMapping.hxx
index 9485e2561689..936d7fc2f48b 100644
--- a/vcl/ios/DataFlavorMapping.hxx
+++ b/vcl/ios/DataFlavorMapping.hxx
@@ -111,10 +111,6 @@ public:
 css::uno::Sequence
 typesArrayToFlavorSequence(NSArray* types) const;
 
-/* Returns an NSArray containing all pasteboard types supported by OOo
-   */
-static NSArray* getAllSupportedPboardTypes();
-
 private:
 /* Determines if the provided Mime content type is valid.
*/
commit 3f8ac50022215e53b592c1d630dd0609cab4e58e
Author: Tor Lillqvist 
AuthorDate: Wed May 29 13:35:54 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 14:07:34 2019 +0300

tdf#124752: We do need to accept text/html from the system clipboard

Sadly we can't accept public.utf8-plain-text, i.e.
text/plain;charset=utf-8, as the code does not know of such a
SotClipboardFormatId. The only text/plain is UTF-16.

And it probably is a good idea to accept HTML anyway. We have to
continue to (I think) not offer text/html because of the assertion
failure issue, see comment in DataFlavorMapper::openOfficeToSystemFlavor().

Change-Id: If5d77b97649424e347c50af10475c2be997c8632

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index be4ecb299ff5..a330209a2d36 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -75,6 +75,8 @@ NSString* OUStringToNSString(const OUString& ustring)
 }
 
 NSString* PBTYPE_PLAINTEXT = (__bridge NSString*)kUTTypePlainText;
+// Nope. See commented-out use below.
+// NSString* PBTYPE_UTF8PLAINTEXT = (__bridge NSString*)kUTTypeUTF8PlainText;
 NSString* PBTYPE_RTF = (__bridge NSString*)kUTTypeRTF;
 NSString* PBTYPE_PNG = (__bridge NSString*)kUTTypePNG;
 NSString* PBTYPE_JPEG = (__bridge NSString*)kUTTypeJPEG;
@@ -123,11 +125,12 @@ struct FlavorMap
 
 static const FlavorMap flavorMap[]
 = { { PBTYPE_PLAINTEXT, "text/plain;charset=utf-16", "Unicode Text 
(UTF-16)", true },
+// Nope. The LO code does not understand text/plain in UTF-8. Which is 
a shame.
+// PBTYPE_UTF8PLAINTEXT, "text/plain;charset=utf-8", "Unicode Text 
(UTF-8)", false },
 { PBTYPE_RTF, "text/rtf", "Rich Text Format", false },
 { PBTYPE_PNG, "image/png", "Portable Network Graphics", false },
 { PBTYPE_JPEG, "image/jpeg", "Portable Network Graphics", false },
-// Nope, sorry. See comment in openOfficeToSystemFlavor() below.
-// { PBTYPE_HTML, "text/html", "Plain HTML", false },
+{ PBTYPE_HTML, "text/html", "Plain HTML", false },
 { PBTYPE_PDF, "application/pdf", "PDF File", false },
 { PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", false },
 { PBTYPE_SLSDX, FLAVOR_SLSDX, "Star Link Source Descriptor (XML)", 
false },
commit bcc36b632ecbf4a2e126e640055ad0ed852fb9e8
Author: Tor Lillqvist 
AuthorDate: Wed May 29 11:36:50 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 14:07:34 2019 +0300

Add a couple of SAL_INFOs about types available on the system clipboard

Change-Id: I821a699ee4f44881aadac89f265974a10095b544

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 8d9a2c68ea92..904ba74b4425 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -478,6 +478,7 @@ certain functionality.
 @li @c vcl.headless - bitmap-based backend
 @li @c vcl.helper
 @li @c vcl.icontest
+@li @c vcl.ios.clipboard
 @li @c vcl.kde5 - KDE5
 @li @c vcl.layout - Widget layout
 @li @c vcl.lazydelete
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 37ff2181d651..be4ecb299ff5 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/i

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

2019-05-29 Thread Xisco Fauli (via logerrit)

 dbaccess/source/core/api/TableDeco.cxx |2 +-
 dbaccess/source/core/inc/TableDeco.hxx |7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 58f121ef2e680697e10453add43bab9b771d153a
Author: Xisco Fauli 
AuthorDate: Wed May 29 11:19:57 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed May 29 13:05:06 2019 +0200

tdf#114596 dbaccess: fix mysterious dataloss bug (part 2)

Same problem as in 96ae2a3300811897c24cccb20f8c2faf382483df

Regression from 497e40ad03c27837978551ba15491c3fb2a0bf53

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

diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index 1c229802b43d..6b632e135e12 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -553,7 +553,7 @@ void ODBTableDecorator::refreshColumns()
 OContainerMediator* pMediator = new OContainerMediator( pCol, 
m_xColumnDefinitions );
 m_xColumnMediator = pMediator;
 pCol->setMediator( pMediator );
-m_pColumns = pCol;
+m_pColumns.reset(pCol);
 }
 else
 m_pColumns->reFill(aVector);
diff --git a/dbaccess/source/core/inc/TableDeco.hxx 
b/dbaccess/source/core/inc/TableDeco.hxx
index 5a964e79401d..52d6fb05e0bb 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -71,10 +71,11 @@ namespace dbaccess
 css::uno::Reference< css::sdbc::XDatabaseMetaData >   m_xMetaData;
 css::uno::Reference< css::util::XNumberFormatsSupplier >  
m_xNumberFormats;
 
-// 
+// 
 mutable sal_Int32 
m_nPrivileges;
-// 
-rtl::Reference<::connectivity::sdbcx::OCollection>   m_pColumns;
+// 
+// note: this thing uses the ref-count of "this", see 
OCollection::acquire()!
+std::unique_ptr<::connectivity::sdbcx::OCollection>   m_pColumns;
 
 // IColumnFactory
 virtual OColumn*createColumn(const OUString& _rName) const 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Caolán McNamara (via logerrit)

 sc/source/ui/docshell/tpstat.cxx |   39 ++-
 sc/source/ui/inc/tpstat.hxx  |   13 ++---
 2 files changed, 20 insertions(+), 32 deletions(-)

New commits:
commit 60f97b07695796368a36f846d5b596481675c22e
Author: Caolán McNamara 
AuthorDate: Wed May 29 09:30:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 29 12:54:01 2019 +0200

weld ScDocStatPage

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

diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 7e35a7a016c9..7e73874e83ed 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -30,48 +30,37 @@
 
 VclPtr ScDocStatPage::Create( TabPageParent pParent, const 
SfxItemSet* rSet )
 {
-return VclPtr::Create( pParent.pParent, *rSet );
+return VclPtr::Create( pParent, *rSet );
 }
 
-ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet )
-:   SfxTabPage( pParent, "StatisticsInfoPage", 
"modules/scalc/ui/statisticsinfopage.ui", &rSet )
+ScDocStatPage::ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet)
+:   SfxTabPage(pParent, "modules/scalc/ui/statisticsinfopage.ui", 
"StatisticsInfoPage", &rSet)
+, m_xFtTables(m_xBuilder->weld_label("nosheets"))
+, m_xFtCells(m_xBuilder->weld_label("nocells"))
+, m_xFtPages(m_xBuilder->weld_label("nopages"))
+, m_xFtFormula(m_xBuilder->weld_label("noformula"))
+, m_xFrame(m_xBuilder->weld_frame("StatisticsInfoPage"))
 {
-get(m_pFtTables,"nosheets");
-get(m_pFtCells,"nocells");
-get(m_pFtPages,"nopages");
-get(m_pFtFormula,"noformula");
 ScDocShell* pDocSh = dynamic_cast( SfxObjectShell::Current()  
);
 ScDocStat   aDocStat;
 
 if ( pDocSh )
 pDocSh->GetDocStat( aDocStat );
 
-VclFrame *pFrame = get("StatisticsInfoPage");
-OUString aInfo = pFrame->get_label();
+OUString aInfo = m_xFrame->get_label();
 aInfo += aDocStat.aDocName;
-pFrame->set_label(aInfo);
-m_pFtTables   ->SetText( OUString::number( aDocStat.nTableCount ) );
-m_pFtCells->SetText( OUString::number( aDocStat.nCellCount ) );
-m_pFtPages->SetText( OUString::number( aDocStat.nPageCount ) );
-m_pFtFormula  ->SetText( OUString::number( aDocStat.nFormulaCount ) );
+m_xFrame->set_label(aInfo);
+m_xFtTables->set_label( OUString::number( aDocStat.nTableCount ) );
+m_xFtCells->set_label( OUString::number( aDocStat.nCellCount ) );
+m_xFtPages->set_label( OUString::number( aDocStat.nPageCount ) );
+m_xFtFormula->set_label( OUString::number( aDocStat.nFormulaCount ) );
 
 }
 
 ScDocStatPage::~ScDocStatPage()
 {
-disposeOnce();
 }
 
-void ScDocStatPage::dispose()
-{
-m_pFtTables.clear();
-m_pFtCells.clear();
-m_pFtPages.clear();
-m_pFtFormula.clear();
-SfxTabPage::dispose();
-}
-
-
 bool ScDocStatPage::FillItemSet( SfxItemSet* /* rSet */ )
 {
 return false;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index 299b703fcf11..a24bc18fa88b 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPSTAT_HXX
 
 #include 
-#include 
 
 class ScDocStatPage: public SfxTabPage
 {
@@ -29,19 +28,19 @@ class ScDocStatPage: public SfxTabPage
 public:
 static VclPtr Create( TabPageParent pParent, const SfxItemSet* 
rSet );
 virtual ~ScDocStatPage() override;
-virtual voiddispose() override;
 
 private:
-ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet );
+ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet);
 protected:
 virtual boolFillItemSet( SfxItemSet* rSet ) override;
 virtual voidReset  ( const SfxItemSet* rSet ) override;
 
 private:
-VclPtr   m_pFtTables;
-VclPtr   m_pFtCells;
-VclPtr   m_pFtPages;
-VclPtr   m_pFtFormula;
+std::unique_ptr m_xFtTables;
+std::unique_ptr m_xFtCells;
+std::unique_ptr m_xFtPages;
+std::unique_ptr m_xFtFormula;
+std::unique_ptr m_xFrame;
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - vcl/ios

2019-05-29 Thread Tor Lillqvist (via logerrit)

 vcl/ios/DataFlavorMapping.cxx |   19 +--
 vcl/ios/DataFlavorMapping.hxx |4 
 2 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit db5fc799d4c7091cf002bcab49d16cfadc147279
Author: Tor Lillqvist 
AuthorDate: Wed May 29 13:50:14 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 13:50:14 2019 +0300

The iOS DataFlavorMapper::getAllSupportedPboardTypes() is unused

Change-Id: Icc72fca62e189559956abc0ebbca9ce196a02073

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 469c8201bf93..644306d6b122 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -567,16 +567,4 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* 
types) const
 return flavors;
 }
 
-NSArray* DataFlavorMapper::getAllSupportedPboardTypes()
-{
-NSMutableArray* array = [[NSMutableArray alloc] 
initWithCapacity:SIZE_FLAVOR_MAP];
-
-for (sal_uInt32 i = 0; i < SIZE_FLAVOR_MAP; i++)
-{
-[array addObject:flavorMap[i].SystemFlavor];
-}
-
-return [array autorelease];
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/ios/DataFlavorMapping.hxx b/vcl/ios/DataFlavorMapping.hxx
index 9485e2561689..936d7fc2f48b 100644
--- a/vcl/ios/DataFlavorMapping.hxx
+++ b/vcl/ios/DataFlavorMapping.hxx
@@ -111,10 +111,6 @@ public:
 css::uno::Sequence
 typesArrayToFlavorSequence(NSArray* types) const;
 
-/* Returns an NSArray containing all pasteboard types supported by OOo
-   */
-static NSArray* getAllSupportedPboardTypes();
-
 private:
 /* Determines if the provided Mime content type is valid.
*/
commit 530d7618a2e8c36c5212135a3dbe9aef99625d93
Author: Tor Lillqvist 
AuthorDate: Wed May 29 13:35:54 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 13:41:27 2019 +0300

tdf#124752: We do need to accept text/html from the system clipboard

Sadly we can't accept public.utf8-plain-text, i.e.
text/plain;charset=utf-8, as the code does not know of such a
SotClipboardFormatId. The only text/plain is UTF-16.

And it probably is a good idea to accept HTML anyway. We have to
continue to (I think) not offer text/html because of the assertion
failure issue, see comment in DataFlavorMapper::openOfficeToSystemFlavor().

Change-Id: If5d77b97649424e347c50af10475c2be997c8632

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index e3875a0bf9b0..469c8201bf93 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -74,6 +74,8 @@ NSString* OUStringToNSString(const OUString& ustring)
 }
 
 NSString* PBTYPE_PLAINTEXT = (__bridge NSString*)kUTTypePlainText;
+// Nope. See commented-out use below.
+// NSString* PBTYPE_UTF8PLAINTEXT = (__bridge NSString*)kUTTypeUTF8PlainText;
 NSString* PBTYPE_RTF = (__bridge NSString*)kUTTypeRTF;
 NSString* PBTYPE_PNG = (__bridge NSString*)kUTTypePNG;
 NSString* PBTYPE_JPEG = (__bridge NSString*)kUTTypeJPEG;
@@ -122,11 +124,12 @@ struct FlavorMap
 
 static const FlavorMap flavorMap[]
 = { { PBTYPE_PLAINTEXT, "text/plain;charset=utf-16", "Unicode Text 
(UTF-16)", true },
+// Nope. The LO code does not understand text/plain in UTF-8. Which is 
a shame.
+// PBTYPE_UTF8PLAINTEXT, "text/plain;charset=utf-8", "Unicode Text 
(UTF-8)", false },
 { PBTYPE_RTF, "text/rtf", "Rich Text Format", false },
 { PBTYPE_PNG, "image/png", "Portable Network Graphics", false },
 { PBTYPE_JPEG, "image/jpeg", "Portable Network Graphics", false },
-// Nope, sorry. See comment in openOfficeToSystemFlavor() below.
-// { PBTYPE_HTML, "text/html", "Plain HTML", false },
+{ PBTYPE_HTML, "text/html", "Plain HTML", false },
 { PBTYPE_PDF, "application/pdf", "PDF File", false },
 { PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", false },
 { PBTYPE_SLSDX, FLAVOR_SLSDX, "Star Link Source Descriptor (XML)", 
false },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Tamás Zolnai (via logerrit)

 chart2/source/view/main/ChartView.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 63d17d01da0f9e3a7554e4327244ee4457b7188d
Author: Tamás Zolnai 
AuthorDate: Tue May 28 17:32:44 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Wed May 29 11:31:19 2019 +0200

tdf#122765: Legend interferes with pie chart after pptx import, second part

Revert of:
2903c5f59d257b6ab94f32df64513f2edf94fb0b

Reverting this commit does not lead to the original bug
to come back, so we can revert it without a problem.

Change-Id: I244a6b9451c47e1094db8a77c71b6696e0c464cc
Reviewed-on: https://gerrit.libreoffice.org/73139
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index d165ccb05251..9d3bf0bb46e6 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1491,7 +1491,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( 
const CreateShapeParam2D
 uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis;
 uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis;
 VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
-bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
 {//create diagram
 aVDiagram.init(rParam.mxDiagramWithAxesShapes, m_xShapeFactory);
 aVDiagram.createShapes(
@@ -1500,7 +1499,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( 
const CreateShapeParam2D
 
 xSeriesTargetInFrontOfAxis = aVDiagram.getCoordinateRegion();
 // It is preferable to use full size than minimum for pie charts
-if (!bIsPieOrDonut && !rParam.mbUseFixedInnerSize)
+if (!rParam.mbUseFixedInnerSize)
 aVDiagram.reduceToMimimumSize();
 }
 
@@ -1528,6 +1527,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( 
const CreateShapeParam2D
 
 //use first coosys only so far; todo: calculate for more than one coosys 
if we have more in future
 //todo: this is just a workaround at the moment for pie and donut labels
+bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
 if( !bIsPieOrDonut && (!rVCooSysList.empty()) )
 {
 VCoordinateSystem* pVCooSys = rVCooSysList[0].get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/sal vcl/ios

2019-05-29 Thread Tor Lillqvist (via logerrit)

 include/sal/log-areas.dox |1 +
 vcl/ios/DataFlavorMapping.cxx |2 ++
 vcl/ios/iOSTransferable.cxx   |   11 +++
 3 files changed, 14 insertions(+)

New commits:
commit 5337a84a64c8ef8401d6cf509f3e7fd99934e684
Author: Tor Lillqvist 
AuthorDate: Wed May 29 11:36:50 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 29 11:36:50 2019 +0300

Add a couple of SAL_INFOs about types available on the system clipboard

Change-Id: I821a699ee4f44881aadac89f265974a10095b544

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b1d575206550..f1f710d172c1 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -466,6 +466,7 @@ certain functionality.
 @li @c vcl.headless - bitmap-based backend
 @li @c vcl.helper
 @li @c vcl.icontest
+@li @c vcl.ios.clipboard
 @li @c vcl.kde4 - KDE4
 @li @c vcl.kde5 - KDE5
 @li @c vcl.layout - Widget layout
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index e90a8f9b245c..e3875a0bf9b0 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -556,6 +556,8 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* 
types) const
 {
 flavors.realloc(flavors.getLength() + 1);
 flavors[flavors.getLength() - 1] = oOOFlavor;
+SAL_INFO("vcl.ios.clipboard",
+ "Mapped " << [sysFormat UTF8String] << " to " << 
oOOFlavor.MimeType);
 }
 }
 
diff --git a/vcl/ios/iOSTransferable.cxx b/vcl/ios/iOSTransferable.cxx
index b1bc4043ea9e..d3c7d0a5c02c 100644
--- a/vcl/ios/iOSTransferable.cxx
+++ b/vcl/ios/iOSTransferable.cxx
@@ -142,6 +142,17 @@ void iOSTransferable::initClipboardItemList()
 throw RuntimeException("Cannot get clipboard data", 
static_cast(this));
 }
 
+#ifdef SAL_LOG_INFO
+NSString* types = @"";
+for (unsigned i = 0; i < [pboardFormats count]; i++)
+{
+if ([types length] > 0)
+types = [types stringByAppendingString:@", "];
+types = [types stringByAppendingString:[pboardFormats 
objectAtIndex:i]];
+}
+SAL_INFO("vcl.ios.clipboard", "Types on clipboard: " << [types 
UTF8String]);
+#endif
+
 mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-29 Thread Jens Carl (via logerrit)

 connectivity/source/drivers/flat/EConnection.cxx |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit d376c09f0100e6545b4804a6698bcc746ea9427c
Author: Jens Carl 
AuthorDate: Tue May 28 17:36:48 2019 +
Commit: Stephan Bergmann 
CommitDate: Wed May 29 09:14:01 2019 +0200

tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)

Replace OSL_VERIFY with if-statement and SAL_WARN.

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

diff --git a/connectivity/source/drivers/flat/EConnection.cxx 
b/connectivity/source/drivers/flat/EConnection.cxx
index ace657fd642d..8091c435ac4c 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace connectivity::flat;
 using namespace connectivity::file;
@@ -67,29 +68,40 @@ void OFlatConnection::construct(const OUString& url,const 
Sequence< PropertyValu
 for(;pBegin != pEnd;++pBegin)
 {
 if(pBegin->Name == "HeaderLine")
-OSL_VERIFY( pBegin->Value >>= m_bHeaderLine );
+{
+if( ! (pBegin->Value >>= m_bHeaderLine) )
+SAL_WARN("connectivity.flat", "construct: unable to get 
property HeaderLine");
+}
 else if(pBegin->Name == "FieldDelimiter")
 {
 OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get 
property FieldDelimiter");
+
 m_cFieldDelimiter = aVal.toChar();
 }
 else if(pBegin->Name == "StringDelimiter")
 {
 OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get 
property StringDelimiter");
+
 m_cStringDelimiter = aVal.toChar();
 }
 else if(pBegin->Name == "DecimalDelimiter")
 {
 OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get 
property DecimalDelimiter");
+
 m_cDecimalDelimiter = aVal.toChar();
 }
 else if(pBegin->Name == "ThousandDelimiter")
 {
 OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get 
property ThousandDelimiter");
+
 m_cThousandDelimiter = aVal.toChar();
 }
 else if ( pBegin->Name == "MaxRowScan" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: opencl/inc opencl/IwyuFilter_opencl.yaml opencl/source

2019-05-29 Thread Gabor Kelemen (via logerrit)

 opencl/IwyuFilter_opencl.yaml|6 ++
 opencl/inc/opencl_device.hxx |5 +++--
 opencl/inc/opencl_device_selection.h |3 ---
 opencl/source/opencl_device.cxx  |4 +---
 opencl/source/openclwrapper.cxx  |6 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 61b7525869178464e100085e0f9a66ffc008e483
Author: Gabor Kelemen 
AuthorDate: Tue May 14 01:02:55 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 29 09:11:52 2019 +0200

tdf#42949 Fix IWYU warnings in opencl/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/opencl/IwyuFilter_opencl.yaml b/opencl/IwyuFilter_opencl.yaml
new file mode 100644
index ..10b5be193d18
--- /dev/null
+++ b/opencl/IwyuFilter_opencl.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: opencl/source/opencl_device.cxx
+blacklist:
+opencl/source/opencl_device.cxx:
+# Avoid loplugin:unreffun error
+- opencl_device.hxx
diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx
index b69cbabc28a5..93cc5f7a1271 100644
--- a/opencl/inc/opencl_device.hxx
+++ b/opencl/inc/opencl_device.hxx
@@ -10,9 +10,10 @@
 #ifndef INCLUDED_OPENCL_INC_OPENCL_DEVICE_HXX
 #define INCLUDED_OPENCL_INC_OPENCL_DEVICE_HXX
 
-#include 
+#include 
 
-#include "opencl_device_selection.h"
+namespace openclwrapper { struct GPUEnv; }
+struct ds_device;
 
 ds_device const & getDeviceSelection(OUString const & pFileName, bool 
bForceSelection);
 
diff --git a/opencl/inc/opencl_device_selection.h 
b/opencl/inc/opencl_device_selection.h
index 982b65a5187c..2acb67047c4e 100644
--- a/opencl/inc/opencl_device_selection.h
+++ b/opencl/inc/opencl_device_selection.h
@@ -17,9 +17,6 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
 
 #include 
 #include 
diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx
index 55f594ba713f..d6b59729c14a 100644
--- a/opencl/source/opencl_device.cxx
+++ b/opencl/source/opencl_device.cxx
@@ -7,17 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -26,6 +23,7 @@
 #include 
 
 #include 
+#include 
 
 #define INPUTSIZE  15360
 #define OUTPUTSIZE 15360
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 26a5e6b7f1b8..ffb1cc788f31 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -10,6 +10,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -24,13 +25,8 @@
 #include 
 
 #include 
-#include 
 
-#include 
 #include 
-#include 
-
-#include 
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

37 matches

Mail list logo