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

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 1684 ++
 1 file changed, 841 insertions(+), 843 deletions(-)

New commits:
commit 7eb54f83cde1e490e5e3127607c65e9027994246
Author: andreas kainz 
AuthorDate: Tue Dec 11 14:51:16 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 08:53:31 2018 +0100

update groupedbar_compact for impress

Change-Id: I2d6c6d975a3047c879a87a1cee0305772c6b5d49
Reviewed-on: https://gerrit.libreoffice.org/65134
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 9151f943e71a8458aa6454c717802327e4d9658c)
Reviewed-on: https://gerrit.libreoffice.org/65137

diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 096d29b62685..82a6843b1184 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -2084,6 +2084,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2410,99 +2430,6 @@
   
 
   
-  
-True
-False
-
-  
-True
-False
-.uno:MacroRecorder
-  
-
-
-  
-True
-False
-.uno:RunMacro
-  
-
-
-  
-True
-False
-.uno:BasicIDEAppear
-  
-
-
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
-True
-False
-.uno:ScriptOrganizer
-  
-
-
-  
-True
-False
-.uno:MacroSignature
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:PresentationMinimizer
-  
-
-
-  
-True
-False
-.uno:BmpMask
-  
-
-
-  
-True
-False
-.uno:AVMediaPlayer
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ViewDataSourceBrowser
-  
-
-
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-  
   
 True
 False
@@ -2666,12 +2593,11 @@
 False
 vertical
 
-  
+  
 True
 False
 5
 5
-bottom
 
   
 True
@@ -2684,50 +2610,42 @@
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
 False
-icons
-False
-
-  
-True
-True
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
   
 
  

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1551 -
 1 file changed, 761 insertions(+), 790 deletions(-)

New commits:
commit 78d11bb70a0f72d5c459ef0a4f483dba0cacf4e0
Author: andreas kainz 
AuthorDate: Tue Dec 11 14:52:57 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 08:39:01 2018 +0100

update groupedbar_compact draw

Change-Id: Id00bcd45faa3d9e82d3ed23843f5c4320bfa8f79
Reviewed-on: https://gerrit.libreoffice.org/65135
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 744c82af55d0ef1bfae61d13e5cf32fbd83c8b6b)
Reviewed-on: https://gerrit.libreoffice.org/65138

diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 7bc75788ccf5..d0c3d24c784a 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -2078,6 +2078,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2411,99 +2431,6 @@
   
 
   
-  
-True
-False
-
-  
-True
-False
-.uno:MacroRecorder
-  
-
-
-  
-True
-False
-.uno:RunMacro
-  
-
-
-  
-True
-False
-.uno:BasicIDEAppear
-  
-
-
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
-True
-False
-.uno:ScriptOrganizer
-  
-
-
-  
-True
-False
-.uno:MacroSignature
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:PresentationMinimizer
-  
-
-
-  
-True
-False
-.uno:BmpMask
-  
-
-
-  
-True
-False
-.uno:AVMediaPlayer
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ViewDataSourceBrowser
-  
-
-
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-  
   
 True
 False
@@ -2626,12 +2553,11 @@
 False
 vertical
 
-  
+  
 True
 False
 5
 5
-bottom
 
   
 True
@@ -2644,50 +2570,42 @@
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
 False
-icons
-False
-
-  
-True
-True
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
   
 
   
@@ -2

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 100 commits - basic/qa basic/source chart2/source compilerplugins/clang configure.ac cui/source desktop/source drawinglayer/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit a1d1dbd85e7bbf0a5dc960653b31d6c8c7cc6b1b
Author: Thorsten Behrens 
AuthorDate: Wed Jul 18 18:06:44 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Dec 14 08:00:42 2018 +0100

Default OpenGL to off on all platforms

Change-Id: Ide04d3b37b9fabb64d514fd87acbdfe9e49e6727

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 26d1ba053a1e..1e001efd4a12 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -59,9 +59,7 @@
   
   
 
-  false
-  false
-  true
+  false
 
   
   
commit 0a102543b69d60e01e81351da8c69230f2fcc004
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 12 16:46:45 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 14 08:00:42 2018 +0100

Disable crash reporter UI

Change-Id: I8106ec674080ede7072581dab2e6700040de5828
(cherry picked from commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c83d424f8a30..e7a4f82ba081 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -913,7 +913,8 @@ bool crashReportInfoExists()
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
 {
-static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
 
 css::uno::Reference< css::uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
 
@@ -927,7 +928,7 @@ void handleCrashReport()
 css::util::URL aURL;
 css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, 
css::uno::Sequence< css::beans::PropertyValue >());
 bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
 }
 #endif
 
commit 05848092b1501f3bb8e2770da4878729e22b5615
Author: Katarina Behrens 
AuthorDate: Wed Feb 10 14:42:18 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 14 08:00:42 2018 +0100

Branded images for msi installer

The sizes are 122 x 234, 374 x 44 installed units respectively, according to

http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx

it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still 
looks pixelated,
but it's as good as it gets.

For better results, we need different graphics, with less fine details 
given the very limited
space

Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 5a163cf86c23..471eea4c22e6 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b4210d131ba2..2703670952bd 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 8c1290435f243f2015b81dc171e4e9f65b6e3141
Author: Katarina Behrens 
AuthorDate: Tue Feb 9 11:09:30 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 14 08:00:41 2018 +0100

Branded application icons

sadly, this doesn't replace Windows taskbar icon, that must be living 
somewhere
else. It works on Linux though.

 Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png

Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b

diff --git a/icon-themes/galaxy/res/main128.png 
b/icon-themes/galaxy/res/main128.png
new file mode 100644
index ..818b7330c25b
Binary files /dev/null and b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_48_8.png 
b/icon-themes/galaxy/res/mainapp_48_8.png
new file mode 100644
index ..562ea23e89c2
Binary files /dev/null and b/icon-themes/galaxy/res/mainapp_48_8.png differ
diff --git a/icon-themes/tango/res/mainapp_16.png 
b/icon-themes/tango/res/mainapp_16.png
index 4a96735b6bb6..13945eeadfd4 100644
Binary files a/icon-themes/tango/res/mainapp_16.png and 
b/icon-themes/tango/res/mainapp_16.png differ
diff --git a/icon-themes/tango/res/mainapp_16_8.png 
b/icon-themes/tango/res/mainapp_16_8.png
index 94abb952996b..13945eeadfd4 100644

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1551 -
 1 file changed, 761 insertions(+), 790 deletions(-)

New commits:
commit 744c82af55d0ef1bfae61d13e5cf32fbd83c8b6b
Author: andreas kainz 
AuthorDate: Tue Dec 11 14:52:57 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 07:35:00 2018 +0100

update groupedbar_compact draw

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

diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 7bc75788ccf5..d0c3d24c784a 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -2078,6 +2078,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2411,99 +2431,6 @@
   
 
   
-  
-True
-False
-
-  
-True
-False
-.uno:MacroRecorder
-  
-
-
-  
-True
-False
-.uno:RunMacro
-  
-
-
-  
-True
-False
-.uno:BasicIDEAppear
-  
-
-
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
-True
-False
-.uno:ScriptOrganizer
-  
-
-
-  
-True
-False
-.uno:MacroSignature
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:PresentationMinimizer
-  
-
-
-  
-True
-False
-.uno:BmpMask
-  
-
-
-  
-True
-False
-.uno:AVMediaPlayer
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ViewDataSourceBrowser
-  
-
-
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-  
   
 True
 False
@@ -2626,12 +2553,11 @@
 False
 vertical
 
-  
+  
 True
 False
 5
 5
-bottom
 
   
 True
@@ -2644,50 +2570,42 @@
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
 False
-icons
-False
-
-  
-True
-True
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
   
 
   
@@ -2698,52 +2616,15 @@
   
 
 
-  
+   

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

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 1684 ++
 1 file changed, 841 insertions(+), 843 deletions(-)

New commits:
commit 9151f943e71a8458aa6454c717802327e4d9658c
Author: andreas kainz 
AuthorDate: Tue Dec 11 14:51:16 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 07:34:03 2018 +0100

update groupedbar_compact for impress

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

diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 096d29b62685..82a6843b1184 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -2084,6 +2084,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2410,99 +2430,6 @@
   
 
   
-  
-True
-False
-
-  
-True
-False
-.uno:MacroRecorder
-  
-
-
-  
-True
-False
-.uno:RunMacro
-  
-
-
-  
-True
-False
-.uno:BasicIDEAppear
-  
-
-
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
-True
-False
-.uno:ScriptOrganizer
-  
-
-
-  
-True
-False
-.uno:MacroSignature
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:PresentationMinimizer
-  
-
-
-  
-True
-False
-.uno:BmpMask
-  
-
-
-  
-True
-False
-.uno:AVMediaPlayer
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ViewDataSourceBrowser
-  
-
-
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-  
   
 True
 False
@@ -2666,12 +2593,11 @@
 False
 vertical
 
-  
+  
 True
 False
 5
 5
-bottom
 
   
 True
@@ -2684,50 +2610,42 @@
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
 False
-icons
-False
-
-  
-True
-True
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
   
 
   
@@ -2738,52 +2656,15 @@
   
 
 
-

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit a4812a5894990f5886765bbd90d039ac0c90bcce
Author: sabri unal 
AuthorDate: Thu Dec 13 23:27:10 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 14 02:45:32 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Correct "Print black" as "Print text in black"

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

diff --git a/helpcontent2 b/helpcontent2
index b0269e6331ef..680526901b10 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b0269e6331ef725f4cea02fc606c5d30b011b3bd
+Subproject commit 680526901b10ce4d1c1c9c61d298fa3b1d5f8a01
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/01/05020200.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 680526901b10ce4d1c1c9c61d298fa3b1d5f8a01
Author: sabri unal 
AuthorDate: Thu Dec 13 23:27:10 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 14 02:45:32 2018 +0100

Correct "Print black" as "Print text in black"

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

diff --git a/source/text/shared/01/05020200.xhp 
b/source/text/shared/01/05020200.xhp
index e8aac4e5a..7e55e0cb0 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -75,7 +75,7 @@
   
 
 
-The text color 
is ignored when printing, if the Print black check box is selected 
in %PRODUCTNAME Writer - Print in the 
Options dialog box.
+The text color 
is ignored when printing, if the Print text in black check box is 
selected in %PRODUCTNAME Writer - Print in the 
Options dialog box.
 
 
 The text color 
is ignored on screen, if the Use automatic font color for screen 
display check box is selected in %PRODUCTNAME - Preferences
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui |   19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

New commits:
commit acc98b964109506141753b9f3baf56393ea4b62b
Author: andreas kainz 
AuthorDate: Tue Dec 11 11:43:20 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 01:05:15 2018 +0100

tdf#119734 add icon AutoFilter to groupedbar in calc

Change-Id: I9ddb8f70b53600c02addeaf44a8cd1978e1ba5d0
Reviewed-on: https://gerrit.libreoffice.org/65128
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 4786a09e7c41c5dc21732b2e0c74c2984c40c9b5)
Reviewed-on: https://gerrit.libreoffice.org/65133

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 9eefefc5b034..2711a049b315 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -5017,6 +5017,18 @@
 icons
 False
 
+  
+True
+False
+True
+.uno:DataFilterAutoFilter
+  
+  
+False
+True
+  
+
+
   
 True
 False
@@ -5041,10 +5053,10 @@
   
 
 
-  
+  
 True
 False
-.uno:FunctionBox
+.uno:DataSort
   
   
 False
@@ -6451,9 +6463,6 @@
   
 
 
-  
-
-
   
 False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |  853 -
 1 file changed, 433 insertions(+), 420 deletions(-)

New commits:
commit f0ee03f161fe4a6bae8f6c9d04b499fdaf87b003
Author: andreas kainz 
AuthorDate: Tue Dec 11 10:31:13 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 00:46:00 2018 +0100

update groupedbar_compact for calc

Change-Id: Iebbf1eb2db64efa340287b0e0846fa8a121ddf19
Reviewed-on: https://gerrit.libreoffice.org/65081
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 9325646778dbd353c8cb24977b627fa8fb274eec)
Reviewed-on: https://gerrit.libreoffice.org/65102

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 9ef4b34e425e..66dc9cab8955 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2269,7 +2269,7 @@
   
 True
 False
-Menubar
+.uno:Menubar
   
 
 
@@ -2324,7 +2324,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
+_Check for 
Updates...
   
 
 
@@ -2334,6 +2334,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2898,64 +2918,72 @@
 False
 5
 5
-bottom
 
   
 True
 False
-end
-5
 
   
 True
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
-True
-icons
-False
-
-  
-True
-False
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+False
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-end
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
+  
+
+
+  
+False
+.uno:Undo
+  
+  
+False
+False
+  
+
+
+  
+False
+.uno:Redo
+  
+  
+False
+False
   
 
   
@@ -2970,54 +2998,28 @@
 True
 False
 
-  
-True
- 

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4ad69820b0614801ce0b43fd0adb53131d12a7b6
Author: Michael Weghorn 
AuthorDate: Thu Dec 13 22:30:04 2018 +0100
Commit: Michael Weghorn 
CommitDate: Fri Dec 14 00:42:43 2018 +0100

Qt5Menu.hxx: Add missing include/forward-declaration

Since 'QObject' and the 'Q_OBJECT' macro are used,
the corresponding header needs to be included.

Without the include and forward-declaration given here,
the compiler doesn't know about 'QObject' and 'QAction'
which are used further below, unless another header that
takes care of this is included before 'QtMenu.hxx'.

The error could be provoked e.g. by moving the
'#include ' in front of all other includes
in 'vcl/qt5/Qt5Frame.cxx'.

Change-Id: I76c15eb445cbe26774d6e4177e12c93658daf0ad
Reviewed-on: https://gerrit.libreoffice.org/65130
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 9f7469fa3f78..6d2d4b786497 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -11,9 +11,12 @@
 
 #include 
 
+#include 
+
 #include 
 
 class MenuItemList;
+class QAction;
 class QActionGroup;
 class QMenu;
 class QMenuBar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/column.hxx|2 
 sc/inc/subtotal.hxx  |   52 +-
 sc/inc/table.hxx |2 
 sc/source/core/data/column2.cxx  |   12 ++---
 sc/source/core/data/documen4.cxx |6 +-
 sc/source/core/data/table3.cxx   |2 
 sc/source/core/tool/subtotal.cxx |   90 +++
 7 files changed, 89 insertions(+), 77 deletions(-)

New commits:
commit d9aaa26a4efbe7c69254ecc5f00b997f237686e9
Author: Eike Rathke 
AuthorDate: Thu Dec 13 19:26:22 2018 +0100
Commit: Eike Rathke 
CommitDate: Fri Dec 14 00:05:10 2018 +0100

Encapsulate ScFunctionData members and abuse WelfordRunner members

... to squeeze some memory and later use this as a mass object
during consolidation.

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

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b1e890a6347c..7e12cf4eda46 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -85,7 +85,7 @@ class ScStyleSheet;
 class SvtBroadcaster;
 class ScTypedStrData;
 class ScProgress;
-struct ScFunctionData;
+class ScFunctionData;
 class ScFlatBoolRowSegments;
 struct ScSetStringParam;
 struct ScColWidthParam;
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 2c1db3ca2264..2e2811e54815 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -30,6 +30,8 @@ public:
 static bool SafeDiv( double& fVal1, double fVal2);
 };
 
+class ScFunctionData;
+
 /** Implements the Welford Online one-pass algorithm.
 See 
https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_Online_algorithm
 and Donald E. Knuth, TAoCP vol.2, 3rd edn., p. 232
@@ -37,34 +39,44 @@ public:
 class WelfordRunner
 {
 public:
-WelfordRunner() : fMean(0.0), fM2(0.0), nCount(0) {}
+WelfordRunner() : mfMean(0.0), mfM2(0.0), mnCount(0) {}
 voidupdate( double fVal );
-sal_uInt64  getCount() const{ return nCount; }
-double  getMean() const { return fMean; }
-double  getVarianceSample() const   { return nCount > 1 ? fM2 / 
(nCount-1) : 0.0; }
-double  getVariancePopulation() const   { return nCount > 0 ? fM2 / 
nCount : 0.0; }
+sal_uInt64  getCount() const{ return mnCount; }
+double  getMean() const { return mfMean; }
+double  getVarianceSample() const   { return mnCount > 1 ? mfM2 / 
(mnCount-1) : 0.0; }
+double  getVariancePopulation() const   { return mnCount > 0 ? mfM2 / 
mnCount : 0.0; }
 
+// The private variables can be abused by ScFunctionData as general
+// sum/min/max/ave/count/... variables to reduce memory footprint for that
+// ScFunctionData may be a mass object during consolidation.
+// ScFunctionData::update() and getResult() take care that purposes are not
+// mixed.
+friend class ScFunctionData;
 private:
-double  fMean;
-double  fM2;
-sal_uInt64  nCount;
+double  mfMean;
+double  mfM2;
+sal_uInt64  mnCount;
 };
 
-struct ScFunctionData   // to calculate single functions
+/** To calculate a single subtotal function. */
+class ScFunctionData
 {
-private:
-WelfordRunner   maWelford;
-double  nVal;
-sal_uInt64  nCount;
 public:
-ScSubTotalFunc const  eFunc;
-boolbError;
+ScFunctionData( ScSubTotalFunc eFn ) : meFunc(eFn), mbError(false) {}
+void update( double fNewVal );
+/// Check getError() after (!) obtaining the result.
+double   getResult();
+bool getError() const{ return mbError; }
+ScSubTotalFunc   getFunc() const { return meFunc; }
+void setError()  { mbError = true; }
+
+private:
+WelfordRunner   maWelford;
+ScSubTotalFunc constmeFunc;
+boolmbError;
 
-ScFunctionData( ScSubTotalFunc eFn ) :
-nVal(0.0), nCount(0), eFunc(eFn), bError(false) {}
-void update( double fNewVal );
-/// Check bError after (!) obtaining the result.
-double getResult();
+double&  getValueRef()  { return maWelford.mfMean; }
+sal_uInt64&  getCountRef()  { return maWelford.mnCount; }
 };
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 64bf2bd95b2c..e26ae0ae7a40 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -99,7 +99,7 @@ class ScStyleSheet;
 class ScTableProtection;
 class ScUserListData;
 struct RowInfo;
-struct ScFunctionData;
+class ScFunctionData;
 class CollatorWrapper;
 class ScFlatUInt16RowSegments;
 class ScFlatBoolRowSegments;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3aabfec3f611..f9b4569d5c4e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3378,10 +3378,10 @@ clas

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui |   19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 4786a09e7c41c5dc21732b2e0c74c2984c40c9b5
Author: andreas kainz 
AuthorDate: Tue Dec 11 11:43:20 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 14 00:00:26 2018 +0100

tdf#119734 add icon AutoFilter to groupedbar in calc

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 9eefefc5b034..2711a049b315 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -5017,6 +5017,18 @@
 icons
 False
 
+  
+True
+False
+True
+.uno:DataFilterAutoFilter
+  
+  
+False
+True
+  
+
+
   
 True
 False
@@ -5041,10 +5053,10 @@
   
 
 
-  
+  
 True
 False
-.uno:FunctionBox
+.uno:DataSort
   
   
 False
@@ -6451,9 +6463,6 @@
   
 
 
-  
-
-
   
 False
 
___
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' - bin/gbuild-to-ide

[Libreoffice Gerrit user]

 bin/gbuild-to-ide |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04769fd324c9b3ae327f1f6464672e4887f72609
Author: Michael Weghorn 
AuthorDate: Thu Dec 13 22:19:08 2018 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 13 23:29:49 2018 +0100

qtcreator: Take system includes into account

Take system includes ('-isystem') into account
when generating the '*.pro' files for Qt Creator
using the 'qtcreator-ide-integration' make target.

Without this, Qt Creator is unable to find the
corresponding included files.

This also makes Qt Creator's ClangCodeModel
able to properly process files and display
actual problems, rather than always showing
a multitude of errors due to missing includes
while parsing the source/header files.

Change-Id: Ie513341e1074ceab9304ae9df73fac9a79329db8
Reviewed-on: https://gerrit.libreoffice.org/65129
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 72d50182f7ec73ffc05b51d4cf59b7fe9509f155)
Reviewed-on: https://gerrit.libreoffice.org/65132
Tested-by: Michael Weghorn 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 90a732d7c614..5c9c6e2445f3 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1491,7 +1491,7 @@ class 
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
 headers_list.append(lopath(file_ + ext))
 
 # List all include paths
-for hdir in lib.include:
+for hdir in (lib.include + lib.include_sys):
 hf_lopath = lopath(hdir)
 includepath_list.append(hf_lopath)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Libreoffice Gerrit user]

 bin/gbuild-to-ide |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72d50182f7ec73ffc05b51d4cf59b7fe9509f155
Author: Michael Weghorn 
AuthorDate: Thu Dec 13 22:19:08 2018 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 13 23:28:49 2018 +0100

qtcreator: Take system includes into account

Take system includes ('-isystem') into account
when generating the '*.pro' files for Qt Creator
using the 'qtcreator-ide-integration' make target.

Without this, Qt Creator is unable to find the
corresponding included files.

This also makes Qt Creator's ClangCodeModel
able to properly process files and display
actual problems, rather than always showing
a multitude of errors due to missing includes
while parsing the source/header files.

Change-Id: Ie513341e1074ceab9304ae9df73fac9a79329db8
Reviewed-on: https://gerrit.libreoffice.org/65129
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 5ea0406be71f..7d91829bedb8 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1488,7 +1488,7 @@ class 
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
 headers_list.append(lopath(file_ + ext))
 
 # List all include paths
-for hdir in lib.include:
+for hdir in (lib.include + lib.include_sys):
 hf_lopath = lopath(hdir)
 includepath_list.append(hf_lopath)
 
___
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' - starmath/source

[Libreoffice Gerrit user]

 starmath/source/view.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 87e2d78fe8891faafcf83f38f1368a3122d9352e
Author: Caolán McNamara 
AuthorDate: Thu Dec 13 16:09:44 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 22:09:28 2018 +0100

Resolves: tdf#117091 prepend a xml declaration if missing

