date:20190605

 sw/qa/extras/ooxmlexport/data/tdf115212.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |7 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |2 ++
 3 files changed, 9 insertions(+)

New commits:
commit f9fd82ffa2ccb0e506f44586289ac8b3e1001b38
Author: László Németh 
AuthorDate: Wed Jun 5 14:30:53 2019 +0200
Commit: László Németh 
CommitDate: Thu Jun 6 08:12:01 2019 +0200

tdf#115212 DOCX export: fix ToC with tracked deletion

Removing part of Table of Contents with tracked deletion
resulted broken DOCX export, ie. unrecoverable and
uneditable document in MSO.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf115212.docx 
b/sw/qa/extras/ooxmlexport/data/tdf115212.docx
new file mode 100644
index ..1a44fbd7764a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf115212.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 3864ecede42f..df83dab157fb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -862,6 +862,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, 
"tdf70234.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:delInstrText");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115212, "tdf115212.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// export field with tracked deletion
+assertXPath(pXmlDoc, "//w:p[2]/w:del[1]/w:r[1]/w:fldChar");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
 {
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9fdd2b94d575..dfd316ee1626 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1390,7 +1390,9 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, bool /
 // Add the fields starts for hyperlinks, TOCs and index marks
 if ( pIt->bOpen && !pIt->pField )
 {
+StartRedline( m_pRedlineData );
 StartField_Impl( pNode, nPos, *pIt, true );
+EndRedline( m_pRedlineData );
 
 if (m_startedHyperlink)
 ++m_nFieldsInHyperlink;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 cui/uiconfig/ui/bulletandposition.ui |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9823786d74bb86c7827a777ef517ba753f58b872
Author: Caolán McNamara 
AuthorDate: Wed Jun 5 14:38:49 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Jun 6 07:52:38 2019 +0200

only want a border here surely, not scrollability

Change-Id: Ief22fa4e437af5d408a4debc776be3237a97601a
Reviewed-on: https://gerrit.libreoffice.org/73553
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/cui/uiconfig/ui/bulletandposition.ui 
b/cui/uiconfig/ui/bulletandposition.ui
index e9d642e2a290..52e29767c1d8 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -195,6 +195,8 @@
 78
 True
 True
+never
+never
 in
 
   
@@ -984,6 +986,8 @@
 300
 True
 True
+never
+never
 in
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Mike Kaganski (via logerrit)

 cui/uiconfig/ui/bulletandposition.ui |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 2265574dd571593e0070754ebd053eef6098ac98
Author: Mike Kaganski 
AuthorDate: Thu Jun 6 11:13:05 2019 +1000
Commit: Andras Timar 
CommitDate: Thu Jun 6 07:52:04 2019 +0200

tdf#125642: fix minimal sizes of dialog and its elements

Change-Id: I0232999866eb731fd74b3e954121f1960a3873bd
Reviewed-on: https://gerrit.libreoffice.org/73577
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/cui/uiconfig/ui/bulletandposition.ui 
b/cui/uiconfig/ui/bulletandposition.ui
index aae253f61f2a..e9d642e2a290 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -90,7 +90,6 @@
 
   
   
-300
 False
 6
 Bullets and Numbering
@@ -98,9 +97,6 @@
 0
 0
 dialog
-
-  
-
 
   
 False
@@ -979,8 +975,7 @@
 none
 
   
-0
-0
+150
 True
 False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 forms/source/inc/formnavigation.hxx |4 ++--
 framework/inc/helper/statusindicatorfactory.hxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ac14e5613597e7361ce6995dacb1bb5bd55b6b00
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:22 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jun 6 07:09:14 2019 +0200

Fix typo

Change-Id: I3883dedde0ad3ca6c4d6190d711af9c1e6411a50
Reviewed-on: https://gerrit.libreoffice.org/73573
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/inc/formnavigation.hxx 
b/forms/source/inc/formnavigation.hxx
index e1068f7bb526..200ab9d01996 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -190,7 +190,7 @@ namespace frm
 */
 static const char* getFeatureURLAscii( sal_Int16 _nFeatureId );
 
-/** retrieves the feature URL belonging to an feature id
+/** retrieves the feature URL belonging to a feature id
 
 @complexity O(log n), with n being the number of all potentially 
known URLs
 @return
@@ -199,7 +199,7 @@ namespace frm
 */
 boolgetFeatureURL( sal_Int16 _nFeatureId, css::util::URL& /* 
[out] */ _rURL );
 
-/** retrieves the feature id belonging to an feature URL
+/** retrieves the feature id belonging to a feature URL
 
 @complexity O(n), with n being the number of all potentially known 
URLs
 @return
commit 23475ea1946935a902d35baf4a160672dff4b670
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:02 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jun 6 07:08:45 2019 +0200

Fix typo

Change-Id: I391dd0af85ced2cb16d54c560c7fb733ff8d780d
Reviewed-on: https://gerrit.libreoffice.org/73574
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/framework/inc/helper/statusindicatorfactory.hxx 
b/framework/inc/helper/statusindicatorfactory.hxx
index 1ad060516313..ac7a0655adc1 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -105,7 +105,7 @@ struct IndicatorInfo
 /** @short  Used to locate an info struct inside a stl structure...
 
 @descr  The indicator object itself is used as key. Its values
-are not interesting then. Because more then one child
+are not interesting then. Because more than one child
 indicator can use the same values...
  */
 bool operator==(const css::uno::Reference< css::task::XStatusIndicator 
>& xIndicator)
@@ -114,7 +114,7 @@ struct IndicatorInfo
 }
 };
 
-/** @descr  Define a lits of child indicator objects and her data. */
+/** @descr  Define a list of child indicator objects and its data. */
 typedef ::std::vector< IndicatorInfo > IndicatorStack;
 
 /** @short  implement a factory service to create new status indicator 
objects
@@ -126,7 +126,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack;
 
 This factory create different indicators and control his 
access
 to a shared output device! Only the last activated 
component
-can write his state to this device. All other requests 
will be
+can write its state to this device. All other requests 
will be
 cached only.
 
 @devstatus  ready to use
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 forms/source/component/refvaluecomponent.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 882074308d36e0ffa5c45ac21d1d720288311953
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:24 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jun 6 07:07:51 2019 +0200

Fix typo

Change-Id: I351a41c7b6964bdf60d9231640c18461fca81ff2
Reviewed-on: https://gerrit.libreoffice.org/73575
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/refvaluecomponent.hxx 
b/forms/source/component/refvaluecomponent.hxx
index 804c477586ca..958837ffcc18 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -27,7 +27,7 @@
 namespace frm
 {
 
-/** a OBoundControlModel which features the exchange of a reference value
+/** an OBoundControlModel which features the exchange of a reference value
 */
 class OReferenceValueComponent : public OBoundControlModel
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 forms/source/inc/FormComponent.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4023c43523c1d3829b9cda73dc8eb14eb1ce6e54
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:23 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jun 6 07:07:29 2019 +0200

Fix typo

Change-Id: Iedf4ec187812fd152d19f70405d2f4554211bf6b
Reviewed-on: https://gerrit.libreoffice.org/73576
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/inc/FormComponent.hxx 
b/forms/source/inc/FormComponent.hxx
index fa19c000e6fb..0c2bba66e705 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -90,7 +90,7 @@ namespace frm
 
 //= ControlModelLock
 
-/** class whose instances lock a OControlModel
+/** class whose instances lock an OControlModel
 
 Locking here merely means locking the OControlModel's mutex.
 
@@ -357,7 +357,7 @@ protected:
 );
 virtual ~OControlModel() override;
 
-/** to be called after a OBoundControlModel (a derivee, respectively) has 
been cloned
+/** to be called after an OBoundControlModel (a derivee, respectively) has 
been cloned
 
 This method contains late initializations which cannot be done in 
the
 constructor of this base class, since the virtual method of derived 
classes do
@@ -397,7 +397,7 @@ public:
 virtual css::uno::Sequence SAL_CALL 
getSupportedServiceNames() override;
 virtual OUString SAL_CALLgetImplementationName() override = 0;
 
-// XSericeInfo - static version(s)
+// XServiceInfo - static version(s)
 /// @throws css::uno::RuntimeException
 static  css::uno::Sequence getSupportedServiceNames_Static();
 
@@ -640,7 +640,7 @@ protected:
 // factory to 
create the aggregate with
 const OUString& _rUnoControlModelTypeName,   // service name of te 
model to aggregate
 const OUString& _rDefault,   // service name of the 
default control
-const bool _bCommitable,// is the control 
(model) commitable ?
+const bool _bCommitable,// is the control 
(model) committable?
 const bool _bSupportExternalBinding,// set to sal_True if 
you want to support XBindableValue
 const bool _bSupportsValidation // set to sal_True if 
you want to support XValidatable
 );
@@ -1137,7 +1137,7 @@ private:
 */
 voidimpl_determineAmbientForm_nothrow();
 
-/** connects to a value supplier which is an database column.
+/** connects to a value supplier which is a database column.
 
 The column is take from our parent, which must be a database form 
respectively row set.
 
@@ -1153,7 +1153,7 @@ private:
 bool  _bFromReload
 );
 
-/** disconnects from a value supplier which is an database column
+/** disconnects from a value supplier which is a database column
 
 @precond The control does not have an external value supplier
 @see impl_connectDatabaseColumn_noNotify
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-3' - source/text

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

New commits:
commit 8a5c2a2daf29764f1cfaf78abf25ea0301f5477e
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:29:27 2019 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 6 04:01:06 2019 +0200

Prevent L10n issue when building Help

Pootle does not convert back < and > into the same entities, thus
disturbing XML parsing of string. Changed to ().

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

diff --git a/source/text/sbasic/python/python_programming.xhp 
b/source/text/sbasic/python/python_programming.xhp
index 888ed96b4..5efa8df15 100644
--- a/source/text/sbasic/python/python_programming.xhp
+++ b/source/text/sbasic/python/python_programming.xhp
@@ -77,7 +77,7 @@
 Module import
 XSCRIPTCONTEXT is not provided to 
imported modules.
 
-%PRODUCTNAME Basic libraries 
contain classes, routines and variables, Python modules contain classes, 
functions and variables. Common pieces of reusable Python or UNO features must 
be stored in My macros within /Scripts/python/pythonpath. Python libraries help organize 
modules in order to prevent module name collisions. Import 
uno.py inside shared modules.
+%PRODUCTNAME Basic libraries 
contain classes, routines and variables, Python modules contain classes, 
functions and variables. Common pieces of reusable Python or UNO features must 
be stored in My macros within (User 
Profile)/Scripts/python/pythonpath. Python libraries help organize 
modules in order to prevent module name collisions. Import 
uno.py inside shared modules.
 
 Genuine BASIC UNO facilities can be 
inferred using uno.py module. Use Python interactive shell to get a complete module description 
using dir() and help() Python 
commands.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - helpcontent2

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

New commits:
commit 716bb38b6f6f249191e51175e4df3c2a9eb8bacf
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:29:27 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Jun 6 04:01:06 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-3'
  - Prevent L10n issue when building Help

Pootle does not convert back < and > into the same entities, thus
disturbing XML parsing of string. Changed to ().

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

diff --git a/helpcontent2 b/helpcontent2
index 4b1d391bfa22..8a5c2a2daf29 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4b1d391bfa22e1090122c9dec944f60860b6f557
+Subproject commit 8a5c2a2daf29764f1cfaf78abf25ea0301f5477e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack

 odk/pack/copying/idl_chapter_refs.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 856d28801b59d45cf4d32602adc57a08cd618b6d
Author: Matthias Seidel 
AuthorDate: Wed Jun 5 23:15:55 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 5 23:15:55 2019 +

Fixed "OfficeDocument"

diff --git a/odk/pack/copying/idl_chapter_refs.txt 
b/odk/pack/copying/idl_chapter_refs.txt
index 4095601a41d7..4f63f05406ba 100644
--- a/odk/pack/copying/idl_chapter_refs.txt
+++ b/odk/pack/copying/idl_chapter_refs.txt
@@ -3126,7 +3126,7 @@ com.sun.star.frame.Controller
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.frame.XDesktop
 com.sun.star.frame.Frame
-com.sun.star.model.OfficeDocument
+com.sun.star.document.OfficeDocument
 TOPIC:
 
 LINK:Documentation/DevGuide/GUI/Dialog_Controls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/uiconfig sd/uiconfig

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

 sc/uiconfig/scalc/ui/notebookbar.ui|  503 +++-
 sd/uiconfig/sdraw/ui/notebookbar.ui|  664 -
 sd/uiconfig/simpress/ui/notebookbar.ui |  603 +++--
 3 files changed, 1138 insertions(+), 632 deletions(-)

New commits:
commit 8974ad7bccaa17e2f540820c5635045785c89e92
Author: andreas kainz 
AuthorDate: Sat Jun 1 00:29:57 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Jun 6 00:55:53 2019 +0200

NB tabbed finished sync between different apps

Change-Id: Ia3e1be0656eb066bd18e21fe365dcf0adec150b4
Reviewed-on: https://gerrit.libreoffice.org/73293
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit b226cd3c2ed3a551f1631cb118456f1f80e32b6c)
Reviewed-on: https://gerrit.libreoffice.org/73355

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9ccc963b09ec..90369c808224 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3084,21 +3084,6 @@
 1
   
 
-
-  
-True
-False
-5
-5
-vertical
-  
-  
-False
-True
-5
-2
-  
-
   
   
 False
@@ -3126,6 +3111,21 @@
 center
 True
 
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
   
 True
 False
@@ -3186,6 +3186,9 @@
 1
   
 
+
+  
+
   
   
 False
@@ -3206,6 +3209,21 @@
 center
 True
 
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
   
 True
 False
@@ -3368,17 +3386,32 @@
   
 
 
+  
+True
+False
+end
+5
+5
+True
+vertical
+  
+  
+False
+True
+5
+1
+  
+
+
   
 True
 False
 end
-5
 True
 icons
 False
 
   
-True
 False
 .uno:SubScript
   
@@ -3398,11 +3431,25 @@

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/UnoApi_offapi.mk

 offapi/UnoApi_offapi.mk | 7443 
 1 file changed, 3722 insertions(+), 3721 deletions(-)

New commits:
commit 536f6a7666895cc8e3ba375651cd2a8f3f1969cd
Author: Matthias Seidel 
AuthorDate: Wed Jun 5 20:19:22 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 5 20:19:22 2019 +

Cleaned up whitespace, added "GlobalEventBroadcaster"

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e111c5bb3ba1..1e491bd64175 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1,5 +1,5 @@
 ###
-#  
+#
 #  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
@@ -7,16 +7,16 @@
 #  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
-#  
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###
 
 
@@ -24,7 +24,7 @@
 $(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
-udkapi \
+   udkapi \
 ))
 
 $(eval $(call gb_UnoApiTarget_set_include,offapi,\
@@ -34,3727 +34,3728 @@ $(eval $(call gb_UnoApiTarget_set_include,offapi,\
 ))
 
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,\
-offapi/com/sun/star/animations/TargetPropertiesCreator \
-offapi/com/sun/star/awt/AsyncCallback \
-offapi/com/sun/star/awt/ContainerWindowProvider \
-offapi/com/sun/star/awt/DialogProvider \
-offapi/com/sun/star/awt/DialogProvider2 \
-offapi/com/sun/star/awt/PrinterServer \
-offapi/com/sun/star/awt/UnoControlDialogModelProvider \
-offapi/com/sun/star/awt/grid/DefaultGridDataModel \
-offapi/com/sun/star/awt/grid/SortableGridDataModel \
-offapi/com/sun/star/awt/tree/MutableTreeDataModel \
-offapi/com/sun/star/awt/tree/MutableTreeNode \
-offapi/com/sun/star/awt/tree/TreeControl \
-offapi/com/sun/star/chart2/data/DatabaseDataProvider \
-offapi/com/sun/star/configuration/Update \
-offapi/com/sun/star/deployment/ExtensionManager \
-offapi/com/sun/star/deployment/PackageInformationProvider \
-offapi/com/sun/star/deployment/PackageRegistryBackend \
-offapi/com/sun/star/deployment/UpdateInformationProvider \
-offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment \
-offapi/com/sun/star/deployment/thePackageManagerFactory \
-offapi/com/sun/star/deployment/ui/LicenseDialog \
-offapi/com/sun/star/deployment/ui/PackageManagerDialog \
-offapi/com/sun/star/deployment/ui/UpdateRequiredDialog \
-offapi/com/sun/star/document/DocumentProperties \
-offapi/com/sun/star/document/DocumentRevisionListPersistence \
-offapi/com/sun/star/drawing/SlideRenderer \
-offapi/com/sun/star/drawing/SlideSorter \
-offapi/com/sun/star/drawing/framework/BasicPaneFactory \
-offapi/com/sun/star/drawing/framework/BasicToolBarFactory \
-offapi/com/sun/star/drawing/framework/BasicViewFactory \
-offapi/com/sun/star/drawing/framework/Configuration \
-offapi/com/sun/star/drawing/framework/ConfigurationController \
-offapi/com/sun/star/drawing/framework/ModuleController \
-offapi/com/sun/star/drawing/framework/ResourceId \
-offapi/com/sun/star/embed/DocumentCloser \
-offapi/com/sun/star/embed/InstanceLocker \
-offapi/com/sun/star/embed/OLESimpleStorage \
-offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel \
-offapi/com/sun/star/form/runtime/FormOperations \
-offapi/com/sun/star/frame/PopupMenuControllerFactory \
-offapi/com/sun/star/frame/StatusbarControllerFactory \
-offapi/com/sun/star/frame/ToolbarControllerFactory \
-offapi/com/sun/star/graphic/GraphicObject \
-offapi/com/sun/star/inspection/DefaultHelpProvider \
-offapi/com/sun/star/inspection/GenericPropertyHandler \
-offapi/com/sun/star/inspection/ObjectInspector \
-offapi/com/sun/star/inspection/ObjectInspectorModel \
-offapi/com/sun/star/inspection/StringRepresentation \
-offapi/com/sun/star/linguistic2/Proofreader \
-offapi/com/sun/star/linguistic2/ProofreadingIterator \
-offapi/com/sun/star/logging/ConsoleHandler \
-offapi/com/sun/star/logging/CsvLogFormatter \
-offapi/com/sun/star/logging/DocumentIOLogRing \
-offapi/com/sun/star/logging/FileHandler \
-offapi/com/sun/st

Base without HSQL support?

2019-06-05 Thread Drew Jensen

Howdy,

I'm just going to jump into it.

If the question is; should Base not include the HSQL driver in the 6.3
release I would say no.
Should Firebird Embedded SDBC be the default selection for new Base files,
I'm agnostic.

But Yes to include it as an option (without needing experimental mode).
Here is a 2:40 video of why.
https://us.hostiso.cloud/index.php/s/HZLHLzeW4LBa5wi
tl/dw; Some simple features still don't work with parts of firebird sdbc.

Should the Migration Assistant be enabled by default yes, but the default
button on the Dialog box which opens when the connection to an HSQL
datasource is created stays No. I would recommend an enhancement which is
to include a URL to a TDF wiki page (with the page setup for translation/NL
support) which covers Why it should be done now, and how to perform a
migration both with the Migration Assistant and without.

Right now if the ODB file with HSQL does not have any of the following data
types, decimal, numeric, Image(Blob), Date, Time or TIMESTAMP, the data
transfer will succeed. How many odb files would have one or more of those
IDK but guessing it would be a fair percentage.

Here is the real problem though, imo, right now with 6.3 if you try to
import any external source into decimal and numeric fields with Firebird
there is an issue. If you drag drop a table from any Base file type or from
Calc or import a text file as CSV. The Date, time, TIMESTAMP and Boolean
fields in Firebird also have some issues with the those Import Wizard
functions, but less extreme in that the import function is more restrictive
on what is recognized as valid input compared to the Import Wizard when
using the HSQL sdbc.

More so however there are still prickly issues with Wizards and Designers
(query, form, report) still not fully functional, or working properly, with
Firebird sdbc.

So what I really think should be considered is to focus any developer
resources for the 6.3 release first on pushing the firebird sdbc much
closer to feature parity with the HSQL regarding how much of the Base UI
functions properly with the sdbc, even if that means there is no further
work on Migration Assistant before the 6.3 release.

I think that if the project really wants to be aggressive on ditching HSQL,
as with 6.4, then right now and thru to the 6.4 release there should be a
TDF emphasize on getting people to make the migration from HSQL odb files.
Either to Firebird embedded or an external data base. This would require
work from documentation folks (creating a tutorial, updating a wiki page or
online help and marketing folks to generate awareness and urgency. There
are advantages to actively pushing people to do this now while there is
both HSQL and Firebird in the LibreOffice package. Those advantages however
require that the current Import Wizard (drag drop of tables) would work,
right now all data types can move via the IW routines from a Firebird sdbc
file to a HSQLdb sdbc file BTW, but not back the other way.

Anyway, that is my two cents worth of opinion on how it is at the moment.

Thanks and best wishes,

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

[Libreoffice-commits] core.git: include/svx sd/CppunitTest_sd_uiimpress.mk sd/Module_sd.mk sd/qa svx/source

 include/svx/svdedtv.hxx|6 ++
 sd/CppunitTest_sd_uiimpress.mk |   84 ++
 sd/Module_sd.mk|1 
 sd/qa/unit/data/tdf111522.odp  |binary
 sd/qa/unit/uiimpress.cxx   |  100 +
 svx/source/svdraw/svdedtv.cxx  |   18 ++-
 svx/source/svdraw/svdedtv1.cxx |2 
 7 files changed, 209 insertions(+), 2 deletions(-)

New commits:
commit 3a874f1c80c37e8b35666e1d73161ff762eb7e4c
Author: Miklos Vajna 
AuthorDate: Wed Jun 5 16:28:53 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 23:20:38 2019 +0200

tdf#111522 svx: fix crash with view1 doing text edit and view2 doing sdr 
undo

If one view has an active text edit, then current code doesn't handle
manipulating the undo text outside the text edit, so avoid problems by
simply not adding an undo action to the undo stack for shape creation or
move.

Other actions might want to do the same in the future: check for
CanDoSdrUndo() before calling SdrUndoFactory member functions.

[ Found no existing test suite similar to CppunitTest_sw_uiwriter, so
added one. ]

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

diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index af60deaac0f6..0305b7fb144c 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -185,6 +185,12 @@ public:
 void SetUndoComment(const OUString& rComment, const OUString& rObjDescr) { 
mpModel->SetUndoComment(rComment,rObjDescr); }
 bool IsUndoEnabled() const;
 
+/**
+ * Checks if this or other views have an active text edit, in which case 
object undos are not
+ * created.
+ */
+bool CanDoSdrUndo() const;
+
 std::vector< std::unique_ptr > CreateConnectorUndo( 
SdrObject& rO );
 void AddUndoActions( std::vector< std::unique_ptr > );
 
diff --git a/sd/CppunitTest_sd_uiimpress.mk b/sd/CppunitTest_sd_uiimpress.mk
new file mode 100644
index ..7881d15d2ef8
--- /dev/null
+++ b/sd/CppunitTest_sd_uiimpress.mk
@@ -0,0 +1,84 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_uiimpress))
+
+$(eval $(call gb_CppunitTest_use_externals,sd_uiimpress,\
+   boost_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_uiimpress, \
+sd/qa/unit/uiimpress \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sd_uiimpress, \
+$(call gb_Helper_optional,AVMEDIA,avmedia) \
+basegfx \
+canvastools \
+comphelper \
+cppcanvas \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sd \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sd_uiimpress,\
+-I$(SRCDIR)/sd/inc \
+-I$(SRCDIR)/sd/source/ui/inc \
+-I$(SRCDIR)/sd/source/ui/slidesorter/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_uiimpress))
+
+$(eval $(call gb_CppunitTest_use_externals,sd_uiimpress,\
+boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sd_uiimpress))
+$(eval $(call gb_CppunitTest_use_vcl,sd_uiimpress))
+
+$(eval $(call gb_CppunitTest_use_rdb,sd_uiimpress,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sd_uiimpress,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sd_uiimpress))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index bd2796ae818e..a7edda76cbe4 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sd,\
 CppunitTest_sd_export_tests \
 CppunitTest_sd_filters_test \
 CppunitTest_sd_misc_tests \
+CppunitTest_sd_uiimpress \
 CppunitTest_sd_html_export_tests \
 CppunitTest_sd_activex_controls_tests \
 ))
diff --git a/sd/qa/unit/data/tdf111522.odp b/sd/qa/unit/data/tdf111522.odp
new file mode 100644
index ..fd6ebeb6ed22
Binary files /dev/null and b/sd/qa/unit/data/tdf111522.odp differ
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
new file mode 100644
index ..910f4a9dd0c3
--- /dev/null
+++ b/sd/qa/unit/uiimpress.cx

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

2019-06-05 Thread Mike Kaganski (via logerrit)

 cui/uiconfig/ui/bulletandposition.ui |   39 ---
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit c3ce652b4a2a5891fa5664a0ad0ee8cb14aef908
Author: Mike Kaganski 
AuthorDate: Wed Jun 5 22:52:36 2019 +1000
Commit: Mike Kaganski 
CommitDate: Wed Jun 5 23:18:54 2019 +0200

Load align icons from theme

GTK stock images aren't available using other vcl plugins

Change-Id: I5ab23733d8d9c71fcf8db9f1867cb7d43516fff1
Co-authored-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/73548
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/uiconfig/ui/bulletandposition.ui 
b/cui/uiconfig/ui/bulletandposition.ui
index 0f2ae3140446..aae253f61f2a 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -66,6 +66,21 @@
   
 
   
+  
+True
+False
+cmd/sc_alignleft.png
+  
+  
+True
+False
+cmd/sc_alignhorizontalcenter.png
+  
+  
+True
+False
+cmd/sc_alignright.png
+  
   
 
   
@@ -797,14 +812,8 @@
 True
 True
 True
+image2
 True
-
-  
-True
-False
-gtk-justify-center
-  
-
   
   
 1
@@ -817,14 +826,8 @@
 True
 True
 88
+image1
 True
-
-  
-True
-False
-gtk-justify-left
-  
-
   
   
 0
@@ -836,14 +839,8 @@
 True
 True
 True
+image3
 True
-
-  
-True
-False
-gtk-justify-right
-  
-
   
   
 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Eike Rathke (via logerrit)

 i18nlangtag/qa/cppunit/test_languagetag.cxx |2 ++
 i18nlangtag/source/isolang/isolang.cxx  |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit c4f9b1cae7e9400b9aa4bc085ee39371c3b67485
Author: Eike Rathke 
AuthorDate: Wed Jun 5 19:08:42 2019 +0200
Commit: Eike Rathke 
CommitDate: Wed Jun 5 23:06:15 2019 +0200

Related: tdf#125404 alias cmn-CN to zh-CN, cmn-TW to zh-TW

Map 'cmn' Mandarin Chinese with associated country for Simplified
and Traditional to the technically used 'zh' macrolanguage code.

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

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 595fd92370e7..925d1615473a 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -742,6 +742,8 @@ bool checkMapping( const OUString& rStr1, const OUString& 
rStr2 )
 if (rStr1 == "en-GB-oed"   ) return rStr2 == "en-GB-oxendict";
 if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad";
 if (rStr1 == "sd-IN"   ) return rStr2 == "sd-Deva-IN";
+if (rStr1 == "cmn-CN"  ) return rStr2 == "zh-CN";
+if (rStr1 == "cmn-TW"  ) return rStr2 == "zh-TW";
 return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 97b4f8c29a09..be183839fb59 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -184,7 +184,9 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_GREEK,   "el", "GR", k0},
 { LANGUAGE_CHINESE_SIMPLIFIED,  "zh", "CN", k0},
 { LANGUAGE_CHINESE_SIMPLIFIED_LEGACY,   "zh", "CN", k0},
+{ LANGUAGE_CHINESE_SIMPLIFIED, "cmn", "CN", kSAME },
 { LANGUAGE_CHINESE_TRADITIONAL, "zh", "TW", k0},
+{ LANGUAGE_CHINESE_TRADITIONAL,"cmn", "TW", kSAME },
 { LANGUAGE_CHINESE_HONGKONG,"zh", "HK", k0},
 { LANGUAGE_CHINESE_SINGAPORE,   "zh", "SG", k0},
 { LANGUAGE_CHINESE_MACAU,   "zh", "MO", k0},
___
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/qt5

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

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

New commits:
commit e70af1096275e7705fa71bb5ca0fc564746a98c7
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jun 1 22:23:58 2019 +
Commit: Katarina Behrens 
CommitDate: Wed Jun 5 22:22:35 2019 +0200

Qt5 use precise timer to prevent unneeded restarts

We just have one driving timer. Not much to sync with. Gets rid
of these annoying scheduler restart messages. The idea of coarse,
synced timer events sounds nice to have, but LO currently can't
handle it in a sensible sense..