Change-Id: Iee8305f581533dedcb94d75af15d7178792947ff
Reviewed-on: https://gerrit.libreoffice.org/65114
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit fc6d5461da366df6fa10561e12923532071af0c8)
Reviewed-on: https://gerrit.libreoffice.org/65127

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5d59faa78b96..744f9a183d96 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1611,6 +1611,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
 OUString aString;
 if (aDataHelper.GetString( nId, aString))
 {
+// tdf#117091 force xml declaration to exist
+if (!aString.startsWith("\n" + 
aString;
+
 std::unique_ptr pClipboardMedium(new 
SfxMedium());
 pClipboardMedium->GetItemSet(); //generates 
initial itemset, not sure if necessary
 std::shared_ptr pMathFilter =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/documen4.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 6702323a10b16c3733da4f57e426d0a1247acf49
Author: Eike Rathke 
AuthorDate: Thu Dec 13 17:25:52 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 21:26:41 2018 +0100

Remove moot comment

ScMarkData is passed since long.

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

diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index c8065b021455..040f5e6b5dc0 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -614,8 +614,6 @@ bool ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
 if (maTabs[*itr])
 maTabs[*itr]->UpdateSelectionFunction(aData, aMark);
 
-//TODO: pass rMark to UpdateSelection Function !
-
 rResult = aData.getResult();
 if (aData.bError)
 rResult = 0.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/subtotal.hxx  |2 +
 sc/source/core/data/column2.cxx  |   60 +++
 sc/source/core/data/documen4.cxx |   66 ---
 3 files changed, 9 insertions(+), 119 deletions(-)

New commits:
commit 775d93cdbf936563f0387e1fca91abc25471838b
Author: Eike Rathke 
AuthorDate: Thu Dec 13 17:13:37 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 21:26:26 2018 +0100

Use ScFunctionData::update() and getResult() instead of direct member access

So we can start to bundle everything in one place.

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

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 441e2e18c0d3..2c1db3ca2264 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -52,9 +52,11 @@ private:
 
 struct ScFunctionData   // to calculate single functions
 {
+private:
 WelfordRunner   maWelford;
 double  nVal;
 sal_uInt64  nCount;
+public:
 ScSubTotalFunc const  eFunc;
 boolbError;
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5f77628699f6..3aabfec3f611 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3383,60 +3383,12 @@ class UpdateSubTotalHandler
 
 switch (mrData.eFunc)
 {
-case SUBTOTAL_FUNC_SUM:
-case SUBTOTAL_FUNC_AVE:
-{
-if (!bVal)
-return;
-
-++mrData.nCount;
-if (!SubTotal::SafePlus(mrData.nVal, fVal))
-mrData.bError = true;
-}
-break;
-case SUBTOTAL_FUNC_CNT: // only the value
-{
-if (!bVal)
-return;
-
-++mrData.nCount;
-}
-break;
-case SUBTOTAL_FUNC_CNT2:// everything
-++mrData.nCount;
-break;
-case SUBTOTAL_FUNC_MAX:
-{
-if (!bVal)
-return;
-
-if (++mrData.nCount == 1 || fVal > mrData.nVal)
-mrData.nVal = fVal;
-}
-break;
-case SUBTOTAL_FUNC_MIN:
-{
-if (!bVal)
-return;
-
-if (++mrData.nCount == 1 || fVal < mrData.nVal)
-mrData.nVal = fVal;
-}
+case SUBTOTAL_FUNC_CNT2:// everything
+mrData.update( fVal);
 break;
-case SUBTOTAL_FUNC_VAR:
-case SUBTOTAL_FUNC_VARP:
-case SUBTOTAL_FUNC_STD:
-case SUBTOTAL_FUNC_STDP:
-{
-if (!bVal)
-return;
-
-mrData.maWelford.update( fVal);
-}
-break;
-default:
-// unhandled unknown
-mrData.bError = true;
+default:// only numeric values
+if (bVal)
+mrData.update( fVal);
 }
 }
 
@@ -3520,7 +3472,7 @@ void ScColumn::UpdateSelectionFunction(
 {
 // Simply count selected rows regardless of cell contents.
 for (; it != itEnd; ++it)
-rData.nCount += it->mnRow2 - it->mnRow1 + 1;
+rData.update( it->mnRow2 - it->mnRow1 + 1);
 }
 break;
 case SUBTOTAL_FUNC_CNT2:
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 94b361cde765..c8065b021455 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -616,71 +616,7 @@ bool ScDocument::GetSelectionFunction( ScSubTotalFunc 
eFunc,
 
 //TODO: pass rMark to UpdateSelection Function !
 
-if (!aData.bError)
-switch (eFunc)
-{
-case SUBTOTAL_FUNC_SUM:
-rResult = aData.nVal;
-break;
-case SUBTOTAL_FUNC_SELECTION_COUNT:
-rResult = aData.nCount;
-break;
-case SUBTOTAL_FUNC_CNT:
-case SUBTOTAL_FUNC_CNT2:
-rResult = aData.nCount;
-break;
-case SUBTOTAL_FUNC_AVE:
-if (aData.nCount)
-rResult = aData.nVal / static_cast(aData.nCount);
-else
-aData.bError = true;
-break;
-case SUBTOTAL_FUNC_MAX:
-case SUBTOTAL_FUNC_MIN:
-if (aData.nCount)
-rResult = aData.nVal;
-else
-aData.bError = true;
-break;
-case SUBTOTAL_FUNC_VAR:
-case SUBTOTAL_FUNC_STD:
-if (aData.maWelfo

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

[Libreoffice Gerrit user]

 sc/inc/subtotal.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e020e25d4d571cbc48f54d7d25fd5f0c6d4f7fe8
Author: Eike Rathke 
AuthorDate: Thu Dec 13 14:16:21 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 21:26:06 2018 +0100

Should had been sal_uInt64 nCount

Change-Id: I45b725ee740ea84f6af297338889dc447f279acd
Reviewed-on: https://gerrit.libreoffice.org/65104
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit bb5327dc220660abfb848b76946aaec5ea70011c)
Reviewed-on: https://gerrit.libreoffice.org/65118

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 46f6fcc7693c..e05327be3861 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -47,7 +47,7 @@ public:
 private:
 double  fMean;
 double  fM2;
-sal_Int64   nCount;
+sal_uInt64  nCount;
 };
 
 struct ScFunctionData   // to calculate single functions
___
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/source

[Libreoffice Gerrit user]

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

New commits:
commit b41e256f3ed994338546bbac2a85b223ce802fce
Author: Xisco Fauli 
AuthorDate: Thu Dec 13 14:19:01 2018 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 13 20:39:53 2018 +0100

tdf#116529: Add calls to SetFieldUnit to switch inch/cm

Change-Id: I96208c01deb75cc9e1a5af7a15d7bc94afd28021
Reviewed-on: https://gerrit.libreoffice.org/65105
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 3e06873d124c9f8f4cd2e5f5d619de3c99ca09bf)
Reviewed-on: https://gerrit.libreoffice.org/65116

diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx 
b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 984c7d8cde2b..8ce3af41a5eb 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -188,16 +188,20 @@ PageMarginControl::PageMarginControl( sal_uInt16 nId, 
vcl::Window* pParent )
 Link aLinkLR = LINK( this, PageMarginControl, 
ModifyLRMarginHdl );
 m_pLeftMarginEdit->SetModifyHdl( aLinkLR );
 SetMetricValue( *m_pLeftMarginEdit.get(), m_nPageLeftMargin, m_eUnit );
+SetFieldUnit( *m_pLeftMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_pRightMarginEdit->SetModifyHdl( aLinkLR );
 SetMetricValue( *m_pRightMarginEdit.get(), m_nPageRightMargin, m_eUnit );
+SetFieldUnit( *m_pRightMarginEdit.get(), lcl_GetFieldUnit() );
 
 Link aLinkUL = LINK( this, PageMarginControl, 
ModifyULMarginHdl );
 m_pTopMarginEdit->SetModifyHdl( aLinkUL );
 SetMetricValue( *m_pTopMarginEdit.get(), m_nPageTopMargin, m_eUnit );
+SetFieldUnit( *m_pTopMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_pBottomMarginEdit->SetModifyHdl( aLinkUL );
 SetMetricValue( *m_pBottomMarginEdit.get(), m_nPageBottomMargin, m_eUnit );
+SetFieldUnit( *m_pBottomMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_aPageSize = pSize->GetSize();
 SetMetricFieldMaxValues( m_aPageSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/osx/salinst.cxx  |   10 ++
 vcl/osx/saltimer.cxx |5 +
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit e3e15d8c625cbf56e1f03d9ebde966e78844c7a4
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 21:21:37 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 21:24:23 2018 +0200

Use the non-deprecated NSEventMaskAny

(Exactly the same thing as the old name NSAnyEventMask. The naming
convention just has changed to use a common prefix: NSEventMask*
instead of NS*EventMask.)

Change-Id: I18a1ae0a2b399ac38567a0171b0d211dcc9faec1

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 6c2ca65c3050..b1c5774c21ff 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -516,10 +516,7 @@ bool AquaSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 {
 SolarMutexReleaser aReleaser;
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
-pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
-SAL_WNODEPRECATED_DECLARATIONS_POP
+pEvent = [NSApp nextEventMatchingMask: NSEventMaskAny
 untilDate: nil
 inMode: NSDefaultRunLoopMode
 dequeue: YES];
@@ -550,10 +547,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 {
 SolarMutexReleaser aReleaser;
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
-pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
-SAL_WNODEPRECATED_DECLARATIONS_POP
+pEvent = [NSApp nextEventMatchingMask: NSEventMaskAny
 untilDate: [NSDate distantFuture]
 inMode: NSDefaultRunLoopMode
 dequeue: YES];
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 43931d722ef8..79dac0fdee9f 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -56,10 +56,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 // so we peek the queue and post to the start, if empty.
 // Some Qt bugs even indicate nextEvent without dequeue
 // sometimes blocks, so we dequeue and re-add the event.
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12
-NSEvent* pPeekEvent = [NSApp nextEventMatchingMask: NSAnyEventMask
-SAL_WNODEPRECATED_DECLARATIONS_POP
+NSEvent* pPeekEvent = [NSApp nextEventMatchingMask: NSEventMaskAny
untilDate: nil
inMode: NSDefaultRunLoopMode
dequeue: YES];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 starmath/source/view.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit fc6d5461da366df6fa10561e12923532071af0c8
Author: Caolán McNamara 
AuthorDate: Thu Dec 13 16:09:44 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 20:18:27 2018 +0100

Resolves: tdf#117091 prepend a xml declaration if missing

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

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c4d2a91316ad..76ad4c5fe541 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1611,6 +1611,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
 OUString aString;
 if (aDataHelper.GetString( nId, aString))
 {
+// tdf#117091 force xml declaration to exist
+if (!aString.startsWith("\n" + 
aString;
+
 std::unique_ptr pClipboardMedium(new 
SfxMedium());
 pClipboardMedium->GetItemSet(); //generates 
initial itemset, not sure if necessary
 std::shared_ptr pMathFilter =
___
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/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/insertcaption.ui  |4 +++
 sw/uiconfig/swriter/ui/mailmerge.ui  |   34 ---
 sw/uiconfig/swriter/ui/optcaptionpage.ui |7 --
 3 files changed, 32 insertions(+), 13 deletions(-)

New commits:
commit 265d9e6ee9c777975e5ce32d977092d7d935ad97
Author: Caolán McNamara 
AuthorDate: Wed Dec 12 11:59:34 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 20:17:31 2018 +0100

add activates.default, etc

Change-Id: Idc3e86d8b0f18a1910c6cde691e96fb8b04e8669
Reviewed-on: https://gerrit.libreoffice.org/65016
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit a99f269b77b744ab2844ecb7a711c8ef339f7bb2)
Reviewed-on: https://gerrit.libreoffice.org/65113
Tested-by: Jenkins

diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui 
b/sw/uiconfig/swriter/ui/insertcaption.ui
index e4959fd3e81f..3a858b3e0bec 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -127,6 +127,7 @@
 True
 True
 True
+True
   
 
   
@@ -226,6 +227,7 @@
 True
 True
 True
+True
 : 
   
   
@@ -252,6 +254,7 @@
 True
 True
 True
+True
 . 
   
   
@@ -292,6 +295,7 @@
 
   
 False
+True
   
 
   
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui 
b/sw/uiconfig/swriter/ui/mailmerge.ui
index ca1e629b6061..623976f6d6e2 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -1,16 +1,23 @@
 
-
+
 
   
   
 1
 1
   
+  
+1
+1
+  
   
 False
 5
 Mail Merge
 dialog
+
+  
+
 
   
 False
@@ -183,6 +190,7 @@
   
 True
 True
+True
 adjustment1
 True
   
@@ -210,7 +218,8 @@
   
 True
 True
-adjustment1
+True
+adjustment2
 True
   
   
@@ -399,8 +408,8 @@
 True
 False
 start
-0
 Field:
+0
   
   
 0
@@ -412,10 +421,10 @@
 True
 False
 start
-0
 _Path:
 True
 path
+0
   
   
 0
@@ -427,10 +436,10 @@
 True
 False
 start
-0
 F_ile format:
 True
 fileformat
+0
   
   
 0
@@ -438,7 +447,7 @@
   
   

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

[Libreoffice Gerrit user]

 include/vcl/weld.hxx   |1 
 sw/source/ui/index/cnttab.cxx  |  642 +++--
 sw/source/uibase/inc/swuicnttab.hxx|  139 +++
 sw/uiconfig/swriter/ui/tocindexpage.ui |  140 ---
 vcl/source/app/salvtables.cxx  |6 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |5 
 6 files changed, 463 insertions(+), 470 deletions(-)

New commits:
commit 75bf9b4cbb668196bc20f4124a55d0a69f7ecdcf
Author: Caolán McNamara 
AuthorDate: Wed Dec 12 16:09:09 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 20:18:09 2018 +0100

weld SwTOXSelectTabPage

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 98521af326c5..41ba948be3a4 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -651,6 +651,7 @@ public:
 {
 insert_item(-1, rId, rStr, nullptr, &rImage, false);
 }
+virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) = 
0;
 virtual void set_item_active(const OString& rIdent, bool bActive) = 0;
 virtual void set_item_label(const OString& rIdent, const OUString& rLabel) 
= 0;
 virtual void set_item_help_id(const OString& rIdent, const OString& 
rHelpId) = 0;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 0ac7ab72239f..cb073ff86353 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -471,8 +471,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl, 
Button*, void )
 OUString sInfo(SwResId(STR_FILE_NOT_FOUND));
 sInfo = sInfo.replaceFirst( "%1", sTemplate );
 sInfo = sInfo.replaceFirst( "%2", aOpt.GetTemplatePath() );
-vcl::Window* pWin = GetParent();
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr,
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
   
VclMessageType::Info, VclButtonsType::Ok,
   sInfo));
 xInfoBox->run();
@@ -722,66 +721,57 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, 
weld::Button&, rBtn, void)
 }
 }
 
-SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& 
rAttrSet)
-: SfxTabPage(pParent, "TocIndexPage",
-"modules/swriter/ui/tocindexpage.ui", &rAttrSet)
+SwTOXSelectTabPage::SwTOXSelectTabPage(TabPageParent pParent, const 
SfxItemSet& rAttrSet)
+: SfxTabPage(pParent, "modules/swriter/ui/tocindexpage.ui", 
"TocIndexPage", &rAttrSet)
 , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
 , m_bWaitingInitialSettings(true)
-{
-get(m_pTitleED, "title");
-get(m_pTypeFT, "typeft");
-get(m_pTypeLB, "type");
-get(m_pReadOnlyCB, "readonly");
-
-get(m_pAreaFrame, "areaframe");
-get(m_pAreaLB, "scope");
-get(m_pLevelFT, "levelft");
-get(m_pLevelNF, "level");
-
-get(m_pCreateFrame, "createframe");
-get(m_pFromHeadingsCB, "fromheadings");
-get(m_pAddStylesCB, "addstylescb");
-sAddStyleUser = get("stylescb")->GetText();
-get(m_pAddStylesPB, "styles");
-get(m_pFromTablesCB, "fromtables");
-get(m_pFromFramesCB, "fromframes");
-get(m_pFromGraphicsCB, "fromgraphics");
-get(m_pFromOLECB, "fromoles");
-get(m_pLevelFromChapterCB, "uselevel");
-
-get(m_pFromCaptionsRB, "captions");
-get(m_pFromObjectNamesRB, "objnames");
-
-get(m_pCaptionSequenceFT, "categoryft");
-get(m_pCaptionSequenceLB, "category");
-get(m_pDisplayTypeFT, "displayft");
-get(m_pDisplayTypeLB, "display");
-get(m_pTOXMarksCB, "indexmarks");
-
-get(m_pIdxOptionsFrame, "optionsframe");
-get(m_pCollectSameCB, "combinesame");
-get(m_pUseFFCB, "useff");
-get(m_pUseDashCB, "usedash");
-get(m_pCaseSensitiveCB, "casesens");
-get(m_pInitialCapsCB, "initcaps");
-get(m_pKeyAsEntryCB, "keyasentry");
-get(m_pFromFileCB, "fromfile");
-get(m_pAutoMarkPB, "file");
-
-get(m_pFromObjFrame, "objectframe");
-get(m_pFromObjCLB, "objects");
-
-get(m_pAuthorityFrame, "authframe");
-get(m_pSequenceCB, "numberentries");
-get(m_pBracketLB, "brackets");
-
-get(m_pSortFrame, "sortframe");
-get(m_pLanguageLB, "lang");
-get(m_pSortAlgorithmLB, "keytype");
-
+, m_xTitleED(m_xBuilder->weld_entry("title"))
+, m_xTypeFT(m_xBuilder->weld_label("typeft"))
+, m_xTypeLB(m_xBuilder->weld_combo_box("type"))
+, m_xReadOnlyCB(m_xBuilder->weld_check_button("readonly"))
+, m_xAreaFrame(m_xBuilder->weld_widget("areaframe"))
+, m_xAreaLB(m_xBuilder->weld_combo_box("scope"))
+, m_xLevelFT(m_xBuilder->weld_label("levelft"))
+, m_xLevelNF(m_xBui

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

[Libreoffice Gerrit user]

 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |   10 ++
 xmloff/source/forms/elementexport.cxx   |2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 8e0e2c1f4b9c8ec16d8b248155bb011e42e4a31a
Author: Lionel Elie Mamane 
AuthorDate: Wed Dec 5 17:17:21 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 19:49:51 2018 +0100

address forward incompatibility of InputRequired default change

commit fec8c14e960fbcd639a04d6c3354caff2d0bd365 changed the default value
of InputRequired as read from the file; that is the value InputRequired
has when it is set to neither false nor true in the file

This is to mitigate the fact that InputRequired was not property
enforced and now suddenly is, but its default value was "true"! So
lots of past forms have InputRequired==true everywhere, users did not
pay attention to it because it was not enforced, and now it is
enforced, which suddenly is a huge PITA for users because they have to
update most controls in all forms. Since older versions of LibreOffice
omitted the input-required attribute in the file (the XML stream) when
it had its then-default value (namely "true"), we changed that to now
mean "false". As a side-effect, newer LibreOffice omits the attribute
in the XML stream when InputRequired has its new default value, namely
"false".

So the situation is that any file saved with an older LibreOffice will
have all its form controls with InputRequired==false when opened with
a newer LibreOffice, and any file saved with a newer LibreOffice will
have all its form controls with InputRequired==true when opened with
an older LibreOffice.

This commit makes LibreOffice always write the XML attribute. So that
any file saved with a newer LibreOffice will have the same
InputRequired values when opened in an older LibreOffice.

This enhances forward compatibility, because InputRequired was
enforced in older versions when the underlying database field was
marked NOT NULL. So the current situation leads to unwanted
enforcement in older LibreOffice versions, with a file that is saved
from newer LibreOffice with a control having InputRequired==false and
bound to a database field marked NOT NULL. This commit fixes that, by
ensuring that any form control with InputRequired==false in newer
LibreOffice will also have InputRequired==false in older LibreOffice.

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

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng 
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index adae650eafc9..d59314e99771 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -2313,6 +2313,16 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+  
+  
+
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index d0fee7480896..410192d84284 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -835,7 +835,7 @@ namespace xmloff
 OAttributeMetaData::getDatabaseAttributeNamespace(),
 OAttributeMetaData::getDatabaseAttributeName( 
DAFlags::InputRequired ),
 PROPERTY_INPUT_REQUIRED,
-BoolAttrFlags::DefaultFalse
+BoolAttrFlags::DefaultFalse | BoolAttrFlags::DefaultVoid
 );
 RESET_BIT( nIncludeDatabase, DAFlags::InputRequired );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |   10 ++
 xmloff/source/forms/elementexport.cxx   |2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 97a0a7f403d9514b6dc9017e6c1ac603efa9576c
Author: Lionel Elie Mamane 
AuthorDate: Wed Dec 5 17:17:21 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 19:49:37 2018 +0100

address forward incompatibility of InputRequired default change

commit fec8c14e960fbcd639a04d6c3354caff2d0bd365 changed the default value
of InputRequired as read from the file; that is the value InputRequired
has when it is set to neither false nor true in the file

This is to mitigate the fact that InputRequired was not property
enforced and now suddenly is, but its default value was "true"! So
lots of past forms have InputRequired==true everywhere, users did not
pay attention to it because it was not enforced, and now it is
enforced, which suddenly is a huge PITA for users because they have to
update most controls in all forms. Since older versions of LibreOffice
omitted the input-required attribute in the file (the XML stream) when
it had its then-default value (namely "true"), we changed that to now
mean "false". As a side-effect, newer LibreOffice omits the attribute
in the XML stream when InputRequired has its new default value, namely
"false".

So the situation is that any file saved with an older LibreOffice will
have all its form controls with InputRequired==false when opened with
a newer LibreOffice, and any file saved with a newer LibreOffice will
have all its form controls with InputRequired==true when opened with
an older LibreOffice.

This commit makes LibreOffice always write the XML attribute. So that
any file saved with a newer LibreOffice will have the same
InputRequired values when opened in an older LibreOffice.

This enhances forward compatibility, because InputRequired was
enforced in older versions when the underlying database field was
marked NOT NULL. So the current situation leads to unwanted
enforcement in older LibreOffice versions, with a file that is saved
from newer LibreOffice with a control having InputRequired==false and
bound to a database field marked NOT NULL. This commit fixes that, by
ensuring that any form control with InputRequired==false in newer
LibreOffice will also have InputRequired==false in older LibreOffice.

Change-Id: I92ef48ad99c4e2ead43e95376282cc861c181ab3
Reviewed-on: https://gerrit.libreoffice.org/64642
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 
Reviewed-by: Eike Rathke 

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng 
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index adae650eafc9..d59314e99771 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -2313,6 +2313,16 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+  
+  
+
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 8a4e99168e58..ddbc49a87210 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -835,7 +835,7 @@ namespace xmloff
 OAttributeMetaData::getDatabaseAttributeNamespace(),
 OAttributeMetaData::getDatabaseAttributeName( 
DAFlags::InputRequired ),
 PROPERTY_INPUT_REQUIRED,
-BoolAttrFlags::DefaultFalse
+BoolAttrFlags::DefaultFalse | BoolAttrFlags::DefaultVoid
 );
 RESET_BIT( nIncludeDatabase, DAFlags::InputRequired );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/tool/subtotal.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6ca8d2c895d729510c8345db79db95016db5e3ba
Author: Eike Rathke 
AuthorDate: Thu Dec 13 16:37:08 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 19:19:21 2018 +0100

Add SUBTOTAL_FUNC_SELECTION_COUNT to ScFunctionData::update() and 
getResult()

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

diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index ad657815b06c..44bec5477756 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -86,6 +86,9 @@ void ScFunctionData::update( double fNewVal )
 case SUBTOTAL_FUNC_CNT2:
 ++nCount;
 break;
+case SUBTOTAL_FUNC_SELECTION_COUNT:
+nCount += fNewVal;
+break;
 case SUBTOTAL_FUNC_AVE:
 if (!SubTotal::SafePlus(nVal, fNewVal))
 bError = true;
@@ -132,6 +135,7 @@ double ScFunctionData::getResult()
 {
 case SUBTOTAL_FUNC_CNT:
 case SUBTOTAL_FUNC_CNT2:
+case SUBTOTAL_FUNC_SELECTION_COUNT:
 fRet = nCount;
 break;
 case SUBTOTAL_FUNC_SUM:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/01/0406.xhp |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b0269e6331ef725f4cea02fc606c5d30b011b3bd
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 16:22:25 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:56:31 2018 +0100

Help files: http -> https

+ some more conservative changes

Change-Id: I328505b05838c3f3ce40759096ca77d30c874c57
Reviewed-on: https://gerrit.libreoffice.org/63196
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0406.xhp 
b/source/text/scalc/01/0406.xhp
index 73826b05d..4a65e0a13 100644
--- a/source/text/scalc/01/0406.xhp
+++ b/source/text/scalc/01/0406.xhp
@@ -43,7 +43,7 @@
 
 
 
-You can download 
the complete ODFF (OpenDocument Format Formula) specification from the http://www.oasis-open.org/committees/documents.php?wg_abbrev=office-formula";>OASIS
 web site.
+You can download 
the complete ODFF (OpenDocument Format Formula) specification from the https://www.oasis-open.org/committees/documents.php?wg_abbrev=office-formula";>OASIS
 web site.
 The 
Function Wizard has two tabs: Functions is used to 
create formulas, and Structure is used to check the formula 
build.
 Functions Tab
 
@@ -53,21 +53,21 @@
 Category
 Lists all 
the categories to which the different functions are assigned. Select a category 
to view the appropriate functions in the list field below. Select "All" 
to view all functions in alphabetical order, irrespective of category. "Last 
Used" lists the functions you have most recently used.
 
-You can browse 
the full List of Categories and Functions
+You can browse 
the full List of Categories and Functions.
 
 Function
 Displays the functions found under the 
selected category. Double-click to select a function. A single-click 
displays a short function description.
 
 Array
-Specifies that the selected function is 
inserted into the selected cell range as an array formula.  Array 
formulas operate on multiple cells. Each cell in the array contains the 
formula, not as a copy but as a common formula shared by all matrix 
cells.
-The 
Array option is identical to the CommandCtrl+Shift+Enter
 command, which is used to enter and confirm formulas in the sheet. The formula 
is inserted as a matrix formula indicated by two braces { }.
+Specifies that the selected function is 
inserted into the selected cell range as an array formula. Array 
formulas operate on multiple cells. Each cell in the array contains the 
formula, not as a copy but as a common formula shared by all matrix 
cells.
+The 
Array option is identical to the CommandCtrl+Shift+Enter
 command, which is used to enter and confirm formulas in the sheet. The formula 
is inserted as a matrix formula indicated by two braces: { 
}.
 The maximum size of 
an array range is 128 by 128 cells.
 Argument Input Fields
-When you 
double-click a function, the argument input field(s) appear on the right side 
of the dialog. To select a cell reference as an argument, click directly into 
the cell, or drag across the required range on the sheet while holding down the 
mouse button. You can also enter numerical and other values or references 
directly into the corresponding fields in the dialog. When using date entries, make 
sure you use the correct format. Click OK to insert the result into the 
spreadsheet.
+When you 
double-click a function, the argument input field(s) appear on the right side 
of the dialog. To select a cell reference as an argument, click directly into 
the cell, or drag across the required range on the sheet while holding down the 
mouse button. You can also enter numerical and other values or references 
directly into the corresponding fields in the dialog. When using date 
entries, make sure you use the correct format. Click 
OK to insert the result into the spreadsheet.
 
 
 Function Result
-As soon you 
enter arguments in the function, the result is calculated. This preview informs 
you if the calculation can be carried out with the arguments given. If the 
arguments result in an error, the corresponding error code is 
displayed.
+As soon you 
enter arguments in the function, the result is calculated. This preview informs 
you if the calculation can be carried out with the arguments given. If the 
arguments result in an error, the corresponding error 
code is displayed.
 The required 
arguments are indicated by names in bold print.
 
 
@@ -89,7 +89,7 @@
 To select a single 
function from a complex formula consisting of several functions, double-click 
the function in the formula window.
 
 Next
-Moves forward through the formula 
components in the formula window. This button can also be used to 
assign functions to the formula. If you select a function and click the 
Next button, the selection appears in the formula 
window.
+Moves forward through the formula 
components in the formula window. This but

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

[Libreoffice Gerrit user]

 source/text/swriter/classificationbar.xhp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9077e33a902ac32266b88516c91e4fc04fd23419
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 22:00:21 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:56:14 2018 +0100

Help files: http -> https

+ some more conservative changes

Change-Id: I6f7e22164c975421f01e9ba974d82f14a34c0d5d
Reviewed-on: https://gerrit.libreoffice.org/63219
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/classificationbar.xhp 
b/source/text/swriter/classificationbar.xhp
index 30960e2eb..d9a2a1aa1 100644
--- a/source/text/swriter/classificationbar.xhp
+++ b/source/text/swriter/classificationbar.xhp
@@ -51,7 +51,7 @@
 
 
 The 
default BAF categories for %PRODUCTNAME are listed below.
-Only the 
Intellectual Properties category will modify the layout of the document with a 
watermark, fields in the header and footer and an information bar on top of the 
document area. Each item inserted in the document is controlled by the 
classification configuration file.
+Only the 
"Intellectual Properties" category will modify the layout of the document with 
a watermark, fields in the header and footer and an information bar on top of 
the document area. Each item inserted in the document is controlled by the 
classification configuration file.
 Intellectual Property
 Intellectual 
property is a generic term for the nature of the contents of the document. 
Select this category for general purpose document classification.
 National Security
@@ -110,10 +110,10 @@ path above to access the file.
 
 
 The Classification bar contains tools to help secure 
document handling.
-The 
Classification toolbar contains listboxes to help in selecting the security of 
the document, according to the BAF category policy 
and BAILS levels. %PRODUCTNAME will add custom 
fields in the document properties (File - 
Properties, Custom Properties tab) to store the classification policy as 
document metadata.
+The 
Classification toolbar contains listboxes to help in selecting the 
security of the document, according to the BAF 
category policy and BAILS levels. %PRODUCTNAME will 
add custom fields in the document properties (File - 
Properties, Custom Properties tab) to store the 
classification policy as document metadata.
 
 
-Go 
to menu View - Toolbars and select Classification
+Go 
to menu View - Toolbars and select Classification
 
 
 
@@ -121,10 +121,10 @@ path above to access the file.
 
 
   
-http://www.tscp.org/about-tscp/";>TSCP (Transglobal Secure Collaboration Participation, 
Inc.) website.
+https://www.tscp.org/about-tscp/";>TSCP (Transglobal Secure Collaboration Participation, 
Inc.) website.
   
   
-http://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAFv1.pdf";>Business 
Authentication Framework (BAF) document 
(PDF)
+https://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAFv1.pdf";>Business 
Authentication Framework (BAF) document 
(PDF)
   
   
 http://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAILSv1.pdf";>Business 
Authorization Identification and Labeling Scheme (BAILS) document (PDF)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 5a2fe0b2703352c682c75394b64648b61ee4fadb
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 16:22:25 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:56:31 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Help files: http -> https

+ some more conservative changes

Change-Id: I328505b05838c3f3ce40759096ca77d30c874c57
Reviewed-on: https://gerrit.libreoffice.org/63196
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9077e33a902a..b0269e6331ef 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9077e33a902ac32266b88516c91e4fc04fd23419
+Subproject commit b0269e6331ef725f4cea02fc606c5d30b011b3bd
commit 338ba5a2ce8bdcf6510a0f42dad77980cf572d59
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 22:00:21 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:56:14 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Help files: http -> https

+ some more conservative changes

Change-Id: I6f7e22164c975421f01e9ba974d82f14a34c0d5d
Reviewed-on: https://gerrit.libreoffice.org/63219
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 06c18977efb4..9077e33a902a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 06c18977efb48ac01627c139a70ae70008319f62
+Subproject commit 9077e33a902ac32266b88516c91e4fc04fd23419
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 11c58296859520d072307dcc6ec1629bde5c5664
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 20:36:15 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:55:56 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Help files: http -> https

+ some more conservative changes

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

diff --git a/helpcontent2 b/helpcontent2
index 0f2aec06d055..06c18977efb4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0f2aec06d05584f3dcddcb29f1c43a70afef081e
+Subproject commit 06c18977efb48ac01627c139a70ae70008319f62
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/01/xformsdatatab.xhp |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 06c18977efb48ac01627c139a70ae70008319f62
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 20:36:15 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:55:56 2018 +0100

Help files: http -> https

+ some more conservative changes

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

diff --git a/source/text/shared/01/xformsdatatab.xhp 
b/source/text/shared/01/xformsdatatab.xhp
index 5542cca6b..0954bbd80 100644
--- a/source/text/shared/01/xformsdatatab.xhp
+++ b/source/text/shared/01/xformsdatatab.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+
 
   
  Data (for XML Form Documents)
@@ -29,7 +27,7 @@

   
  Data (for XML Form 
Documents)
- The 
Data tab page of the Properties dialog for an XML Form document offers some XML 
forms settings.
+ The 
Data tab page of the Properties dialog for an XML 
Form document offers some XML forms settings.
   
   
  
@@ -43,7 +41,7 @@
   Select or enter the name of a binding. Selecting the name of an 
existing binding associates the binding with the form control. Entering a new 
name creates a new binding and associates it with the form 
control.
 
 Binding 
expression
-  Enter the DOM node what's a DOM node? spec doesn't 
tellto bind the control model towhat's a control model? spec 
doesn't tell. may be a typo in spec: control's model?. Click the ... 
button for a dialog to enter the XPath expression.
+  Enter the DOM node what's a DOM node? spec doesn't 
tellto bind the control model towhat's a control model? spec 
doesn't tell. may be a typo in spec: control's model?. Click the 
... button for a dialog to enter the XPath 
expression.
 
 Required
   Specifies if the item must be included on the XForm.
@@ -71,10 +69,10 @@
   The following 
lists all facets that are valid for data types. Some facets are only available 
for some data types.
 
 Whitespaces
-  Specifies how whitespaces are to be handled when a string of the 
current data type is being processed. Possible values are Preserve, Replace, 
and Collapse. The semantics follow the definition at 
http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace.
+  Specifies how whitespaces are to be handled when a string of the 
current data type is being processed. Possible values are "Preserve", 
"Replace", and "Collapse". The semantics follow the definition at https://www.w3.org/TR/xmlschema-2/#rf-whiteSpace";>https://www.w3.org/TR/xmlschema-2/#rf-whiteSpace.
 
 Pattern
-  Specifies a regular expression pattern. Strings validated against the 
data type must conform to this pattern to be valid. The XSD data type syntax 
for regular expressions is different from the regular expression syntax used 
elsewhere in %PRODUCTNAME, for example in the Find & Replace 
dialog.
+  Specifies a regular expression pattern. Strings validated against the 
data type must conform to this pattern to be valid. The XSD data type syntax 
for regular expressions is different from the regular expression syntax used 
elsewhere in %PRODUCTNAME, for example in the Find & Replace 
dialog.
 
 Digits 
(total)
   Specifies the maximum total number of digits that values of the decimal 
data type can have.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit dfd1108a3f3a6420087766b9e692b1a6be8c2fe2
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 19:09:00 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:53:06 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Help files: Cleanups and Small Improvements

Change-Id: Id363e364f66ab66989d853ba0d2edb49abd3f7f4
Reviewed-on: https://gerrit.libreoffice.org/63207
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index bab5603f2ffe..0f2aec06d055 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bab5603f2ffea0079fad86192d7feb6a7b0596fe
+Subproject commit 0f2aec06d05584f3dcddcb29f1c43a70afef081e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/swriter/00/0405.xhp |  278 +---
 1 file changed, 107 insertions(+), 171 deletions(-)

New commits:
commit 0f2aec06d05584f3dcddcb29f1c43a70afef081e
Author: Sophia Schröder 
AuthorDate: Fri Nov 9 19:09:00 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:53:06 2018 +0100

Help files: Cleanups and Small Improvements

Change-Id: Id363e364f66ab66989d853ba0d2edb49abd3f7f4
Reviewed-on: https://gerrit.libreoffice.org/63207
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/00/0405.xhp 
b/source/text/swriter/00/0405.xhp
index f77117774..187a111be 100644
--- a/source/text/swriter/00/0405.xhp
+++ b/source/text/swriter/00/0405.xhp
@@ -29,82 +29,71 @@

   Format Menu
   
- Choose Format - Paragraph - Drop Caps 
tab
- Choose View - Styles - open context menu 
Modify/New - Drop Caps tab
+ Choose Format - Paragraph - Drop Caps 
tab.
+ Choose View - Styles - open context menu 
Modify/New - Drop Caps tab.
   
   
- Choose Format - Paragraph - Text Flow 
tab
- Choose View - Styles - open context menu 
Modify/New - Text Flow tab
- Choose Edit - Find & Replace - Format - Text 
Flow tab
+ Choose Format - Paragraph - Text Flow 
tab.
+ Choose View - Styles - open context menu 
Modify/New - Text Flow tab.
+ Choose Edit - Find & Replace - Format - Text 
Flow tab.
   
   
- Right-click a paragraph with style Text 
body. Choose Edit Paragraph Style - Condition 
tab
+ Right-click a paragraph with style Text 
body. Choose Edit Paragraph Style - Condition 
tab.
   
   
  Open 
Styles window. Click the New Style from Selection 
icon and keep the mouse button pressed. Choose Load Styles from 
the submenu.
   
   
- Choose Format - Page
- 
- Choose View - Styles - open context menu 
New/Modify (for Page Styles)
+ Choose Format - Page.
+ Choose View - Styles - open context menu 
New/Modify (for Page Styles).
   
   
- Choose Format - Paragraph - Outline & 
Numbering tab
- Choose View - Styles - open context menu 
Modify/New - Outline & Numbering tab (Paragraph 
Styles)
+ Choose Format - Paragraph - Outline & 
Numbering tab.
+ Choose View - Styles - open context menu 
Modify/New - Outline & Numbering tab (Paragraph 
Styles).
   
-  Choose Format - Sections - 
Options button
-
+  Choose Format - Sections - 
Options button.
   
- Choose Format - Page - Columns tab
- Choose Format - Frame and Object - Properties - 
Columns tab
- Choose View - Styles - open context menu 
Modify/New - Columns tab
- Choose Insert - Frame - Frame - Columns 
tab
- Choose Insert/Format - Section(s) - Columns 
tab
+ Choose Format - Page - Columns tab.
+ Choose Format - Frame and Object - Properties - 
Columns tab.
+ Choose View - Styles - open context menu 
Modify/New - Columns tab.
+ Choose Insert - Frame - Frame - Columns 
tab.
+ Choose Insert/Format - Section(s) - Columns 
tab.
   
   
- Choose Format - Page - Footnote tab
- Choose View - Styles - open context menu 
Modify/New - Footnote tab
+ Choose Format - Page - Footnote tab.
+ Choose View - Styles - open context menu 
Modify/New - Footnote tab.
   
   
- Choose Insert - Section - Footnotes/Endnotes 
tab
- Choose Format - Sections - Options button 
Footnotes/Endnotes tab
+ Choose Insert - Section - Footnotes/Endnotes 
tab.
+ Choose Format - Sections - Options button 
Footnotes/Endnotes tab.
   
   
- Choose View - Styles - open context menu 
Modify/New (for Paragraph Styles)
+ Choose View - Styles - open context menu 
Modify/New (for Paragraph Styles).
   
   
- Choose View - Styles - open context menu 
Modify/New (for Character Styles)
+ Choose View - Styles - open context menu 
Modify/New (for Character Styles).
   
   
- Choose View - Styles - open context menu 
Modify/New (for Frame Styles)
+ Choose View - Styles - open context menu 
Modify/New (for Frame Styles).
   
   
- Choose View - Styles - open context menu 
Modify/New (for List Styles)
-  
-  Choose Tools - AutoCorrect - 
While Typing
-
-  Choose Tools - 
AutoCorrect
-
-  Choose Tools - AutoCorrect - 
Apply
-
-  Choose Tools - AutoCorrect - 
Apply and Edit Changes
-
-  Choose Table - AutoFormat 
Styles (with cursor in a table)
-
+ Choose View - Styles - open context menu 
Modify/New (for List Styles).
+  
+  Choose Tools - AutoCorrect - 
While Typing.
+  Choose Tools - 
AutoCorrect.
+  Choose Tools - AutoCorrect - 
Apply.
+  Choose Tools - AutoCor

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

[Libreoffice Gerrit user]

 source/text/swriter/01/04070100.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bab5603f2ffea0079fad86192d7feb6a7b0596fe
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:30:14 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:51:24 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: I2286dcecc52a6dafd8075a211161a16d5a637686
Reviewed-on: https://gerrit.libreoffice.org/64933
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/01/04070100.xhp 
b/source/text/swriter/01/04070100.xhp
index 01bb278f8..925a3c4f9 100644
--- a/source/text/swriter/01/04070100.xhp
+++ b/source/text/swriter/01/04070100.xhp
@@ -42,10 +42,10 @@
   
 
   Addressee
-  Enter the 
delivery address. You can also click in this box, and select a 
database, a table, and field, and then click the arrow button to insert the 
field in the address. If you want, you can apply  formatting, such as bold and 
underline, to the address text.
+  Enter the 
delivery address. You can also click in this box, and select a 
database, a table, and field, and then click the arrow button to insert the 
field in the address. If you want, you can apply formatting, such as bold and 
underline, to the address text.
   
 Sender
-  Includes a return address on 
the envelope. Select the Sender check box, and then enter the 
return  address. $[officename] automatically inserts your user data in 
the Sender box, but you can also enter the data that you 
want.
+  Includes a return address on 
the envelope. Select the Sender check box, and then enter the 
return address. $[officename] automatically inserts your user data in 
the Sender box, but you can also enter the data that you 
want.
   Database
   Select 
the database containing the address data that you want to 
insert.
   Table
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 97974d89a6d14bbf38b255cda82c1db7ec9516b2
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:30:14 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:51:24 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: I2286dcecc52a6dafd8075a211161a16d5a637686
Reviewed-on: https://gerrit.libreoffice.org/64933
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 62ecec5be137..bab5603f2ffe 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 62ecec5be137df3f361dcd8184f199f514787809
+Subproject commit bab5603f2ffea0079fad86192d7feb6a7b0596fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/explorer/database/menufilesave.xhp |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 62ecec5be137df3f361dcd8184f199f514787809
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:03:59 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:51:03 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: Ie60e05fb6b82cd91d3141ef567919f680fd84b6c
Reviewed-on: https://gerrit.libreoffice.org/64929
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/explorer/database/menufilesave.xhp 
b/source/text/shared/explorer/database/menufilesave.xhp
index 0438df399..4cec43510 100644
--- a/source/text/shared/explorer/database/menufilesave.xhp
+++ b/source/text/shared/explorer/database/menufilesave.xhp
@@ -1,6 +1,5 @@
 
-
-
+
 
-   
-
+
 
 
 Save
@@ -32,7 +30,7 @@
 
 
 Save
-In this dialog, 
you can specify the position and name of a form UFI: spec says also 
for report, but reports can be created only by Wizard and are autosaved 
thereUFI: spec says also for query, cannot verify 
that you save within a database file. The 
dialog opens automatically when you save a form the first time.UFI: no 
chance to open the dialog a second time
+In this dialog, 
you can specify the position and name of a form UFI: spec says also 
for report, but reports can be created only by Wizard and are autosaved 
thereUFI: spec says also for query, cannot 
verifythat you save within a database file. The 
dialog opens automatically when you save a form the first time.UFI: no 
chance to open the dialog a second time
 
 Create 
New Directory
 Click to create a new folder within the database 
file.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit ae9c93b80343b2141f3c1e2557711c65c7a7171d
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:03:59 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:51:03 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: Ie60e05fb6b82cd91d3141ef567919f680fd84b6c
Reviewed-on: https://gerrit.libreoffice.org/64929
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c7d250f32089..62ecec5be137 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c7d250f32089736164d4d95757fa5837491a634f
+Subproject commit 62ecec5be137df3f361dcd8184f199f514787809
commit 645050b57650bc006a76b2518ea827eff90995ea
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:57:52 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:50:43 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces

Change-Id: I3d29383ab3674d2967b41cceeff1d0ef0fafea06
Reviewed-on: https://gerrit.libreoffice.org/64928
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 911e28b1d83b..c7d250f32089 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 911e28b1d83b4cb6bbac8c6c3ba7eb5d67d4a5f1
+Subproject commit c7d250f32089736164d4d95757fa5837491a634f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/02/1004.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7d250f32089736164d4d95757fa5837491a634f
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:57:52 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:50:43 2018 +0100

Related: tdf#121173 double spaces

Change-Id: I3d29383ab3674d2967b41cceeff1d0ef0fafea06
Reviewed-on: https://gerrit.libreoffice.org/64928
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/1004.xhp 
b/source/text/shared/02/1004.xhp
index ef1eebe78..1630bf80f 100644
--- a/source/text/shared/02/1004.xhp
+++ b/source/text/shared/02/1004.xhp
@@ -20,7 +20,7 @@
 
 
   
-To  Document End/Last Page
+To Document End/Last Page
 /text/shared/02/1004.xhp
   
   
@@ -31,7 +31,7 @@
 
 
 
- To  Document 
End Last Page 
+ To Document 
EndLast Page
 Moves to the last page of the document. This function is only 
active when you select the Print Preview function on the 
File menu.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 78b15e97543c71a7e92e8cbc08b6c893347d44e9
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 17:32:48 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:50:20 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#121173 correct double spaces in sentences

Change-Id: Ia8116e46e75cbf32293f20e0c905ed8707156b95
Reviewed-on: https://gerrit.libreoffice.org/64886
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dc560c20cae5..911e28b1d83b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dc560c20cae5eb34c155ea65a34169cb19e830ca
+Subproject commit 911e28b1d83b4cb6bbac8c6c3ba7eb5d67d4a5f1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit a53a3228f697c34b524e2475cec990961befc6e9
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:54:18 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:49:25 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: Icee0b15ad69fadc6e01a50b7f1c6485675ed42b5
Reviewed-on: https://gerrit.libreoffice.org/64927
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 1dc486827433..1c9e65b6315b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1dc486827433e96acbfd36663858c8b5f2b7a0a4
+Subproject commit 1c9e65b6315bb98a9a3110677ef442fb2b125a3a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/02/01170200.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c9e65b6315bb98a9a3110677ef442fb2b125a3a
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:54:18 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:49:25 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: Icee0b15ad69fadc6e01a50b7f1c6485675ed42b5
Reviewed-on: https://gerrit.libreoffice.org/64927
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/01170200.xhp 
b/source/text/shared/02/01170200.xhp
index 4b991035f..e6a38a590 100644
--- a/source/text/shared/02/01170200.xhp
+++ b/source/text/shared/02/01170200.xhp
@@ -35,7 +35,7 @@
   forms; 
propertiesproperties; 
forms
 
 Form 
Properties
-  In this dialog 
you can specify, among others,  the data source and the events for the whole 
form.
+  In this dialog 
you can specify, among others, the data source and the events for the whole 
form.
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/sbasic/shared/03100300.xhp |3 +--
 source/text/sbasic/shared/03170010.xhp |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 911e28b1d83b4cb6bbac8c6c3ba7eb5d67d4a5f1
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 17:32:48 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:50:20 2018 +0100

tdf#121173 correct double spaces in sentences

Change-Id: Ia8116e46e75cbf32293f20e0c905ed8707156b95
Reviewed-on: https://gerrit.libreoffice.org/64886
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03100300.xhp 
b/source/text/sbasic/shared/03100300.xhp
index be91779d2..48ad01dce 100644
--- a/source/text/sbasic/shared/03100300.xhp
+++ b/source/text/sbasic/shared/03100300.xhp
@@ -48,8 +48,7 @@
 
 Parameters:
  
Expression: Any string or numeric expression that you want to 
convert.
-When you 
convert a string expression, the date and time must be entered
-either in one of the date acceptance patterns defined for your locale 
setting (see Tools - Options - Language Settings - 
Languages) or in ISO date format (momentarily, only the ISO format with 
hyphens, e.g. "2012-12-31" is accepted). In numeric expressions, values to the 
left of the decimal represent the date, beginning from December 31, 1899. 
Values to the right of the decimal represent the time.
+When you 
convert a string expression, the date and time must be entered either in one of 
the date acceptance patterns defined for your locale setting (see Tools - Options - Language Settings - Languages) or in 
ISO date format (momentarily, only the ISO format with hyphens, e.g. 
"2012-12-31" is accepted). In numeric expressions, values to the left of the 
decimal represent the date, beginning from December 31, 1899. Values to the 
right of the decimal represent the time.
 
 
 
commit dc560c20cae5eb34c155ea65a34169cb19e830ca
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 14:07:34 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:50:05 2018 +0100

tdf#121173 correct double spaces in sentences

Change-Id: I46b602d6ca6323d932839b8da5bfef6d4eec2dcc
Reviewed-on: https://gerrit.libreoffice.org/64872
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03170010.xhp 
b/source/text/sbasic/shared/03170010.xhp
index 0d615dfed..cf582c729 100644
--- a/source/text/sbasic/shared/03170010.xhp
+++ b/source/text/sbasic/shared/03170010.xhp
@@ -34,7 +34,7 @@
 
 expression: Required. The numeric expression to 
be formatted.
 
-numDigitsAfterDecimal: Optional. A numeric value 
specifying the number of digits that should be displayed after the decimal. If 
omitted, it defaults to the value -1, meaning that the default settings for 
user interface  locale should be used.
+numDigitsAfterDecimal: Optional. A numeric value 
specifying the number of digits that should be displayed after the decimal. If 
omitted, it defaults to the value -1, meaning that the default settings for 
user interface locale should be used.
 
 includeLeadingDigit: Optional. A vbTriState enumeration value, specifying whether a 
leading zero should be displayed for fractional values.
 
@@ -49,7 +49,7 @@
 vbUseDefaults or -2: Use the user interface 
locale settings. This is the default when omitted.
 
 
-useParensForNegativeNumbers: Optional. A vbTriState enumeration value  specifying whether 
negative numbers should be encased in parenthesis.
+useParensForNegativeNumbers: Optional. A vbTriState enumeration value specifying whether 
negative numbers should be encased in parenthesis.
 
 
 vbTrue or -1: Use parenthesis for negative 
numbers.
@@ -62,7 +62,7 @@
 
 
 
-groupDigits: Optional. A vbTriState enumeration value  specifying the number 
should be grouped (into thousands, etc.), using the group delimiter that is 
specified on the system's regional settings.
+groupDigits: Optional. A vbTriState enumeration value specifying the number 
should be grouped (into thousands, etc.), using the group delimiter that is 
specified on the system's regional settings.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 85e1d5a13c9850bc54cb893544b0d2d264a8f787
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 14:07:34 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:50:05 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#121173 correct double spaces in sentences

Change-Id: I46b602d6ca6323d932839b8da5bfef6d4eec2dcc
Reviewed-on: https://gerrit.libreoffice.org/64872
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 6849bd0b34db..dc560c20cae5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6849bd0b34db2341fa3e99707dc32b1facdd7da2
+Subproject commit dc560c20cae5eb34c155ea65a34169cb19e830ca
commit f51aff4fd4f12dcb6155d8db874a48a282574de8
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 22:11:50 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:49:46 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: I3bbcb7c64473be6ae9ffa165d448ed90a9a67b1d
Reviewed-on: https://gerrit.libreoffice.org/64899
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 1c9e65b6315b..6849bd0b34db 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1c9e65b6315bb98a9a3110677ef442fb2b125a3a
+Subproject commit 6849bd0b34db2341fa3e99707dc32b1facdd7da2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/schart/01/type_stock.xhp |   26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 6849bd0b34db2341fa3e99707dc32b1facdd7da2
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 22:11:50 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:49:46 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: I3bbcb7c64473be6ae9ffa165d448ed90a9a67b1d
Reviewed-on: https://gerrit.libreoffice.org/64899
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/schart/01/type_stock.xhp 
b/source/text/schart/01/type_stock.xhp
index e5808ffd2..760955498 100644
--- a/source/text/schart/01/type_stock.xhp
+++ b/source/text/schart/01/type_stock.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
-
+
+  
   
  Chart Type Stock
  /text/schart/01/type_stock.xhp
@@ -33,7 +31,7 @@
 mw added one entry
 Chart Type Stock
 
-  On the 
first page of the Chart 
Wizard you can choose a chart type. 
+  On the 
first page of the Chart 
Wizard you can choose a chart type.
   
  
   
@@ -205,11 +203,10 @@
   The 
open, low, high, and closing values of a row build together one data unit in 
the chart. A stock price data series consists of several rows containing such 
data units. The column containing the transaction volume builds an optional 
second data series.
   Depending on the chosen variant, you do not need all 
columns.
   Stock Chart Variants
-  Choose 
the Stock chart type on the first page of the Chart wizard. Then select one 
of the four variants.
+  Choose 
the Stock chart type on the first page of the Chart Wizard. Then 
select one of the four variants.
   Type 1
-  Based 
on low
- and high column the Type 1 shows the distance between 
bottom price (low) and top price (high) by a vertical line.
-  Based 
on low, high, and close column Type 1 shows an 
additional horizontal mark for the closing price.
+  Based on 
low and high column the Type 1 shows the distance 
between bottom price (low) and top price (high) by a vertical line.
+  Based on 
low, high, and close column Type 1 shows an 
additional horizontal mark for the closing price.
   Type 2
   Based on 
open, low, high, and close column Type 2 generates 
the traditional "candle stick" chart. Type 2 draws the vertical line between 
the bottom and top price and adds a rectangle in front, which visualizes the 
range between the opening and closing price. If you click on the rectangle you 
see more information in the status bar. %PRODUCTNAME uses different fill colors 
for rising values (the opening price is lower than the closing price) and 
falling values.
   Type 3
@@ -219,14 +216,14 @@
   Because 
measurement for transaction volume might be "units", a second y axis is 
introduced in chart Type 3 and Type 4. The price axis is shown on the right 
side and the volume axis on the left side.
   Setting the Data Source
   Charts based on its own data
-  To 
change the data series of a chart having its own data, choose Chart Data Table from the View menu 
or from the context menu of the chart in edit mode.
+  To 
change the data series of a chart having its own data, choose Chart Data Table from 
the View menu or from the context menu of the chart in edit 
mode.
   In an 
embedded chart data table, the data series are always organized in 
columns.
-  For a new 
stock chart first use a column chart. Add the columns you need and enter your 
data in the order which is shown in the example, omitting any columns not 
required for the desired variant. Use Move Series Right to change the column 
order. Close the chart data table. Now use the Chart Type dialog to change to 
the stock chart variant. 
+  For a new 
stock chart first use a column chart. Add the columns you need and enter your 
data in the order which is shown in the example, omitting any columns not 
required for the desired variant. Use Move Series Right to change 
the column order. Close the chart data table. Now use the Chart 
Type dialog to change to the stock chart variant.
   If you 
have already got a stock chart and you want to change the variant, then first 
change the chart type to a column chart, add or remove columns so that it fits 
to the variant, and then change the chart type back to a stock 
chart.Watch issue 72433 to see whether a change in the handling is 
done.
   Do not 
write the name of a data series in a row. Write the name into the field above 
the role name.
   The 
order of the rows determines how the categories are arranged in the chart. Use 
Move Row Down to change the order.
   Charts based on Calc or Writer tables
-  You can 
choose or alter a data range on the second page of the Chart wizard or in the 
Data Range dialog. For 
fine tuning use the Data 
Series dialog.
+  You can 
choose 

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 0485c17c6191bf9ae11461790d075bf380111466
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:48:42 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:49:03 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: Iabedfa85dcb06bea8bfb7b0946ef1feafd0eb1d2
Reviewed-on: https://gerrit.libreoffice.org/64926
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index eb9651b20adf..1dc486827433 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eb9651b20adfcad54b0aba16d3cce482faa5f8a8
+Subproject commit 1dc486827433e96acbfd36663858c8b5f2b7a0a4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 8e2eed6298fe20e7e51af75a46c36b4acf7cf659
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:10:07 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:48:37 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces in sentences

Change-Id: Ifc4c6777d2b6b45c2dd08a4c62fa794151ad886d
Reviewed-on: https://gerrit.libreoffice.org/64930
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3e81e4c583e3..eb9651b20adf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3e81e4c583e3db236891fc102c488d51583024fe
+Subproject commit eb9651b20adfcad54b0aba16d3cce482faa5f8a8
commit 4fbda09a4a76b3abef17cd3ba4b1ddffc2fa6b05
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 18:04:54 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:48:22 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces

Change-Id: I9e923e6e67393ed460b7641c5c478c00a2a36e0b
Reviewed-on: https://gerrit.libreoffice.org/64888
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 21adf0705302..3e81e4c583e3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 21adf07053023db71838ecb833bd50ee700b079c
+Subproject commit 3e81e4c583e3db236891fc102c488d51583024fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/01/ref_epub_export.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1dc486827433e96acbfd36663858c8b5f2b7a0a4
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 09:48:42 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:49:03 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: Iabedfa85dcb06bea8bfb7b0946ef1feafd0eb1d2
Reviewed-on: https://gerrit.libreoffice.org/64926
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/ref_epub_export.xhp 
b/source/text/shared/01/ref_epub_export.xhp
index a879c2103..dc58567ac 100644
--- a/source/text/shared/01/ref_epub_export.xhp
+++ b/source/text/shared/01/ref_epub_export.xhp
@@ -81,7 +81,7 @@
 
 
 Custom 
cover image
-Enter the full 
path of the custom cover image file.  If the entry is empty, the exporter takes 
the cover image in the media directory (see below) when the name is one of the 
following: cover.gif, cover.jpg, cover.png or cover.svg.
+Enter the full 
path of the custom cover image file. If the entry is empty, the exporter takes 
the cover image in the media directory (see below) when the name is one of the 
following: cover.gif, cover.jpg, cover.png or cover.svg.
 The custom 
cover image is embedded in the EPUB file.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 1ef935075b1d8aa2ff12116a6f8a826d78643caf
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 21:47:36 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:47:59 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Related: tdf#121173 double spaces

Change-Id: I6060aa9759a17cbcb5419586a565688c543cb8f4
Reviewed-on: https://gerrit.libreoffice.org/64898
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 193f79464c5a..21adf0705302 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 193f79464c5ab0c4b183bd1d439f1bceedfdca8c
+Subproject commit 21adf07053023db71838ecb833bd50ee700b079c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/sbasic/shared/03/lib_tools.xhp |   28 ++--
 source/text/simpress/main0503.xhp  |2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit eb9651b20adfcad54b0aba16d3cce482faa5f8a8
Author: Sophia Schröder 
AuthorDate: Tue Dec 11 10:10:07 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:48:37 2018 +0100

Related: tdf#121173 double spaces in sentences

Change-Id: Ifc4c6777d2b6b45c2dd08a4c62fa794151ad886d
Reviewed-on: https://gerrit.libreoffice.org/64930
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/simpress/main0503.xhp 
b/source/text/simpress/main0503.xhp
index 57e2907d3..fa80737bb 100644
--- a/source/text/simpress/main0503.xhp
+++ b/source/text/simpress/main0503.xhp
@@ -41,7 +41,7 @@
   Many of the 
tools for creating vector graphics in $[officename] Draw are available in 
$[officename] Impress.
   Creating Slides
   $[officename] Impress provides you with templates to create 
professional-looking slides.
-  You can also 
assign a number of  dynamic effects to your slides, including animation and 
transition  effects.
+  You can also 
assign a number of dynamic effects to your slides, including animation and 
transition effects.
   Creating Presentations
   Several 
views or pages are available when you design a slide show. For example, the 
Slide Sorter displays an overview of your slides in thumbnail form, while the 
Handout page contains both the slide and the text you want to distribute to the 
audience.
   $[officename] Impress also lets you rehearse the timing of 
your slide show.
commit 3e81e4c583e3db236891fc102c488d51583024fe
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 18:04:54 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:48:22 2018 +0100

Related: tdf#121173 double spaces

Change-Id: I9e923e6e67393ed460b7641c5c478c00a2a36e0b
Reviewed-on: https://gerrit.libreoffice.org/64888
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/03/lib_tools.xhp 
b/source/text/sbasic/shared/03/lib_tools.xhp
index 689103018..dcf6950a4 100644
--- a/source/text/sbasic/shared/03/lib_tools.xhp
+++ b/source/text/sbasic/shared/03/lib_tools.xhp
@@ -35,8 +35,8 @@
 BASIC Tools library;Debug module
 
 
-Debug  Module
-Functions and subroutines for debugging Basic 
macros
+Debug Module
+Functions and subroutines for debugging Basic 
macros.
 
 
 
@@ -92,7 +92,7 @@
 
 
 
-Sub WriteDbgString(LocString as 
string)
+Sub WriteDbgString(LocString as 
String)
 
 
 
@@ -204,7 +204,7 @@
 BASIC Tools library;ListBox module
 
 
-ListBox  Module
+ListBox Module
 Functions and subroutines for handling ListBox 
elements.
 
 
@@ -212,7 +212,7 @@
 BASIC Tools library;Misc module
 
 
-Misc  Module
+Misc Module
 Miscellaneous functions and subroutines.
 
 
@@ -315,7 +315,7 @@
 RetrieveFileName
 
 
-' Retrieves a FileName out of a 
StarOffice-Document
+' Retrieves a FileName out of a 
StarOffice-Document.
 
 Function RetrieveFileName(LocDoc as 
Object)
 
@@ -326,7 +326,7 @@
 GetPathSettings
 
 
-' Gets a special configured 
PathSetting
+' Gets a special configured 
PathSetting.
 
 Function GetPathSettings(
 sPathType as String,
@@ -340,7 +340,7 @@
 GetOfficeSubPath
 
 
-' Gets the fully qualified path to a 
subdirectory of the Template Directory, e. g. with the parameter 
"wizard/bitmap"  The parameter must be passed over in Url-scription. The 
return-Value is in Urlscription
+' Gets the fully qualified path to a 
subdirectory of the Template Directory, e. g. with the parameter 
"wizard/bitmap". The parameter must be passed over in Url-scription. The 
return-Value is in Urlscription.
 
 Function GetOfficeSubPath(
 sOfficePath as String, 
@@ -397,7 +397,7 @@
 DeleteInputCells
 
 
-' Deletes the content of all cells that 
are softformatted according to the 'InputStyleName'
+' Deletes the content of all cells that 
are softformatted according to the 'InputStyleName'.
  

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

[Libreoffice Gerrit user]

 source/text/shared/01/prop_font_embed.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 21adf07053023db71838ecb833bd50ee700b079c
Author: Sophia Schröder 
AuthorDate: Mon Dec 10 21:47:36 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:47:59 2018 +0100

Related: tdf#121173 double spaces

Change-Id: I6060aa9759a17cbcb5419586a565688c543cb8f4
Reviewed-on: https://gerrit.libreoffice.org/64898
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/prop_font_embed.xhp 
b/source/text/shared/01/prop_font_embed.xhp
index e1ba0e896..1f7e8dd47 100644
--- a/source/text/shared/01/prop_font_embed.xhp
+++ b/source/text/shared/01/prop_font_embed.xhp
@@ -18,16 +18,16 @@
 
   
  
-embedding fonts in document file
+ embedding fonts in document file
  documents; embedding fonts
  font embedding; in documents
-fonts; embedding
-embedding; fonts
+ fonts; embedding
+ embedding; fonts
  
  
  
  Font
- Embed  
document fonts in the current file.
+ Embed 
document fonts in the current file.
   
   
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 29b1d651c07708d9869e86b3e77f4e4a268a328c
Author: Andrea Gelmini 
AuthorDate: Thu Dec 13 18:45:03 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:47:33 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix typo

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

diff --git a/helpcontent2 b/helpcontent2
index eea4d307ecbd..193f79464c5a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eea4d307ecbd8500bc429be7b0c05cf4097a5686
+Subproject commit 193f79464c5ab0c4b183bd1d439f1bceedfdca8c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 193f79464c5ab0c4b183bd1d439f1bceedfdca8c
Author: Andrea Gelmini 
AuthorDate: Thu Dec 13 18:45:03 2018 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:47:33 2018 +0100

Fix typo

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

diff --git a/source/text/sbasic/python/python_locations.xhp 
b/source/text/sbasic/python/python_locations.xhp
index eec6a0e85..0e6d01d5a 100644
--- a/source/text/sbasic/python/python_locations.xhp
+++ b/source/text/sbasic/python/python_locations.xhp
@@ -18,7 +18,7 @@
 
 
 Python 
Scripts Organization and Location
-The Python script files are stored in the file system, in 
folders controlled by %PRODUCTNAME. The macros can be stared at installation, 
user or file level.
+The Python script files are stored in the filesystem, in 
folders controlled by %PRODUCTNAME. The macros can be started at installation, 
user or file level.
 
 
 Python Script Locations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/osx/salframeview.mm |   62 +---
 1 file changed, 18 insertions(+), 44 deletions(-)

New commits:
commit d59e44bc18bea4bccfa87865200d889f65e10bf1
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 12 11:06:53 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 13 18:33:19 2018 +0100

tdf#120342 OSX always lock SolarMutex in drawRect

Since we're now a good OSX citizen and do all our drawing in the
main thread, I believe the workaround from i#93512 and merged in
commit 81ec69125209 ("CWS-TOOLING: integrate CWS i93512_DEV300")
isn't needed anymore. Therefore we can just claim the SolarMutex
and draw. And I couldn't reproduce the deadlock of i#93512 with
this patch applied.

But I already was wrong a few times and many drawing semantics
have changed for OSX 10.14, so I might be wrong again ;-)

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

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 241cb388409f..3d89e179484d 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -506,57 +506,31 @@ static AquaSalFrame* getMouseContainerFrame()
 return NO;
 }
 
-// helper class similar to a osl::Guard< comphelper::SolarMutex > for the
-// SalYieldMutex; the difference is that it only does tryToAcquire instead of
-// acquire so dreaded deadlocks like #i93512# are prevented
-class TryGuard
-{
-public:
-TryGuard()  { mbGuarded = ImplSalYieldMutexTryToAcquire(); }
-~TryGuard() { if( mbGuarded ) ImplSalYieldMutexRelease(); }
-boolIsGuarded() { return mbGuarded; }
-private:
-boolmbGuarded;
-};
-
 -(void)drawRect: (NSRect)aRect
 {
-if( GetSalData()->mpInstance )
-{
-const bool bIsLiveResize = [self inLiveResize];
-const bool bWasLiveResize = GetSalData()->mpInstance->mbIsLiveResize;
-if ( bWasLiveResize != bIsLiveResize )
-{
-GetSalData()->mpInstance->mbIsLiveResize = bIsLiveResize;
-Scheduler::ProcessTaskScheduling();
-}
-}
+AquaSalInstance *pInstance = GetSalData()->mpInstance;
+assert(pInstance);
+if (!pInstance)
+return;
 
-// HOTFIX: #i93512# prevent deadlocks if any other thread already has the 
SalYieldMutex
-TryGuard aTryGuard;
-if( !aTryGuard.IsGuarded() )
-{
-// NOTE: the mpFrame access below is not guarded yet!
-// TODO: mpFrame et al need to be guarded by an independent mutex
-AquaSalGraphics* pGraphics = (mpFrame && 
AquaSalFrame::isAlive(mpFrame)) ? mpFrame->mpGraphics : nullptr;
-if( pGraphics )
-{
-// we did not get the mutex so we cannot draw now => request to 
redraw later
-// convert the NSRect to a CGRect for Refreshrect()
-const CGRect aCGRect = 
{{aRect.origin.x,aRect.origin.y},{aRect.size.width,aRect.size.height}};
-pGraphics->RefreshRect( aCGRect );
-}
+SolarMutexGuard aGuard;
+if (!mpFrame || !AquaSalFrame::isAlive(mpFrame))
 return;
+
+const bool bIsLiveResize = [self inLiveResize];
+const bool bWasLiveResize = pInstance->mbIsLiveResize;
+if (bWasLiveResize != bIsLiveResize)
+{
+pInstance->mbIsLiveResize = bIsLiveResize;
+Scheduler::ProcessTaskScheduling();
 }
 
-if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
+AquaSalGraphics* pGraphics = mpFrame->mpGraphics;
+if (pGraphics)
 {
-if( mpFrame->mpGraphics )
-{
-mpFrame->mpGraphics->UpdateWindow( aRect );
-if( mpFrame->getClipPath() )
-[mpFrame->getNSWindow() invalidateShadow];
-}
+pGraphics->UpdateWindow(aRect);
+if (mpFrame->getClipPath())
+[mpFrame->getNSWindow() invalidateShadow];
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/subtotal.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a772eeefdbc42f5c17c8c0e39476b95cae237c2
Author: Eike Rathke 
AuthorDate: Thu Dec 13 14:27:31 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 18:23:31 2018 +0100

Allow better packing of ScFunctionData

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

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index d8bf53de6050..441e2e18c0d3 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -53,13 +53,13 @@ private:
 struct ScFunctionData   // to calculate single functions
 {
 WelfordRunner   maWelford;
-ScSubTotalFunc const  eFunc;
 double  nVal;
 sal_uInt64  nCount;
+ScSubTotalFunc const  eFunc;
 boolbError;
 
 ScFunctionData( ScSubTotalFunc eFn ) :
-eFunc(eFn), nVal(0.0), nCount(0), bError(false) {}
+nVal(0.0), nCount(0), eFunc(eFn), bError(false) {}
 void update( double fNewVal );
 /// Check bError after (!) obtaining the result.
 double getResult();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/subtotal.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb5327dc220660abfb848b76946aaec5ea70011c
Author: Eike Rathke 
AuthorDate: Thu Dec 13 14:16:21 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 18:22:29 2018 +0100

Should had been sal_uInt64 nCount

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

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 2fa9e717ad19..d8bf53de6050 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -47,7 +47,7 @@ public:
 private:
 double  fMean;
 double  fM2;
-sal_Int64   nCount;
+sal_uInt64  nCount;
 };
 
 struct ScFunctionData   // to calculate single functions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk Package_html_media.mk source/media source/text

[Libreoffice Gerrit user]

 AllLangHelp_sbasic.mk  |3 -
 Package_html_media.mk  |1 
 source/media/helpimg/python/python_shell.png   |binary
 source/text/sbasic/python/main.xhp |9 ++-
 source/text/sbasic/python/python_ide.xhp   |   13 -
 source/text/sbasic/python/python_locations.xhp |   15 +++---
 source/text/sbasic/python/python_shell.xhp |   59 +
 7 files changed, 86 insertions(+), 14 deletions(-)

New commits:
commit eea4d307ecbd8500bc429be7b0c05cf4097a5686
Author: Alain Romedenne 
AuthorDate: Thu Dec 13 15:06:45 2018 -0200
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 18:21:03 2018 +0100

More pages on Python scripts

Change-Id: I5d8db28da384f52ee835195d3eb889fde0fe33b3
Signed-off-by: Olivier Hallot 
Reviewed-on: https://gerrit.libreoffice.org/65117
Tested-by: Jenkins

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index ec22b518e..303228599 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -364,8 +364,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/python/main \
 helpcontent2/source/text/sbasic/python/python_ide \
 helpcontent2/source/text/sbasic/python/python_locations \
-helpcontent2/source/text/sbasic/shared/stardesktop \
-helpcontent2/source/text/sbasic/shared/uno_objects \
+helpcontent2/source/text/sbasic/python/python_shell \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/Package_html_media.mk b/Package_html_media.mk
index 798d9be1a..1c31f353e 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -284,6 +284,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/starmath/un21214.png \
 helpimg/starmath/un21215.png \
 helpimg/starmath/un21221.png \
+helpimg/python/python_shell.png \
 helpimg/sw_paste_range.png \
 helpimg/sw_signatureline01.png \
 helpimg/sw_signatureline02.png \
diff --git a/source/media/helpimg/python/python_shell.png 
b/source/media/helpimg/python/python_shell.png
new file mode 100644
index 0..afb1738a0
Binary files /dev/null and b/source/media/helpimg/python/python_shell.png differ
diff --git a/source/text/sbasic/python/main.xhp 
b/source/text/sbasic/python/main.xhp
index 989ea22d0..f83d1b72c 100644
--- a/source/text/sbasic/python/main.xhp
+++ b/source/text/sbasic/python/main.xhp
@@ -8,7 +8,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 *
 -->
-
 
 
 Python Scripts
@@ -19,17 +18,21 @@
 
 macros;Python scripts
 Python;macros
+APSO
+Alternative Python Scripts Organizer
 
-%PRODUCTNAME Python Scripts 
Help
+%PRODUCTNAME Python Scripts Help
 
 
 %PRODUCTNAME provides an Application Programming Interface 
(API) that allows controlling the $[officename] components with different 
programming languages by using the $[officename] Software Development Kit 
(SDK). For more information about the $[officename] API and the Software 
Development Kit, visit https://api.libreoffice.org/"; 
name="api.libreoffice.org">https://api.libreoffice.org
 This 
help section explains the most common Python script functions for %PRODUCTNAME. 
For more in-depth information please refer to the https://wiki.documentfoundation.org/Macros/Python_Design_Guide"; 
name="wiki.documentfoundation.org PYTHON Guide">Designing & Developing 
Python Applications on the Wiki.
 
 
-Working with Python Scripts in %PRODUCTNAME.
+Working with Python Scripts in %PRODUCTNAME.
+You can execute Python scripts 
choosing Tools - Macros – Run macro Editing scripts 
can be done with your preferred text editor. Python scripts are present in 
various locations detailed hereafter. You can refer to Programming examples for 
macros illustrating how to run Python interactive console from %PRODUCTNAME 
.
 
 
+
 Programming with Python Scripts
 
 Creating a dialog
diff --git a/source/text/sbasic/python/python_ide.xhp 
b/source/text/sbasic/python/python_ide.xhp
index 05645cc50..aa81a574c 100644
--- a/source/text/sbasic/python/python_ide.xhp
+++ b/source/text/sbasic/python/python_ide.xhp
@@ -22,11 +22,18 @@
 python;IDE - integrated development 
environment
 python;editor
 
-Setting up an 
Integrated Development Environment (IDE) for 
Python
+Setting up an 
Integrated Development Environment (IDE) for Python
 Writing Python macros requires extra configuration steps in 
order set an IDE of choice.
-
 
 
-Unlike Basic language macros development in %PRODUCTNAME, 
writing Python macros requires extra configuration steps in order to build your 
IDE of choice. In return you are provided with flexible design experience built 
upon your Python developing preferences or habits. Hereafter are IDE setup 
guid

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 5313addd2c1d30f1fc999db0bafe33bd4486738e
Author: Alain Romedenne 
AuthorDate: Thu Dec 13 15:06:45 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 18:21:03 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - More pages on Python scripts

Change-Id: I5d8db28da384f52ee835195d3eb889fde0fe33b3
Signed-off-by: Olivier Hallot 
Reviewed-on: https://gerrit.libreoffice.org/65117
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 1405725db508..eea4d307ecbd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1405725db5080e22b5567fde2a81610f4e0b0bed
+Subproject commit eea4d307ecbd8500bc429be7b0c05cf4097a5686
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dbaccess/source wizards/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/UserAdmin.src |  131 ++-
 wizards/source/euro/euro.src |5 -
 2 files changed, 57 insertions(+), 79 deletions(-)

New commits:
commit 4cb07fcff412200783dcd138ca67880f429e9ca8
Author: Matthias Seidel 
AuthorDate: Thu Dec 13 15:42:10 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Dec 13 15:42:10 2018 +

Added missing space

diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 3ec2ccee9792..136d63e9c071 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -28,6 +28,7 @@
 #define MESSAGES 1400
 #define CURRENCIES 1500
 #define STEP_LASTPAGE 1600
+
 // 
 String STEP_ZERO
 {
@@ -41,7 +42,7 @@ Text [ en-US ] = "~Help" ;
 
 String STEP_ZERO + 2
 {
-Text [ en-US ] = "<<~Back" ;
+Text [ en-US ] = "<< ~Back" ;
 };
 
 String STEP_ZERO + 3
@@ -66,7 +67,7 @@ Text [ en-US ] = "Currencies:" ;
 
 String STEP_ZERO + 7
 {
-Text [ en-US ] = "C~ontinue>>" ;
+Text [ en-US ] = "C~ontinue >>" ;
 };
 
 String STEP_ZERO + 8
commit a32dc56b942af998a497a59f28b52adfa1b95e98
Author: Matthias Seidel 
AuthorDate: Thu Dec 13 15:41:11 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Dec 13 15:41:11 2018 +

Cleaned up resource file, removed double space

diff --git a/dbaccess/source/ui/dlg/UserAdmin.src 
b/dbaccess/source/ui/dlg/UserAdmin.src
index 0111e54cdc94..b8bf91bad2bf 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -38,28 +38,28 @@ TabPage TAB_PAGE_USERADMIN
 {
 SVLook  = TRUE ;
 HelpId  = HID_TAB_PAGE_USERADMIN ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-Hide = TRUE;
+Size= MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
+Hide = TRUE ;
 
 FixedLine FL_USER
 {
-Pos = MAP_APPFONT ( 6 , 3  ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
 Size= MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
-Text [ en-US ]  = "User selection";
+Text [ en-US ]  = "User selection" ;
 };
 
 FixedText FT_USER
 {
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size= MAP_APPFONT ( 90 , 10 ) ;
-Text [ en-US ]  = "Us~er:";
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size= MAP_APPFONT ( 90, 10 ) ;
+Text [ en-US ]  = "Us~er:" ;
 };
 
 ListBox LB_USER
 {
 Border  = TRUE ;
-Pos = MAP_APPFONT ( 108 , 13) ;
-Size= MAP_APPFONT ( 105 , 97 ) ;
+Pos = MAP_APPFONT ( 108, 13) ;
+Size= MAP_APPFONT ( 105, 97 ) ;
 TabStop = TRUE ;
 HScroll = TRUE ;
 Sort= TRUE ;
@@ -70,45 +70,45 @@ TabPage TAB_PAGE_USERADMIN
 
 PushButton PB_NEWUSER
 {
-Pos = MAP_APPFONT ( 12 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( 12, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBUSER ;
-Text [ en-US ] = "~Add User...";
+Text [ en-US ] = "~Add User..." ;
 };
 
 PushButton PB_CHANGEPWD
 {
-Pos = MAP_APPFONT ( 95 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( 95, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBCHGPWD ;
-Text [ en-US ] = "Change ~Password...";
+Text [ en-US ] = "Change ~Password..." ;
 };
 
 PushButton PB_DELETEUSER
 {
-Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBUSERDELETE ;
-Text [ en-US ] = "~Delete User...";
+Text [ en-US ] = "~Delete User..." ;
 };
 
 FixedLine FL_TABLE_GRANTS
 {
-Pos = MAP_APPFONT ( 6 , 52  ) ;
+Pos = MAP_APPFONT ( 6, 52 ) ;
 Size= MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
-Text [ en-US ] = "Access rights for selected user";
+Text [ en-US ] = "Access rights for selected user" ;
 };
 
 Control CTRL_TABLE_GRANTS
 {
-Pos = MAP_APPFONT ( 12 , 63  ) ;
-Size= MAP_APPFONT ( WINDOW_

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

[Libreoffice Gerrit user]

 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx   |  
 21 -
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx|  
 12 
 sd/source/ui/animations/CustomAnimationPane.cxx |  
136 ++
 sd/source/ui/animations/SlideTransitionPane.cxx |  
 22 -
 sd/source/ui/annotations/annotationmanager.cxx  |  
 85 ++
 sd/source/ui/app/sdxfer.cxx |  
  5 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx  |  
  7 
 sd/source/ui/dlg/assclass.cxx   |  
 18 -
 sd/source/ui/dlg/custsdlg.cxx   |  
 14 -
 sd/source/ui/dlg/present.cxx|  
  4 
 sd/source/ui/dlg/sdpreslt.cxx   |  
 18 -
 sd/source/ui/dlg/sdtreelb.cxx   |  
 15 -
 sd/source/ui/framework/configuration/Configuration.cxx  |  
 13 
 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx|  
 22 -
 sd/source/ui/framework/configuration/ConfigurationController.cxx|  
 14 -
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |  
 26 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx   |  
  7 
 sd/source/ui/framework/configuration/ResourceFactoryManager.cxx |  
 58 +---
 sd/source/ui/framework/factories/BasicPaneFactory.cxx   |  
  8 
 sd/source/ui/framework/factories/BasicViewFactory.cxx   |  
 33 --
 sd/source/ui/framework/module/ModuleController.cxx  |  
  7 
 sd/source/ui/func/fuinsfil.cxx  |  
 21 -
 sd/source/ui/func/fuprlout.cxx  |  
  3 
 sd/source/ui/func/fuprobjs.cxx  |  
 12 
 sd/source/ui/func/smarttag.cxx  |  
  8 
 sd/source/ui/func/unmovss.cxx   |  
  4 
 sd/source/ui/presenter/PresenterPreviewCache.cxx|  
 17 -
 sd/source/ui/remotecontrol/BluetoothServer.cxx  |  
  5 
 sd/source/ui/remotecontrol/Server.cxx   |  
 34 --
 29 files changed, 220 insertions(+), 429 deletions(-)

New commits:
commit 0f0f8bdc3e5c1534d608f8475d9d3e3df4faddaa
Author: Arkadiy Illarionov 
AuthorDate: Thu Dec 13 00:42:49 2018 +0300
Commit: Noel Grandin 
CommitDate: Thu Dec 13 18:07:25 2018 +0100

Simplify containers iterations in sd/source/ui/[a-r]*

Use range-based loop or replace with STL functions

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

diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 8e0124f53641..bb55af18a6f3 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -478,19 +478,14 @@ uno::Sequence< sal_Int32 > SAL_CALL
 }
 std::sort( vXShapes.begin(), vXShapes.end(), XShapePosCompareHelper() );
 //get the index of the selected object in the group
-std::vector< uno::Reference >::iterator aIter;
-//we start counting position from 1
-sal_Int32 nPos = 1;
-for ( aIter = vXShapes.begin(); aIter != vXShapes.end(); ++aIter, nPos++ )
-{
-if ( (*aIter).get() == xCurShape.get() )
-{
-sal_Int32* pArray = aRet.getArray();
-pArray[0] = 1; //it should be 1 based, not 0 based.
-pArray[1] = vXShapes.size();
-pArray[2] = nPos;
-break;
-}
+auto aIter = std::find_if(vXShapes.begin(), vXShapes.end(),
+[&xCurShape](const uno::Reference& rxShape) { return 
rxShape.get() == xCurShape.get(); });
+if (aIter != vXShapes.end())
+{
+sal_Int32* pArray = aRet.getArray();
+pArray[0] = 1; //it should be 1 based, not 0 based.
+pArray[1] = vXShapes.size();
+pArray[2] = static_cast(std::distance(vXShapes.begin(), 
aIter)) + 1; //we start counting position from 1
 }
 return aRet;
 }
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 4d363de2eca7..3c0193e5c552 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -692,20 +692,18 @@ void 
AccessibleSlideSorterView::Implementation::UpdateChildren()
 
 void AccessibleSlideSorterView::Implementation::Clea

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

[Libreoffice Gerrit user]

 vcl/unx/gtk/gtksalmenu.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 4107e1c4268811623a4620eb30264b210a2acdab
Author: Caolán McNamara 
AuthorDate: Thu Dec 13 11:50:41 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 17:48:14 2018 +0100

Resolves: tdf#122016 crash accessing deleted GtkSalMenu

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

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e504e5d7aef0..f9053ce23f6f 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -506,6 +506,8 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const tools::Rectangl
 g_object_unref(mpActionGroup);
 ClearActionGroupAndMenuModel();
 
+mpFrame = nullptr;
+
 return true;
 #else
 (void)pWin;
@@ -581,6 +583,9 @@ GtkSalMenu::~GtkSalMenu()
 g_object_unref(mpMenuModel);
 
 maItems.clear();
+
+if (mpFrame)
+mpFrame->SetMenu(nullptr);
 }
 
 bool GtkSalMenu::VisibleMenuBar()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 3e06873d124c9f8f4cd2e5f5d619de3c99ca09bf
Author: Xisco Fauli 
AuthorDate: Thu Dec 13 14:19:01 2018 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 13 17:23:55 2018 +0100

tdf#116529: Add calls to SetFieldUnit to switch inch/cm

Change-Id: I96208c01deb75cc9e1a5af7a15d7bc94afd28021
Reviewed-on: https://gerrit.libreoffice.org/65105
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx 
b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 984c7d8cde2b..8ce3af41a5eb 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -188,16 +188,20 @@ PageMarginControl::PageMarginControl( sal_uInt16 nId, 
vcl::Window* pParent )
 Link aLinkLR = LINK( this, PageMarginControl, 
ModifyLRMarginHdl );
 m_pLeftMarginEdit->SetModifyHdl( aLinkLR );
 SetMetricValue( *m_pLeftMarginEdit.get(), m_nPageLeftMargin, m_eUnit );
+SetFieldUnit( *m_pLeftMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_pRightMarginEdit->SetModifyHdl( aLinkLR );
 SetMetricValue( *m_pRightMarginEdit.get(), m_nPageRightMargin, m_eUnit );
+SetFieldUnit( *m_pRightMarginEdit.get(), lcl_GetFieldUnit() );
 
 Link aLinkUL = LINK( this, PageMarginControl, 
ModifyULMarginHdl );
 m_pTopMarginEdit->SetModifyHdl( aLinkUL );
 SetMetricValue( *m_pTopMarginEdit.get(), m_nPageTopMargin, m_eUnit );
+SetFieldUnit( *m_pTopMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_pBottomMarginEdit->SetModifyHdl( aLinkUL );
 SetMetricValue( *m_pBottomMarginEdit.get(), m_nPageBottomMargin, m_eUnit );
+SetFieldUnit( *m_pBottomMarginEdit.get(), lcl_GetFieldUnit() );
 
 m_aPageSize = pSize->GetSize();
 SetMetricFieldMaxValues( m_aPageSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/test/util/xrefreshable.hxx |4 +---
 sc/CppunitTest_sc_ddelinkobj.mk|1 +
 sc/qa/extras/sccellfieldsobj.cxx   |4 +---
 sc/qa/extras/scddelinkobj.cxx  |   22 ++
 test/source/sheet/xddelink.cxx |6 +++---
 test/source/util/xrefreshable.cxx  |   22 +-
 6 files changed, 21 insertions(+), 38 deletions(-)

New commits:
commit c94ae40267ae3352e95911bcd1fb9f12f4a714a0
Author: Mike Kaganski 
AuthorDate: Thu Dec 13 12:02:32 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 13 17:17:22 2018 +0100

Fix sc_ddelinkobj tests

Regression from commit 63ff8602c16b0c26927dc3413b12a5368fe367b0.
See thread started at
  
https://lists.freedesktop.org/archives/libreoffice/2018-December/081542.html

The Application::SetName is mandatory for DDE to work; otherwise
InitializeDde() in SfxApplication::SfxApplication() fails.

DDE spreadsheet formula expects full name of the target spreadsheet,
including path.

Fixed sheet name (it's "Sheet1", not "Sheet").

Removed redundant tests (former "testRemoveRefreshListener" tests all).

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

diff --git a/include/test/util/xrefreshable.hxx 
b/include/test/util/xrefreshable.hxx
index 2ffab9946e4a..dd82303259ef 100644
--- a/include/test/util/xrefreshable.hxx
+++ b/include/test/util/xrefreshable.hxx
@@ -23,9 +23,7 @@ class OOO_DLLPUBLIC_TEST XRefreshable
 public:
 virtual css::uno::Reference init() = 0;
 
-void testAddRefreshListener();
-void testRefresh();
-void testRemoveRefreshListener();
+void testRefreshListener();
 
 protected:
 ~XRefreshable() {}
diff --git a/sc/CppunitTest_sc_ddelinkobj.mk b/sc/CppunitTest_sc_ddelinkobj.mk
index 123e4cf3a021..c59cf6e96360 100644
--- a/sc/CppunitTest_sc_ddelinkobj.mk
+++ b/sc/CppunitTest_sc_ddelinkobj.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ddelinkobj, \
subsequenttest \
test \
unotest \
+   vcl \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_ddelinkobj,\
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
index b015b96f99b0..f1626527b063 100644
--- a/sc/qa/extras/sccellfieldsobj.cxx
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -56,9 +56,7 @@ public:
 CPPUNIT_TEST(testCreateEnumeration);
 
 // XRefreshable
-CPPUNIT_TEST(testAddRefreshListener);
-CPPUNIT_TEST(testRefresh);
-CPPUNIT_TEST(testRemoveRefreshListener);
+CPPUNIT_TEST(testRefreshListener);
 
 CPPUNIT_TEST_SUITE_END();
 
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index 204c5b6f8ace..0aa2e968c58e 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -12,6 +12,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -55,9 +57,7 @@ public:
 CPPUNIT_TEST(testSetNameThrowsException);
 
 // XRefreshable
-CPPUNIT_TEST(testAddRefreshListener);
-CPPUNIT_TEST(testRefresh);
-CPPUNIT_TEST(testRemoveRefreshListener);
+CPPUNIT_TEST(testRefreshListener);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -67,7 +67,9 @@ private:
 
 ScDDELinkObj::ScDDELinkObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
-, XNamed("soffice|ScDDELinksObj.ods!Sheet.A1")
+, XNamed("soffice|"
+ + 
m_directories.getURLFromSrc("/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods")
+ + "!Sheet1.A1")
 {
 }
 
@@ -79,10 +81,13 @@ uno::Reference ScDDELinkObj::init()
 uno::Reference xIA(xSheets, UNO_QUERY_THROW);
 uno::Reference xSheet(xIA->getByIndex(0), 
UNO_QUERY_THROW);
 
-xSheet->getCellByPosition(5, 5)->setFormula(
-"=DDE(\"soffice\";\"ScDDELinksObj.ods\";\"Sheet.A1\"");
-xSheet->getCellByPosition(1, 4)->setFormula(
-"=DDE(\"soffice\";\"ScDDELinksObj.ods\";\"Sheet.A1\"");
+const OUString testdoc
+= 
m_directories.getURLFromSrc("/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods");
+
+xSheet->getCellByPosition(5, 5)->setFormula("=DDE(\"soffice\";\"" + testdoc
++ "\";\"Sheet1.A1\")");
+xSheet->getCellByPosition(1, 4)->setFormula("=DDE(\"soffice\";\"" + testdoc
++ "\";\"Sheet1.A1\")");
 
 uno::Reference xPropSet(xDoc, UNO_QUERY_THROW);
 uno::Any aDDELinks = xPropSet->getPropertyValue("DDELinks");
@@ -94,6 +99,7 @@ uno::Reference ScDDELinkObj::init()
 
 void ScDDELinkObj::setUp()
 {
+Application::SetAppName("soffice"); // Enable DDE
 CalcUnoApiTest::setUp();
 // create a calc document
 mxComponent = loadFromDesktop("private:factory/scalc");
diff --git a/test/source/sheet/xddelink.cxx b/test/source/sheet/xddelink.cxx
index 403449452ba5..b166275d5367 100644
--- a/test/source/sheet/xddelink.cxx
+++ b/test/source/s

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Miklos, Caolan, Christian, Jan-Marek, Eike, Michael W, Heiko,
  Stephan, Sophie, Xisco, Kendy, Thorsten, Mert

* Completed Action Items:
+ poke Guilhelm wrt gandalf → to poke admins (Christian)
  [ Markus volunteered to look at this & ~all is well (Stephan) ]
+ run certification script (Kendy)
  [ run the script – and mailed it out ]

* Pending Action Items:
+ add screenshot builder to basic build stats (Christian)
  [ still failing when languages are enabled.
Not sure if it is related to langtag things –
perhaps a coincidence ? - more digging required ]

* Release Engineering update (Christian)
+ 6.1.4 RC2 status
  + will up-load builds during the day.
+ 6.2 RC 1 – Dec 17th
  + want to tag early to help out bug-hunting with builds before Friday
 + aiming for Tuesday evening – please help out reviewing patches.
  + currently require 1 review for libreoffice-6-2
  + Late Features ?
 + red-lining paragraph attribute re-work (Thorsten)
+ a flurry of activity in the private branch private/mst/redlining4b
+ pretty confident.
+ running mass-comparison framework from Milos 
+ should be in a good shape next week.
+ with consent of ESC – if none of the BZ docs trigger problems.
+ as close to production ready as possible.
+ crash testing ? (Michael)
   + input documents are the set of bugzilla docs (Thorsten)
  + lots of overlap
  + also using it with no experimental (Xisco)
  + don’t without the branch (Thorsten)
=> merge it into RC1 – not experimental anymore.
   + easy to turn off later – just a 1 liner.
   + happy to have a kill-switch too (Miklos)
+ Remotes
+ Android viewer
  + thanks to Stephan for fixing C++ exceptions here
  + updated tinderbox to recent debian so it now builds.
  + Christian has access to recovery console too now.
+ Online

* Documentation (Olivier)
 + New Help
 + Updates in XSLT + DTD for Python code fragments
 + writing python documentation / help
 + Help
 + Fix typos from translators review (ohallot, Sabri Unal)
 + some refactor (SophiaS)
 + Fix menu paths for recent UI (S. Horacek)
 + New pages for Python Scripts (ohallot, libreofficiant)
 + New pages for StarDesktop, Enum objects (libreofficiant)
 + Guides
 + Work in progress

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
260(260) (topicUI) bugs open, 286(286) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months  
 added 10(1)  22(-6)62(4)  103(1)  
 commented 56(-12)   166(-2)   436(12)1452(-16)
   removed  0(0)   6(-2) 8(0)   12(-1) 
  resolved  1(-1)  6(1) 22(-1) 112(-1) 
+ top 10 contributors:
  Tietze, Heiko made 91 changes in 1 month, and 534 changes in 1 year
  Xisco Faulí made 53 changes in 1 month, and 292 changes in 1 year
  Thomas Lendo made 38 changes in 1 month, and 348 changes in 1 year
  Pedro made 33 changes in 1 month, and 89 changes in 1 year
  Foote, V Stuart made 25 changes in 1 month, and 226 changes in 1 year
  Dieter Praas made 25 changes in 1 month, and 124 changes in 1 year
  kompilainenn made 17 changes in 1 month, and 57 changes in 1 year
  Henschel, Regina made 13 changes in 1 month, and 77 changes in 1 year
  Raal made 10 changes in 1 month, and 31 changes in 1 year
  himajin10 made 8 changes in 1 month, and 13 changes in 1 year

   + New needsUXEval between Dec/06-Dec/12

   * Wasting of time and bad behaviour when you use the 'clone' of the cell
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121876
 => NAB
   * Mail Merge toolbar hidden on next run if it was manually enabled
 + https://bugs.documentfoundation.org/show_bug.cgi?id=122002
 => NEW
   * default padding around Images
 + https://bugs.documentfoundation.org/show_bug.cgi?id=122063
   * Some enhancement request for customization dialog
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121939
   * Some enhancement request and issues for the Personas dialog
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121937
   * Can't select/pick multiples shapes or images in
 Writer/Calc/Impress/Draw with CTRL key
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121967
   * Data loss risk referencing slides from external impress presentation
 (Menu Insert -> File, selecting link)
 + https://bugs.documentfoundation.org/show_bug.cgi?id=51554
 => in discussion

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/qa desktop/source include/LibreOfficeKit

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   37 
 desktop/source/lib/init.cxx |   23 -
 include/LibreOfficeKit/LibreOfficeKit.h |   10 ---
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   29 -
 4 files changed, 99 deletions(-)

New commits:
commit d7533cbaf810b5d678678bb9d3b00e4c9e41a520
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 17:21:46 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 17:40:43 2018 +0200

Revert "Add a localisation API to LibreOfficeKitClass"

Was reverted in master, too. The functionality is implemented
differently now in the iOS app, without requiring any new methods in
LibreOfficeKitClass.

This reverts commit 36beb79184e5f4153c8cc92b176b21b697594228.

Change-Id: Ic0c42848c81a9b48e50a2b01a0a5a98ef5220870

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 7a5756e5ed35..2b571921738c 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -118,7 +117,6 @@ public:
 void testCommentsImpress();
 void testCommentsCallbacksWriter();
 void testRunMacro();
-void testTranslate();
 void testExtractParameter();
 void testGetSignatureState_NonSigned();
 void testGetSignatureState_Signed();
@@ -166,7 +164,6 @@ public:
 CPPUNIT_TEST(testCommentsImpress);
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
-CPPUNIT_TEST(testTranslate);
 CPPUNIT_TEST(testExtractParameter);
 CPPUNIT_TEST(testGetSignatureState_Signed);
 CPPUNIT_TEST(testGetSignatureState_NonSigned);
@@ -2221,20 +2218,6 @@ void DesktopLOKTest::testRunMacro()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
-void DesktopLOKTest::testTranslate()
-{
-comphelper::LibreOfficeKit::setActive();
-
-LibLibreOffice_Impl aOffice;
-
-// Try translating to a non-existent locale, should return the English 
string
-char *translated = aOffice.m_pOfficeClass->translateGet(&aOffice, 
STR_DESCRIPTION_FACTORY_WRITER, "svt", "foo");
-CPPUNIT_ASSERT_EQUAL(0, strcmp(translated, "Text Document"));
-free(translated);
-
-comphelper::LibreOfficeKit::setActive(false);
-}
-
 void DesktopLOKTest::testExtractParameter()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -2479,11 +2462,6 @@ void DesktopLOKTest::testInsertCertificatePEM()
 
 namespace {
 
-size_t classOffset(int i)
-{
-return sizeof(static_cast(nullptr)->nSize) + 
i * sizeof(void*);
-}
-
 size_t documentClassOffset(int i)
 {
 return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
@@ -2494,21 +2472,6 @@ size_t documentClassOffset(int i)
 void DesktopLOKTest::testABI()
 {
 // STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
-
-CPPUNIT_ASSERT_EQUAL(classOffset(0), offsetof(struct _LibreOfficeKitClass, 
destroy));
-CPPUNIT_ASSERT_EQUAL(classOffset(1), offsetof(struct _LibreOfficeKitClass, 
documentLoad));
-CPPUNIT_ASSERT_EQUAL(classOffset(2), offsetof(struct _LibreOfficeKitClass, 
getError));
-CPPUNIT_ASSERT_EQUAL(classOffset(3), offsetof(struct _LibreOfficeKitClass, 
documentLoadWithOptions));
-CPPUNIT_ASSERT_EQUAL(classOffset(4), offsetof(struct _LibreOfficeKitClass, 
freeError));
-CPPUNIT_ASSERT_EQUAL(classOffset(5), offsetof(struct _LibreOfficeKitClass, 
registerCallback));
-CPPUNIT_ASSERT_EQUAL(classOffset(6), offsetof(struct _LibreOfficeKitClass, 
getFilterTypes));
-CPPUNIT_ASSERT_EQUAL(classOffset(7), offsetof(struct _LibreOfficeKitClass, 
setOptionalFeatures));
-CPPUNIT_ASSERT_EQUAL(classOffset(8), offsetof(struct _LibreOfficeKitClass, 
setDocumentPassword));
-CPPUNIT_ASSERT_EQUAL(classOffset(9), offsetof(struct _LibreOfficeKitClass, 
getVersionInfo));
-CPPUNIT_ASSERT_EQUAL(classOffset(10), offsetof(struct 
_LibreOfficeKitClass, runMacro));
-CPPUNIT_ASSERT_EQUAL(classOffset(11), offsetof(struct 
_LibreOfficeKitClass, translateGet));
-CPPUNIT_ASSERT_EQUAL(classOffset(12), offsetof(struct 
_LibreOfficeKitClass, translateNGet));
-
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2bb9ba95b3fd..42a06ce2be6c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1423,8 +1423,6 @@ static void
lo_setDocumentPassword(LibreOfficeKit* pThis,
const char* pPassword);
 static char*   lo_getVersionInfo(LibreOfficeKit* pThis);
 static int lo_runMacro  (LibreOfficeKit* pThis

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

[Libreoffice Gerrit user]

 sw/source/ui/config/optload.cxx  |   56 ++-
 sw/source/uibase/inc/cption.hxx  |2 -
 sw/source/uibase/inc/optload.hxx |   20 ++---
 3 files changed, 8 insertions(+), 70 deletions(-)

New commits:
commit f890035cf98cdd86d661dc3a6d29ac2f0308d2f4
Author: Caolán McNamara 
AuthorDate: Wed Dec 12 11:52:48 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 16:40:13 2018 +0100

drop unused SwCaptionPreview

an rename CaptionPreview back to SwCaptionPreview

Change-Id: I24d6f2c66f1c2b152b7d625501ea6fe39d2161ae
Reviewed-on: https://gerrit.libreoffice.org/65015
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 7b8f23c17cabbcb4910e8428d87aff2cac91f804)
Reviewed-on: https://gerrit.libreoffice.org/65101

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 1030d21c796a..b2d5d0673533 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -402,14 +402,11 @@ SwCaptionOptDlg::SwCaptionOptDlg(weld::Window* pParent, 
const SfxItemSet& rSet)
 SetTabPage(SwCaptionOptPage::Create(aParent, &rSet));
 }
 
-SwCaptionPreview::SwCaptionPreview(vcl::Window* pParent, WinBits nStyle)
-: Window(pParent, nStyle)
-, mbFontInitialized(false)
+SwCaptionPreview::SwCaptionPreview()
+: mbFontInitialized(false)
 {
 }
 
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SwCaptionPreview, 0)
-
 void SwCaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
 {
 Wallpaper 
aBack(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
@@ -424,8 +421,6 @@ void SwCaptionPreview::ApplySettings(vcl::RenderContext& 
rRenderContext)
 mbFontInitialized = true;
 }
 rRenderContext.SetFont(maFont);
-
-SetBorderStyle(WindowBorderStyle::MONO);
 }
 
 void SwCaptionPreview::SetPreviewText(const OUString& rText)
@@ -437,57 +432,14 @@ void SwCaptionPreview::SetPreviewText(const OUString& 
rText)
 }
 }
 
-Size SwCaptionPreview::GetOptimalSize() const
-{
-return LogicToPixel(Size(106 , 20), MapMode(MapUnit::MapAppFont));
-}
-
-void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect)
-{
-Window::Paint(rRenderContext, rRect);
-
-rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), GetSizePixel()));
-rRenderContext.DrawText(Point(4, 6), maText);
-}
-
-CaptionPreview::CaptionPreview()
-: mbFontInitialized(false)
-{
-}
-
-void CaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
-{
-Wallpaper 
aBack(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
-rRenderContext.SetBackground(aBack);
-rRenderContext.SetFillColor(aBack.GetColor());
-rRenderContext.SetLineColor(aBack.GetColor());
-
-if (!mbFontInitialized)
-{
-maFont = rRenderContext.GetFont();
-maFont.SetFontHeight(maFont.GetFontHeight() * 120 / 100);
-mbFontInitialized = true;
-}
-rRenderContext.SetFont(maFont);
-}
-
-void CaptionPreview::SetPreviewText(const OUString& rText)
-{
-if (rText != maText)
-{
-maText = rText;
-Invalidate();
-}
-}
-
-void CaptionPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SwCaptionPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(106 , 20), 
MapMode(MapUnit::MapAppFont)));
 pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
 }
 
-void CaptionPreview::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&)
+void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&)
 {
 ApplySettings(rRenderContext);
 
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index fc3be92a3adf..8f3de7db57ce 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -43,7 +43,7 @@ class SwCaptionDialog : public SfxDialogController
 
 css::uno::Reference< css::container::XNameAccess >xNameAccess;
 
-CaptionPreview m_aPreview;
+SwCaptionPreview m_aPreview;
 std::unique_ptr m_xTextEdit;
 std::unique_ptr m_xCategoryBox;
 std::unique_ptr m_xFormatText;
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 6f23242811b6..7f19f94f7536 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -101,21 +101,7 @@ public:
 SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet);
 };
 
-class SwCaptionPreview : public vcl::Window
-{
-private:
-OUString maText;
-bool mbFontInitialized;
-vcl::Font maFont;
-public:
-SwCaptionPreview(vcl::Window* pParent, WinBits nStyle);
-virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
-void SetPreviewText( const OUString& rText );
-virtual void P

[Libreoffice-commits] core.git: embeddedobj/Library_emboleobj.mk embeddedobj/source include/vcl vcl/Library_vcl.mk vcl/source

[Libreoffice Gerrit user]

 embeddedobj/Library_emboleobj.mk|1 
 embeddedobj/source/msole/xdialogcreator.cxx |8 +
 include/vcl/winscheduler.hxx|   39 
 vcl/Library_vcl.mk  |1 
 vcl/source/app/winscheduler.cxx |   37 ++
 5 files changed, 79 insertions(+), 7 deletions(-)

New commits:
commit 7b148b0edfb217196c171f8e64e79b49669fc36f
Author: Jan-Marek Glogowski 
AuthorDate: Thu Dec 13 11:50:41 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 13 16:33:58 2018 +0100

WIN move native dialog hack into WinScheduler

The "hides" the hack for native Windows dialogs introduced in
commit 5bb798a99e7b ("tdf#117295 WIN no main loop shortcut for
OLE dialog") in its own header.

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

diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 3bfbec56d89d..9e3c1b5950d2 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/em
 
 $(eval $(call gb_Library_set_include,emboleobj,\
-I$(SRCDIR)/embeddedobj/source/inc \
-   $(if $(filter WNT,$(OS)),-I$(SRCDIR)/vcl/inc) \
$$(INCLUDE) \
 ))
 
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx 
b/embeddedobj/source/msole/xdialogcreator.cxx
index be26a300d298..836f198eb867 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -43,10 +43,7 @@
 #ifdef _WIN32
 
 #include 
-
-#include 
-#include 
-#include 
+#include 
 
 class InitializedOleGuard
 {
@@ -180,8 +177,7 @@ embed::InsertedObjectInfo SAL_CALL 
MSOLEDialogObjectCreator::createInstanceByDia
 
 // Disable any event loop shortcuts by enabling a real timer.
 // This way the native windows dialog won't block our own processing.
-BOOL const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, 
SAL_MSG_FORCE_REAL_TIMER, 0, 0);
-SAL_WARN_IF(0 == ret, "embeddedobj.ole", "ERROR: PostMessage() failed!");
+WinScheduler::SetForceRealTimer();
 
 uTemp=pInsertFct(&io);
 
diff --git a/include/vcl/winscheduler.hxx b/include/vcl/winscheduler.hxx
new file mode 100644
index ..02d86116bb38
--- /dev/null
+++ b/include/vcl/winscheduler.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_WINSCHEDULER_HXX
+#define INCLUDED_VCL_WINSCHEDULER_HXX
+
+#ifndef _WIN32
+#error This header is just useable on Windows
+#else
+
+#include 
+
+struct VCL_DLLPUBLIC WinScheduler final
+{
+/// Hack for Windows native dialogs, which run the main loop, so we can't
+/// use the direct processing shortcut.
+static void SetForceRealTimer();
+};
+
+#endif // _WIN32
+#endif // INCLUDED_VCL_WINSCHEDULER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4bd1469a6d34..da9bc387ca2f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -380,6 +380,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/app/unohelp2 \
 vcl/source/app/unohelp \
 vcl/source/app/vclevent \
+vcl/source/app/winscheduler \
 vcl/source/components/dtranscomp \
 vcl/source/components/factory \
 vcl/source/components/fontident \
diff --git a/vcl/source/app/winscheduler.cxx b/vcl/source/app/winscheduler.cxx
new file mode 100644
index ..f8a90f3f638d
--- /dev/null
+++ b/vcl/source/app/winscheduler.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the

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

[Libreoffice Gerrit user]

 sfx2/source/view/viewsh.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit e07f85a68cedde82a32a2b1f9bde75f25d7dc640
Author: Tor Lillqvist 
AuthorDate: Fri Nov 16 00:46:51 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 16:19:53 2018 +0100

Be less eager to use a fallback in SfxViewShell::SetLOKLanguageTag()

If the fallback language tag based on available localisations would
have the same language as the original Bcp47 tag string, use a tag
based on the original.

For example, if the user locale is 'de-CH', the localisation for plain
'de' will be used automatically anyway, without making the LOK
language tag 'de' which would actually end up being stored as 'de-DE'
and thus be misleading.

We will need to know that it's the 'de-CH' locale we are actually
working with when handling Swiss German translations by replacing 'ß'
characters in a generic German translation with 'ss'.

Do it only when comphelper::LibreOfficeKit::isActive() to avoid
modifying behaviour in the "normal" cases.

Change-Id: Ib5bdfe07fd53251b42122389cb81782ef87b65c5
Reviewed-on: https://gerrit.libreoffice.org/63446
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 683d6a45f288..246d5ea0c1ab 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -1495,8 +1495,17 @@ vcl::Window* 
SfxViewShell::GetEditWindowForActiveOLEObj() const
 
 void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag)
 {
+LanguageTag aTag = LanguageTag(rBcp47LanguageTag, true);
+
 css::uno::Sequence 
inst(officecfg::Setup::Office::InstalledLocales::get()->getElementNames());
-maLOKLanguageTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, 
/* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback();
+LanguageTag aFallbackTag = 
LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* 
bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback();
+
+// If we want de-CH, and the de localisation is available, we don't want 
to use de-DE as then
+// the magic in Translate::get() won't turn ess-zet into double s. 
Possibly other similar cases?
+if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == 
aFallbackTag.getLanguage())
+maLOKLanguageTag = aTag;
+else
+maLOKLanguageTag = aFallbackTag;
 }
 
 void SfxViewShell::NotifyCursor(SfxViewShell* /*pViewShell*/) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - ios/config.h.in ios/Mobile ios/Mobile.xcodeproj

[Libreoffice Gerrit user]

 ios/Mobile.xcodeproj/project.pbxproj   |6 +
 ios/Mobile/L10n.h  |   13 +++
 ios/Mobile/L10n.mm |   28 +
 ios/Mobile/TemplateCollectionViewController.h  |2 -
 ios/Mobile/TemplateCollectionViewController.mm |7 +++---
 ios/config.h.in|3 ++
 6 files changed, 54 insertions(+), 5 deletions(-)

New commits:
commit 600c3a8969f9613deb18ac501479675c38daef18
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 16:17:12 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 16:17:12 2018 +0200

Add a dummy VEREIGN_URL here, too

Change-Id: I01f22ec18a2e56286520bb1f14fcd02bd43352cb

diff --git a/ios/config.h.in b/ios/config.h.in
index 0911b21fc..18ca58e4e 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -111,5 +111,8 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
+/* Default value of per_documents.document_signing_url */
+#define VEREIGN_URL ""
+
 /* Version number of package */
 /* #undef VERSION */
commit f3f1b1e228e84074d05f1523ef66a7bd06427a8c
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 16:02:04 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 16:14:42 2018 +0200

Adapt to LibreOfficeKitClass no longer having the translateGet() method

This is a somewhat temporary quick solution. It bluntly uses the same
code here that I had added for a while as the implementation of
translateGet() for LibreOfficeKitClass in LO core.

Ideally we should have a script here in online to pick the needed
translation from the translations submodule of core and keep them
around even if a translation happens to evaporate from
core/translations. The same idea as in the scripts/unocommands.py, but
I did not yet start modifying or copying that.

Change-Id: I455ad6044e321ef59873d60f8e5f3e7032f2447e

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 5f5252c6e..7fcce4ae4 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -63,6 +63,7 @@
BEA2835D21498AD400848631 /* Socket.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA2835C21498AD400848631 /* Socket.cpp */; };
BEA28360214ACA8500848631 /* FakeSocket.cpp in Sources */ = {isa 
= PBXBuildFile; fileRef = BEA2835F214ACA8500848631 /* FakeSocket.cpp */; };
BEA28377214FFD8C00848631 /* Unit.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA28376214FFD8C00848631 /* Unit.cpp */; };
+   BEFB1EE121C29CC70081D757 /* L10n.mm in Sources */ = {isa = 
PBXBuildFile; fileRef = BEFB1EE021C29CC70081D757 /* L10n.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -552,6 +553,8 @@
BEB6524E216FD0CA00B8C09A /* stream.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stream.cxx; 
path = "../../ios-device/tools/source/stream/stream.cxx"; sourceTree = 
""; };
BEB6524F216FD0CA00B8C09A /* strmwnt.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strmwnt.cxx; 
path = "../../ios-device/tools/source/stream/strmwnt.cxx"; sourceTree = 
""; };
BEB65250216FD0CA00B8C09A /* strmunx.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strmunx.cxx; 
path = "../../ios-device/tools/source/stream/strmunx.cxx"; sourceTree = 
""; };
+   BEFB1EDF21C29CC70081D757 /* L10n.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
L10n.h; sourceTree = ""; };
+   BEFB1EE021C29CC70081D757 /* L10n.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
path = L10n.mm; sourceTree = ""; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1081,6 +1084,8 @@
BE8D77312136762500AC58EA /* 
DocumentViewController.mm */,
BE8D77332136762500AC58EA /* Document.h */,
BE8D77342136762500AC58EA /* Document.mm */,
+   BEFB1EDF21C29CC70081D757 /* L10n.h */,
+   BEFB1EE021C29CC70081D757 /* L10n.mm */,
BE80E45C21B6CEF100859C97 /* 
TemplateSectionHeaderView.h */,
BE80E45D21B6CEF200859C97 /* 
TemplateSectionHeaderView.m */,
BE80E45621B68F5000859C97 /* 
TemplateCollectionViewController.h */,
@@ -1457,6 +1462,7 @@
BE80E45E21B6CEF200859C97 /* 
TemplateSectionHeaderView.m in Sources */,
BE5EB5C3213FE29900E0826C /* Session.cpp in 
Sources */,
BE5EB5D22140039100E0826C /* LOOLWSD.cpp in 
Sources */,
+

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

[Libreoffice Gerrit user]

 unotools/source/i18n/resmgr.cxx |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit b75ee1b35c72214d7c0dea98eda87ec9531cb768
Author: Tor Lillqvist 
AuthorDate: Fri Nov 16 00:54:14 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 15:17:53 2018 +0100

Swiss Standard German: replace 'ß' in German translation with 'ss'

Although there as such is nothing LibreOfficeKit-specific here, do it
conditionally only when being used from a LibreOfficeKit client to
avoid bike-shedding.

Change-Id: I2af12394648ddad352f24c71581be0f9bf5e3d70
Reviewed-on: https://gerrit.libreoffice.org/63447
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index be66f9445816..d2a59c727cf7 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -40,6 +40,7 @@
 #   include 
 #endif
 
+#include 
 #include 
 #include 
 #include 
@@ -218,7 +219,16 @@ namespace Translate
 
 //otherwise translate it
 const std::string ret = boost::locale::pgettext(sContext.getStr(), 
pId, loc);
-return ExpandVariables(createFromUtf8(ret.data(), ret.size()));
+OUString result(ExpandVariables(createFromUtf8(ret.data(), 
ret.size(;
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// If it is de-CH, change sharp s to double s.
+if (std::use_facet(loc).country() == "CH" &&
+std::use_facet(loc).language() == "de")
+result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), 
"ss");
+}
+return result;
 }
 
 OUString nget(const char* pContextAndIds, int n, const std::locale &loc)
@@ -243,7 +253,15 @@ namespace Translate
 
 //otherwise translate it
 const std::string ret = 
boost::locale::npgettext(aContextIdId[0].getStr(), aContextIdId[1].getStr(), 
aContextIdId[2].getStr(), n, loc);
-return ExpandVariables(createFromUtf8(ret.data(), ret.size()));
+OUString result(ExpandVariables(createFromUtf8(ret.data(), 
ret.size(;
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+if (std::use_facet(loc).country() == "CH" &&
+std::use_facet(loc).language() == "de")
+result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), 
"ss");
+}
+return result;
 }
 
 static ResHookProc pImplResHookProc = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/weld.hxx   |1 
 sw/source/ui/index/cnttab.cxx  |  642 +++--
 sw/source/uibase/inc/swuicnttab.hxx|  139 +++
 sw/uiconfig/swriter/ui/tocindexpage.ui |  140 ---
 vcl/source/app/salvtables.cxx  |6 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |5 
 6 files changed, 463 insertions(+), 470 deletions(-)

New commits:
commit bbb130f8228797121d57a5e2e36ae95256bdce33
Author: Caolán McNamara 
AuthorDate: Wed Dec 12 16:09:09 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 15:11:36 2018 +0100

weld SwTOXSelectTabPage

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 98521af326c5..41ba948be3a4 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -651,6 +651,7 @@ public:
 {
 insert_item(-1, rId, rStr, nullptr, &rImage, false);
 }
+virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) = 
0;
 virtual void set_item_active(const OString& rIdent, bool bActive) = 0;
 virtual void set_item_label(const OString& rIdent, const OUString& rLabel) 
= 0;
 virtual void set_item_help_id(const OString& rIdent, const OString& 
rHelpId) = 0;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4298a9da83de..0dd57e26b893 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -471,8 +471,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl, 
Button*, void )
 OUString sInfo(SwResId(STR_FILE_NOT_FOUND));
 sInfo = sInfo.replaceFirst( "%1", sTemplate );
 sInfo = sInfo.replaceFirst( "%2", aOpt.GetTemplatePath() );
-vcl::Window* pWin = GetParent();
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr,
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
   
VclMessageType::Info, VclButtonsType::Ok,
   sInfo));
 xInfoBox->run();
@@ -722,66 +721,57 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, 
weld::Button&, rBtn, void)
 }
 }
 
-SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& 
rAttrSet)
-: SfxTabPage(pParent, "TocIndexPage",
-"modules/swriter/ui/tocindexpage.ui", &rAttrSet)
+SwTOXSelectTabPage::SwTOXSelectTabPage(TabPageParent pParent, const 
SfxItemSet& rAttrSet)
+: SfxTabPage(pParent, "modules/swriter/ui/tocindexpage.ui", 
"TocIndexPage", &rAttrSet)
 , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
 , m_bWaitingInitialSettings(true)
-{
-get(m_pTitleED, "title");
-get(m_pTypeFT, "typeft");
-get(m_pTypeLB, "type");
-get(m_pReadOnlyCB, "readonly");
-
-get(m_pAreaFrame, "areaframe");
-get(m_pAreaLB, "scope");
-get(m_pLevelFT, "levelft");
-get(m_pLevelNF, "level");
-
-get(m_pCreateFrame, "createframe");
-get(m_pFromHeadingsCB, "fromheadings");
-get(m_pAddStylesCB, "addstylescb");
-sAddStyleUser = get("stylescb")->GetText();
-get(m_pAddStylesPB, "styles");
-get(m_pFromTablesCB, "fromtables");
-get(m_pFromFramesCB, "fromframes");
-get(m_pFromGraphicsCB, "fromgraphics");
-get(m_pFromOLECB, "fromoles");
-get(m_pLevelFromChapterCB, "uselevel");
-
-get(m_pFromCaptionsRB, "captions");
-get(m_pFromObjectNamesRB, "objnames");
-
-get(m_pCaptionSequenceFT, "categoryft");
-get(m_pCaptionSequenceLB, "category");
-get(m_pDisplayTypeFT, "displayft");
-get(m_pDisplayTypeLB, "display");
-get(m_pTOXMarksCB, "indexmarks");
-
-get(m_pIdxOptionsFrame, "optionsframe");
-get(m_pCollectSameCB, "combinesame");
-get(m_pUseFFCB, "useff");
-get(m_pUseDashCB, "usedash");
-get(m_pCaseSensitiveCB, "casesens");
-get(m_pInitialCapsCB, "initcaps");
-get(m_pKeyAsEntryCB, "keyasentry");
-get(m_pFromFileCB, "fromfile");
-get(m_pAutoMarkPB, "file");
-
-get(m_pFromObjFrame, "objectframe");
-get(m_pFromObjCLB, "objects");
-
-get(m_pAuthorityFrame, "authframe");
-get(m_pSequenceCB, "numberentries");
-get(m_pBracketLB, "brackets");
-
-get(m_pSortFrame, "sortframe");
-get(m_pLanguageLB, "lang");
-get(m_pSortAlgorithmLB, "keytype");
-
+, m_xTitleED(m_xBuilder->weld_entry("title"))
+, m_xTypeFT(m_xBuilder->weld_label("typeft"))
+, m_xTypeLB(m_xBuilder->weld_combo_box("type"))
+, m_xReadOnlyCB(m_xBuilder->weld_check_button("readonly"))
+, m_xAreaFrame(m_xBuilder->weld_widget("areaframe"))
+, m_xAreaLB(m_xBuilder->weld_combo_box("scope"))
+, m_xLevelFT(m_xBuilder->weld_label("levelft"))
+, m_xLevelNF(m_xBui

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

[Libreoffice Gerrit user]

 vcl/unx/gtk/gtksalmenu.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a32059cfd1fa12eeb93b1ed3079ded0ce42deef6
Author: Caolán McNamara 
AuthorDate: Thu Dec 13 11:50:41 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 15:10:36 2018 +0100

Resolves: tdf#122016 crash accessing deleted GtkSalMenu

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

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e504e5d7aef0..f9053ce23f6f 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -506,6 +506,8 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const tools::Rectangl
 g_object_unref(mpActionGroup);
 ClearActionGroupAndMenuModel();
 
+mpFrame = nullptr;
+
 return true;
 #else
 (void)pWin;
@@ -581,6 +583,9 @@ GtkSalMenu::~GtkSalMenu()
 g_object_unref(mpMenuModel);
 
 maItems.clear();
+
+if (mpFrame)
+mpFrame->SetMenu(nullptr);
 }
 
 bool GtkSalMenu::VisibleMenuBar()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 14 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit d5ba70fa905c5d72fb52c2dd626167e6509579ab
Author: Michael Stahl 
AuthorDate: Thu Dec 13 13:26:20 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 13 14:53:41 2018 +0100

Revert "HACK: ODF import: always hide redlines"

This reverts commit 4382312c0160ab799ff1f8f2432da6b87d7a7302.

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60cc3a5f46a9..f36ffb47a147 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +856,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-#if 0
-  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
-#else
-  true))
-#endif
+  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
 {
 try
 {
@@ -893,10 +890,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
-#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
-#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 18ef0ec883c5c0c189f243601f2ec7ca6061caf8
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 13 14:53:41 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..60cc3a5f46a9 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,8 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
-!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+#if 0
+  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -890,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 67bdf2138f5c45aae0fe3aa4fb4200bb43549111
Author: Michael Stahl 
AuthorDate: Wed Dec 5 16:37:18 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 13 14:53:40 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7b6411163cb3..c756aedf4cd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -267,6 +267,7 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 
 bool bGoOn = true;
 TextFrameIndex const nOffset = MapModelToViewPos(rPos);
+assert(nOffset != TextFrameIndex(COMPLETE_STRING)); // not going to 
end well
 TextFrameIndex nNextOfst;
 
 do
commit 7f328adc45f43879c73df307e2a56562b51d0453
Author: Michael Stahl 
AuthorDate: Mon Dec 10 15:25:37 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 13 14:53:40 2018 +0100

sw_redlinehide_4b: FindText() adapt the replace part as well

When redlining is enabled, the result will be a delete redline for the
existing text, and an insert redline for the new text; that much is
obious (and ReplaceRange can deal with a selection larger than one
SwTextNode easily, since it mostly adds redlines).

For the case when redlining is disabled, there are 2 options,
and i don't really know which is preferrable from UX point of view:

One approach is to reuse GetRanges() to ignore delete redlines in
the replace range; move its declaration to different header.

Another approach is to DeleteAndJoin() the existing delete redlines,
which is the same as the previous model based Hide mode,
which calls 

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

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx   |5 +++--
 include/svtools/restartdialog.hxx|4 ++--
 svtools/source/dialogs/restartdialog.cxx |6 --
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 0fa14d58457e9418ff756a0efd66e365c4403a67
Author: Mike Kaganski 
AuthorDate: Thu Dec 13 14:24:01 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 13 14:22:28 2018 +0100

tdf#121180: close Options dialog when restart is confirmed

Change-Id: Ieb6e62ca83921abed6b6432d70c6717dadfaaa34
Reviewed-on: https://gerrit.libreoffice.org/65090
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0a2aa20f6885..435fd0acb04c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -696,8 +696,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ApplyHdl_Impl, 
Button*, void)
 if ( bNeedsRestart )
 {
 SolarMutexGuard aGuard;
-
::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
-GetFrameWeld(), eRestartReason);
+if 
(svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
+GetFrameWeld(), eRestartReason))
+EndDialog(RET_OK);
 }
 }
 
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 27f756b89e3f..932a03271a1e 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -63,8 +63,8 @@ enum RestartReason {
 RESTART_REASON_NONE
 };
 
-// Must be called with the solar mutex locked:
-SVT_DLLPUBLIC void executeRestartDialog(
+// Must be called with the solar mutex locked; returns if restart was 
initiated:
+SVT_DLLPUBLIC bool executeRestartDialog(
 css::uno::Reference< css::uno::XComponentContext > const & context,
 weld::Window* parent, RestartReason reason);
 
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index 460267c2dde3..4ec3356276bb 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -93,18 +93,20 @@ IMPL_LINK_NOARG(RestartDialog, hdlNo, weld::Button&, void)
 
 }
 
-void svtools::executeRestartDialog(
+bool svtools::executeRestartDialog(
 css::uno::Reference< css::uno::XComponentContext > const & context,
 weld::Window* parent, RestartReason reason)
 {
 auto xRestartManager = css::task::OfficeRestartManager::get(context);
 if (xRestartManager->isRestartRequested(false))
-return; // don't try to show another dialog when restart is already in 
progress
+return true; // don't try to show another dialog when restart is 
already in progress
 RestartDialog aDlg(parent, reason);
 if (aDlg.run()) {
 xRestartManager->requestRestart(
 css::uno::Reference< css::task::XInteractionHandler >());
+return true;
 }
+return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/xmlhelp.dtd

[Libreoffice Gerrit user]

 helpers/xmlhelp.dtd |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 1405725db5080e22b5567fde2a81610f4e0b0bed
Author: Olivier Hallot 
AuthorDate: Thu Dec 13 11:02:19 2018 -0200
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 14:20:02 2018 +0100

Update DTD for 

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

diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd
index 20dbe802d..135f561a6 100644
--- a/helpers/xmlhelp.dtd
+++ b/helpers/xmlhelp.dtd
@@ -41,7 +41,9 @@ Version Nov 2018
 
 
 
-
+
+
+
 
 
 
 
-
+
 
@@ -79,7 +81,7 @@ Version Nov 2018
   date CDATA #REQUIRED
 >
 
-
+
 
 
 
@@ -205,7 +207,7 @@ Version Nov 2018
   localize CDATA #IMPLIED
 >
 
-
+
 
@@ -235,7 +237,7 @@ Version Nov 2018
   id CDATA #REQUIRED
 >
 
-
+
 https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 340edbc5431293469ff2416b8f7f695508b07470
Author: Olivier Hallot 
AuthorDate: Thu Dec 13 11:02:19 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 14:20:02 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Update DTD for 

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

diff --git a/helpcontent2 b/helpcontent2
index ff95264637de..1405725db508 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ff95264637de17c48fa5de9765c97bb103cf077b
+Subproject commit 1405725db5080e22b5567fde2a81610f4e0b0bed
___
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' - scaddins/source sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/data/functions/date_time/fods/yearfrac.fods  |  234 +++-
 sc/qa/unit/data/functions/financial/fods/amordegrc.fods |   38 +-
 scaddins/source/analysis/analysishelper.cxx |   78 +
 3 files changed, 281 insertions(+), 69 deletions(-)

New commits:
commit 6441ffbeacc5b107430accbdf5f82f6ad4269f94
Author: Winfried Donkers 
AuthorDate: Sun Dec 9 11:52:18 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 14:17:25 2018 +0100

tdf#69569 implement proposed change to ODF1.2 part 2 §4.11.7.7

Calculating the number of days in a year in AddIn function GetDaysInYear()
for basis 1 (actual/actual) gave wrong results.
Now the results are correct and the same as in Excel.

Extended the unit test document for function YEARFRAC and corrected the
unit test document for function AMORDEGRC (verified the results with Excel).

Change-Id: Ic68f108496f41dec71b3616095dff80512a64c31
Reviewed-on: https://gerrit.libreoffice.org/64837
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 22be500b1624753decec43c0de4ccb1c5f7a21d4)
Reviewed-on: https://gerrit.libreoffice.org/65038

diff --git a/sc/qa/unit/data/functions/date_time/fods/yearfrac.fods 
b/sc/qa/unit/data/functions/date_time/fods/yearfrac.fods
index 4d6e896a0388..adbfe0fac983 100644
--- a/sc/qa/unit/data/functions/date_time/fods/yearfrac.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/yearfrac.fods
@@ -1227,7 +1227,237 @@
  without 3rd argument
  
 
-
+
+ 
+  28-02-2003
+ 
+ 
+  29-02-2004
+ 
+ 
+  =(B34-A34)/YEARFRAC(A34;B34;1)
+ 
+ 
+  365,50
+ 
+ 
+  365,50
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  28-02-2003
+ 
+ 
+  28-02-2004
+ 
+ 
+  =(B35-A35)/YEARFRAC(A35;B35;1)
+ 
+ 
+  365,00
+ 
+ 
+  365,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  28-02-2004
+ 
+ 
+  28-02-2005
+ 
+ 
+  =(B36-A36)/YEARFRAC(A36;B36;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  01-01-2016
+ 
+ 
+  31-01-2016
+ 
+ 
+  =(B37-A37)/YEARFRAC(A37;B37;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  01-01-2016
+ 
+ 
+  01-01-2017
+ 
+ 
+  =(B38-A38)/YEARFRAC(A38;B38;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  31-01-2016
+ 
+ 
+  01-01-2017
+ 
+ 
+  =(B39-A39)/YEARFRAC(A39;B39;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  31-01-2016
+ 
+ 
+  31-01-2017
+ 
+ 
+  =(B40-A40)/YEARFRAC(A40;B40;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  29-02-2016
+ 
+ 
+  01-05-2016
+ 
+ 
+  =(B41-A41)/YEARFRAC(A41;B41;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  30-04-2016
+ 
+ 
+  01-09-2016
+ 
+ 
+  =(B42-A42)/YEARFRAC(A42;B42;1)
+ 
+ 
+  366,00
+ 
+ 
+  366,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
+ 
+  30-11-2016
+ 
+ 
+  29-09-2017
+ 
+ 
+  =(B43-A43)/YEARFRAC(A43;B43;1)
+ 
+ 
+  365.00
+ 
+ 
+  365,00
+ 
+ 
+  1
+ 
+ 
+  tdf69569, days in year
+ 
+
+
  
 
 
@@ -1246,4 +1476,4 @@

   
  
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/financial/fods/amordegrc.fods 
b/sc/qa/unit/data/functions/financial/fods/amordegrc.fods
index 6ab807231e40..0e98f330bf0c 100644
--- a/sc/qa/unit/data/functions/financial/fods/amordegrc.fods
+++ b/sc/qa/unit/data/functions/financial/fods/amordegrc.fods
@@ -1312,11 +1312,11 @@
  
 
 
- 
-  2808
+ 
+  2813
  
- 
-  2808
+ 
+  2813
  
  
   PRAVDA
@@ -1324,7 +1324,9 @@
  
   =AMORDEGRC(J1;J2;J3;J4;J5;J6;J7)
  
- 
+ 
+  tdf69569, verified with Excel2016
+ 
  
  
   purchase date
@@ -1342,11 +1344,11 @@
  
 
 
- 
-  2808
+ 
+  2813
  
- 
-  2808
+ 
+  2813
  
  
   

[Libreoffice-commits] online.git: bundled/include

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h   |   10 ---
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx |   29 --
 2 files changed, 39 deletions(-)

New commits:
commit 07155e3b53132e368219634d011c29f38d5521df
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 15:05:13 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 15:05:32 2018 +0200

Revert "Update from core master"

Was reverted in core, too.

This reverts commit cd389cb6b0fffa4ba1b2a8c6428252715774f09a.

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 68074a637..4dd23a2cb 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -94,16 +94,6 @@ struct _LibreOfficeKitClass
 @since LibreOffice 6.0
  */
 int (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
-
-/** @see lok::Office::translateGet().
-@since LibreOffice 6.3
- */
-char* (*translateGet) (LibreOfficeKit *pThis, const char* pId, const char* 
pPrefixName, const char* pBcp47LanguageTag);
-
-/** @see lok::Office::translateNGet().
-@since LibreOffice 6.3
- */
-char* (*translateNGet) (LibreOfficeKit *pThis, const char* pId, int n, 
const char* pPrefixName, const char* pBcp47LanguageTag);
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 923af7136..5d7771cf8 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -791,35 +791,6 @@ public:
 {
 return mpThis->pClass->runMacro( mpThis, pURL );
 }
-
-/**
- * Fetch translation for a string.
- *
- * @since LibreOffice 6.3
- * @returns the translated string, if available
- * @param pId the context and string, separated by a '\004' character
- * @param pPrefixName the prefix passed to Translate::Create()
- * @param pBcp47LanguageTag the locale into which the string should be 
translated
- */
-char* translateGet( const char* pId, const char* pPrefixName, const char* 
pBcp47LanguageTag )
-{
-return mpThis->pClass->translateGet( mpThis, pId, pPrefixName, 
pBcp47LanguageTag );
-}
-
-/**
- * Fetch translation for a string corresponding to a specific number of 
something.
- *
- * @since LibreOffice 6.3
- * @returns the translated string, if available
- * @param pId the context and string, separated by a '\004' character
- * @param n the number
- * @param pPrefixName the prefix passed to Translate::Create()
- * @param pBcp47LanguageTag the locale into which the string should be 
translated
- */
-char* translateNGet( const char* pId, int n, const char* pPrefixName, 
const char* pBcp47LanguageTag )
-{
-return mpThis->pClass->translateNGet( mpThis, pId, n, pPrefixName, 
pBcp47LanguageTag );
-}
 };
 
 /// Factory method to create a lok::Office instance.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 878232f45cedfc00ab3f737cd2aa38b276276df9
Author: Olivier Hallot 
AuthorDate: Fri Dec 7 17:36:56 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 14:04:16 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add info on python location in filesystem

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

diff --git a/helpcontent2 b/helpcontent2
index 7db9d1ee3bb3..ff95264637de 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7db9d1ee3bb3626d99a6a58fe98eb185c65ddda5
+Subproject commit ff95264637de17c48fa5de9765c97bb103cf077b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/sbasic/python/python_locations.xhp |   44 +
 1 file changed, 37 insertions(+), 7 deletions(-)

New commits:
commit ff95264637de17c48fa5de9765c97bb103cf077b
Author: Olivier Hallot 
AuthorDate: Fri Dec 7 17:36:56 2018 -0200
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 14:04:16 2018 +0100

Add info on python location in filesystem

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

diff --git a/source/text/sbasic/python/python_locations.xhp 
b/source/text/sbasic/python/python_locations.xhp
index f8bb85ff5..24462b698 100644
--- a/source/text/sbasic/python/python_locations.xhp
+++ b/source/text/sbasic/python/python_locations.xhp
@@ -11,19 +11,49 @@
 
 
 
-Location of Python Scripts
+Python Scripts 
Organization
 /text/sbasic/python/python_locations.xhp
 
 
 
 
-Location of 
Python scripts
-The Python script files are simply stored within the file 
system.
-
+Python 
scripts Organization and Location
+The Python script files are stored in the file system, in 
folders controlled by %PRODUCTNAME. The macros can be stared at installation, 
user or file level.
 
 
-%PRODUCTNAME installation share
-%PRODUCTNAME user profile
-Embedded in the document
+Python Script Locations
+%PRODUCTNAME Macros container
+Existing macros in 
this location (container) were copied by the installation program and are 
available to every computer user, and any open document can access macros 
stored the container. You need administrative rights to store or edit macros 
here.
+
+The LibreOfficeDev 
Macros container location in the file system depends on the operating 
system:
+
+
+For 
Windows, C:\Program Files 
(x86)\LibreOffice\Basis\share\Scripts\python.
+
+
+For Linux 
and macOS, in 
$(Installation)/share/Scripts/python.
+
+
+My Macros
+This container is 
accessible only by the %PRODUCTNAME user. Any open document can access macros 
stored the container. Macros in this location are stored in the %PRODUCTNAME 
user profile.
+The My Macros 
container location is in the user space and depends on the operating 
system:
+
+
+For 
Windows, in 
C:\Users\current-user\AppData\Roaming\libreoffice\4\user\Scripts\python.
+
+
+For 
Linux and macOS, in 
$(HOME)/.config/libreoffice/4/user/Scripts/python.
+
+
+Document macros
+Document macros are 
embedded in the document and are accessible only when the document is 
open.
+Libraries, Modules and Macros
+Like BASIC macros, 
Python macros can organized in libraries, modules and macros. Note that a 
module may not be part of a library.
+Creating a Python Library
+Libraries are 
folders in the container tree. To create a library, add a folder in the target 
container. The library name is the folder name.
+Creating a Python Module.
+A module is a 
python file in the library or the container. Create a module adding a file in 
the container.
+Python macros
+A macro is a python 
object in the module.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |  853 -
 1 file changed, 433 insertions(+), 420 deletions(-)

New commits:
commit 9325646778dbd353c8cb24977b627fa8fb274eec
Author: andreas kainz 
AuthorDate: Tue Dec 11 10:31:13 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Dec 13 13:55:46 2018 +0100

update groupedbar_compact for calc

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 9ef4b34e425e..66dc9cab8955 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2269,7 +2269,7 @@
   
 True
 False
-Menubar
+.uno:Menubar
   
 
 
@@ -2324,7 +2324,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
+_Check for 
Updates...
   
 
 
@@ -2334,6 +2334,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -2898,64 +2918,72 @@
 False
 5
 5
-bottom
 
   
 True
 False
-end
-5
 
   
 True
 False
 vertical
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
-True
-icons
-False
-
-  
-True
-False
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+False
+.uno:SearchDialog
   
   
 False
-True
-0
+False
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-end
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+False
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+False
+  
+
+
+  
+False
+.uno:Undo
+  
+  
+False
+False
+  
+
+
+  
+False
+.uno:Redo
+  
+  
+False
+False
   
 
   
@@ -2970,54 +2998,28 @@
 True
 False
 
-  
-True
-True
-end
-True
-ico

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 64a6a34c27b861fdb87facb4626aff431667cc55
Author: Olivier Hallot 
AuthorDate: Thu Dec 13 10:17:56 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Dec 13 13:53:34 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add support for python code scripts

Introduced  section and "pycode" role for paragraphs
with same behaviour as BASIC coounterparts.

Used to list python scripts examples ans code fragments
in help pages

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

diff --git a/helpcontent2 b/helpcontent2
index 3f0f45251961..7db9d1ee3bb3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f0f452519618e4b0bd0b97a855fc5ffe5514a49
+Subproject commit 7db9d1ee3bb3626d99a6a58fe98eb185c65ddda5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/online_transform.xsl |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7db9d1ee3bb3626d99a6a58fe98eb185c65ddda5
Author: Olivier Hallot 
AuthorDate: Thu Dec 13 10:17:56 2018 -0200
Commit: Olivier Hallot 
CommitDate: Thu Dec 13 13:53:34 2018 +0100

Add support for python code scripts

Introduced  section and "pycode" role for paragraphs
with same behaviour as BASIC coounterparts.

Used to list python scripts examples ans code fragments
in help pages

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

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index e5671e22f..e69d22310 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -553,7 +553,7 @@
 
 
 
-
+
 
 
 
@@ -949,6 +949,13 @@
 http://schema.org/SoftwareSourceCode"; itemprop="codeSampleType" 
content="snippet">
 
 
+
+http://schema.org/SoftwareSourceCode"; itemprop="codeSampleType" 
content="snippet">
+
+
+http://schema.org/SoftwareSourceCode"; itemprop="codeSampleType" 
content="snippet">
+
+
 
 
 
___
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' - extras/source solenv/bin sw/inc sw/source sw/uiconfig

[Libreoffice Gerrit user]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 solenv/bin/native-code.py  |1 
 sw/inc/swabstdlg.hxx   |2 
 sw/source/ui/config/optload.cxx|1 
 sw/source/ui/dialog/swdlgfact.cxx  |5 
 sw/source/ui/dialog/swdlgfact.hxx  |2 
 sw/source/ui/frmdlg/cption.cxx |  219 -
 sw/source/uibase/inc/cption.hxx|   69 +++
 sw/source/uibase/uiview/viewdlg2.cxx   |4 
 sw/uiconfig/swriter/ui/insertcaption.ui|  202 ---
 10 files changed, 258 insertions(+), 250 deletions(-)

New commits:
commit fcb2685ac23f6a1a5fb03f2ec431f8f7c43db58d
Author: Caolán McNamara 
AuthorDate: Wed Dec 12 11:50:06 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 13 13:38:57 2018 +0100

weld SwCaptionDialog

Change-Id: I5babfbf3489f88c5d6cdeffbd514d86368f04fa9
Reviewed-on: https://gerrit.libreoffice.org/65014
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 72ebf150ab1f35a65de7c99e0227af77bae72be9)
Reviewed-on: https://gerrit.libreoffice.org/65078

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 2882a06c3370..78b49b2f0cf5 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -223,9 +223,6 @@
 
-
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a314d5628c5c..edf8afcaff05 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -508,7 +508,6 @@ custom_widgets = [
 'SvxTextEncodingBox',
 'SvxTextEncodingBox',
 'SwAddressPreview',
-'SwCaptionPreview',
 'SwFieldRefTreeListBox',
 'SwGlTreeListBox',
 'SwIdxTreeListBox',
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 5bffda4b0f2d..2e97df323db9 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -377,7 +377,7 @@ public:
 virtual VclPtr  CreateSwCharDlg(weld::Window* 
pParent, SwView& pVw, const SfxItemSet& rCoreSet,
 SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) = 0;
 virtual VclPtr CreateSwConvertTableDlg(SwView& 
rView, bool bToTable) = 0;
-virtual VclPtr CreateSwCaptionDialog ( vcl::Window 
*pParent, SwView &rV) = 0;
+virtual VclPtr CreateSwCaptionDialog(weld::Window 
*pParent, SwView &rV) = 0;
 
 virtual VclPtr 
CreateSwInsertDBColAutoPilot(SwView& rView,
 css::uno::Reference< css::sdbc::XDataSource> rxSource,
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 8c2e76e4c1cd..1030d21c796a 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -495,7 +495,6 @@ void CaptionPreview::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rect
 rRenderContext.DrawText(Point(4, 6), maText);
 }
 
-
 IMPL_LINK(SwCaptionOptPage, TextFilterHdl, OUString&, rTest, bool)
 {
 rTest = m_aTextFilter.filter(rTest);
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index e5451360c27b..1705fe76312c 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -829,10 +829,9 @@ VclPtr 
SwAbstractDialogFactory_Impl::CreateSwConvertT
 return 
VclPtr::Create(o3tl::make_unique(rView,
 bToTable));
 }
 
-VclPtr SwAbstractDialogFactory_Impl::CreateSwCaptionDialog 
( vcl::Window *pParent, SwView &rV)
+VclPtr 
SwAbstractDialogFactory_Impl::CreateSwCaptionDialog(weld::Window *pParent, 
SwView &rV)
 {
-VclPtr pDlg = VclPtr::Create( pParent, rV );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rV));
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index ae653f8687d5..05eab8cbcb35 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -615,7 +615,7 @@ public:
 virtual VclPtr  CreateSwCharDlg(weld::Window* 
pParent, SwView& pVw, const SfxItemSet& rCoreSet,
 SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) 
override;
 virtual VclPtr CreateSwConvertTableDlg(SwView& 
rView, bool bToTable) override;
-virtual VclPtr CreateSwCaptionDialog ( vcl::Window 
*pParent, SwView &rV) override;
+virtual VclPtr CreateSwCaptionDialog(weld::Window 
*pParent, SwView &rV) override;
 virtual VclPtr 
CreateSwInsertDBColAutoPilot(SwView& rView,
 css::uno::Reference< css::sdbc::XDataSource> rxSource,
 css::uno::Reference xColSupp,
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index cf1668f42c2f..49993753e587 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -97,30 +97,36 @@ OUString TextFilterAutoCon

[Libreoffice-commits] dev-tools.git: 2 commits - qa/bugzillaChecker.py

[Libreoffice Gerrit user]

 qa/bugzillaChecker.py |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f51b006bf3cf76a15a275aa6833af3ef7d7a405f
Author: Xisco Fauli 
AuthorDate: Thu Dec 13 13:35:31 2018 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 13 13:39:04 2018 +0100

QA: verify crashes and regressions

diff --git a/qa/bugzillaChecker.py b/qa/bugzillaChecker.py
index 5409a5d..1b459a5 100755
--- a/qa/bugzillaChecker.py
+++ b/qa/bugzillaChecker.py
@@ -226,8 +226,8 @@ def analyze_bugzilla_checkers(statList, bugzillaData, cfg):
 movedToNew = True
 movedToNewValue = resultValue
 
-if addedStatus == 'RESOLVED_FIXED' and rowStatus 
== 'RESOLVED_FIXED' and 'regression' in rowKeywords \
-and 'bisected' in rowKeywords:
+if addedStatus == 'RESOLVED_FIXED' and rowStatus 
== 'RESOLVED_FIXED' and ('regression' in rowKeywords \
+or 'crash' in row['summary'].lower()):
 util_add_to_result(lResults, 'verify_fix', 
resultValue)
 
 elif change['field_name'] == 'resolution':
commit d5b01ed304589ab7d3e8a72d3bcd1d4e14c5d597
Author: Xisco Fauli 
AuthorDate: Wed Dec 12 20:02:37 2018 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 13 13:39:04 2018 +0100

QA: ignore needsUXEval bugs here

diff --git a/qa/bugzillaChecker.py b/qa/bugzillaChecker.py
index 55e8d49..5409a5d 100755
--- a/qa/bugzillaChecker.py
+++ b/qa/bugzillaChecker.py
@@ -347,8 +347,9 @@ def analyze_bugzilla_checkers(statList, bugzillaData, cfg):
 util_add_to_result(lResults, 'metabug_not_added', 
movedToNewValue)
 
 if not versionChanged and movedToNew and not autoConfirmed and 
row['severity'] != 'enhancement' and \
-('regression' not in rowKeywords and 'bisected' not in 
rowKeywords and \
-'easyHack' not in rowKeywords) and row['component'] != 
'Documentation' and \
+'regression' not in rowKeywords and 'bisected' not in 
rowKeywords and \
+'easyHack' not in rowKeywords and 'needsUXEval' not in 
rowKeywords and \
+row['component'] != 'Documentation' and \
 movedToNewValue[2] not in 
cfg['configQA']['ignore']['confirmer'] and \
 (rowVersion.startswith(versionsToCheck) or rowVersion == 
'unspecified'):
 util_add_to_result(lResults, 'version_not_changed', 
movedToNewValue)
___
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/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |  734 +--
 1 file changed, 470 insertions(+), 264 deletions(-)

New commits:
commit 2a70f6a2cba8e1a8e88acfcb7a50325c9b2596eb
Author: andreas kainz 
AuthorDate: Tue Dec 11 07:41:46 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Dec 13 13:32:04 2018 +0100

tdf#11976 update groupedbar_compact writer NB

Change-Id: I5be7ae9a49122c73ce5a16e773665bcc4c9593be
Reviewed-on: https://gerrit.libreoffice.org/65066
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit b1d66892bbd4359be945bf103eba80959bab7478)
Reviewed-on: https://gerrit.libreoffice.org/65073

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 6b5382adf408..7055e0c099a1 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -2372,6 +2372,26 @@
   
 
 
+  
+True
+False
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:ScriptOrganizer
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -3004,58 +3024,71 @@
   
 True
 False
-end
 5
+bottom
 
   
 True
 False
 vertical
+top
 
-  
+  
 True
-False
-end
+True
+icons
+False
 
-  
+  
 True
-True
-icons
-False
-
-  
-True
-False
-.uno:SearchDialog
-  
-  
-False
-True
-  
-
+False
+.uno:SearchDialog
   
   
 False
-True
-0
+True
   
 
 
-  
-_Menu
+  
 True
-True
-False
-False
-center
-True
-none
-True
+False
+.uno:HelpIndex
   
   
 False
-True
-1
+True
+  
+
+
+  
+True
+False
+.uno:CloseDoc
+  
+  
+False
+True
+  
+
+
+  
+False
+.uno:Undo
+  
+  
+False
+True
+  
+
+
+  
+False
+.uno:Redo
+  
+  
+False
+True
   
 
   
@@ -3070,53 +3103,28 @@
 True
 False
 
-  
-True
-True
-end
-True
-icons
-False
-1
-
-  
-True
-False
- 

[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk android/source config_host.mk.in configure.ac

[Libreoffice Gerrit user]

 android/CustomTarget_lo_android.mk |2 +-
 android/source/Makefile|4 ++--
 config_host.mk.in  |1 +
 configure.ac   |   10 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 25a0ae6138d5439bf0c1490be2e667a8e7b4beec
Author: Stephan Bergmann 
AuthorDate: Thu Dec 13 09:43:55 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 13 13:29:40 2018 +0100

Introduce --enable-android-editing

...to select the experimental ...Editing... Android build variant.  (Ignored
for non-Android builds, but using libo_FUZZ_ARG_ENABLE anyway, just in 
case.)

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

diff --git a/android/CustomTarget_lo_android.mk 
b/android/CustomTarget_lo_android.mk
index 642dfe2f569a..3f80fe86be3a 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call 
gb_Postprocess_get_target,AllModulesButInstsetNa
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-   cp 
$(SRCDIR)/android/source/build/outputs/apk/strippedUI/debug/*-debug.apk 
$(BUILDDIR)/instsetoo_native/foo/bin
+   cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if 
$(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk 
$(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/source/Makefile b/android/source/Makefile
index d0242117d1a8..3fbfcddb0dd3 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -16,7 +16,7 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j -g core -g writer -g calc -g draw -g edit > $@
 
 install:
-   ./gradlew $(if $(verbose),--info) $(if 
$(versionCode),-PcmdVersionCode=$(versionCode)) install$(if 
$(DISABLE_UI),StrippedUI,FullUI)Debug
+   ./gradlew $(if $(verbose),--info) $(if 
$(versionCode),-PcmdVersionCode=$(versionCode)) install$(if 
$(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug
@echo
@echo 'Run it with "make run"'
@echo
@@ -30,7 +30,7 @@ clean:
rm -f liboSettings.gradle
 
 build-gradle: liboSettings.gradle local.properties link-so
-   ./gradlew $(if $(verbose),--info) $(if 
$(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if 
$(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
+   ./gradlew $(if $(verbose),--info) $(if 
$(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if 
$(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if 
$(ENABLE_RELEASE_BUILD),Release,Debug)
 
 run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n 
$(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity
diff --git a/config_host.mk.in b/config_host.mk.in
index a095f430464b..51125374491d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -110,6 +110,7 @@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
 export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
+export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
diff --git a/configure.ac b/configure.ac
index 14182d154939..e30d0cc938b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,6 +526,16 @@ if test -n "$with_android_sdk"; then
 fi
 AC_SUBST(ANDROID_SDK_HOME)
 
+libo_FUZZ_ARG_ENABLE([android-editing],
+AS_HELP_STRING([--enable-android-editing],
+[Enable the experimental editing feature on Android.])
+)
+ENABLE_ANDROID_EDITING=
+if test "$enable_android_editing" = yes; then
+ENABLE_ANDROID_EDITING=TRUE
+fi
+AC_SUBST([ENABLE_ANDROID_EDITING])
+
 dnl ===
 dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 868a683138308727496f53b43aa145a0a4e03c83
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 13:30:24 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 13:58:21 2018 +0200

Un-revert the addition of more ABI checks for LibreOfficeKitClass

Change-Id: Idf2ebb552065fa600a4010e83a24a0f13651c029

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 74e2c09bb5af..e7694905747e 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2463,6 +2463,11 @@ void DesktopLOKTest::testInsertCertificatePEM()
 
 namespace {
 
+constexpr size_t classOffset(int i)
+{
+return sizeof(static_cast(nullptr)->nSize) + 
i * sizeof(void*);
+}
+
 constexpr size_t documentClassOffset(int i)
 {
 return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
@@ -2473,6 +2478,18 @@ constexpr size_t documentClassOffset(int i)
 void DesktopLOKTest::testABI()
 {
 // STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
+CPPUNIT_ASSERT_EQUAL(classOffset(0), offsetof(struct _LibreOfficeKitClass, 
destroy));
+CPPUNIT_ASSERT_EQUAL(classOffset(1), offsetof(struct _LibreOfficeKitClass, 
documentLoad));
+CPPUNIT_ASSERT_EQUAL(classOffset(2), offsetof(struct _LibreOfficeKitClass, 
getError));
+CPPUNIT_ASSERT_EQUAL(classOffset(3), offsetof(struct _LibreOfficeKitClass, 
documentLoadWithOptions));
+CPPUNIT_ASSERT_EQUAL(classOffset(4), offsetof(struct _LibreOfficeKitClass, 
freeError));
+CPPUNIT_ASSERT_EQUAL(classOffset(5), offsetof(struct _LibreOfficeKitClass, 
registerCallback));
+CPPUNIT_ASSERT_EQUAL(classOffset(6), offsetof(struct _LibreOfficeKitClass, 
getFilterTypes));
+CPPUNIT_ASSERT_EQUAL(classOffset(7), offsetof(struct _LibreOfficeKitClass, 
setOptionalFeatures));
+CPPUNIT_ASSERT_EQUAL(classOffset(8), offsetof(struct _LibreOfficeKitClass, 
setDocumentPassword));
+CPPUNIT_ASSERT_EQUAL(classOffset(9), offsetof(struct _LibreOfficeKitClass, 
getVersionInfo));
+CPPUNIT_ASSERT_EQUAL(classOffset(10), offsetof(struct 
_LibreOfficeKitClass, runMacro));
+
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/CppunitTest_svx_unit.mk   |1 
 svx/qa/unit/customshapes.cxx  |  102 ++
 svx/qa/unit/data/viewBox_positive_twolines_strict.odp |binary
 svx/source/customshapes/EnhancedCustomShape2d.cxx |8 -
 4 files changed, 107 insertions(+), 4 deletions(-)

New commits:
commit 25f059a423d42b546e319d0860df0de9c1580101
Author: Regina Henschel 
AuthorDate: Thu Dec 6 12:27:25 2018 +0100
Commit: Regina Henschel 
CommitDate: Thu Dec 13 12:35:41 2018 +0100

tdf#121890 ODF custom shapes use left and top from viewBox

MS custom shapes use always zero for identifier left and top in
the formulas of the shape geometry. But custom shapes in ODF use
the left and top value from the svg:viewBox attribute, see
table 11 in section 19.171 draw:formula; part 1 of the spec.

Change-Id: Ief4b9d9b8797e165a494d049f32c5a46880044c2
Reviewed-on: https://gerrit.libreoffice.org/64704
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index f48f2c1a5560..4ae8fecf2762 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_set_include,svx_unit,\
 
 $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
svx/qa/unit/svdraw/test_SdrTextObject \
+   svx/qa/unit/customshapes \
svx/qa/unit/unodraw \
svx/qa/unit/xoutdev \
svx/qa/unit/XTableImportExportTest \
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
new file mode 100755
index ..b5aeea670ae2
--- /dev/null
+++ b/svx/qa/unit/customshapes.cxx
@@ -0,0 +1,102 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+const OUString sDataDirectory("/svx/qa/unit/data/");
+
+/// Tests for svx/source/customshapes/ code.
+class CustomshapesTest : public test::BootstrapFixture, public 
unotest::MacrosTest
+{
+uno::Reference mxComponent;
+
+public:
+virtual void setUp() override
+{
+test::BootstrapFixture::setUp();
+mxDesktop.set(frame::Desktop::create(m_xContext));
+}
+
+virtual void tearDown() override
+{
+if (mxComponent.is())
+{
+mxComponent->dispose();
+}
+test::BootstrapFixture::tearDown();
+}
+
+void testViewBoxLeftTop();
+
+CPPUNIT_TEST_SUITE(CustomshapesTest);
+CPPUNIT_TEST(testViewBoxLeftTop);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void CustomshapesTest::testViewBoxLeftTop()
+{
+// tdf#121890 formula values "left" and "top" are wrongly calculated
+// Load a document with two custom shapes of type "non-primitive"
+OUString aURL
+= m_directories.getURLFromSrc(sDataDirectory) + 
"viewBox_positive_twolines_strict.odp";
+mxComponent = loadFromDesktop(aURL, 
"com.sun.star.comp.presentation.PresentationDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+
+uno::Reference xDrawPagesSupplier(mxComponent,
+   
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", 
xDrawPagesSupplier.is());
+uno::Reference 
xDrawPages(xDrawPagesSupplier->getDrawPages());
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY_THROW);
+
+// Get the shape "leftright". Error was, that the identifier "left" was 
always set to zero, thus
+// the path was outside the frame rectangle for a viewBox having a 
positive "left" value.
+uno::Reference xShapeLR(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape 'leftright'", 
xShapeLR.is());
+uno::Reference xShapeLRProps(xShapeLR, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape 'leftright' properties", 
xShapeLRProps.is());
+awt::Rectangle aFrameRectLR;
+xShapeLRProps->getPropertyValue(UNO_NAME_MISC_OBJ_FRAMERECT) >>= 
aFrameRectLR;
+awt::Rectangle aBoundRectLR;
+xShapeLRProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= 
aBoundRectLR;
+// difference should be zero, but allow some rounding errors
+CPPUNIT_ASSERT_LESS(static_cast(3), labs(aFrameRectLR.X - 
aBoundRectLR.X));
+
+// Get the shape "topbottom". Error was, that the identifier "top" was 
always set to zero, thus
+// the path was outside the frame rectangle for a viewBox having a 
positive "top" value.
+uno::Reference xShapeTB(xDrawPage->getBy

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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   37 
 desktop/source/lib/init.cxx |   22 
 include/LibreOfficeKit/LibreOfficeKit.h |   10 ---
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   29 -
 4 files changed, 98 deletions(-)

New commits:
commit ef9e7c83267d9bfa7f225a25fceafa1027a21a6a
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 13:18:46 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 13:20:30 2018 +0200

Revert adding the tanslateGet() and translateNGet() API to LibreOfficeKit

Will handle it another way instead that isn't so visible and annoying.

This reverts commit 5f0dda8e9f2e35e1fdb5750089a70543478fa8a1.
This reverts commit 4f1a341bc312673b8d92e4474cc39bc3ab69aa5b.

Change-Id: If456d2792a5f2793ee6337898aaa4a55637f8522

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 067541dd345d..74e2c09bb5af 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -119,7 +118,6 @@ public:
 void testCommentsImpress();
 void testCommentsCallbacksWriter();
 void testRunMacro();
-void testTranslate();
 void testExtractParameter();
 void testGetSignatureState_NonSigned();
 void testGetSignatureState_Signed();
@@ -167,7 +165,6 @@ public:
 CPPUNIT_TEST(testCommentsImpress);
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
-CPPUNIT_TEST(testTranslate);
 CPPUNIT_TEST(testExtractParameter);
 CPPUNIT_TEST(testGetSignatureState_Signed);
 CPPUNIT_TEST(testGetSignatureState_NonSigned);
@@ -,20 +2219,6 @@ void DesktopLOKTest::testRunMacro()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
-void DesktopLOKTest::testTranslate()
-{
-comphelper::LibreOfficeKit::setActive();
-
-LibLibreOffice_Impl aOffice;
-
-// Try translating to a non-existent locale, should return the English 
string
-char *translated = aOffice.m_pOfficeClass->translateGet(&aOffice, 
STR_DESCRIPTION_FACTORY_WRITER, "svt", "foo");
-CPPUNIT_ASSERT_EQUAL(0, strcmp(translated, "Text Document"));
-free(translated);
-
-comphelper::LibreOfficeKit::setActive(false);
-}
-
 void DesktopLOKTest::testExtractParameter()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -2480,11 +2463,6 @@ void DesktopLOKTest::testInsertCertificatePEM()
 
 namespace {
 
-constexpr size_t classOffset(int i)
-{
-return sizeof(static_cast(nullptr)->nSize) + 
i * sizeof(void*);
-}
-
 constexpr size_t documentClassOffset(int i)
 {
 return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
@@ -2495,21 +2473,6 @@ constexpr size_t documentClassOffset(int i)
 void DesktopLOKTest::testABI()
 {
 // STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
-
-CPPUNIT_ASSERT_EQUAL(classOffset(0), offsetof(struct _LibreOfficeKitClass, 
destroy));
-CPPUNIT_ASSERT_EQUAL(classOffset(1), offsetof(struct _LibreOfficeKitClass, 
documentLoad));
-CPPUNIT_ASSERT_EQUAL(classOffset(2), offsetof(struct _LibreOfficeKitClass, 
getError));
-CPPUNIT_ASSERT_EQUAL(classOffset(3), offsetof(struct _LibreOfficeKitClass, 
documentLoadWithOptions));
-CPPUNIT_ASSERT_EQUAL(classOffset(4), offsetof(struct _LibreOfficeKitClass, 
freeError));
-CPPUNIT_ASSERT_EQUAL(classOffset(5), offsetof(struct _LibreOfficeKitClass, 
registerCallback));
-CPPUNIT_ASSERT_EQUAL(classOffset(6), offsetof(struct _LibreOfficeKitClass, 
getFilterTypes));
-CPPUNIT_ASSERT_EQUAL(classOffset(7), offsetof(struct _LibreOfficeKitClass, 
setOptionalFeatures));
-CPPUNIT_ASSERT_EQUAL(classOffset(8), offsetof(struct _LibreOfficeKitClass, 
setDocumentPassword));
-CPPUNIT_ASSERT_EQUAL(classOffset(9), offsetof(struct _LibreOfficeKitClass, 
getVersionInfo));
-CPPUNIT_ASSERT_EQUAL(classOffset(10), offsetof(struct 
_LibreOfficeKitClass, runMacro));
-CPPUNIT_ASSERT_EQUAL(classOffset(11), offsetof(struct 
_LibreOfficeKitClass, translateGet));
-CPPUNIT_ASSERT_EQUAL(classOffset(12), offsetof(struct 
_LibreOfficeKitClass, translateNGet));
-
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cf9352f3b2cc..90994a92c257 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1422,8 +1422,6 @@ static void
lo_setDocumentPassword(LibreOfficeKit* pThis,
const char* pPassword);
 static char*   lo_getVersionInfo(LibreOfficeKit* pThis);
 static int lo_runMacro   

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

[Libreoffice Gerrit user]

 chart2/source/view/main/PolarLabelPositionHelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6dabb2fd9fa198533722358e3d8dfff3bd1329c
Author: Andrea Gelmini 
AuthorDate: Mon Dec 10 15:37:06 2018 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 13 11:50:56 2018 +0100

Fix typo

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

diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx 
b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index 4af1d78b63a8..6cea12f672cc 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -84,7 +84,7 @@ awt::Point 
PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
 if(m_nDimensionCount==3 && nLabelPlacement == 
css::chart::DataLabelPlacement::OUTSIDE)
 {
 //check whether the upper or the downer edge is more distant from the 
center
-//take the farest point to put the label to
+//take the farthest point to put the label to
 
 awt::Point aP0( transformSceneToScreenPosition(
 m_pPosHelper->transformUnitCircleToScene( 0, 0, fLogicZ ) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/subtotal.hxx  |3 
 sc/source/core/tool/subtotal.cxx |  126 +++
 2 files changed, 129 insertions(+)

New commits:
commit 9176dd1acdad9112df73268ad0a39d421c1307d4
Author: Eike Rathke 
AuthorDate: Wed Dec 12 15:18:23 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 11:43:04 2018 +0100

Introduce ScFunctionData::update() and getResult()

... to further replace code where that is explicitly done.

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

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 46f6fcc7693c..2fa9e717ad19 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -60,6 +60,9 @@ struct ScFunctionData   // to calculate 
single functions
 
 ScFunctionData( ScSubTotalFunc eFn ) :
 eFunc(eFn), nVal(0.0), nCount(0), bError(false) {}
+void update( double fNewVal );
+/// Check bError after (!) obtaining the result.
+double getResult();
 };
 
 #endif
diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index ec908b16eeec..ad657815b06c 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -62,6 +62,132 @@ bool SubTotal::SafeDiv(double& fVal1, double fVal2)
 return bOk;
 }
 
+void ScFunctionData::update( double fNewVal )
+{
+if (bError)
+return;
+
+switch (eFunc)
+{
+case SUBTOTAL_FUNC_SUM:
+if (!SubTotal::SafePlus(nVal, fNewVal))
+bError = true;
+break;
+case SUBTOTAL_FUNC_PROD:
+if (nCount == 0)// copy first value (nVal is initialized to 0)
+{
+nVal = fNewVal;
+nCount = 1; // don't care about further count
+}
+else if (!SubTotal::SafeMult(nVal, fNewVal))
+bError = true;
+break;
+case SUBTOTAL_FUNC_CNT:
+case SUBTOTAL_FUNC_CNT2:
+++nCount;
+break;
+case SUBTOTAL_FUNC_AVE:
+if (!SubTotal::SafePlus(nVal, fNewVal))
+bError = true;
+else
+++nCount;
+break;
+case SUBTOTAL_FUNC_MAX:
+if (nCount == 0)// copy first value (nVal is initialized to 0)
+{
+nVal = fNewVal;
+nCount = 1; // don't care about further count
+}
+else if (fNewVal > nVal)
+nVal = fNewVal;
+break;
+case SUBTOTAL_FUNC_MIN:
+if (nCount == 0)// copy first value (nVal is initialized to 0)
+{
+nVal = fNewVal;
+nCount = 1; // don't care about further count
+}
+else if (fNewVal < nVal)
+nVal = fNewVal;
+break;
+case SUBTOTAL_FUNC_VAR:
+case SUBTOTAL_FUNC_STD:
+case SUBTOTAL_FUNC_VARP:
+case SUBTOTAL_FUNC_STDP:
+maWelford.update( fNewVal);
+break;
+default:
+// unhandled unknown
+bError = true;
+}
+}
+
+double ScFunctionData::getResult()
+{
+if (bError)
+return 0.0;
+
+double fRet = 0.0;
+switch (eFunc)
+{
+case SUBTOTAL_FUNC_CNT:
+case SUBTOTAL_FUNC_CNT2:
+fRet = nCount;
+break;
+case SUBTOTAL_FUNC_SUM:
+case SUBTOTAL_FUNC_MAX:
+case SUBTOTAL_FUNC_MIN:
+// Note that nVal is 0.0 for MAX and MIN if nCount==0, that's also
+// how it is defined in ODFF.
+fRet = nVal;
+break;
+case SUBTOTAL_FUNC_PROD:
+fRet = (nCount > 0) ? nVal : 0.0;
+break;
+case SUBTOTAL_FUNC_AVE:
+if (nCount == 0)
+bError = true;
+else
+fRet = nVal / nCount;
+break;
+case SUBTOTAL_FUNC_VAR:
+case SUBTOTAL_FUNC_STD:
+if (maWelford.getCount() < 2)
+bError = true;
+else
+{
+fRet = maWelford.getVarianceSample();
+if (fRet < 0.0)
+bError = true;
+else if (eFunc == SUBTOTAL_FUNC_STD)
+fRet = sqrt( fRet);
+}
+break;
+case SUBTOTAL_FUNC_VARP:
+case SUBTOTAL_FUNC_STDP:
+if (maWelford.getCount() < 1)
+bError = true;
+else if (maWelford.getCount() == 1)
+fRet = 0.0;
+else
+{
+fRet = maWelford.getVariancePopulation();
+if (fRet < 0.0)
+bError = true;
+else if (eFunc == SUBTOTAL_FUNC_STDP)
+fRet = sqrt( fRet);
+}
+break;
+default:
+assert(!"unhandled unk

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

[Libreoffice Gerrit user]

 sc/source/core/data/dptabres.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 26df14014ff8a7b4625f12123f32c5655f9b7071
Author: Eike Rathke 
AuthorDate: Wed Dec 12 17:59:36 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 13 11:42:51 2018 +0100

Reset WelfordRunner in ScDPAggData::Reset()

Change-Id: I170b6bc5557f6d0d982751ace3dccc94c6778808
Reviewed-on: https://gerrit.libreoffice.org/65048
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit ec3ab1c671e00b9c32f6cdb529fb43e49f1e8689)
Reviewed-on: https://gerrit.libreoffice.org/65057

diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index d989875b7359..b0084cefbb42 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -665,6 +665,7 @@ ScDPAggData* ScDPAggData::GetChild()
 
 void ScDPAggData::Reset()
 {
+maWelford = WelfordRunner();
 fVal = 0.0;
 fAux = 0.0;
 nCount = SC_DPAGG_EMPTY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |
8 -
 chart2/source/controller/sidebar/ChartAreaPanel.cxx  |
5 -
 include/svx/xbtmpit.hxx  |
2 
 include/svx/xflftrit.hxx |
2 
 include/svx/xflgrit.hxx  |
2 
 include/svx/xflhtit.hxx  |
2 
 include/svx/xlndsit.hxx  |
2 
 include/svx/xlnedit.hxx  |
2 
 include/svx/xlnstit.hxx  |
2 
 sd/source/ui/func/futempl.cxx|   
21 +
 svx/source/sdr/properties/attributeproperties.cxx|
4 
 svx/source/svdraw/svdmodel.cxx   |
4 
 svx/source/xoutdev/xattr.cxx |   
42 +-
 svx/source/xoutdev/xattrbmp.cxx  |
5 -
 sw/source/core/doc/docfly.cxx|
3 
 15 files changed, 49 insertions(+), 57 deletions(-)

New commits:
commit b586bfcff288151082f7d247b392c5640ae5c951
Author: Noel Grandin 
AuthorDate: Wed Dec 12 15:11:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 13 11:32:56 2018 +0100

use unique_ptr in checkForUniqueItem

fixing a memory leak in chart2

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

diff --git 
a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 494aee798ac9..fa7a0d319b04 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -297,7 +297,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 
 // translate model name to UI-name for predefined entries, so
 // that the correct entry is chosen in the list of UI-names
-XLineDashItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
+std::unique_ptr pItemToPut = 
aItem.checkForUniqueItem( & m_rDrawModel );
 
 if(pItemToPut)
  rOutItemSet.Put( *pItemToPut );
@@ -323,7 +323,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 
 // translate model name to UI-name for predefined entries, so
 // that the correct entry is chosen in the list of UI-names
-XFillGradientItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
+std::unique_ptr pItemToPut = 
aItem.checkForUniqueItem( & m_rDrawModel );
 
 if(pItemToPut)
 rOutItemSet.Put( *pItemToPut );
@@ -349,7 +349,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 
 // translate model name to UI-name for predefined entries, so
 // that the correct entry is chosen in the list of UI-names
-XFillHatchItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
+std::unique_ptr pItemToPut = 
aItem.checkForUniqueItem( & m_rDrawModel );
 
 if(pItemToPut)
 rOutItemSet.Put( *pItemToPut );
@@ -370,7 +370,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 
 // translate model name to UI-name for predefined entries, so
 // that the correct entry is chosen in the list of UI-names
-XFillBitmapItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
+std::unique_ptr pItemToPut = 
aItem.checkForUniqueItem( & m_rDrawModel );
 
 if(pItemToPut)
 rOutItemSet.Put( *pItemToPut );
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 023d14127922..0dd4d3e2de5c 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -458,7 +458,7 @@ void ChartAreaPanel::updateData()
 xPropSet->getPropertyValue("FillBitmapName") >>= aBitmapName;
 GraphicObject aBitmap = getXBitmapFromName(mxModel, aBitmapName);
 XFillBitmapItem aBitmapItem(aBitmapName, aBitmap);
-XFillBitmapItem* pBitmapItem = nullptr;
+std::unique_ptr pBitmapItem;
 DrawModelWrapper* pModelWrapper = nullptr;
 try
 {
@@ -471,8 +471,7 @@ void ChartAreaPanel::updateData()
 catch (...)
 {
 }
-updateFillBitmap(false, true, pBitmapItem ? pBitmapItem : 
&aBitmapItem);
-delet

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

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit e71f44f4dc847c75b874d514888d0675ccb00496
Author: Dmitriy Shilin 
AuthorDate: Thu Dec 13 07:23:37 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 13 11:21:03 2018 +0100

vcl/win/gdi: get dither mapping value explicitly

Having a macro with a very short and nice API but assuming
that some variables must be defined before using it leads
to a huge misunderstanding.

Change-Id: Idb16307ab4bdeff055ee2a9e237c1436cacd3591
Reviewed-on: https://gerrit.libreoffice.org/65069
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index b8fafc25482d..1f161619589a 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -61,8 +61,6 @@
 #define SAL_POLYPOLYCOUNT_STACKBUF  8
 #define SAL_POLYPOLYPOINTS_STACKBUF 64
 
-#define DMAP( _def_nVal, _def_nThres )  
((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
-
 #define SAL_POLY_STACKBUF   32
 
 namespace {
@@ -1462,6 +1460,12 @@ HBRUSH WinSalGraphicsImpl::SearchStockBrush(COLORREF 
nBrushColor)
 namespace
 {
 
+BYTE GetDitherMappingValue(BYTE nVal, BYTE nThres, const SalData* pSalData)
+{
+return (pSalData->mpDitherDiff[nVal] > nThres) ?
+pSalData->mpDitherHigh[nVal] : pSalData->mpDitherLow[nVal];
+}
+
 HBRUSH Make16BitDIBPatternBrush(Color nColor)
 {
 const SalData* pSalData = GetSalData();
@@ -1483,18 +1487,15 @@ HBRUSH Make16BitDIBPatternBrush(Color nColor)
 };
 
 BYTE* pTmp = pSalData->mpDitherDIBData;
-long* pDitherDiff = pSalData->mpDitherDiff;
-BYTE* pDitherLow = pSalData->mpDitherLow;
-BYTE* pDitherHigh = pSalData->mpDitherHigh;
 
 for(int nY = 0; nY < 8; ++nY)
 {
 for(int nX = 0; nX < 8; ++nX)
 {
 const BYTE nThres = aOrdDither16Bit[nY][nX];
-*pTmp++ = DMAP(nBlue, nThres);
-*pTmp++ = DMAP(nGreen, nThres);
-*pTmp++ = DMAP(nRed, nThres);
+*pTmp++ = GetDitherMappingValue(nBlue, nThres, pSalData);
+*pTmp++ = GetDitherMappingValue(nGreen, nThres, pSalData);
+*pTmp++ = GetDitherMappingValue(nRed, nThres, pSalData);
 }
 }
 
@@ -1522,18 +1523,15 @@ HBRUSH Make8BitDIBPatternBrush(Color nColor)
 };
 
 BYTE* pTmp = pSalData->mpDitherDIBData;
-long* pDitherDiff = pSalData->mpDitherDiff;
-BYTE* pDitherLow = pSalData->mpDitherLow;
-BYTE* pDitherHigh = pSalData->mpDitherHigh;
 
 for (int nY = 0; nY < 8; ++nY)
 {
 for (int nX = 0; nX < 8; ++nX)
 {
 const BYTE nThres = aOrdDither8Bit[nY][nX];
-*pTmp = DMAP(nRed, nThres) +
-DMAP(nGreen, nThres) * 6 +
-DMAP(nBlue, nThres) * 36;
+*pTmp = GetDitherMappingValue(nRed, nThres, pSalData) +
+GetDitherMappingValue(nGreen, nThres, pSalData) * 6 +
+GetDitherMappingValue(nBlue, nThres, pSalData) * 36;
 pTmp++;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 46ba7ac94595ff8317dc8988852aa75ec28a049e
Author: Stephan Bergmann 
AuthorDate: Thu Dec 13 11:11:32 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 13 11:11:32 2018 +0100

Add missing "!"

Change-Id: Ic3e50e1a64b334bee86db7456a4821fa9427370b

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 3a8e5753b053..79a37803b3c7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -90,7 +90,7 @@ class RTTI
 t_rtti_map m_rttis;
 t_rtti_map m_generatedRttis;
 
-#if defined ANDROID
+#if !defined ANDROID
 void * m_hApp;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svtools/restartdialog.hxx |   50 +++---
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit da00284e5c4f2ab1740b602974bf3f0bb48524a6
Author: Stephan Bergmann 
AuthorDate: Thu Dec 13 07:35:14 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 13 11:05:12 2018 +0100

Make it more obvious which enumerators the comments pertain to

i.e., the following one, not the preceding one; see the discussion at
 "tdf#104277 follow-up: use
svtools::executeRestartDialog"

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

diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 29a7673d8dcd..27f756b89e3f 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -23,43 +23,43 @@ namespace com { namespace sun { namespace star { namespace 
uno {
 namespace svtools {
 
 enum RestartReason {
-// "For the selected Java runtime environment to work properly,
-// %PRODUCTNAME must be restarted."
+// "For the selected Java runtime environment to work properly,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_JAVA,
-// For the modified default print job format to take effect,
-// %PRODUCTNAME must be restarted.
+// For the modified default print job format to take effect,
+// %PRODUCTNAME must be restarted:
 RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
-// "For the bibliography to work properly,
-// %PRODUCTNAME must be restarted."
+// "For the bibliography to work properly,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_BIBLIOGRAPHY_INSTALL,
-// "For the mail merge to work properly,
-// %PRODUCTNAME must be restarted."
+// "For the mail merge to work properly,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_MAILMERGE_INSTALL,
-// "For the updated language settings to take effect,
-// %PRODUCTNAME must be restarted."
+// "For the updated language settings to take effect,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_LANGUAGE_CHANGE,
-// "For the added path to take effect,
-// %PRODUCTNAME must be restarted."
+// "For the added path to take effect,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_ADDING_PATH,
-// "For the assigned java parameters to take effect,
-// %PRODUCTNAME must be restarted."
+// "For the assigned java parameters to take effect,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_ASSIGNING_JAVAPARAMETERS,
-// "For the assigned folders and archives to take effect,
-// %PRODUCTNAME must be restarted."
+// "For the assigned folders and archives to take effect,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_ASSIGNING_FOLDERS,
-// "For the modified experimental features to take effect,
-// %PRODUCTNAME must be restarted."
+// "For the modified experimental features to take effect,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_EXP_FEATURES,
-// "For the extension to work properly,
-// %PRODUCTNAME must be restarted."
+// "For the extension to work properly,
+// %PRODUCTNAME must be restarted.":
 RESTART_REASON_EXTENSION_INSTALL,
-// For the OpenGL changes to take effect,
-// %PRODUCTNAME must be restarted.
+// For the OpenGL changes to take effect,
+// %PRODUCTNAME must be restarted:
 RESTART_REASON_OPENGL,
-// For the OpenCL changes to take effect,
-// %PRODUCTNAME must be restarted.
+// For the OpenCL changes to take effect,
+// %PRODUCTNAME must be restarted:
 RESTART_REASON_OPENCL,
-// No particular reason
+// No particular reason:
 RESTART_REASON_NONE
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 solenv/bin/native-code.py |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 0c7960fc82cfc57062e411da43f2569ed5a77654
Author: Tor Lillqvist 
AuthorDate: Thu Dec 13 11:58:43 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 13 12:03:27 2018 +0200

Add more missing constructors from chart2/source/chartcore.component

I think it would be better if native-code.py parsed the .component
files it is interested in and just copied the constructor names from
them to its output? Or are there many cases where it is a carefully
manually selected subset of constructors from some .component file
that should be put in the generated native-code.h, not all? But even
in that case, if some constructor should not be linked in to a mobile
app, that could be handled by adding some specific attribute in the
.component file.

Change-Id: Ib947279610f6755f112d3571512406c5d0cd620d

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0acedacf5693..0ba747e6ffea 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -68,10 +68,14 @@ core_constructor_list = [
 # canvas/source/factory/canvasfactory.component
 "com_sun_star_comp_rendering_CanvasFactory_get_implementation",
 # chart2/source/chartcore.component
+"com_sun_star_chart2_ExponentialScaling_get_implementation",
 "com_sun_star_chart2_LinearScaling_get_implementation",
+"com_sun_star_chart2_LogarithmicScaling_get_implementation",
+"com_sun_star_chart2_PowerScaling_get_implementation",
 "com_sun_star_comp_chart_AreaChartType_get_implementation",
 "com_sun_star_comp_chart_BarChartType_get_implementation",
 "com_sun_star_comp_chart_BubbleChartType_get_implementation",
+"com_sun_star_comp_chart_CachedDataSequence_get_implementation",
 "com_sun_star_comp_chart_CandleStickChartType_get_implementation",
 "com_sun_star_comp_chart_ChartTypeManager_get_implementation",
 "com_sun_star_comp_chart_ColumnChartType_get_implementation",
@@ -79,20 +83,30 @@ core_constructor_list = [
 "com_sun_star_comp_chart_DataSource_get_implementation",
 "com_sun_star_comp_chart_FilledNetChartType_get_implementation",
 "com_sun_star_comp_chart_FormattedString_get_implementation",
+"com_sun_star_comp_chart_InternalDataProvider_get_implementation",
 "com_sun_star_comp_chart_LineChartType_get_implementation",
 "com_sun_star_comp_chart_NetChartType_get_implementation",
 "com_sun_star_comp_chart_PieChartType_get_implementation",
 "com_sun_star_comp_chart_ScatterChartType_get_implementation",
 "com_sun_star_comp_chart2_Axis_get_implementation",
 "com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation",
+"com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation",
 "com_sun_star_comp_chart2_ChartController_get_implementation",
 "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
 "com_sun_star_comp_chart2_ChartModel_get_implementation",
+"com_sun_star_comp_chart2_ChartView_get_implementation",
+"com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation",
 "com_sun_star_comp_chart2_Diagram_get_implementation",
 "com_sun_star_comp_chart2_ErrorBar_get_implementation",
+"com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation",
+"com_sun_star_comp_chart2_GridProperties_get_implementation",
 "com_sun_star_comp_chart2_LabeledDataSequence_get_implementation",
 "com_sun_star_comp_chart2_Legend_get_implementation",
 "com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation",
+"com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation",
+"com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation",
+"com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation",
+"com_sun_star_comp_chart2_PageBackground_get_implementation",
 "com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation",
 "com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation",
 "com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/appl/workwin.cxx |   86 +++
 sfx2/source/inc/workwin.hxx  |2 -
 2 files changed, 40 insertions(+), 48 deletions(-)

New commits:
commit 62ecafe8cffad810be842b73ee7ae5c3327edfb8
Author: Noel Grandin 
AuthorDate: Wed Dec 12 14:43:18 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 13 11:01:12 2018 +0100

use unique_ptr in SfxWorkWindow

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

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 419b2b4d6d17..bde14fdef12c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -428,7 +428,7 @@ void SfxWorkWindow::Sort_Impl()
 aSortedList.clear();
 for (size_t i = 0; i < aChildren.size(); ++i)
 {
-SfxChild_Impl *pCli = aChildren[i];
+SfxChild_Impl *pCli = aChildren[i].get();
 if (pCli)
 {
 decltype(aSortedList)::size_type k;
@@ -477,7 +477,8 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame 
*pFrm, SfxFrame* pMast
 
 // For the ObjectBars a integral place in the Childlist is reserved,
 // so that they always come in a defined order.
-aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, nullptr );
+for (int i=0; i xFrame = GetFrameInterface();
@@ -684,7 +685,7 @@ void SfxWorkWindow::FlushPendingChildSizes()
 // size to which they are getting resized towards.
 for (size_t i = 0; i < aChildren.size(); ++i)
 {
-SfxChild_Impl *pCli = aChildren[i];
+SfxChild_Impl *pCli = aChildren[i].get();
 if (!pCli || !pCli->pWin)
 continue;
 (void)pCli->pWin->GetSizePixel();
@@ -725,7 +726,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 for (sal_uInt16 n : aSortedList)
 {
-SfxChild_Impl* pCli = aChildren[n];
+SfxChild_Impl* pCli = aChildren[n].get();
 if ( !pCli->pWin )
 continue;
 
@@ -873,13 +874,13 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( 
vcl::Window& rWindow,
 if ( rWindow.GetParent() != pWorkWin )
 rWindow.SetParent( pWorkWin );
 
-SfxChild_Impl *pChild = new SfxChild_Impl(rWindow, rWindow.GetSizePixel(),
+auto pChild = o3tl::make_unique(rWindow, 
rWindow.GetSizePixel(),
 eAlign, rWindow.IsVisible());
 
-aChildren.push_back(pChild);
+aChildren.push_back(std::move(pChild));
 bSorted = false;
 nChildren++;
-return aChildren.back();
+return aChildren.back().get();
 }
 
 SfxChild_Impl* 
SfxWorkWindow::RegisterChild_Impl(std::shared_ptr& 
rController,
@@ -888,12 +889,12 @@ SfxChild_Impl* 
SfxWorkWindow::RegisterChild_Impl(std::shared_ptr(rController, eAlign);
 
-aChildren.push_back(pChild);
+aChildren.push_back(std::move(pChild));
 bSorted = false;
 nChildren++;
-return aChildren.back();
+return aChildren.back().get();
 }
 
 void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow )
@@ -903,21 +904,16 @@ void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& 
rWindow )
 decltype(aChildren)::size_type nPos;
 for ( nPos = 0; nPos < aChildren.size(); ++nPos )
 {
-pChild = aChildren[nPos];
+pChild = aChildren[nPos].get();
 if ( pChild && pChild->pWin == &rWindow )
-break;
-}
-
-if ( nPos < aChildren.size() )
-{
-bSorted = false;
-nChildren--;
-aChildren.erase(aChildren.begin() + nPos);
-delete pChild;
-}
-else {
-OSL_FAIL( "releasing unregistered child" );
+{
+bSorted = false;
+nChildren--;
+aChildren.erase(aChildren.begin() + nPos);
+return;
+}
 }
+OSL_FAIL( "releasing unregistered child" );
 }
 
 void SfxWorkWindow::ReleaseChild_Impl(SfxModelessDialogController& rController)
@@ -927,21 +923,16 @@ void 
SfxWorkWindow::ReleaseChild_Impl(SfxModelessDialogController& rController)
 decltype(aChildren)::size_type nPos;
 for ( nPos = 0; nPos < aChildren.size(); ++nPos )
 {
-pChild = aChildren[nPos];
+pChild = aChildren[nPos].get();
 if (pChild && pChild->xController.get() == &rController)
-break;
-}
-
-if ( nPos < aChildren.size() )
-{
-bSorted = false;
-nChildren--;
-aChildren.erase(aChildren.begin() + nPos);
-delete pChild;
-}
-else {
-OSL_FAIL( "releasing unregistered child" );
+{
+bSorted = false;
+nChildren--;
+aChildren.erase(aChildren.begin() + nPos);
+return;
+}
 }
+OSL_FAIL( "releasing unregistered child" );
 }
 
 SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) 
const
@@ -950,7 +941,7 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const 
vcl::Window& rWindow ) const
   

Re: Compiler baselines

[Stephan Bergmann]

On 21/11/2018 17:42, Stephan Bergmann wrote:

SUMMARY
===

If nobody objects, we'd update the build baselines on master (towards LO 
6.3) as follows (cf README.md):


* Windows: from Visual Studio 2017 to Visual Studio 2017 version 15.7

* macOS: from Xcode 8 to Xcode 9.3

* Linux GCC: from GCC 4.8.1 to GCC 7

* Linux Clang: from Clang to Clang 5.0.2

* Clang compiler plugins: from Clang 3.8 to Clang 5.0.2

* flex: from 2.5.35 to 2.6.0

* gperf: from 3.0.0 to 3.1


On Android, since 
 
"Switch Android armeabi-v7a to libc++/libc++abi/libunwind too", all 
architectures now build (with NDK 16) against a toolchain that appears 
to be recent enough, too:  The used Clang is reported as



$ android-ndk-r16b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --version
Android clang version 5.0.300080  (based on LLVM 5.0.300080)
Target: x86_64-unknown-linux
Thread model: posix
InstalledDir: .../android-ndk-r16b/toolchains/llvm/prebuilt/linux-x86_64/bin


with an odd nonstandard version number of 5.0.300080, but which appears 
to be new enough; and the used libc++ is reported as


$ cat android-ndk-r16b/sources/cxx-stl/llvm-libc++/include/__libcpp_version 
6000


i.e., libc++ 6.  The CXXFLAGS_CXX11 in config_host.mk are detected as 
-std=gnu++1z, which is OK.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/CppunitTest_sw_ww8import.mk sw/qa sw/source

[Libreoffice Gerrit user]

 sw/CppunitTest_sw_ww8import.mk|1 
 sw/qa/extras/ww8import/data/tdf121734.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |   43 ++
 sw/source/filter/ww8/ww8par.cxx   |4 --
 sw/source/filter/ww8/ww8par4.cxx  |3 --
 sw/source/filter/ww8/ww8par6.cxx  |6 +---
 6 files changed, 47 insertions(+), 10 deletions(-)

New commits:
commit d9af7661abb3b6c85b39819f27bafa2125884e3e
Author: Mike Kaganski 
AuthorDate: Wed Dec 12 00:31:13 2018 +0300
Commit: Andras Timar 
CommitDate: Thu Dec 13 10:58:47 2018 +0100

tdf#121734: ww8 import: use direct formatting for floating object frames

... and don't modify standard frame styles to have no borders and padding.
This makes "Frame", "OLE", and "Graphics" frame styles of imported DOC
files to have usual settings (for "Frame", it's 1.5 mm padding and all
borders set to 0.05 pt black line).

All objects that need invisible frame will have them with all necessary
settings set explicitly, which allows to copy and paste such frames to
other documents without problems.

This makes DOC import aligned with DOCX import in this regard.

Change-Id: I6f05cf71e63ceccb8e0ddebe23ec41bf69af9b52
Reviewed-on: https://gerrit.libreoffice.org/64992
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/65012
Tested-by: Mike Kaganski 
Reviewed-by: Andras Timar 

diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 593886526cf9..1e733e1f2feb 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \
 comphelper \
 cppu \
 cppuhelper \
+editeng \
 sal \
 test \
 unotest \
diff --git a/sw/qa/extras/ww8import/data/tdf121734.doc 
b/sw/qa/extras/ww8import/data/tdf121734.doc
new file mode 100644
index ..11a9bf503ca5
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf121734.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 907fe47ebcff..718c8948645d 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -13,6 +13,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -139,6 +142,46 @@ DECLARE_WW8IMPORT_TEST(testTdf112346, "tdf112346.doc")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf121734, "tdf121734.doc")
+{
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SwPosFlyFrames aPosFlyFrames = pDoc->GetAllFlyFormats(nullptr, false);
+// There is only one fly frame in the document: the one with the imported 
floating table
+CPPUNIT_ASSERT_EQUAL(size_t(1), aPosFlyFrames.size());
+for (const auto& rPosFlyFrame : aPosFlyFrames)
+{
+const SwFrameFormat& rFormat = rPosFlyFrame->GetFormat();
+const SfxPoolItem* pItem = nullptr;
+
+// The LR and UL spacings and borders must all be set explicitly;
+// spacings and border distances must be 0; borders must be absent.
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, 
rFormat.GetItemState(RES_LR_SPACE, false, &pItem));
+auto pLR = static_cast(pItem);
+CPPUNIT_ASSERT(pLR);
+CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetLeft());
+CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetRight());
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, 
rFormat.GetItemState(RES_UL_SPACE, false, &pItem));
+auto pUL = static_cast(pItem);
+CPPUNIT_ASSERT(pUL);
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pUL->GetUpper());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pUL->GetLower());
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, rFormat.GetItemState(RES_BOX, 
false, &pItem));
+auto pBox = static_cast(pItem);
+CPPUNIT_ASSERT(pBox);
+for (auto eLine : { SvxBoxItemLine::TOP, SvxBoxItemLine::BOTTOM,
+SvxBoxItemLine::LEFT, SvxBoxItemLine::RIGHT })
+{
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pBox->GetDistance(eLine));
+CPPUNIT_ASSERT(!pBox->GetLine(eLine));
+}
+}
+}
+
 // tests should only be added to ww8IMPORT *if* they fail round-tripping in 
ww8EXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 05bf0966dcac..8929ad71fae5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6340,12 +6340,8 @@ ErrCode WW8Reader::Read(SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, cons
 rBaseURL, bNew, bSkipImages, *rPaM.GetPoint()));
 if (bNew)
 {
-// Remove Frame and offsets from Frame Templat