Change-Id: I169c2bb582aca0e03b00e24dc364ac9b19162c3b
Reviewed-on: https://gerrit.libreoffice.org/73392
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 677db60166106e33bc2329f868f96cf2fb85f11b)
Reviewed-on: https://gerrit.libreoffice.org/73411
Reviewed-by: Michael Weghorn 
(cherry picked from commit f85d99ede4054876f608819e808c9b03c6a03481)
Reviewed-on: https://gerrit.libreoffice.org/73464
Reviewed-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index 7fcb7e17dcda..348c9a825ae6 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -29,6 +29,7 @@
 Qt5Timer::Qt5Timer()
 {
 m_aTimer.setSingleShot(true);
+m_aTimer.setTimerType(Qt::PreciseTimer);
 connect(&m_aTimer, SIGNAL(timeout()), this, SLOT(timeoutActivated()));
 connect(this, SIGNAL(startTimerSignal(int)), this, SLOT(startTimer(int)));
 connect(this, SIGNAL(stopTimerSignal()), this, SLOT(stopTimer()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 offapi/com/sun/star/text/BaseIndex.idl  |   11 ---
 offapi/com/sun/star/text/IllustrationsIndex.idl |   11 +--
 2 files changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 16c5d819648f7c2fba03cc386fbc5568499ac714
Author: Matthias Seidel 
AuthorDate: Wed Jun 5 19:34:30 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 5 19:34:30 2019 +

Fixed typos

diff --git a/offapi/com/sun/star/text/BaseIndex.idl 
b/offapi/com/sun/star/text/BaseIndex.idl
index 74afc8798640..79934dc7edea 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -21,7 +21,6 @@
 
 
 
-
 #ifndef __com_sun_star_text_BaseIndex_idl__
 #define __com_sun_star_text_BaseIndex_idl__
 
@@ -51,7 +50,7 @@
 
 //=
 
- module com {  module sun {  module star {  module text {
+ module com { module sun { module star { module text {
 
 //=
 
@@ -59,7 +58,7 @@
 /** specifies the basic service of different indexes within a document.@see 
com::sun::star::text::DocumentIndex
 @see com::sun::star::text::ContentIndex
 @see com::sun::star::text::UserDefinedIndex
-@see com::sun::star::text::IllustrationIndex
+@see com::sun::star::text::IllustrationsIndex
 @see com::sun::star::text::TableIndex
 @see com::sun::star::text::ObjectIndex
  */
@@ -73,7 +72,7 @@ published service BaseIndex
 
 // DocMerge: empty anyway
 [property] string Title;
-/** determins if the index is protected.*/
+/** determines if the index is protected.*/
 
 // DocMerge: empty anyway
 [property] boolean IsProtected;
@@ -161,7 +160,7 @@ published service BaseIndex
  */
 // DocMerge: empty anyway
 [optional, property] com::sun::star::container::XIndexReplace LevelFormat;
-/** determins if the content of the document index is created from the
+/** determines if the content of the document index is created from the
  complete document content or from the current chapter only.
   It is not available in the bibliography*/
 [optional, property] boolean CreateFromChapter;
@@ -180,5 +179,3 @@ published service BaseIndex
 }; }; }; };
 
 #endif
-
-
diff --git a/offapi/com/sun/star/text/IllustrationsIndex.idl 
b/offapi/com/sun/star/text/IllustrationsIndex.idl
index 9dbf791c6afc..a4b1748c8498 100644
--- a/offapi/com/sun/star/text/IllustrationsIndex.idl
+++ b/offapi/com/sun/star/text/IllustrationsIndex.idl
@@ -36,17 +36,17 @@ module com { module sun { module star { module text {
 */
 published service IllustrationsIndex
 {
-service  com::sun::star::text::BaseIndex;
+service com::sun::star::text::BaseIndex;
 
-/* determins if the name or the label of an object is used to create the 
index.
+/* determines if the name or the label of an object is used to create the 
index.
  */
 [optional, property] boolean CreateFromLabels; //tables, illustrations
-/* determins the name of the sequence field that is evaluated to create 
the index.
+/* determines the name of the sequence field that is evaluated to create 
the index.
  */
 [optional, property] string LabelCategory; //tables, illustrations
-/* determins the way the paragraph containing a label is included in the 
index.
+/* determines the way the paragraph containing a label is included in the 
index.
 @see ChapterFormat*/
-[optional, property] short LabelDisplayType;//tables, illustrations
+[optional, property] short LabelDisplayType; //tables, illustrations
 };
 
 //=
@@ -54,4 +54,3 @@ published service IllustrationsIndex
 }; }; }; };
 
 #endif
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/commit-msg

 .git-hooks/commit-msg |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 058c54d540950426751dcb4a00f2488e6375e05a
Author: Miklos Vajna 
AuthorDate: Wed Jun 5 11:56:32 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 21:34:15 2019 +0200

git-hooks: show length of first line if it's too long

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

diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
index cf52ce307dda..64fb7924956b 100755
--- a/.git-hooks/commit-msg
+++ b/.git-hooks/commit-msg
@@ -41,8 +41,9 @@ fi
 
 # ...and that it is not too long
 
-if [ "`head -n 1 $1 | wc -c`" -gt 79 ] ; then
-abort "$1" "The first line is too long, please try to fit into 79 
characters."
+len="`head -n 1 $1 | wc -c`"
+if [ "$len" -gt 79 ] ; then
+abort "$1" "The first line is $len characters, please try to fit into 79 
characters."
 fi
 
 fdo_regex='fdo#[0-9]+'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/workben/fodpfuzzer.cxx |5 +
 vcl/workben/pptxfuzzer.cxx |2 ++
 2 files changed, 7 insertions(+)

New commits:
commit 722041b43bd578ec9f6daeb716309d2ead4ea1a4
Author: Caolán McNamara 
AuthorDate: Wed Jun 5 14:50:02 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 5 21:18:39 2019 +0200

ofz#15068 build failure

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

diff --git a/vcl/workben/fodpfuzzer.cxx b/vcl/workben/fodpfuzzer.cxx
index 268bc492a253..55fb840db9cd 100644
--- a/vcl/workben/fodpfuzzer.cxx
+++ b/vcl/workben/fodpfuzzer.cxx
@@ -24,6 +24,11 @@ extern "C" void* SdCreateDialogFactory()
 return nullptr;
 }
 
+extern "C" void* com_sun_star_comp_Draw_VisioImportFilter_get_implementation()
+{
+return nullptr;
+}
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
 SvMemoryStream aStream(const_cast(data), size, StreamMode::READ);
diff --git a/vcl/workben/pptxfuzzer.cxx b/vcl/workben/pptxfuzzer.cxx
index 7af963dc370d..0fb1ef6a4bb2 100644
--- a/vcl/workben/pptxfuzzer.cxx
+++ b/vcl/workben/pptxfuzzer.cxx
@@ -21,6 +21,8 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
 
 extern "C" void* SdCreateDialogFactory() { return nullptr; }
 
+extern "C" void* com_sun_star_comp_Draw_VisioImportFilter_get_implementation() 
{}
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
 SvMemoryStream aStream(const_cast(data), size, StreamMode::READ);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/uitest/writer_tests5/tdf118540.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c3f92d7d97109515e2b4a6aec6d65f41480b9da5
Author: Miklos Vajna 
AuthorDate: Wed Jun 5 11:58:00 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 21:02:44 2019 +0200

sw: disable test_tdf118540_preview_document_properties()

See the discussion at  this
test is quite unstable at the moment, unfortunately.

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

diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py 
b/sw/qa/uitest/writer_tests5/tdf118540.py
index a7b403d3b750..9b8b34fa3200 100644
--- a/sw/qa/uitest/writer_tests5/tdf118540.py
+++ b/sw/qa/uitest/writer_tests5/tdf118540.py
@@ -21,6 +21,8 @@ def get_url_for_data_file(file_name):
 
 class tdf118540(UITestCase):
def test_tdf118540_preview_document_properties(self):
+# FIXME flaky test, usually passes, but breaks regularly.
+return
 writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf118540.docx"))
 document = self.ui_test.get_component()
 self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Noel Grandin (via logerrit)

 sw/source/core/text/txtfrm.cxx |9 -
 vcl/source/outdev/map.cxx  |   20 
 2 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit 1d74d6d3c1f724fcec4d061e17e325b332739c0c
Author: Noel Grandin 
AuthorDate: Wed Jun 5 14:42:27 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 5 20:49:11 2019 +0200

make OutputDevice::LogicToLogic respect empty Rectangle in more cases

follow the logic from the block at the top of the function

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

diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 5a91bfb274c3..18a015ce5129 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1876,22 +1876,26 @@ tools::Rectangle OutputDevice::LogicToLogic( const 
tools::Rectangle& rRectSource
 {
 ENTER4( rMapModeSource, rMapModeDest );
 
-return tools::Rectangle( fn5( rRectSource.Left() + 
aMapResSource.mnMapOfsX,
+auto left = fn5( rRectSource.Left() + aMapResSource.mnMapOfsX,
aMapResSource.mnMapScNumX, 
aMapResDest.mnMapScDenomX,
aMapResSource.mnMapScDenomX, 
aMapResDest.mnMapScNumX ) -
-  aMapResDest.mnMapOfsX,
-  fn5( rRectSource.Top() + aMapResSource.mnMapOfsY,
+  aMapResDest.mnMapOfsX;
+auto top = fn5( rRectSource.Top() + aMapResSource.mnMapOfsY,
aMapResSource.mnMapScNumY, 
aMapResDest.mnMapScDenomY,
aMapResSource.mnMapScDenomY, 
aMapResDest.mnMapScNumY ) -
-  aMapResDest.mnMapOfsY,
-  fn5( rRectSource.Right() + aMapResSource.mnMapOfsX,
+  aMapResDest.mnMapOfsY;
+if (rRectSource.IsEmpty())
+return tools::Rectangle(left, top);
+
+auto right = fn5( rRectSource.Right() + aMapResSource.mnMapOfsX,
aMapResSource.mnMapScNumX, 
aMapResDest.mnMapScDenomX,
aMapResSource.mnMapScDenomX, 
aMapResDest.mnMapScNumX ) -
-  aMapResDest.mnMapOfsX,
-  fn5( rRectSource.Bottom() + aMapResSource.mnMapOfsY,
+  aMapResDest.mnMapOfsX;
+auto bottom = fn5( rRectSource.Bottom() + aMapResSource.mnMapOfsY,
aMapResSource.mnMapScNumY, 
aMapResDest.mnMapScDenomY,
aMapResSource.mnMapScDenomY, 
aMapResDest.mnMapScNumY ) -
-  aMapResDest.mnMapOfsY );
+  aMapResDest.mnMapOfsY;
+return tools::Rectangle(left, top, right, bottom);
 }
 }
 
commit 597ede6c2eecd9a3c4dca5ff610050080c0ded7c
Author: Noel Grandin 
AuthorDate: Wed Jun 5 14:07:18 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 5 20:48:56 2019 +0200

crash testing export of ooo72915-2.odt to ooo72915-2.doc

blind fix

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

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 3125b2362510..5dc660ba0d4a 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -215,12 +215,17 @@ namespace sw {
 SwpHints const*const pHints(0 < m_CurrentExtent
 ? m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints()
 : nullptr);
-m_CurrentHint = pHints ? pHints->Count() : 0;
+if (pHints)
+{
+pHints->SortIfNeedBe();
+m_CurrentHint = pHints->Count();
+}
 }
 else
 {
 if (SwpHints const*const pHints = m_pNode->GetpSwpHints())
 {
+pHints->SortIfNeedBe();
 m_CurrentHint = pHints->Count();
 }
 }
@@ -265,6 +270,8 @@ namespace sw {
 SwpHints const*const pHints(
 
m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints());
 m_CurrentHint = pHints ? pHints->Count() : 0; // reset
+if (pHints)
+pHints->SortIfNeedBe();
 }
 }
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/docxattributeoutput.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7dc4f5d686f7834702ff133b4e75f29ffa6b5ec3
Author: László Németh 
AuthorDate: Tue Jun 4 15:00:19 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 20:05:54 2019 +0200

tdf#70234 DOCX export: fix only expanded fields

The commit caf2f5fff39caf06204f71d0c2276b415ef047c3
"tdf#70234 DOCX: export tracked deletion of fields"
must handle only the fields with multiple runs
(expanded fields).

Change-Id: I2303bade75401e07accf3f0a874f093458fe7efa
Reviewed-on: https://gerrit.libreoffice.org/73453
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 222f6a1c43b7ae7bf8e2f1fbc1dbe6457e611ab7)
Reviewed-on: https://gerrit.libreoffice.org/73540
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5a0b1708c6f5..5f0b20865008 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1944,6 +1944,8 @@ void DocxAttributeOutput::StartField_Impl( const 
SwTextNode* pNode, sal_Int32 nP
 // normally in the text run
 if ( !rInfos.pField )
 CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
+else
+m_bWritingField = true;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/unodraw/UnoGraphicExporter.cxx |   66 +++---
 1 file changed, 35 insertions(+), 31 deletions(-)

New commits:
commit 95ffc97e9dc1c7ba2f13f6b46e495608f70bbe96
Author: Xisco Fauli 
AuthorDate: Mon Jun 3 16:36:23 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 20:04:41 2019 +0200

tdf#125062: distort hairline borders only if selection is used

Regression from 046df0a876b3d948bb1e14443c00c180bc8cccaa

Use the fix for tdf#105998 only when 'selection' option is checked
in the save dialog

Change-Id: I8c4127c780736408e905ead48e0d3ee6ae149197
Reviewed-on: https://gerrit.libreoffice.org/73391
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
(cherry picked from commit 6c31c2b01dd32cc7ba1230f2c4a98b8f7def219b)
Reviewed-on: https://gerrit.libreoffice.org/73555
Tested-by: Jenkins

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 78a5585061b9..3b8b1d4fa183 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -180,7 +180,7 @@ namespace {
 
 /** creates a bitmap that is optionally transparent from a metafile
 */
-BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, const Size* pSize 
)
+BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf,bool bIsSelection, 
const Size* pSize )
 {
 // use new primitive conversion tooling
 basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
@@ -213,35 +213,39 @@ namespace {
 
 if(!aRect.IsEmpty())
 {
-// tdf#105998 Correct the Metafile using information from it's 
real sizes measured
-// using rMtf.GetBoundRect above and a copy
-const Size aOnePixelInMtf(
-Application::GetDefaultDevice()->PixelToLogic(
-Size(1, 1),
-rMtf.GetPrefMapMode()));
 GDIMetaFile aMtf(rMtf);
-const Size aHalfPixelInMtf(
-(aOnePixelInMtf.getWidth() + 1) / 2,
-(aOnePixelInMtf.getHeight() + 1) / 2);
-const bool bHairlineBR(
-!aHairlineRect.IsEmpty() && (aRect.Right() == 
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
-
-// Move the content to (0,0), usually TopLeft ist slightly
-// negative. For better visualization, add a half pixel, too
-aMtf.Move(
-aHalfPixelInMtf.getWidth() - aRect.Left(),
-aHalfPixelInMtf.getHeight() - aRect.Top());
-
-// Do not Scale, but set the PrefSize. Some levels deeper the
-// MetafilePrimitive will add a mapping to the decomposition
-// (and possibly a clipping) to map the graphic content to
-// a unit coordinate system.
-// Size is the measured size plus one pixel if needed (bHairlineBR)
-// and the moved half pixwel from above
-aMtf.SetPrefSize(
-Size(
-aRect.getWidth() + (bHairlineBR ? 
aOnePixelInMtf.getWidth() : 0) + aHalfPixelInMtf.getWidth(),
-aRect.getHeight() + (bHairlineBR ? 
aOnePixelInMtf.getHeight() : 0) + aHalfPixelInMtf.getHeight()));
+
+if (bIsSelection)
+{
+// tdf#105998 Correct the Metafile using information from it's 
real sizes measured
+// using rMtf.GetBoundRect above and a copy
+const Size aOnePixelInMtf(
+Application::GetDefaultDevice()->PixelToLogic(
+Size(1, 1),
+rMtf.GetPrefMapMode()));
+const Size aHalfPixelInMtf(
+(aOnePixelInMtf.getWidth() + 1) / 2,
+(aOnePixelInMtf.getHeight() + 1) / 2);
+const bool bHairlineBR(
+!aHairlineRect.IsEmpty() && (aRect.Right() == 
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
+
+// Move the content to (0,0), usually TopLeft ist slightly
+// negative. For better visualization, add a half pixel, too
+aMtf.Move(
+aHalfPixelInMtf.getWidth() - aRect.Left(),
+aHalfPixelInMtf.getHeight() - aRect.Top());
+
+// Do not Scale, but set the PrefSize. Some levels deeper the
+// MetafilePrimitive will add a mapping to the decomposition
+// (and possibly a clipping) to map the graphic content to
+// a unit coordinate system.
+// Size is the measured size plus one pixel if needed 
(bHairlineBR)
+// and the moved half pixwel from above
+aMtf.SetPrefSize(
+Size(
+aRect.getWidth() + (bHairlineBR ? 
aOnePixelInMtf.getWidth() : 0) + aHalfPixelInMtf.getWidth(),
+aRect.

[Libreoffice-commits] core.git: cppcanvas/source cppuhelper/source cui/source dbaccess/source desktop/source

2019-06-05 Thread Arkadiy Illarionov (via logerrit)

 cppcanvas/source/mtfrenderer/implrenderer.cxx|   18 +--
 cppcanvas/source/mtfrenderer/polypolyaction.cxx  |4 +-
 cppcanvas/source/mtfrenderer/textaction.cxx  |4 +-
 cppuhelper/source/component_context.cxx  |6 +--
 cppuhelper/source/factory.cxx|4 +-
 cppuhelper/source/shlib.cxx  |2 -
 cppuhelper/source/tdmgr.cxx  |4 +-
 cppuhelper/source/typemanager.cxx|2 -
 cui/source/customize/SvxConfigPageHelper.cxx |2 -
 cui/source/customize/cfg.cxx |4 +-
 cui/source/dialogs/SignSignatureLineDialog.cxx   |2 -
 cui/source/dialogs/SpellDialog.cxx   |2 -
 cui/source/dialogs/hangulhanjadlg.cxx|2 -
 cui/source/dialogs/insdlg.cxx|2 -
 cui/source/dialogs/screenshotannotationdlg.cxx   |2 -
 cui/source/dialogs/scriptdlg.cxx |2 -
 cui/source/dialogs/thesdlg.cxx   |4 +-
 cui/source/options/cfgchart.cxx  |2 -
 cui/source/options/optlingu.cxx  |   16 -
 cui/source/options/treeopt.cxx   |2 -
 dbaccess/source/core/api/FilteredContainer.cxx   |4 +-
 dbaccess/source/core/api/RowSetCache.cxx |2 -
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx   |2 -
 dbaccess/source/core/dataaccess/ContentHelper.cxx|2 -
 dbaccess/source/core/dataaccess/databasecontext.cxx  |2 -
 dbaccess/source/core/dataaccess/documentcontainer.cxx|6 +--
 dbaccess/source/core/dataaccess/documentdefinition.cxx   |   14 
 dbaccess/source/core/dataaccess/documentevents.cxx   |2 -
 dbaccess/source/core/misc/DatabaseDataProvider.cxx   |6 +--
 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx  |2 -
 dbaccess/source/filter/xml/xmlExport.cxx |   10 +++---
 dbaccess/source/filter/xml/xmlfilter.cxx |2 -
 dbaccess/source/ui/app/AppController.cxx |6 +--
 dbaccess/source/ui/browser/exsrcbrw.cxx  |2 -
 dbaccess/source/ui/browser/unodatbr.cxx  |2 -
 dbaccess/source/ui/dlg/DbAdminImpl.cxx   |2 -
 dbaccess/source/ui/dlg/tablespage.cxx|2 -
 dbaccess/source/ui/misc/DExport.cxx  |2 -
 dbaccess/source/ui/misc/RowSetDrop.cxx   |2 -
 dbaccess/source/ui/misc/TokenWriter.cxx  |8 ++--
 dbaccess/source/ui/misc/WCopyTable.cxx   |4 +-
 dbaccess/source/ui/misc/linkeddocuments.cxx  |2 -
 dbaccess/source/ui/querydesign/querycontroller.cxx   |6 +--
 dbaccess/source/ui/relationdesign/RTableConnectionData.cxx   |2 -
 dbaccess/source/ui/tabledesign/TableController.cxx   |2 -
 dbaccess/source/ui/uno/copytablewizard.cxx   |6 +--
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |4 +-
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx|6 +--
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |2 -
 desktop/source/deployment/manager/dp_informationprovider.cxx |2 -
 desktop/source/deployment/misc/dp_update.cxx |4 +-
 desktop/source/deployment/registry/package/dp_package.cxx|2 -
 desktop/source/lib/init.cxx  |2 -
 desktop/source/migration/migration.cxx   |2 -
 desktop/source/migration/services/oo3extensionmigration.cxx  |2 -
 desktop/source/splash/splash.cxx |2 -
 56 files changed, 108 insertions(+), 108 deletions(-)

New commits:
commit 2ed3d691b42525f6c1cc430d5863febcb102816e
Author: Arkadiy Illarionov 
AuthorDate: Sat May 4 21:20:18 2019 +0300
Commit: Noel Grandin 
CommitDate: Wed Jun 5 19:24:57 2019 +0200

Use hasElements to check Sequence emptiness in cppcanvas..desktop

Similar to clang-tidy readability-container-size-empty

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

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 241443aa39a9..5de65e350bc7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -392,8 +392,8 @@ namespace cppcanvas
 const OutDevState& rState( rParms.mrStates.getState() );
 if( (!rState.isLineColorSe

[Libreoffice-commits] dev-tools.git: scripts/git-cherry-gerrit

2019-06-05 Thread Jan Holesovsky (via logerrit)

 scripts/git-cherry-gerrit |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 317f9b2c09375609306fd7c8ed53b7cb53b1b16b
Author: Jan Holesovsky 
AuthorDate: Wed Jun 5 13:31:20 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Jun 5 13:31:20 2019 +0200

git-cherry-gerrit: Fix typo preventing finding the merge-base correctly.

Without this, it all worked when you were switched to the right branch;
but otherwise was generating empty lists.

Change-Id: If18c31652aa3ffe75c896e5302e89f1621e96aec

diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit
index f1f6e76..5dc7ebb 100755
--- a/scripts/git-cherry-gerrit
+++ b/scripts/git-cherry-gerrit
@@ -21,7 +21,7 @@ fi
 merge_base=$(git merge-base $cherry_from $cherry_to)
 
 if [ -z "$branch_point" ] ; then
-branch_point=${merge_mase}
+branch_point=${merge_base}
 fi
 
 : > /tmp/tohashes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

 sc/source/ui/formdlg/dwfunctr.src |  104 +-
 1 file changed, 36 insertions(+), 68 deletions(-)

New commits:
commit 700260a171ebf6a9d35985eb1cbe31515d9253dd
Author: Matthias Seidel 
AuthorDate: Wed Jun 5 14:43:46 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 5 14:43:46 2019 +

Cleaned up whitespace, removed maskcolor

diff --git a/sc/source/ui/formdlg/dwfunctr.src 
b/sc/source/ui/formdlg/dwfunctr.src
index a96c4dc45e6f..9f1e496330a5 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -20,12 +20,13 @@
  */
 
 
- // include ---
+
+// include ---
 #include "sc.hrc"
 #include "dwfunctr.hrc"
- // pragma 
+// pragma 
 
- // RID_SVXDLG_CALCFUNC --
+// RID_SVXDLG_CALCFUNC --
 DockingWindow FID_FUNCTION_BOX
 {
 Border = TRUE ;
@@ -37,14 +38,14 @@ DockingWindow FID_FUNCTION_BOX
 Zoomable = TRUE ;
 Dockable = TRUE ;
 EnableResizing = TRUE ;
-Size = MAP_APPFONT ( 130 , 160 ) ;
+Size = MAP_APPFONT ( 130, 160 ) ;
 HelpId = HID_FUNCTION_BOX ;
 ListBox CB_CAT
 {
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 20 , 4 ) ;
-Size = MAP_APPFONT ( 56 , 80 ) ;
+Pos = MAP_APPFONT ( 20, 4 ) ;
+Size = MAP_APPFONT ( 56, 80 ) ;
 DropDown = TRUE ;
 AutoSize = TRUE ;
 TabStop = TRUE ;
@@ -52,27 +53,27 @@ DockingWindow FID_FUNCTION_BOX
 AutoHScroll = TRUE ;
 StringList [ en-US ] =
 {
-< "Last Used" ; Default ; > ;
-< "All" ; Default ; > ;
-< "Database" ; Default ; > ;
-< "Date&Time" ; Default ; > ;
-< "Financial" ; Default ; > ;
-< "Information" ; Default ; > ;
-< "Logical" ; Default ; > ;
-< "Mathematical" ; Default ; > ;
-< "Array" ; Default ; > ;
-< "Statistical" ; Default ; > ;
-< "Spreadsheet" ; Default ; > ;
-< "Text" ; Default ; > ;
-< "Add-in" ; Default ; > ;
+< "Last Used" ; Default ; > ;
+< "All" ;   Default ; > ;
+< "Database" ;  Default ; > ;
+< "Date&Time" ; Default ; > ;
+< "Financial" ; Default ; > ;
+< "Information" ;   Default ; > ;
+< "Logical" ;   Default ; > ;
+< "Mathematical" ;  Default ; > ;
+< "Array" ; Default ; > ;
+< "Statistical" ;   Default ; > ;
+< "Spreadsheet" ;   Default ; > ;
+< "Text" ;  Default ; > ;
+< "Add-in" ;Default ; > ;
 };
 };
 ListBox DDLB_FUNC
 {
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 103 , 4 ) ;
-Size = MAP_APPFONT ( 56 , 80 ) ;
+Pos = MAP_APPFONT ( 103, 4 ) ;
+Size = MAP_APPFONT ( 56, 80 ) ;
 Hide = TRUE ;
 TabStop = TRUE ;
 DropDown = TRUE ;
@@ -80,10 +81,10 @@ DockingWindow FID_FUNCTION_BOX
 };
 ListBox LB_FUNC
 {
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 3 , 19 ) ;
-Size = MAP_APPFONT ( 72 , 90 ) ;
+Pos = MAP_APPFONT ( 3, 19 ) ;
+Size = MAP_APPFONT ( 72, 90 ) ;
 TabStop = TRUE ;
 AutoHScroll = TRUE ;
 };
@@ -92,64 +93,31 @@ DockingWindow FID_FUNCTION_BOX
 WordBreak = TRUE ;
 Border = TRUE ;
 SVLook = TRUE ;
-Pos = MAP_APPFONT ( 3 , 115 ) ;
-Size = MAP_APPFONT ( 72 , 40 ) ;
+Pos = MAP_APPFONT ( 3, 115 ) ;
+Size = MAP_APPFONT ( 72, 40 ) ;
 };
 Control FT_SPLIT
 {
-Pos = MAP_APPFONT ( 3 , 110 ) ;
-Size = MAP_APPFONT ( 72 , 3 ) ;
+Pos = MAP_APPFONT ( 3, 110 ) ;
+Size = MAP_APPFONT ( 72, 3 ) ;
 };
 ImageButton IMB_INSERT
 {
-HelpID = "sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT";
-Pos = MAP_APPFONT ( 3 , 4 ) ;
-Size = MAP_APPFONT ( 13 , 13 ) ;
+HelpID = "sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT" ;
+Pos = MAP_APPFONT ( 3, 4 ) ;
+Size = MAP_APPFONT ( 13, 13 ) ;
 TabStop = TRUE ;
 ButtonImage = Image
 {
 ImageBitmap = Bitmap
 {
-

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

 loolwsd.xml.in |5 +++--
 wsd/DocumentBroker.cpp |   13 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 3c927a9f325d74516e6671930de4eb01f2a9b056
Author: Miklos Vajna 
AuthorDate: Wed Jun 5 17:24:05 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 17:28:03 2019 +0200

wsd: allow disabling idlesave and autosave from configuration

The code already assumed a signed integer, but the configuration advertised
unsigned, standardize on signed.

This way it doesn't matter if the "disable" value is zero or a negative
number.

Change-Id: I56632c8a36be01afefdc5f2a35e70bde945d69d3

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 5ffb55ab7..b0fd22464 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -20,8 +20,9 @@
true
 3600
 
-30
-300
+
+30
+300
 0
 0
 8000
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index e45f6bff0..34f520b31 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1046,9 +1046,18 @@ bool DocumentBroker::autoSave(const bool force)
 
 static const int idleSaveDurationMs = 
LOOLWSD::getConfigValue("per_document.idlesave_duration_secs", 30) * 1000;
 static const int autoSaveDurationMs = 
LOOLWSD::getConfigValue("per_document.autosave_duration_secs", 300) * 1000;
+bool save = false;
+// Zero or negative config value disables save.
 // Either we've been idle long enough, or it's auto-save time.
-if (inactivityTimeMs >= idleSaveDurationMs ||
-timeSinceLastSaveMs >= autoSaveDurationMs)
+if (idleSaveDurationMs > 0 && inactivityTimeMs >= idleSaveDurationMs)
+{
+save = true;
+}
+if (autoSaveDurationMs > 0 && timeSinceLastSaveMs >= 
autoSaveDurationMs)
+{
+save = true;
+}
+if (save)
 {
 LOG_TRC("Sending timed save command for [" << _docKey << "].");
 sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/true,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/layout/tabfrm.cxx |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 58ccc484c565ad9b275873738f705f7dd750e305
Author: Michael Stahl 
AuthorDate: Tue Jun 4 18:01:24 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 16:47:54 2019 +0200

tdf#125685 sw: disregard footnotes in follow table on table split

The first problem here is that the table isn't fully formatted; it fails
with:

warn:legacy.osl:22975:22975:sw/source/core/layout/tabfrm.cxx:2639: debug 
assertion:  - format of table lowers suppressed by fix 
i44910

The situation is that there is a big table split across pages; the first
line of the table would fit onto the previous page so its follow frame
moves backward and then the table frame tries to split again.

During SwTabFrame::Split(), all the frames in the table are formatted,
and at that point a footnote that was on the next page is moved to this
page.

A nested table frame also splits, such that it fits inside the page...
but then the split of the outer table fails by 5 twips, because the
moved footnote has reduced the space available for the outer table.

The footnote is anchored in the inner table's follow frame, which would
be moved to the next page anyway, taking the footnote with it.

Fix this in lcl_RecalcSplitLine() by checking for footnotes that are
anchored in the follow frame of the top-level table being split, and
adding their height to the available space on the page.

Fixing the first problem avoids the crash as well; the crash happens
since 18765b9fa739337d2d891513f6e2fb7c3ce23b50 and it's rather hard to
avoid it in a situation where formatting starts at the end and recurses
into an unformatted table preceding it, which isn't supposed to happen.

Change-Id: I85286583c1c4930468a1c283afc98504cd35bb71
Reviewed-on: https://gerrit.libreoffice.org/73465
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e37ffdd118da2d21c5e78e8c7b67252d0d1adc8c)
Reviewed-on: https://gerrit.libreoffice.org/73536
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d93d82de8725031cbe9b47046081328674cbead4)
Reviewed-on: https://gerrit.libreoffice.org/73552
Tested-by: Michael Stahl 

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index fcdec1a97a69..18e000192549 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -710,7 +711,39 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 // #i26945# - include check, if objects fit
 const SwTwips nDistanceToUpperPrtBottom =
 aRectFnSet.BottomDist(rTab.getFrameArea(), 
aRectFnSet.GetPrtBottom(*rTab.GetUpper()));
-if ( nDistanceToUpperPrtBottom < 0 || !rTab.DoesObjsFit() )
+// tdf#125685 ignore footnotes that are anchored in follow-table of this
+// table - if split is successful they move to the next page/column anyway
+assert(rTab.GetFollow() == rFollowLine.GetUpper());
+SwTwips nFollowFootnotes(0);
+// actually there should always be a boss frame, except if "this" isn't
+// connected to a page yet; not sure if that can happen
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote = 
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();
+if (pTab)
+{
+while (pTab->GetUpper()->IsInTab())
+{
+pTab = pTab->GetUpper()->FindTabFrame();
+}
+// TODO currently do this only for top-level tables?
+// otherwise would need to check rTab's follow and any 
upper table's follow?
+if (pTab == rTab.GetFollow())
+{
+nFollowFootnotes += 
aRectFnSet.GetHeight(pFootnote->getFrameArea());
+}
+}
+}
+}
+}
+if (nDistanceToUpperPrtBottom + nFollowFootnotes < 0 || 
!rTab.DoesObjsFit())
 bRet = false;
 
 // 2. Check if each cell in the last line has at least one content frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/unodraw/UnoGraphicExporter.cxx |   66 +++---
 1 file changed, 35 insertions(+), 31 deletions(-)

New commits:
commit 6c31c2b01dd32cc7ba1230f2c4a98b8f7def219b
Author: Xisco Fauli 
AuthorDate: Mon Jun 3 16:36:23 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 16:28:20 2019 +0200

tdf#125062: distort hairline borders only if selection is used

Regression from 046df0a876b3d948bb1e14443c00c180bc8cccaa

Use the fix for tdf#105998 only when 'selection' option is checked
in the save dialog

Change-Id: I8c4127c780736408e905ead48e0d3ee6ae149197
Reviewed-on: https://gerrit.libreoffice.org/73391
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 78a5585061b9..3b8b1d4fa183 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -180,7 +180,7 @@ namespace {
 
 /** creates a bitmap that is optionally transparent from a metafile
 */
-BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, const Size* pSize 
)
+BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf,bool bIsSelection, 
const Size* pSize )
 {
 // use new primitive conversion tooling
 basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
@@ -213,35 +213,39 @@ namespace {
 
 if(!aRect.IsEmpty())
 {
-// tdf#105998 Correct the Metafile using information from it's 
real sizes measured
-// using rMtf.GetBoundRect above and a copy
-const Size aOnePixelInMtf(
-Application::GetDefaultDevice()->PixelToLogic(
-Size(1, 1),
-rMtf.GetPrefMapMode()));
 GDIMetaFile aMtf(rMtf);
-const Size aHalfPixelInMtf(
-(aOnePixelInMtf.getWidth() + 1) / 2,
-(aOnePixelInMtf.getHeight() + 1) / 2);
-const bool bHairlineBR(
-!aHairlineRect.IsEmpty() && (aRect.Right() == 
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
-
-// Move the content to (0,0), usually TopLeft ist slightly
-// negative. For better visualization, add a half pixel, too
-aMtf.Move(
-aHalfPixelInMtf.getWidth() - aRect.Left(),
-aHalfPixelInMtf.getHeight() - aRect.Top());
-
-// Do not Scale, but set the PrefSize. Some levels deeper the
-// MetafilePrimitive will add a mapping to the decomposition
-// (and possibly a clipping) to map the graphic content to
-// a unit coordinate system.
-// Size is the measured size plus one pixel if needed (bHairlineBR)
-// and the moved half pixwel from above
-aMtf.SetPrefSize(
-Size(
-aRect.getWidth() + (bHairlineBR ? 
aOnePixelInMtf.getWidth() : 0) + aHalfPixelInMtf.getWidth(),
-aRect.getHeight() + (bHairlineBR ? 
aOnePixelInMtf.getHeight() : 0) + aHalfPixelInMtf.getHeight()));
+
+if (bIsSelection)
+{
+// tdf#105998 Correct the Metafile using information from it's 
real sizes measured
+// using rMtf.GetBoundRect above and a copy
+const Size aOnePixelInMtf(
+Application::GetDefaultDevice()->PixelToLogic(
+Size(1, 1),
+rMtf.GetPrefMapMode()));
+const Size aHalfPixelInMtf(
+(aOnePixelInMtf.getWidth() + 1) / 2,
+(aOnePixelInMtf.getHeight() + 1) / 2);
+const bool bHairlineBR(
+!aHairlineRect.IsEmpty() && (aRect.Right() == 
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
+
+// Move the content to (0,0), usually TopLeft ist slightly
+// negative. For better visualization, add a half pixel, too
+aMtf.Move(
+aHalfPixelInMtf.getWidth() - aRect.Left(),
+aHalfPixelInMtf.getHeight() - aRect.Top());
+
+// Do not Scale, but set the PrefSize. Some levels deeper the
+// MetafilePrimitive will add a mapping to the decomposition
+// (and possibly a clipping) to map the graphic content to
+// a unit coordinate system.
+// Size is the measured size plus one pixel if needed 
(bHairlineBR)
+// and the moved half pixwel from above
+aMtf.SetPrefSize(
+Size(
+aRect.getWidth() + (bHairlineBR ? 
aOnePixelInMtf.getWidth() : 0) + aHalfPixelInMtf.getWidth(),
+aRect.getHeight() + (bHairlineBR ? 
aOnePixelInMtf.getHeight() : 0) + aHalfPixelInMtf.getHeight()));
+}
 
 return convertMetafileToB

Re: Need for new x86 Jenkin's Bot

2019-06-05 Thread Luke Benes

Christian,

Our concern is that by scuttling @87, we will lose important diversity in TDF's 
testing infrastructure. While upgrading @87 does address this, it is not what 
we are asking for.

Why have you chosen to not upgrade @87 like you have the others? Master will 
build on x86 Fedora 30, Cent OS 7, and should on Cent OS 6 with the 
devtoolset-7 found here: 
https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-i386/


I can help you with this or setting up a new Jenkins bot. However, I cannot 
provide the hardware nor network resources for this purpose. Providing 
resources to keep our codebase healthy is at the heart of TDF’s mission.  If 
@87 can not longer be used for baseline binaries, it should be used for this 
purpose.

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

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-2' - 88 commits - avmedia/source chart2/qa chart2/source connectivity/registry connectivity/source cui/source cui/uiconfig dbaccess/sou

 avmedia/source/gstreamer/gstplayer.cxx|   
84 +
 avmedia/source/gstreamer/gstplayer.hxx|
3 
 chart2/qa/extras/chart2dump/chart2dump.cxx|
1 
 chart2/qa/extras/chart2dump/data/tdf118150.xlsx   
|binary
 chart2/qa/extras/chart2dump/reference/axislabeltest/tdf118150.txt |  
216 ++
 chart2/qa/extras/chart2import.cxx |   
23 
 chart2/qa/extras/data/pptx/tdf122765.pptx 
|binary
 chart2/source/view/main/ChartView.cxx |
4 
 connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu |
4 
 connectivity/source/commontools/TIndex.cxx|
4 
 connectivity/source/commontools/TKey.cxx  |
2 
 connectivity/source/drivers/ado/AGroup.cxx|
2 
 connectivity/source/drivers/ado/AIndex.cxx|
2 
 connectivity/source/drivers/ado/AKey.cxx  |
2 
 connectivity/source/drivers/ado/AUser.cxx |
2 
 connectivity/source/drivers/dbase/DIndex.cxx  |
2 
 cui/source/dialogs/about.cxx  |
2 
 cui/source/dialogs/cuicharmap.cxx |
8 
 cui/source/inc/align.hxx  |   
12 
 cui/source/tabpages/align.cxx |   
48 
 cui/source/tabpages/autocdlg.cxx  |
3 
 cui/source/tabpages/transfrm.cxx  |
2 
 cui/uiconfig/ui/acorreplacepage.ui|
5 
 dbaccess/source/core/api/TableDeco.cxx|
2 
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx   |   
16 
 dbaccess/source/core/dataaccess/ComponentDefinition.hxx   |
3 
 dbaccess/source/core/inc/TableDeco.hxx|
7 
 dbaccess/source/ui/misc/singledoccontroller.cxx   |   
12 
 desktop/source/app/cmdlinehelp.cxx|   
14 
 distro-configs/Jenkins/linux_clang_dbgutil_64 |
1 
 distro-configs/Jenkins/linux_gcc_release_64   |
2 
 download.lst  |
4 
 external/curl/zlib.patch.0|   
10 
 external/libcdr/ExternalProject_libcdr.mk |
1 
 external/libqxp/ExternalProject_libqxp.mk |
1 
 formula/source/ui/dlg/formula.cxx |
2 
 i18npool/source/localedata/data/ko_KR.xml |
4 
 include/connectivity/sdbcx/VGroup.hxx |
3 
 include/connectivity/sdbcx/VIndex.hxx |
3 
 include/connectivity/sdbcx/VKey.hxx   |
3 
 include/connectivity/sdbcx/VUser.hxx  |
3 
 include/oox/drawingml/shape.hxx   |
2 
 include/oox/export/drawingml.hxx  |
5 
 include/sfx2/charmapcontrol.hxx   |
4 
 include/vcl/sysdata.hxx   |
2 
 officecfg/registry/data/org/openoffice/Office/Writer.xcu  |
3 
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs|
4 
 oox/source/drawingml/chart/titleconverter.cxx |
3 
 oox/source/drawingml/diagram/diagram.cxx  |   
53 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx   |  
116 -
 oox/source/drawingml/diagram/layoutatomvisitors.cxx   |   
38 
 oox/source/drawingml/shape.cxx|
9 
 oox/source/export/drawingml.cxx   |  
324 
 oox/source/shape/ShapeContextHandler.cxx  |
8 
 oox/source/token/tokens.txt   |
1 
 sc/source/core/tool/interpr4.cxx  |   
27 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx  |   
55 
 sd/qa/unit/data/pptx/group.pptx   
|binary
 sd/qa/unit/data/pptx/smartart-background-drawingml-fallback.pptx  
|binary
 sd/qa/unit/data/pptx/smartart-back

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

 sw/source/core/layout/tabfrm.cxx |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

New commits:
commit d93d82de8725031cbe9b47046081328674cbead4
Author: Michael Stahl 
AuthorDate: Tue Jun 4 18:01:24 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Jun 5 15:29:00 2019 +0200

tdf#125685 sw: disregard footnotes in follow table on table split

The first problem here is that the table isn't fully formatted; it fails
with:

warn:legacy.osl:22975:22975:sw/source/core/layout/tabfrm.cxx:2639: debug 
assertion:  - format of table lowers suppressed by fix 
i44910

The situation is that there is a big table split across pages; the first
line of the table would fit onto the previous page so its follow frame
moves backward and then the table frame tries to split again.

During SwTabFrame::Split(), all the frames in the table are formatted,
and at that point a footnote that was on the next page is moved to this
page.

A nested table frame also splits, such that it fits inside the page...
but then the split of the outer table fails by 5 twips, because the
moved footnote has reduced the space available for the outer table.

The footnote is anchored in the inner table's follow frame, which would
be moved to the next page anyway, taking the footnote with it.

Fix this in lcl_RecalcSplitLine() by checking for footnotes that are
anchored in the follow frame of the top-level table being split, and
adding their height to the available space on the page.

Fixing the first problem avoids the crash as well; the crash happens
since 18765b9fa739337d2d891513f6e2fb7c3ce23b50 and it's rather hard to
avoid it in a situation where formatting starts at the end and recurses
into an unformatted table preceding it, which isn't supposed to happen.

Change-Id: I85286583c1c4930468a1c283afc98504cd35bb71
Reviewed-on: https://gerrit.libreoffice.org/73465
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e37ffdd118da2d21c5e78e8c7b67252d0d1adc8c)
Reviewed-on: https://gerrit.libreoffice.org/73536
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 1a28e325e789..75c0c7444d1e 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -711,7 +712,39 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 // #i26945# - include check, if objects fit
 const SwTwips nDistanceToUpperPrtBottom =
 aRectFnSet.BottomDist(rTab.getFrameArea(), 
aRectFnSet.GetPrtBottom(*rTab.GetUpper()));
-if ( nDistanceToUpperPrtBottom < 0 || !rTab.DoesObjsFit() )
+// tdf#125685 ignore footnotes that are anchored in follow-table of this
+// table - if split is successful they move to the next page/column anyway
+assert(rTab.GetFollow() == rFollowLine.GetUpper());
+SwTwips nFollowFootnotes(0);
+// actually there should always be a boss frame, except if "this" isn't
+// connected to a page yet; not sure if that can happen
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote = 
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();
+if (pTab)
+{
+while (pTab->GetUpper()->IsInTab())
+{
+pTab = pTab->GetUpper()->FindTabFrame();
+}
+// TODO currently do this only for top-level tables?
+// otherwise would need to check rTab's follow and any 
upper table's follow?
+if (pTab == rTab.GetFollow())
+{
+nFollowFootnotes += 
aRectFnSet.GetHeight(pFootnote->getFrameArea());
+}
+}
+}
+}
+}
+if (nDistanceToUpperPrtBottom + nFollowFootnotes < 0 || 
!rTab.DoesObjsFit())
 bRet = false;
 
 // 2. Check if each cell in the last line has at least one content frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   10 --
 sw/source/filter/ww8/docxattributeoutput.cxx |   25 +
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
 3 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 1d9513ee4036c5af93a263aeb173dbc7d74e843e
Author: László Németh 
AuthorDate: Tue Jun 4 13:06:33 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 14:54:44 2019 +0200

tdf#70234 DOCX: export tracked deletion of fields

Multiple runs of a field weren't exported as
tracked deletion, resulting bad DOCX export
with reappearing deleted fields in LO and
invalid document in MSO.

Change-Id: I2a1957371b78e0af60d8bf3944a1c28abe8ba0cc
Reviewed-on: https://gerrit.libreoffice.org/73438
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit caf2f5fff39caf06204f71d0c2276b415ef047c3)
Reviewed-on: https://gerrit.libreoffice.org/73539

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index f7e69073085c..3864ecede42f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -852,8 +852,14 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, "tdf70234.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-// import fields with tracked deletion
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:fldChar");
+// import field with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r[1]/w:fldChar");
+
+// export multiple runs of a field with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r", 6);
+
+// export w:delInstrText
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:delInstrText");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 472649c7585a..5a0b1708c6f5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1502,6 +1502,7 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, bool /
 m_pSerializer->endElementNS( XML_w, XML_r );
 
 // if there is some redlining in the document, output it
+// (except in the case of fields with multiple runs)
 EndRedline( m_pRedlineData );
 
 // enclose in a sdt block, if necessary: if one is already started, then 
don't do it for now
@@ -1543,7 +1544,10 @@ void DocxAttributeOutput::EndRun(const SwTextNode* 
pNode, sal_Int32 nPos, bool /
 
 WritePendingPlaceholder();
 
-m_pRedlineData = nullptr;
+if ( !m_bWritingField )
+{
+m_pRedlineData = nullptr;
+}
 
 if ( m_closeHyperlinkInThisRun )
 {
@@ -1602,6 +1606,11 @@ void DocxAttributeOutput::EndRun(const SwTextNode* 
pNode, sal_Int32 nPos, bool /
 }
 }
 
+if ( m_pRedlineData )
+{
+EndRedline( m_pRedlineData );
+m_pRedlineData = nullptr;
+}
 
 DoWriteBookmarksStart(m_rFinalBookmarksStart);
 DoWriteBookmarksEnd(m_rFinalBookmarksEnd);
@@ -1908,6 +1917,8 @@ void DocxAttributeOutput::StartField_Impl( const 
SwTextNode* pNode, sal_Int32 nP
 }
 else
 {
+m_bWritingField = true;
+
 // Write the field start
 if ( rInfos.pField && (rInfos.pField->Which() == 
SwFieldIds::DateTime) && rInfos.pField->GetSubType() & FIXEDFLD )
 {
@@ -1946,9 +1957,13 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& 
rCmd )
 m_aSeqBookmarksNames[sSeqName].push_back(m_sLastOpenedBookmark);
 }
 // Write the Field command
-m_pSerializer->startElementNS(XML_w, XML_instrText);
+sal_Int32 nTextToken = XML_instrText;
+if ( m_pRedlineData && m_pRedlineData->GetType() == RedlineType::Delete )
+nTextToken = XML_delInstrText;
+
+m_pSerializer->startElementNS(XML_w, nTextToken);
 m_pSerializer->writeEscaped( rCmd );
-m_pSerializer->endElementNS( XML_w, XML_instrText );
+m_pSerializer->endElementNS( XML_w, nTextToken );
 
 }
 
@@ -2147,6 +2162,7 @@ void DocxAttributeOutput::EndField_Impl( const 
SwTextNode* pNode, sal_Int32 nPos
 // Write the Field end
 if ( rInfos.bClose  )
 {
+m_bWritingField = false;
 m_pSerializer->startElementNS(XML_w, XML_r);
 DoWriteFieldRunProperties( pNode, nPos );
 m_pSerializer->singleElementNS(XML_w, XML_fldChar, FSNS(XML_w, 
XML_fldCharType), "end");
@@ -3041,7 +3057,7 @@ void DocxAttributeOutput::StartRedline( const 
SwRedlineData * pRedlineData )
 
 void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData )
 {
-if ( !pRedlineData )
+if ( !pRedlineData || m_bWritingField )
 return;
 
 switch ( pRedlineD

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 65610498bf3d0f63db7cd5b292b6724f7a4da51c
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:29:27 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 5 14:46:30 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Prevent L10n issue when building Help

Pootle does not convert back < and > into the same entities, thus
disturbing XML parsing of string. Changed to ().

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

diff --git a/helpcontent2 b/helpcontent2
index 1ae3459c9c29..dcedbce9f56f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1ae3459c9c2983eb3718927da090670c702d44a3
+Subproject commit dcedbce9f56f3a315db998e69b5fe5925ae189a6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 3e337f918a2325c5af89626b13ce0fd2bfa60bcb
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:11:54 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 5 14:46:10 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#124582 Change Outline to Chapter in Help page

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

diff --git a/helpcontent2 b/helpcontent2
index 41a83520a0f8..1ae3459c9c29 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 41a83520a0f8a1a84619324291d3b1c1e2a2ee15
+Subproject commit 1ae3459c9c2983eb3718927da090670c702d44a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit dcedbce9f56f3a315db998e69b5fe5925ae189a6
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:29:27 2019 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 5 14:46:30 2019 +0200

Prevent L10n issue when building Help

Pootle does not convert back < and > into the same entities, thus
disturbing XML parsing of string. Changed to ().

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

diff --git a/source/text/sbasic/python/python_programming.xhp 
b/source/text/sbasic/python/python_programming.xhp
index 888ed96b4..5efa8df15 100644
--- a/source/text/sbasic/python/python_programming.xhp
+++ b/source/text/sbasic/python/python_programming.xhp
@@ -77,7 +77,7 @@
 Module import
 XSCRIPTCONTEXT is not provided to 
imported modules.
 
-%PRODUCTNAME Basic libraries 
contain classes, routines and variables, Python modules contain classes, 
functions and variables. Common pieces of reusable Python or UNO features must 
be stored in My macros within /Scripts/python/pythonpath. Python libraries help organize 
modules in order to prevent module name collisions. Import 
uno.py inside shared modules.
+%PRODUCTNAME Basic libraries 
contain classes, routines and variables, Python modules contain classes, 
functions and variables. Common pieces of reusable Python or UNO features must 
be stored in My macros within (User 
Profile)/Scripts/python/pythonpath. Python libraries help organize 
modules in order to prevent module name collisions. Import 
uno.py inside shared modules.
 
 Genuine BASIC UNO facilities can be 
inferred using uno.py module. Use Python interactive shell to get a complete module description 
using dir() and help() Python 
commands.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/swriter/guide/insert_tab_innumbering.xhp |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 1ae3459c9c2983eb3718927da090670c702d44a3
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 09:11:54 2019 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 5 14:46:10 2019 +0200

tdf#124582 Change Outline to Chapter in Help page

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

diff --git a/source/text/swriter/guide/insert_tab_innumbering.xhp 
b/source/text/swriter/guide/insert_tab_innumbering.xhp
index f9b657d13..2c43dd50d 100644
--- a/source/text/swriter/guide/insert_tab_innumbering.xhp
+++ b/source/text/swriter/guide/insert_tab_innumbering.xhp
@@ -24,7 +24,7 @@

 
 
-Changing the Outline Level of Numbered and 
Bulleted Lists
+Changing the Chapter Level of Numbered and 
Bulleted Lists
 /text/swriter/guide/insert_tab_innumbering.xhp
 
 
@@ -32,23 +32,23 @@
 tab stops; inserting in lists
 numbering; changing the level of
 lists;changing levels
-levels;changing outline levels
+levels;changing chapter levels
 bullet lists;changing levels
-lowering outline levels
-rising outline levels
-changing;outline levels
+lowering chapter levels
+rising chapter levels
+changing;chapter levels
 
-Changing the Outline Level of Numbered 
and Bulleted Lists
+Changing the Chapter Level of Numbered 
and Bulleted Lists
 
 
 
-To move a 
numbered or bulleted paragraph down one outline level, click at the beginning 
of the paragraph, and then press Tab.
+To move a 
numbered or bulleted paragraph down one chapter level, click at the beginning 
of the paragraph, and then press Tab.
 
 
-To move a 
numbered or bulleted paragraph up one outline level, click at the beginning of 
the paragraph, and then press Shift+Tab.
+To move a 
numbered or bulleted paragraph up one chapter level, click at the beginning of 
the paragraph, and then press Shift+Tab.
 
 
-To insert a tab 
between the number or bullet and the paragraph text, click at the beginning of 
the paragraph, and then press Command 
+To insert a tab 
between the number or bullet and the paragraph text, click at the beginning of 
the paragraph, and then press Command
 
Ctrl+Tab.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 69aef611fab69df386ced8408aa2704d73e7fcb5
Author: Xisco Fauli 
AuthorDate: Wed May 29 11:19:57 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 14:42:52 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
(cherry picked from commit ebae54a6fde07a08e0b666b56dbd654691e5c416)
Reviewed-on: https://gerrit.libreoffice.org/73543
Tested-by: Michael Stahl 

diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index a57883ba2ba2..c80f6974be9e 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: Branch 'libreoffice-6-2' - vcl/source

2019-06-05 Thread Mark Hung (via logerrit)

 vcl/source/gdi/CommonSalLayout.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ff8b31743305635b968b0a0f21c2778a29c0ce03
Author: Mark Hung 
AuthorDate: Sun Jun 2 10:00:41 2019 +0800
Commit: Michael Stahl 
CommitDate: Wed Jun 5 14:35:01 2019 +0200

tdf#107487 fix font fallback for non-BMP characters.

Non-BMP characters use two sal_Unicodes. It is necessary
to advnace with OUString::iterateCodePoints safely instead of
nCharPos + 1.

Change-Id: Iea1005f05421b1021a9b3ff611439357d4dcba9e
Reviewed-on: https://gerrit.libreoffice.org/73326
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 
(cherry picked from commit 16faad3657fad114aa984f92a14a5f212a2f8ff5)
Reviewed-on: https://gerrit.libreoffice.org/73537
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 9a638663d1ca..763546346459 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -190,12 +190,14 @@ void GenericSalLayout::SetNeedFallback(ImplLayoutArgs& 
rArgs, sal_Int32 nCharPos
 //mark all glyphs as missing so the whole thing is rendered with the same
 //font
 sal_Int32 nDone;
-sal_Int32 nGraphemeStartPos =
-mxBreak->previousCharacters(rArgs.mrStr, nCharPos + 1, aLocale,
-i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 sal_Int32 nGraphemeEndPos =
 mxBreak->nextCharacters(rArgs.mrStr, nCharPos, aLocale,
 i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
+// Safely advance nCharPos in case it is a non-BMP character.
+rArgs.mrStr.iterateCodePoints(&nCharPos);
+sal_Int32 nGraphemeStartPos =
+mxBreak->previousCharacters(rArgs.mrStr, nCharPos, aLocale,
+i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 
 rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 3 commits - brand/cib configure.ac icon-themes/cib icon-themes/cib_svg instsetoo_native/util sysui/desktop

2019-06-05 Thread Marina Latini (CIB) (via logerrit)

Rebased ref, commits from common ancestor:
commit 202bf0d5bac6cb03196b4ca7ab974bae089beab5
Author: Marina Latini (CIB) 
AuthorDate: Mon May 20 15:18:34 2019 +0200
Commit: Katarina Behrens 
CommitDate: Wed Jun 5 14:11:08 2019 +0200

Final CIB branding and last edits to config files

Change-Id: Id583453910f50839dbe1f114afc5c6a4aa6c2e07

diff --git a/brand/cib/Image.svg b/brand/cib/Image.svg
new file mode 100644
index ..369941585b61
--- /dev/null
+++ b/brand/cib/Image.svg
@@ -0,0 +1,306 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 162 312"
+   xml:space="preserve"
+   id="svg3336"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="Image.svg"
+   width="162"
+   height="312"
+   
inkscape:export-filename="C:\cygwin\home\Marina\lode\dev\FLOSS-194\instsetoo_native\inc_common\windows\msi_templates\Binary\ImageBanner.bmp.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+
+   .st0{display:none;}
+   .st1{display:inline;}
+   .st2{fill:#5FA243;}
+   .st3{fill:#FF;}
+   .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF;}
+   .st5{fill:#C12521;}
+   .st6{clip-path:url(#SVGID_2_);fill:#FF;}
+   .st7{display:inline;fill:#5FA243;}
+   .st8{display:inline;fill:#C12521;}
+   .st9{display:inline;fill:#FF;}
+   .st10{clip-path:url(#SVGID_4_);fill:#FF;}
+   .st11{font-family:'CIBUnit';}
+   .st12{font-size:17px;}
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   powered
 by
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/brand/cib/banner.svg b/brand/cib/banner.svg
new file mode 100644
index ..9b03d38ea183
--- /dev/null
+++ b/brand/cib/banner.svg
@@ -0,0 +1,306 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 499 58"
+   xml:space="preserve"
+   id="svg3336"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="banner.svg"
+   width="499"
+   height="58"
+   
inkscape:export-filename="C:\cygwin\home\Marina\lode\dev\FLOSS-194\brand\cib\intro-highres.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+
+   .st0{display:none;}
+   .st1{display:inline;}
+   .st2{fill:#5FA243;}
+   .st3{fill:#FF;}
+   .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF;}
+   .st5{fill:#C12521;}
+   .st6{clip-path:url(#SVGID_2_);fill:#FF;}
+   .st7{display:inline;fill:#5FA243;}
+   .st8{display:inline;fill:#C12521;}
+   .st9{display:inline;fill:#FF;}
+   .st10{clip-path:url(#SVGID_4_);fill:#FF;}
+   .st11{font-family:'CIBUnit';}
+   .st12{font-size:17px;}
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+

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

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

New commits:
commit 9dcfca99d53eff4f10de648bf9f8d30ddab7a0b7
Author: Xisco Fauli 
AuthorDate: Wed May 29 11:19:57 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 14:13:38 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
(cherry picked from commit ebae54a6fde07a08e0b666b56dbd654691e5c416)
Reviewed-on: https://gerrit.libreoffice.org/73543
Tested-by: Michael Stahl 

diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index a57883ba2ba2..c80f6974be9e 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: Branch 'libreoffice-6-3' - README.md

2019-06-05 Thread Christian Lohmaier (via logerrit)

 README.md |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff7207d02ef95538507875ef26c753e077aa90dd
Author: Christian Lohmaier 
AuthorDate: Wed Jun 5 12:17:14 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Jun 5 13:50:08 2019 +0200

baseline is CentOS/RHEL 7 (glibc 2.14 or later)

Change-Id: Ie796a5c8f36b33c61eb69b6b68f7439f9359526f
(cherry picked from commit b1a17c2d3f35ed801d745785fdeb7cf1ea2e1c60)

diff --git a/README.md b/README.md
index ddfe9a760a47..6234096389c0 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: 10.10
 * Build: 10.13.2 + Xcode 9.3
 * Linux:
-* Runtime: RHEL 6 or CentOS 6
+* Runtime: RHEL 7 or CentOS 7
 * Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0
 * iOS (only for LibreOfficeKit):
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl offapi/com sw/source vcl/source vcl/workben

2019-06-05 Thread Olivier R (via logerrit)

 include/vcl/outdev.hxx|2 -
 offapi/com/sun/star/text/TextMarkupDescriptor.idl |4 ++
 sw/source/core/inc/wrong.hxx  |   22 ++-
 sw/source/core/txtnode/fntcache.cxx   |   31 +-
 vcl/source/outdev/textline.cxx|7 ++--
 vcl/workben/outdevgrind.cxx   |9 --
 6 files changed, 52 insertions(+), 23 deletions(-)

New commits:
commit cdd69ce780dc7758047a27ed3c76bdc01b5ffb89
Author: Olivier R 
AuthorDate: Mon Jun 3 20:33:21 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 13:58:23 2019 +0200

Linguistic: new underlining styles for grammar checkers

This patch adds two new underlining styles:
- BOLDWAVE: a thicker version of the default WAVE style
- BOLD: a thick straight line

No default setting changed. It's up to the grammar checkers to specify
the underlining style they want.

This contribution to LibreOffice is licensed under the MPLv2/LGPLv3+ dual 
license.

modified : include/vcl/outdev.hxx
modified : offapi/com/sun/star/text/TextMarkupDescriptor.idl
modified : sw/source/core/inc/wrong.hxx
modified : sw/source/core/txtnode/fntcache.cxx
modified : vcl/source/outdev/textline.cxx
modified : vcl/workben/outdevgrind.cxx

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8e79c0f646ee..8f8c009fa291 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -988,7 +988,7 @@ public:
 voidImplDrawTextLines( SalLayout&, FontStrikeout 
eStrikeout, FontLineStyle eUnderline,
FontLineStyle eOverline, 
bool bWordLine, bool bUnderlineAbove );
 
-voidDrawWaveLine( const Point& rStartPos, const 
Point& rEndPos );
+voidDrawWaveLine( const Point& rStartPos, const 
Point& rEndPos, long nLineWidth = 1 );
 
 boolImplDrawRotateText( SalLayout& );
 
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl 
b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
index f78cb28c07ce..2afd054a74aa 100644
--- a/offapi/com/sun/star/text/TextMarkupDescriptor.idl
+++ b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
@@ -54,7 +54,9 @@ struct TextMarkupDescriptor
 nType | aKey
 - | -
 PROOFREADING or SMARTTAG  | "LineColor": changes the markup color from 
default to RGB aValue (int32)
-PROOFREADING or SMARTTAG  | "LineType": changes the wiggly line type 
from default to aValue (short) (WAVE or DASH)
+PROOFREADING or SMARTTAG  | "LineType": changes the underlining style 
to aValue (short): WAVE, DASH
+  | @since 6.3: BOLDWAVE, BOLD
+  | See: com::sun::star::awt::FontUnderline
 */
 com::sun::star::container::XStringKeyMap xMarkupInfoContainer;
 };
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 3fe7cb7bf75b..53581720e853 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -47,9 +47,11 @@ class SwWrongList;
 
 enum WrongAreaLineType
 {
-WRONGAREA_DASHED,
+WRONGAREA_NONE,
 WRONGAREA_WAVE,
-WRONGAREA_NONE
+WRONGAREA_BOLDWAVE,
+WRONGAREA_BOLD,
+WRONGAREA_DASHED
 };
 
 enum WrongListType
@@ -125,6 +127,14 @@ private:
 {
 return WRONGAREA_WAVE;
 }
+if (css::awt::FontUnderline::BOLDWAVE == lineType)
+{
+return WRONGAREA_BOLDWAVE;
+}
+if (css::awt::FontUnderline::BOLD == lineType)
+{
+return WRONGAREA_BOLD;
+}
 if (css::awt::FontUnderline::DASH == lineType)
 {
 return WRONGAREA_DASHED;
@@ -189,6 +199,14 @@ private:
 {
 return WRONGAREA_WAVE;
 }
+if (css::awt::FontUnderline::BOLDWAVE == lineType)
+{
+return WRONGAREA_BOLDWAVE;
+}
+if (css::awt::FontUnderline::BOLD == lineType)
+{
+return WRONGAREA_BOLD;
+}
 if (css::awt::FontUnderline::SMALLWAVE == lineType)
 {
 return WRONGAREA_WAVE; //Code draws wave height based on 
space that fits.
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index ed312422a361..871f9ce655ca 100644
--- a/sw/source/core/txtnode/fntcache.cxx

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

 sw/source/core/layout/tabfrm.cxx |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

New commits:
commit b9089b1be5ad1df8949527d28b9ce5840a892d0b
Author: Michael Stahl 
AuthorDate: Tue Jun 4 18:01:24 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 13:48:02 2019 +0200

tdf#125685 sw: disregard footnotes in follow table on table split

The first problem here is that the table isn't fully formatted; it fails
with:

warn:legacy.osl:22975:22975:sw/source/core/layout/tabfrm.cxx:2639: debug 
assertion:  - format of table lowers suppressed by fix 
i44910

The situation is that there is a big table split across pages; the first
line of the table would fit onto the previous page so its follow frame
moves backward and then the table frame tries to split again.

During SwTabFrame::Split(), all the frames in the table are formatted,
and at that point a footnote that was on the next page is moved to this
page.

A nested table frame also splits, such that it fits inside the page...
but then the split of the outer table fails by 5 twips, because the
moved footnote has reduced the space available for the outer table.

The footnote is anchored in the inner table's follow frame, which would
be moved to the next page anyway, taking the footnote with it.

Fix this in lcl_RecalcSplitLine() by checking for footnotes that are
anchored in the follow frame of the top-level table being split, and
adding their height to the available space on the page.

Fixing the first problem avoids the crash as well; the crash happens
since 18765b9fa739337d2d891513f6e2fb7c3ce23b50 and it's rather hard to
avoid it in a situation where formatting starts at the end and recurses
into an unformatted table preceding it, which isn't supposed to happen.

Change-Id: I85286583c1c4930468a1c283afc98504cd35bb71
Reviewed-on: https://gerrit.libreoffice.org/73465
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e37ffdd118da2d21c5e78e8c7b67252d0d1adc8c)
Reviewed-on: https://gerrit.libreoffice.org/73535

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7188751e5b5d..4f9e0880ff50 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -715,7 +716,39 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 // #i26945# - include check, if objects fit
 const SwTwips nDistanceToUpperPrtBottom =
 aRectFnSet.BottomDist(rTab.getFrameArea(), 
aRectFnSet.GetPrtBottom(*rTab.GetUpper()));
-if ( nDistanceToUpperPrtBottom < 0 || !rTab.DoesObjsFit() )
+// tdf#125685 ignore footnotes that are anchored in follow-table of this
+// table - if split is successful they move to the next page/column anyway
+assert(rTab.GetFollow() == rFollowLine.GetUpper());
+SwTwips nFollowFootnotes(0);
+// actually there should always be a boss frame, except if "this" isn't
+// connected to a page yet; not sure if that can happen
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote = 
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();
+if (pTab)
+{
+while (pTab->GetUpper()->IsInTab())
+{
+pTab = pTab->GetUpper()->FindTabFrame();
+}
+// TODO currently do this only for top-level tables?
+// otherwise would need to check rTab's follow and any 
upper table's follow?
+if (pTab == rTab.GetFollow())
+{
+nFollowFootnotes += 
aRectFnSet.GetHeight(pFootnote->getFrameArea());
+}
+}
+}
+}
+}
+if (nDistanceToUpperPrtBottom + nFollowFootnotes < 0 || 
!rTab.DoesObjsFit())
 bRet = false;
 
 // 2. Check if each cell in the last line has at least one content frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/qt5/Qt5Frame.cxx |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit e770bacc85a0eec96de77068d61b03f374b3cdec
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 2 21:01:33 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jun 5 13:22:26 2019 +0200

Qt5 workaround modal change after show bug

The presentation minimizer dialog calls setVisible before execute.
This results in the dialog being shown before setting the modality
in execute. And this triggers a bug in the Qt / Xcb stack (gtk is
fine because it directly uses XSendEvent to change the state).

The result is an unmapped, modal dialog window: it's invisible and
blocks the GUI. Qt believes it's show; isVisible() returns true.

And my ~/.xsession-errors shows a "qt.qpa.xcb: QXcbConnection: XCB
error: 3 (BadWindow) ... major code: 18 (ChangeProperty)" with an
invalid resource id, according to 'xwininfo -tree -root'.
You can find the window resource of the minimizer by its name in
the full root tree and its unmapped state with 'xwininfo -id'.

I originally thought of a Scheduler bug so enabled debug output
for it. This is already responsible for a delay long enough to
prevent the bug often. Same for doing an additional hide() and
show() sequence. In the end I went with a fixed delay, but that
is just a guess. In theory we could check the mapped state via
Xlib in Qt's show event and manually map it using XMapWindow and
the winId...

I also noted that the minimizer leaks, as there are multiple new
presenter resources after each show and hide...

Change-Id: I2060918aa9c63d385ebb2ffee9e7a3e4196ea766
Reviewed-on: https://gerrit.libreoffice.org/73462
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index a9ffbf7756aa..ed8af3f1542d 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -507,21 +508,27 @@ void Qt5Frame::SetModal(bool bModal)
 auto* pSalInst(static_cast(GetSalData()->m_pInstance));
 assert(pSalInst);
 pSalInst->RunInMainThread([this, bModal]() {
-bool wasVisible = windowHandle()->isVisible();
+
+QWidget* const pChild = asChild();
+const bool bWasVisible = pChild->isVisible();
 
 // modality change is only effective if the window is hidden
-if (wasVisible)
+if (bWasVisible)
 {
-windowHandle()->hide();
+pChild->hide();
+if (QGuiApplication::platformName() == "xcb")
+{
+SAL_WARN("vcl.qt5", "SetModal called after Show - apply 
delay");
+// give QXcbConnection some time to recover from unmap
+// ~/.xsession-errors => (BadWindow) (ChangeProperty)
+QThread::msleep(250);
+}
 }
 
-windowHandle()->setModality(bModal ? Qt::WindowModal : 
Qt::NonModal);
+pChild->setWindowModality(bModal ? Qt::WindowModal : Qt::NonModal);
 
-// and shown again if it was visible
-if (wasVisible)
-{
-windowHandle()->show();
-}
+if (bWasVisible)
+pChild->show();
 });
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/inc/qt5/Qt5Instance.hxx  |5 +
 vcl/qt5/Qt5Instance.cxx  |   18 --
 vcl/unx/kde5/KDE5SalInstance.cxx |   25 +++--
 vcl/unx/kde5/KDE5SalInstance.hxx |   20 ++--
 4 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit ca69a1e17782d88580f2449e0252be52c26cae42
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 2 20:17:49 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jun 5 13:21:36 2019 +0200

Qt5/KDE5 always use either Qt5 or KDE5 pickers

And use RunInMain for both SalInstances and for both picker types,
as there is no reason to assume just the file and not the folder
picker can be called from the non-GUI thread.

Little drawback is the inclusion of Qt5FilePicker header in the
Qt5Instance header, as Qt's enums aren't forward-declarable.

Change-Id: Ie170d247a76134df9aff835393c71c9d6e907d32
Reviewed-on: https://gerrit.libreoffice.org/73416
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 52b45b12d2b8..c87f3c93c1ac 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -33,6 +33,8 @@
 #include 
 #include 
 
+#include "Qt5FilePicker.hxx"
+
 class QApplication;
 class SalYieldMutex;
 class SalFrame;
@@ -74,6 +76,9 @@ Q_SIGNALS:
 void ImplRunInMainSignal();
 void deleteObjectLaterSignal(QObject* pObject);
 
+protected:
+virtual Qt5FilePicker* createPicker(QFileDialog::FileMode);
+
 public:
 explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo 
= false);
 virtual ~Qt5Instance() override;
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 0358ecd548a6..52eab795682e 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -394,18 +394,32 @@ void Qt5Instance::ProcessEvent(SalUserEvent aEvent)
 aEvent.m_pFrame->CallCallback(aEvent.m_nEvent, aEvent.m_pData);
 }
 
+Qt5FilePicker* Qt5Instance::createPicker(QFileDialog::FileMode eMode)
+{
+if (!IsMainThread())
+{
+SolarMutexGuard g;
+Qt5FilePicker* pPicker;
+RunInMainThread(std::function([&, this]() { pPicker = 
createPicker(eMode); }));
+assert(pPicker);
+return pPicker;
+}
+
+return new Qt5FilePicker(eMode);
+}
+
 css::uno::Reference
 Qt5Instance::createFilePicker(const 
css::uno::Reference&)
 {
 return css::uno::Reference(
-new Qt5FilePicker(QFileDialog::ExistingFile));
+createPicker(QFileDialog::ExistingFile));
 }
 
 css::uno::Reference
 Qt5Instance::createFolderPicker(const 
css::uno::Reference&)
 {
 return css::uno::Reference(
-new Qt5FilePicker(QFileDialog::Directory));
+createPicker(QFileDialog::Directory));
 }
 
 css::uno::Reference
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index 63ce689518f5..e2bd75277d23 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -50,34 +50,23 @@ SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent, 
SalFrameStyleFlags nSt
 return pRet;
 }
 
-uno::Reference
-KDE5SalInstance::createFilePicker(const 
uno::Reference& xMSF)
+Qt5FilePicker* KDE5SalInstance::createPicker(QFileDialog::FileMode eMode)
 {
 if (!IsMainThread())
 {
 SolarMutexGuard g;
-uno::Reference xRet;
-RunInMainThread(
-std::function([&xRet, this, xMSF]() { xRet = 
this->createFilePicker(xMSF); }));
-assert(xRet);
-return xRet;
+Qt5FilePicker* pPicker;
+RunInMainThread(std::function([&, this]() { pPicker = 
createPicker(eMode); }));
+assert(pPicker);
+return pPicker;
 }
 
 // In order to insert custom controls, KDE5FilePicker currently relies on 
KFileWidget
 // being used in the native file picker, which is only the case for KDE 
Plasma.
 // Therefore, return the plain qt5 one in order to not lose custom 
controls.
 if (Application::GetDesktopEnvironment() == "KDE5")
-{
-return uno::Reference(
-new KDE5FilePicker(QFileDialog::ExistingFile));
-}
-return Qt5Instance::createFilePicker(xMSF);
-}
-
-uno::Reference
-KDE5SalInstance::createFolderPicker(const 
uno::Reference& /*xMSF*/)
-{
-return uno::Reference(new 
KDE5FilePicker(QFileDialog::Directory));
+return new KDE5FilePicker(eMode);
+return Qt5Instance::createPicker(eMode);
 }
 
 extern "C" {
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 11276be3f4ec..53993a5ecc34 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -21,23 +21,15 @@
 
 #include 
 
-class QApplication;
-
-class KDE5SalInstance : public Qt5Instance
+class KDE5SalInstance final : public Qt5Instance
 {
-public:
-explicit KDE5SalInstance(std::unique_ptr& pQApp);
-
-virtual bool hasNativeFileSe

[Libreoffice-commits] core.git: README.md

2019-06-05 Thread Christian Lohmaier (via logerrit)

 README.md |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1a17c2d3f35ed801d745785fdeb7cf1ea2e1c60
Author: Christian Lohmaier 
AuthorDate: Wed Jun 5 12:17:14 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Jun 5 12:17:14 2019 +0200

baseline is CentOS/RHEL 7 (glibc 2.14 or later)

Change-Id: Ie796a5c8f36b33c61eb69b6b68f7439f9359526f

diff --git a/README.md b/README.md
index ddfe9a760a47..6234096389c0 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: 10.10
 * Build: 10.13.2 + Xcode 9.3
 * Linux:
-* Runtime: RHEL 6 or CentOS 6
+* Runtime: RHEL 7 or CentOS 7
 * Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0
 * iOS (only for LibreOfficeKit):
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2019-06-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=79641

Eike Rathke  changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ca1f44e54d6b3f8c946bf7162fc85b2343b7bbd
Author: Andrea Gelmini 
AuthorDate: Sat May 4 08:49:15 2019 +
Commit: andreas_kainz 
CommitDate: Wed Jun 5 12:05:34 2019 +0200

Fix typo

Change-Id: Id77320481846d20fd3f2a8dbdb845a19411baa1d
Reviewed-on: https://gerrit.libreoffice.org/71817
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index c07442b3024e..6f57c490a070 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -14219,7 +14219,7 @@
   
 False
 
-  
+  
 True
 False
 
@@ -14728,7 +14728,7 @@
   
 
 
-  
+  
 True
 False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need for new x86 Jenkin's Bot

2019-06-05 Thread Christian Lohmaier

On Tue, Jun 4, 2019 at 5:01 PM Luke Benes  wrote:
>
> The decision was to demote release builds, but NOT to remove x86 
> compatibility. If you take this as an excuse to also end x86 CI testing bots, 
> you are effectively killing x86 through bit rot.

That is completely missing the point. The tinderbox *IS* using
baseline. And since the baseline is not recent enough to build 32bit
anymore, there is *no way* to have it still produce builds. Otherwise
32bit binaries could still be provided.

> This is not a hypothetical. As you know, @87 just recently caught a 
> regression […]

Anyone is free to setup a tinderbox and send results - no registration
or similar needed for that,
https://wiki.documentfoundation.org/Development/Tinderbox/Setup

> If we chose to go down the path of killing x86, we should discuss it. While I 
> agree that overhead of x86 release build may not be worth it, the advantages 
> of maintaining a working x86 build are clear.  My suggestion would be to 
> upgrade @87 to CentOS 7 or Debian 9.0 before bit rot makes this a difficult 
> task. Currently master has no problem building on 32-bit Fedora 30.

My personal interest is having baseline builds verified. So there is
no point if the build succeeds in a current distro, but cannot run on
the end-users systems because of glibc or other requirements.

But again: anyone can setup a tinderbox...

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

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

2019-06-05 Thread Ashod Nakashian (via logerrit)

 include/tools/link.hxx |   51 +
 1 file changed, 51 insertions(+)

New commits:
commit 7b3d401fe8ec01dbcbe511b51f7022bd080b3e8d
Author: Ashod Nakashian 
AuthorDate: Sun May 12 17:16:27 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Jun 5 11:54:14 2019 +0200

Link: support tracing link source and target

By adding a couple of members to Link, we are
now able to trace the target function name and
the file:line where the Link instance in question
was created (provided the LINK macro is used).

This gives the invaluable ability to track down the
source of a Link instance in the debugger, provided
we have enabled this feature, which is enabled in
DBG_UTIL automatically, unless explicitly enabled.

Of course it is also possible to judiciously add
LOG/fprintf statements to chase this info, if not
outright track all links, if so we wish, by dumping
from Link::Call, or at construction time of Link.

Change-Id: Iab1dce31a179d28aaa1f20228e9e0405973b5e9b
Reviewed-on: https://gerrit.libreoffice.org/73478
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index c4989e0593f3..b127a79054d0 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -67,18 +67,46 @@
 RetType Class::Member( \
 SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER ArgType)
 
+#ifdef DBG_UTIL
+#define XSTRINGIFY(X) #X
+#define STRINGIFY(X) XSTRINGIFY(X)
+#define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
+::tools::detail::castTo(Instance), &Class::LinkStub##Member, 
__FILE__, __LINE__, STRINGIFY(Class::LinkStub##Member))
+#else
 #define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
 ::tools::detail::castTo(Instance), &Class::LinkStub##Member)
+#endif
 
 template
 class SAL_WARN_UNUSED Link {
 public:
 typedef Ret Stub(void *, Arg);
 
+#ifdef DBG_UTIL
+Link()
+: function_(nullptr)
+, instance_(nullptr)
+, file_("unknown")
+, line_(0)
+, target_("unknown")
+{
+}
+
+Link(void* instance, Stub* function, const char* const file = "unknown", 
const int line = 0,
+ const char* const target = "unknown")
+: function_(function)
+, instance_(instance)
+, file_(file)
+, line_(line)
+, target_(target)
+{
+}
+#else
 Link(): function_(nullptr), instance_(nullptr) {}
 
 Link(void * instance, Stub * function):
 function_(function), instance_(instance) {}
+#endif
 
 Ret Call(Arg data) const
 { return function_ == nullptr ? Ret() : (*function_)(instance_, data); }
@@ -103,9 +131,25 @@ public:
 
 void *GetInstance() const { return instance_; }
 
+#ifdef DBG_UTIL
+const char* getSourceFilename() const { return file_; }
+int getSourceLineNumber() const { return line_; }
+const char* getTargetName() const { return target_; }
+#endif
+
 private:
 Stub * function_;
 void * instance_;
+
+#ifdef DBG_UTIL
+/// Support tracing link source and target.
+/// When debugging async events, it's often critical
+/// to find out not only where a link leads (i.e. the target
+/// function), but also where it was created (file:line).
+const char* file_;
+int line_;
+const char* target_;
+#endif
 };
 
 // Class used to indicate that the Call() parameter is not in use:
@@ -118,10 +162,17 @@ namespace tools { namespace detail {
 template To castTo(From from)
 { return static_cast(from); }
 
+#ifdef DBG_UTIL
+template
+Link makeLink(void * instance, Ret (* function)(void *, Arg), const 
char* file, int line, const char* target) {
+return Link(instance, function, file, line, target);
+}
+#else
 template
 Link makeLink(void * instance, Ret (* function)(void *, Arg)) {
 return Link(instance, function);
 }
+#endif
 
 } }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

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

New commits:
commit 60504bffca213f6d5c66d1a2de596c20533b7d9c
Author: Caolán McNamara 
AuthorDate: Wed May 29 15:42:28 2019 +0100
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 11:42:15 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/73174
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index b162b5c67848..bf87ed3aba21 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -875,6 +875,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.
@@ -892,7 +909,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 'distro/collabora/cp-6.0' - sw/qa

 sw/qa/extras/uiwriter/uiwriter2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit eaa76c324afe29f84f6eb30e68ca1ab3a1bf0f61
Author: Andras Timar 
AuthorDate: Wed Jun 5 11:41:49 2019 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 5 11:41:49 2019 +0200

disable SwUiWriterTest2::testTdf122942 on Windows

Change-Id: Ie885224f257916debec85ab4a42435ff606b0acd

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 2da2640e7fcc..b78454a061b4 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -434,6 +434,7 @@ void SwUiWriterTest2::testMixedFormFieldInsertion()
 void SwUiWriterTest2::testTdf122942()
 {
 #ifndef MACOSX
+#ifndef WNT
 load(DATA_DIRECTORY, "tdf122942.odt");
 SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
 SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
@@ -473,6 +474,7 @@ void SwUiWriterTest2::testTdf122942()
 const tools::Rectangle& rOutRect2 = pObject2->GetLastBoundRect();
 CPPUNIT_ASSERT(rOutRect2.Top() > rOutRect1.Top() && rOutRect2.Top() < 
rOutRect1.Bottom());
 #endif
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Tamas Bunth (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |   11 
++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 4b3a1d249748b0589f74fb63a7849edeec543c0f
Author: Tamas Bunth 
AuthorDate: Thu May 30 18:34:03 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 11:30:33 2019 +0200

mysqlc: Add support for mysql type INT24

Which is mapped to sal_Int32.

Change-Id: Ibf12e92a20034440fa990ed0c6f1196f4ca3f40f
Reviewed-on: https://gerrit.libreoffice.org/73217
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 3a4c4482ecdc7a7ef4dd944a49d17a9d30d27b78)
Reviewed-on: https://gerrit.libreoffice.org/73459
Reviewed-by: Xisco Faulí 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index b3630072c143..3b9e4a2aeb57 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace rtl;
 #include 
@@ -66,6 +67,7 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_SHORT:
 return std::type_index(typeid(sal_Int16));
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return std::type_index(typeid(sal_Int32));
 case MYSQL_TYPE_LONGLONG:
 return std::type_index(typeid(sal_Int64));
@@ -88,7 +90,6 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_BLOB:
 case MYSQL_TYPE_YEAR:
 case MYSQL_TYPE_BIT:
-case MYSQL_TYPE_INT24:
 case MYSQL_TYPE_SET:
 case MYSQL_TYPE_ENUM:
 case MYSQL_TYPE_GEOMETRY:
@@ -266,6 +267,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_SHORT:
 return getShort(nColumnIndex);
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return getInt(nColumnIndex);
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
@@ -285,9 +287,10 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_NEWDECIMAL:
 return getString(nColumnIndex);
 default:
-mysqlc_sdbc_driver::throwFeatureNotImplementedException(
-"OPreparedResultSet::getRowSetValue", *this);
-return ORowSetValue();
+SAL_WARN("connectivity.mysqlc", 
"OPreparedResultSet::getRowSetValue: unknown type: "
+<< m_aFields[nColumnIndex - 
1].type);
+throw SQLException("Unknown column type when fetching result", 
*this, OUString(), 1,
+   Any());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cui/source/tabpages/chardlg.cxx  |2 +-
 include/editeng/escapementitem.hxx   |5 +++--
 writerfilter/source/dmapper/DomainMapper.cxx |   16 +---
 xmloff/source/style/escphdl.cxx  |7 ---
 4 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 39e5b45f53ad5c3634450b123e809b3057617806
Author: László Németh 
AuthorDate: Wed May 29 16:36:41 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 11:30:56 2019 +0200

tdf#120412 char formatting UI: clean-up DFLT_ESC_AUTO

Default auto values must be outside of the new
enlarged range of the superscript/subscript percent values.

Note: the raising limit was modified to 13999 from 14400,
because the RTF unit test tdf112208_hangingIndent.rtf
lost its hanging from the bigger value.

Change-Id: I3a7e9715a27570278ee4ee70f9fc9ad29457e100
Reviewed-on: https://gerrit.libreoffice.org/73166
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 32262b0a537207832d7d126d8427d8949b9e821d)
Reviewed-on: https://gerrit.libreoffice.org/73460

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d1340a4463b3..8fa64293fe87 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2705,7 +2705,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
 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);
+m_xHighLowMF->set_max(MAX_ESC_POS, FieldUnit::PERCENT);
 
 //fdo#75307 validate all the entries and discard all of them if any are
 //out of range
diff --git a/include/editeng/escapementitem.hxx 
b/include/editeng/escapementitem.hxx
index 86e148361051..82f9dde70823 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -28,8 +28,9 @@
 #define DFLT_ESC_SUPER   33 // 1/3
 #define DFLT_ESC_SUB-33 // also 1/3 previously 8/100
 #define DFLT_ESC_PROP58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB  -101
+#define MAX_ESC_POS  13999
+#define DFLT_ESC_AUTO_SUPER  (MAX_ESC_POS+1)
+#define DFLT_ESC_AUTO_SUB-DFLT_ESC_AUTO_SUPER
 
 /*  [Description]
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6276d56a1b01..195e360a671d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2206,9 +2207,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 sal_Int16 nEscapement = 0;
 sal_Int8 nProp  = 58;
 if ( sStringValue == "superscript" )
-nEscapement = 101;
+nEscapement = DFLT_ESC_AUTO_SUPER;
 else if ( sStringValue == "subscript" )
-nEscapement = -101;
+nEscapement = DFLT_ESC_AUTO_SUB;
 else
 nProp = 100;
 
@@ -2839,8 +2840,17 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 nEscapement = ( nIntValue > 0 ) ? 58: -58;
 }
 }
+
 // tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters)
-if( nEscapement > 14400 ) nEscapement = 14400;
+if ( nEscapement > MAX_ESC_POS )
+{
+nEscapement = MAX_ESC_POS;
+}
+else if ( nEscapement < -MAX_ESC_POS )
+{
+nEscapement = -MAX_ESC_POS;
+}
+
 rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( 
nEscapement ) );
 rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT,  uno::makeAny( nProp 
) );
 }
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index f97ca6ee1f2f..f52c360d0865 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -28,10 +28,11 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-// this is a copy of defines in svx/inc/escpitem.hxx
+// this is a copy of defines in include/editeng/escapementitem.hxx
 #define DFLT_ESC_PROP58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB  -101
+#define MAX_ESC_POS  13999
+#define DFLT_ESC_AUTO_SUPER  (MAX_ESC_POS+1)
+#define DFLT_ESC_AUTO_SUB-DFLT_ESC_AUTO_SUPER
 
 
 // class XMLEscapementPropHdl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Mark Hung (via logerrit)

 sw/source/ui/misc/pggrid.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 595d28ab771c9acdfc613502a28486e4a85b38d7
Author: Mark Hung 
AuthorDate: Fri May 31 23:22:43 2019 +0800
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 11:29:33 2019 +0200

tdf#104922 recover text grid setting properly.

Lines per page and chars per line can not be set before the
max values determined, otherwise we may get incorrect result
because of truncating to incorrect max values.

Change-Id: I9829af0dcfd744f4383a5f9034270b00fdfb15b8
Reviewed-on: https://gerrit.libreoffice.org/73280
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit c1c3a3c619bd596e2a64e2c9b9328b4adfa990eb)
Reviewed-on: https://gerrit.libreoffice.org/73458
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index dbef0e81300b..860f913985cd 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -171,6 +171,8 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
 
 voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 {
+sal_Int32 nLinesPerPage = 0;
+
 if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID))
 {
 const SwTextGridItem& rGridItem = rSet->Get(RES_TEXTGRID);
@@ -185,7 +187,8 @@ voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 m_xDisplayCB->set_active(rGridItem.IsDisplayGrid());
 GridTypeHdl(*pButton);
 m_xSnapToCharsCB->set_active(rGridItem.IsSnapToChars());
-m_xLinesPerPageNF->set_value(rGridItem.GetLines());
+nLinesPerPage = rGridItem.GetLines();
+
 SetLinesOrCharsRanges(*m_xLinesRangeFT , m_xLinesPerPageNF->get_max());
 m_nRubyUserValue = rGridItem.GetBaseHeight();
 m_bRubyUserValue = true;
@@ -198,6 +201,9 @@ voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 }
 UpdatePageSize(*rSet);
 
+if (nLinesPerPage > 0)
+m_xLinesPerPageNF->set_value(nLinesPerPage);
+
 m_xNoGridRB->save_state();
 m_xLinesGridRB->save_state();
 m_xSnapToCharsCB->save_state();
@@ -301,8 +307,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
 
 if ( m_bSquaredMode )
 {
-m_xCharsPerLineNF->set_value(m_aPageSize.Width() / nTextSize);
-m_xCharsPerLineNF->set_max(m_xCharsPerLineNF->get_value());
+sal_Int32 nCharsPerLine = m_aPageSize.Width() / nTextSize;
+m_xCharsPerLineNF->set_max(nCharsPerLine);
+m_xCharsPerLineNF->set_value(nCharsPerLine);
 m_xLinesPerPageNF->set_max(m_aPageSize.Height() /
 (   
m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP)) +
 
m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/examples

2019-06-05 Thread Ashod Nakashian (via logerrit)

 scripting/examples/python/InsertText.py |   61 
 1 file changed, 61 insertions(+)

New commits:
commit c7c188c745ff054f5ba1e7939a4fa7ec92be9708
Author: Ashod Nakashian 
AuthorDate: Fri Jul 27 00:18:09 2018 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Jun 5 11:28:37 2019 +0200

python: add sample python script to insert/replace text

Change-Id: Idde3cd22ecc1f1bd34f7519acedc85584ed2deaf
Reviewed-on: https://gerrit.libreoffice.org/58160
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/73477
Tested-by: Jenkins

diff --git a/scripting/examples/python/InsertText.py 
b/scripting/examples/python/InsertText.py
new file mode 100644
index ..e04874d52b0a
--- /dev/null
+++ b/scripting/examples/python/InsertText.py
@@ -0,0 +1,61 @@
+# HelloWorld python script for the scripting framework
+
+#
+# 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 .
+#
+
+def InsertText(text):
+"""Inserts the argument string into the current document.
+   If there is a selection, the selection is replaced by it."""
+
+# Get the doc from the scripting context which is made available to all 
scripts
+desktop = XSCRIPTCONTEXT.getDesktop()
+model = desktop.getCurrentComponent()
+
+# Check whether there's already an opened document.
+if not hasattr(model, "Text"):
+return
+
+# The context variable is of type XScriptContext and is available to
+# all BeanShell scripts executed by the Script Framework
+xModel = XSCRIPTCONTEXT.getDocument()
+
+#the writer controller impl supports the css.view.XSelectionSupplier 
interface
+xSelectionSupplier = xModel.getCurrentController()
+
+#see section 7.5.1 of developers' guide
+xIndexAccess = xSelectionSupplier.getSelection()
+count = xIndexAccess.getCount();
+if count >= 1:  #ie we have a selection
+i = 0
+
+while i < count:
+xTextRange = xIndexAccess.getByIndex(i);
+theString = xTextRange.getString();
+if not len(theString):
+# Nothing really selected; just insert.
+xText = xTextRange.getText();
+xWordCursor = xText.createTextCursorByRange(xTextRange);
+xWordCursor.setString(text);
+xSelectionSupplier.select(xWordCursor);
+else:
+# Replace the selection.
+xTextRange.setString(text);
+xSelectionSupplier.select(xTextRange);
+
+i += 1
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/ooxmlexport/data/tdf70234.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|7 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
 3 files changed, 8 insertions(+)

New commits:
commit fe317b8d0845657703803d51e16f01e529740ef0
Author: László Németh 
AuthorDate: Mon Jun 3 17:26:16 2019 +0200
Commit: Xisco Faulí 
CommitDate: Wed Jun 5 11:28:43 2019 +0200

tdf#70234 DOCX: import tracked deletion of fields

Deleted fields in tracked changes, for example page
number fields, imported as not deleted text fields.

Change-Id: Id35c3ad7d293039fc8a2d0b564572dc459a25d0f
Reviewed-on: https://gerrit.libreoffice.org/73397
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit d160bca0dcb80f1b517b79221d5c3a43bbad8639)
Reviewed-on: https://gerrit.libreoffice.org/73457

diff --git a/sw/qa/extras/ooxmlexport/data/tdf70234.docx 
b/sw/qa/extras/ooxmlexport/data/tdf70234.docx
new file mode 100644
index ..33ef99430bda
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf70234.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 70b6e79bc04d..f7e69073085c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -849,6 +849,13 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[" + OString::number(i) + 
"]/w:pPr/w:rPr/w:del");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, "tdf70234.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// import fields with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:fldChar");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
 {
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index eb852bf943d4..f03ee6f8271b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5195,6 +5195,7 @@ void DomainMapper_Impl::PopFieldContext()
 aMap.InsertProps(m_pLastCharacterContext);
 aMap.InsertProps(m_aFieldStack.top()->getProperties());
 appendTextContent(xToInsert, aMap.GetPropertyValues());
+CheckRedline( xToInsert->getAnchor( ) );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/htmlimport/data/tdf122789.html |7 +++
 sw/qa/extras/htmlimport/htmlimport.cxx  |   11 +++
 sw/source/filter/html/htmlgrin.cxx  |4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit cf839dcb09fa117744380d3213cb3cf8d9f363f2
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 21:15:18 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 11:17:29 2019 +0200

tdf#122789 sw HTML import: fix handling of images with relative sizes

Relative size should have priority over image size from image headers.

(cherry picked from commit a628c01e783b8970ec6d1a4499f01981c077e607)

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

diff --git a/sw/qa/extras/htmlimport/data/tdf122789.html 
b/sw/qa/extras/htmlimport/data/tdf122789.html
new file mode 100644
index ..7ee6552013c7
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/tdf122789.html
@@ -0,0 +1,7 @@
+
+
+   
+   
+
+
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 52a6a7145bc4..dd6281d9b845 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -349,6 +349,17 @@ DECLARE_HTMLIMPORT_TEST(testImageSize, "image-size.html")
 CPPUNIT_ASSERT_EQUAL(static_cast(aExpected.getHeight()), 
aSize.Height);
 }
 
+DECLARE_HTMLIMPORT_TEST(testTdf122789, "tdf122789.html")
+{
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rFormats.size());
+// This failed, the image had an absolute size, not a relative one.
+CPPUNIT_ASSERT_EQUAL(static_cast(70), 
rFormats[0]->GetAttrSet().GetFrameSize().GetWidthPercent());
+}
+
 DECLARE_HTMLIMPORT_TEST(testReqIfPageStyle, "reqif-page-style.xhtml")
 {
 // Without the accompanying fix in place, this test would have failed with
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 9527271c2f11..431099fa95f4 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -644,7 +644,9 @@ IMAGE_SETEVENT:
 bool bSetScaleImageMap = false;
 sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
 
-if ((!nWidth || !nHeight) && allowAccessLink(*m_xDoc))
+// bPrcWidth / bPrcHeight means we have a percent size.  If that's not the 
case and we have no
+// size from nWidth / nHeight either, then inspect the image header.
+if ((!bPrcWidth && !nWidth) && (!bPrcHeight && !nHeight) && 
allowAccessLink(*m_xDoc))
 {
 GraphicDescriptor aDescriptor(aGraphicURL);
 if (aDescriptor.Detect(/*bExtendedInfo=*/true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-6-3' - common/Log.hpp

2019-06-05 Thread Samuel Mehrbrodt (via logerrit)

 common/Log.hpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dc20893e0e4edd13f5e9a113e080d6905edf7f7e
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 22 08:31:59 2019 +0200
Commit: Michael Meeks 
CommitDate: Wed Jun 5 11:10:13 2019 +0200

Log fatal errors also to stderr

Change-Id: I5e6429ab007d13a2506c375923049b91c80ffba0
Reviewed-on: https://gerrit.libreoffice.org/72722
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit b40cf51181ecf6d65f25238b84da0f98176fc249)
Reviewed-on: https://gerrit.libreoffice.org/73526
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/common/Log.hpp b/common/Log.hpp
index 50881f941..5b7e77f91 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -15,6 +15,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -341,6 +342,7 @@ namespace Log
 #define LOG_FTL(X)  \
 do  \
 {   \
+std::cerr << X << std::endl;\
 auto &log_ = Log::logger(); \
 if (log_.fatal())   \
 {   \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-6-3' - wsd/LOOLWSD.cpp

2019-06-05 Thread Jan Holesovsky (via logerrit)

 wsd/LOOLWSD.cpp |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 6ddc1dc94fd82b573058e3b28b9e1d950864b941
Author: Jan Holesovsky 
AuthorDate: Tue Jun 4 14:45:26 2019 +0200
Commit: Michael Meeks 
CommitDate: Wed Jun 5 11:08:58 2019 +0200

Answer 404 when the file to download does not exist.

This gives a better idea what has happened to those using the
Download_As postMessage.  Without this, the attempted download just gets
stuck.

Change-Id: Ic23bbca3761d795251664cf09956468fab13ed80
Reviewed-on: https://gerrit.libreoffice.org/73450
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 230aa62d17e4237e344fcf7d95491dbbd97ec660)
Reviewed-on: https://gerrit.libreoffice.org/73530
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 28c91dbdf..0e0fe6098 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2542,7 +2542,6 @@ private:
 + JAILED_DOCUMENT_ROOT + tokens[4] + "/" + 
fileName);
 const std::string filePathAnonym = 
LOOLWSD::anonymizeUrl(filePath.toString());
 LOG_INF("HTTP request for: " << filePathAnonym);
-bool responded = false;
 if (filePath.isAbsolute() && File(filePath).exists())
 {
 const Poco::URI postRequestUri(request.getURI());
@@ -2567,7 +2566,6 @@ private:
 try
 {
 HttpHelper::sendFile(socket, filePath.toString(), 
contentType, response);
-responded = true;
 }
 catch (const Exception& exc)
 {
@@ -2580,8 +2578,15 @@ private:
 else
 {
 LOG_ERR("Download file [" << filePathAnonym << "] not found.");
+std::ostringstream oss;
+oss << "HTTP/1.1 404 Not Found\r\n"
+<< "Date: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: 0\r\n"
+<< "\r\n";
+socket->send(oss.str());
+socket->shutdown();
 }
-(void)responded;
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Samuel Mehrbrodt (via logerrit)

 loleaflet/css/leaflet.css |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a97c1c0cb7dcf1835bf93edca8e85aa09b1d6e56
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 28 15:39:48 2019 +0200
Commit: Michael Meeks 
CommitDate: Wed Jun 5 11:09:16 2019 +0200

Use LO branding colors for loading progress bar

From https://wiki.documentfoundation.org/Marketing/Branding

Change-Id: I7d3d5932ef67ae5c1a522d03e1d1a0a8960b0816
Reviewed-on: https://gerrit.libreoffice.org/73107
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit 43f09f284ca9be50913a3799c0c98137a1fdf42c)
Reviewed-on: https://gerrit.libreoffice.org/73528
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 4ddd1cdf4..74cdc3418 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -729,14 +729,14 @@ input.clipboard {
margin: 0 -1px;
height: 100%;
text-align: right;
-   background: #5c3dcc;
+   background: #18A303;
border: 1px solid;
-   border-color: #4422bf #5435c4;
+   border-color: #106802;
border-radius: 10px;
-   background-image: -webkit-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: -moz-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: -o-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: linear-gradient(to bottom, #745dc6, #6549cc 70%, 
#5c3dcc);
+   background-image: -webkit-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: -moz-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: -o-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: linear-gradient(to bottom, #92E285, #43C330 70%, 
#18A303);
-webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px 
rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 
0, 0.2);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Mark Hung (via logerrit)

 vcl/source/gdi/CommonSalLayout.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 76f0cf39fd06ec1b523e9bdf8fbcc98a55a541b4
Author: Mark Hung 
AuthorDate: Sun Jun 2 10:00:41 2019 +0800
Commit: Michael Stahl 
CommitDate: Wed Jun 5 11:05:36 2019 +0200

tdf#107487 fix font fallback for non-BMP characters.

Non-BMP characters use two sal_Unicodes. It is necessary
to advnace with OUString::iterateCodePoints safely instead of
nCharPos + 1.

Change-Id: Iea1005f05421b1021a9b3ff611439357d4dcba9e
Reviewed-on: https://gerrit.libreoffice.org/73326
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 
(cherry picked from commit 16faad3657fad114aa984f92a14a5f212a2f8ff5)
Reviewed-on: https://gerrit.libreoffice.org/73461
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 5ef6992cabdc..e146fb245131 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -190,12 +190,14 @@ void GenericSalLayout::SetNeedFallback(ImplLayoutArgs& 
rArgs, sal_Int32 nCharPos
 //mark all glyphs as missing so the whole thing is rendered with the same
 //font
 sal_Int32 nDone;
-sal_Int32 nGraphemeStartPos =
-mxBreak->previousCharacters(rArgs.mrStr, nCharPos + 1, aLocale,
-i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 sal_Int32 nGraphemeEndPos =
 mxBreak->nextCharacters(rArgs.mrStr, nCharPos, aLocale,
 i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
+// Safely advance nCharPos in case it is a non-BMP character.
+rArgs.mrStr.iterateCodePoints(&nCharPos);
+sal_Int32 nGraphemeStartPos =
+mxBreak->previousCharacters(rArgs.mrStr, nCharPos, aLocale,
+i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 
 rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 3 commits - .gitreview loleaflet/src wsd/ClientSession.cpp

2019-06-05 Thread Samuel Mehrbrodt (via logerrit)

 .gitreview|2 +-
 loleaflet/src/map/handler/Map.WOPI.js |2 +-
 wsd/ClientSession.cpp |6 --
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 90bc3b8021e59a02324a0004a6f8106b8580d6c8
Author: Samuel Mehrbrodt 
AuthorDate: Wed Jun 5 10:54:07 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Jun 5 10:54:07 2019 +0200

.gitreview: Update default branch

diff --git a/.gitreview b/.gitreview
index b89dcd89d..ef326068a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=libreoffice-6-2
+defaultbranch=distro/cib/libreoffice-6-2
 
commit 7e165e578c60ade6209315e741ced5251d5177fd
Author: Michael Meeks 
AuthorDate: Thu May 23 17:55:01 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Jun 5 10:53:35 2019 +0200

Make renamefile more careful.

Change-Id: If39353fc01ea48d8e0077b228a6281839dde5c87
Reviewed-on: https://gerrit.libreoffice.org/72877
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 56dd06f2cf30de858e800a81f83437ae83f38070)

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 9797d73bb..a1e6c9319 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -217,8 +217,10 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 
 return true;
 }
-else if (tokens[0] == "versionrestore") {
-if (tokens[1] == "prerestore") {
+else if (tokens[0] == "versionrestore")
+{
+if (tokens.size() > 1 && tokens[1] == "prerestore")
+{
 // green signal to WOPI host to restore the version *after* saving
 // any unsaved changes, if any, to the storage
 docBroker->closeDocument("versionrestore: prerestore_ack");
commit 5d97ef0c6be89f7041475126ecabbaa1cfb656e2
Author: Alexandru Vlăduţu 
AuthorDate: Wed May 15 10:46:11 2019 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Wed Jun 5 10:53:24 2019 +0200

loleaflet: add postmessage check

Checks if messages are coming from the parent only (the frame which
opened the editor) to avoid unwanted commands from 3rd parties.

Change-Id: Ieffe36169dcefbe130869596672c1628c76b6799
Reviewed-on: https://gerrit.libreoffice.org/72340
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit e1c2c2e3c5b16990c156ea795d68f365deb30253)
Reviewed-on: https://gerrit.libreoffice.org/73022
(cherry picked from commit 40608eab166a65487edd1e5de98223d13713ba37)

diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 654b2a51c..2c343055f 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -124,7 +124,7 @@ L.Map.WOPI = L.Handler.extend({
},
 
_postMessageListener: function(e) {
-   if (!window.WOPIPostmessageReady) {
+   if (!window.WOPIPostmessageReady || (e.origin !== 
window.parent.origin)) {
return;
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/layout/tabfrm.cxx |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

New commits:
commit e37ffdd118da2d21c5e78e8c7b67252d0d1adc8c
Author: Michael Stahl 
AuthorDate: Tue Jun 4 18:01:24 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 5 10:49:14 2019 +0200

tdf#125685 sw: disregard footnotes in follow table on table split

The first problem here is that the table isn't fully formatted; it fails
with:

warn:legacy.osl:22975:22975:sw/source/core/layout/tabfrm.cxx:2639: debug 
assertion:  - format of table lowers suppressed by fix 
i44910

The situation is that there is a big table split across pages; the first
line of the table would fit onto the previous page so its follow frame
moves backward and then the table frame tries to split again.

During SwTabFrame::Split(), all the frames in the table are formatted,
and at that point a footnote that was on the next page is moved to this
page.

A nested table frame also splits, such that it fits inside the page...
but then the split of the outer table fails by 5 twips, because the
moved footnote has reduced the space available for the outer table.

The footnote is anchored in the inner table's follow frame, which would
be moved to the next page anyway, taking the footnote with it.

Fix this in lcl_RecalcSplitLine() by checking for footnotes that are
anchored in the follow frame of the top-level table being split, and
adding their height to the available space on the page.

Fixing the first problem avoids the crash as well; the crash happens
since 18765b9fa739337d2d891513f6e2fb7c3ce23b50 and it's rather hard to
avoid it in a situation where formatting starts at the end and recurses
into an unformatted table preceding it, which isn't supposed to happen.

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

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7188751e5b5d..4f9e0880ff50 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -715,7 +716,39 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 // #i26945# - include check, if objects fit
 const SwTwips nDistanceToUpperPrtBottom =
 aRectFnSet.BottomDist(rTab.getFrameArea(), 
aRectFnSet.GetPrtBottom(*rTab.GetUpper()));
-if ( nDistanceToUpperPrtBottom < 0 || !rTab.DoesObjsFit() )
+// tdf#125685 ignore footnotes that are anchored in follow-table of this
+// table - if split is successful they move to the next page/column anyway
+assert(rTab.GetFollow() == rFollowLine.GetUpper());
+SwTwips nFollowFootnotes(0);
+// actually there should always be a boss frame, except if "this" isn't
+// connected to a page yet; not sure if that can happen
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote = 
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();
+if (pTab)
+{
+while (pTab->GetUpper()->IsInTab())
+{
+pTab = pTab->GetUpper()->FindTabFrame();
+}
+// TODO currently do this only for top-level tables?
+// otherwise would need to check rTab's follow and any 
upper table's follow?
+if (pTab == rTab.GetFollow())
+{
+nFollowFootnotes += 
aRectFnSet.GetHeight(pFootnote->getFrameArea());
+}
+}
+}
+}
+}
+if (nDistanceToUpperPrtBottom + nFollowFootnotes < 0 || 
!rTab.DoesObjsFit())
 bRet = false;
 
 // 2. Check if each cell in the last line has at least one content frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sfx2/source/dialog/templdlg.cxx|3 ++-
 sw/source/uibase/app/docst.cxx |2 ++
 sw/source/uibase/shells/basesh.cxx |4 
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0d6ec494f83fb26524bf3a5fc7af27c225293e87
Author: Jim Raykowski 
AuthorDate: Thu May 23 01:06:47 2019 -0800
Commit: Katarina Behrens 
CommitDate: Wed Jun 5 10:34:56 2019 +0200

tdf#124152 Broadcast StyleSheetModified to update style tree list box

...and also make undo redo update

Change-Id: I49d62d487bed27d9dbe2ab813d992d02ecaeb77a
Reviewed-on: https://gerrit.libreoffice.org/72826
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Katarina Behrens 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e47900441476..98db80802603 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1489,7 +1489,8 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& 
/*rBC*/, const SfxHint
 if(!bDontUpdate && nId != SfxHintId::Dying &&
(dynamic_cast(&rHint) ||
 dynamic_cast(&rHint) ||
-dynamic_cast(&rHint)))
+dynamic_cast(&rHint) ||
+nId == SfxHintId::StyleSheetModified))
 {
 if(!pIdle)
 {
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 4336e37d10cf..292095ae2544 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -633,6 +633,8 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void)
 
 if( m_bNew )
 m_xBasePool->Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetCreated, 
*m_xTmp));
+else
+
m_xBasePool->Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetModified, 
*m_xTmp));
 
 pDoc->getIDocumentState().SetModified();
 if( !m_bModified )
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 6f33b6142174..0c76cd643f9a 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -539,6 +539,10 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
 {
 rReq.SetReturnValue( SfxUInt32Item(nId, 
static_cast(SID_REPAIRPACKAGE)) );
 }
+else if (nUndoId == SwUndoId::INSFMTATTR)
+{
+
rWrtShell.GetDoc()->GetDocShell()->GetStyleSheetPool()->Broadcast(SfxHint(SfxHintId::StyleSheetModified));
+}
 
 if (pViewFrame) { pViewFrame->GetBindings().InvalidateAll(false); }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need for new x86 Jenkin's Bot

2019-06-05 Thread Michael Stahl

On 04.06.19 19:23, Jan-Marek Glogowski wrote:

Hi everyone,

Am 04.06.19 um 17:01 schrieb Luke Benes:

The decision was to demote release builds, but NOT to remove x86
compatibility. If you take this as an excuse to also end x86 CI testing bots,
you are effectively killing x86 through bit rot. This is not a hypothetical.
As you know, @87 just recently caught a regression introduced by an easyHack
to convert use of sal_uLong to better integer types. Without CI testing,
these bugs will pile up effectively removing x86 compatibility.

IMHO we should "just" switch one of the Jenkins Linux builds to 32bit, not have
an other one. Preferable the gcc release one, as that has smaller object size,
if that is a concern for 32bit (linking etc). Should be fine just to cross-build
on 64bit in a 32bit chroot.

I remember there were some problems because of a missing 32bit Red Hat Developer
Toolset needed for the build, which was AFAIK the real reason to get rid of the
32bit builds - aehmm. Not sure that is now available.

just to reiterate again, we have a docker container setup that builds on
the same CentOS 7 + DevToolset 7 baseline that the 64-bit builds use;
the toolchain is 64-bit, which helps with the OOM issues that used to
plague the 32-bit build.

https://fosdem.org/2019/schedule/event/lightning_talks/attachments/slides/3334/export/events/attachments/lightning_talks/slides/3334/7_Thorsten.odp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-06-05 Thread Mike Kaganski (via logerrit)

 cui/uiconfig/ui/bulletandposition.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ada2b5be85f8c4d16c627a990e3f362ae0663d9f
Author: Mike Kaganski 
AuthorDate: Wed Jun 5 17:00:00 2019 +1000
Commit: Mike Kaganski 
CommitDate: Wed Jun 5 09:51:22 2019 +0200

Add GtkImage ids

An assert is failing without this:

ucrtbased.dll!abort() Line 61
at minkernel\crts\ucrt\src\appcrt\startup\abort.cpp(61)
ucrtbased.dll!common_assert_to_stderr(const wchar_t * const 
expression, const wchar_t * const file_name, const unsigned int line_number) 
Line 187
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(187)
ucrtbased.dll!common_assert(const wchar_t * const expression, 
const wchar_t * const file_name, const unsigned int line_number, void * const 
return_address) Line 420
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(420)
ucrtbased.dll!_wassert(const wchar_t * expression, const wchar_t * 
file_name, unsigned int line_number) Line 444
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(444)
vcllo.dll!VclBuilder::get(const rtl::OString & sID) Line 446
at C:\cygwin\home\user\lode\dev\core\include\vcl\builder.hxx(446)
vcllo.dll!VclBuilder::VclBuilder(vcl::Window * pParent, const 
rtl::OUString & sUIDir, const rtl::OUString & sUIFile, const rtl::OString & 
sID, const com::sun::star::uno::Reference & 
rFrame, bool bLegacy) Line 698
at 
C:\cygwin\home\user\lode\dev\core\vcl\source\window\builder.cxx(698)
vcllo.dll!SalInstanceBuilder::SalInstanceBuilder(vcl::Window * pParent, 
const rtl::OUString & rUIRoot, const rtl::OUString & rUIFile) Line 4995
at 
C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(4995)
vcllo.dll!SalInstance::CreateBuilder(weld::Widget * pParent, const 
rtl::OUString & rUIRoot, const rtl::OUString & rUIFile) Line 5260
at 
C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(5260)
vcllo.dll!Application::CreateBuilder(weld::Widget * pParent, const 
rtl::OUString & rUIFile) Line 146
at 
C:\cygwin\home\user\lode\dev\core\vcl\source\window\builder.cxx(146)

vcllo.dll!weld::GenericDialogController::GenericDialogController(weld::Widget * 
pParent, const rtl::OUString & rUIFile, const rtl::OString & rDialogId) Line 
5347
at 
C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(5347)

sduilo.dll!SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window * 
pWindow, const SfxItemSet & rSet, sd::View * pView) Line 117
at 
C:\cygwin\home\user\lode\dev\core\sd\source\ui\dlg\BulletAndPositionDlg.cxx(117)
sduilo.dll!std::make_unique(weld::Window * & <_Args_0>, const 
SfxItemSet & <_Args_1>, sd::View * & <_Args_2>) Line 2042
at C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC\Tools\MSVC\14.21.27702\include\memory(2042)

sduilo.dll!SdAbstractDialogFactory_Impl::CreateSvxBulletAndPositionDlg(weld::Window
 * pParent, const SfxItemSet * pAttr, sd::View * pView) Line 387
at 
C:\cygwin\home\user\lode\dev\core\sd\source\ui\dlg\sddlgfact.cxx(387)
sdlo.dll!sd::FuBulletAndPosition::DoExecute(SfxRequest & rReq) Line 92
at 
C:\cygwin\home\user\lode\dev\core\sd\source\ui\func\fuolbull.cxx(92)
sdlo.dll!sd::FuBulletAndPosition::Create(sd::ViewShell * pViewSh, 
sd::Window * pWin, sd::View * pView, SdDrawDocument * pDoc, SfxRequest & rReq) 
Line 57
at 
C:\cygwin\home\user\lode\dev\core\sd\source\ui\func\fuolbull.cxx(57)
sdlo.dll!sd::DrawViewShell::FuTemporary(SfxRequest & rReq) Line 1447
at 
C:\cygwin\home\user\lode\dev\core\sd\source\ui\view\drviews2.cxx(1447)
sdlo.dll!SfxStubDrawViewShellFuTemporary(SfxShell * pShell, SfxRequest 
& rReq) Line 1514
at 
C:\cygwin\home\user\lode\dev\core\workdir\SdiTarget\sd\sdi\sdslots.hxx(1514)
sfxlo.dll!SfxShell::CallExec(void(*)(SfxShell *, SfxRequest &) pFunc, 
SfxRequest & rReq) Line 197
at C:\cygwin\home\user\lode\dev\core\include\sfx2\shell.hxx(197)
sfxlo.dll!SfxDispatcher::Call_Impl(SfxShell & rShell, const SfxSlot & 
rSlot, SfxRequest & rReq, bool bRecord) Line 360
at 
C:\cygwin\home\user\lode\dev\core\sfx2\source\control\dispatch.cxx(360)
sfxlo.dll!SfxDispatcher::Execute_(SfxShell & rShell, const SfxSlot & 
rSlot, SfxRequest & rReq, SfxCallMode eCallMode) Line 857
at 
C:\cygwin\home\user\lode\dev\core\sfx2\source\control\dispatch.cxx(857)
sfxlo.dll!SfxBindings::Execute_Impl(SfxRequest & aReq, const SfxSlot * 
pSlot, SfxShell * pShell) Line 1066
at 
C:\cygwin\home\user\lode\dev\core\sfx2\source\control\bindings.cxx(1066)
sfxlo.dll!SfxDispatchController_Impl::dispatch(const 
com::sun::star::util::URL & aURL, const 
com::sun::star::uno::Sequence & aArgs, 
c

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.0-32'

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 07:40 +

co-6.0-32

Changes since cp-6.0-19:
Andras Timar (1):
  remove executable bit from *.aff and *.dic files

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

[Libreoffice-commits] core.git: Branch 'refs/tags/co-6.0-32' - postprocess/signing

2019-06-05 Thread Adolfo Jayme Barrientos (via logerrit)

Rebased ref, commits from common ancestor:
commit de2fe0399fe01f84e96d5b025a4e48678d116957
Author: Andras Timar 
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit: Andras Timar 
CommitDate: Wed Jun 5 00:31:59 2019 -0700

[cp] HACK: sleep before sign

On Windows, with 16x parallel build, build-nocheck target fails,
because it tries to sign a file that is already in use (gengal).

Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index bd5c2e3fe0d1..2e4acf562039 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -41,6 +41,7 @@ my @args= ();
 my @files_to_sign = ();
 
  main #
+sleep(120);
 $myname = script_id();
 if ( $#ARGV < 2 ) {
 usage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.0-32'

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 07:40 +

co-6.0-32

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'refs/tags/co-6.0-32' - 0 commits -

2019-06-05 Thread (via logerrit)

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'refs/tags/co-6.0-32' - 0 commits -

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/co-6.0-32' - 0 commits -

2019-06-05 Thread (via logerrit)

Rebased ref, commits from common ancestor:
___
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' - postprocess/signing

 postprocess/signing/signing.pl |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de2fe0399fe01f84e96d5b025a4e48678d116957
Author: Andras Timar 
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit: Andras Timar 
CommitDate: Wed Jun 5 00:31:59 2019 -0700

[cp] HACK: sleep before sign

On Windows, with 16x parallel build, build-nocheck target fails,
because it tries to sign a file that is already in use (gengal).

Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index bd5c2e3fe0d1..2e4acf562039 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -41,6 +41,7 @@ my @args= ();
 my @files_to_sign = ();
 
  main #
+sleep(120);
 $myname = script_id();
 if ( $#ARGV < 2 ) {
 usage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit f9c6f40ef0dc42af810466ff8cad59fe69daa6bb
Author: Miklos Vajna 
AuthorDate: Tue Jun 4 21:33:02 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 09:16:44 2019 +0200

editeng: consider btlr in SvxFrameDirectionItem::GetValueCount()

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

diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 840cae4a2f9e..e7dede30ce90 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -47,7 +47,7 @@ public:
 
 virtual sal_uInt16  GetValueCount() const override
 {
-return sal_uInt16(SvxFrameDirection::Environment) + 1;
+return sal_uInt16(SvxFrameDirection::Vertical_LR_BT) + 1;
 }
 
 // SfxPoolItem copy function dichotomy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - cui/inc