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

[Libreoffice Gerrit user]

 icon-themes/colibre/cmd/32/datasort.png |binary
 icon-themes/colibre_svg/cmd/32/datasort.svg |   23 ++-
 icon-themes/colibre_svg/cmd/sc_datasort.svg |6 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 112c73efe5396905a88ad08ca920a29505f8feef
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:57:53 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 08:36:08 2018 +0100

Colibre icons: fix 32px datasort icon

Change-Id: Ie0d85c41f4008ada7d90ea16d59c16fced0c22f9
Reviewed-on: https://gerrit.libreoffice.org/65233
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 157763f0ccfa1bd3c976e010f4310fb145d0db4d)
Reviewed-on: https://gerrit.libreoffice.org/65237

diff --git a/icon-themes/colibre/cmd/32/datasort.png 
b/icon-themes/colibre/cmd/32/datasort.png
index 8c00be5acff9..9feac77d6dc5 100644
Binary files a/icon-themes/colibre/cmd/32/datasort.png and 
b/icon-themes/colibre/cmd/32/datasort.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/datasort.svg 
b/icon-themes/colibre_svg/cmd/32/datasort.svg
index 86675cfe6911..e2c6306556ab 100644
--- a/icon-themes/colibre_svg/cmd/32/datasort.svg
+++ b/icon-themes/colibre_svg/cmd/32/datasort.svg
@@ -1 +1,22 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
+
+  
+  
+
+
+  
+
diff --git a/icon-themes/colibre_svg/cmd/sc_datasort.svg 
b/icon-themes/colibre_svg/cmd/sc_datasort.svg
index 79986646cda3..ccbaa63c2429 100644
--- a/icon-themes/colibre_svg/cmd/sc_datasort.svg
+++ b/icon-themes/colibre_svg/cmd/sc_datasort.svg
@@ -1 +1,5 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  517 +++---
 1 file changed, 291 insertions(+), 226 deletions(-)

New commits:
commit e1251c631f6fa225e4506f1ddc4bccc1a9afb90f
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:40:10 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 07:41:04 2018 +0100

nb groupedbar_compact impress sync table context menu

Change-Id: I31908adeab72a16a5b82fbc3bc8ac3cce9ea4a4f
Reviewed-on: https://gerrit.libreoffice.org/65218
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 82a6843b1184..5630e3920c3b 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -4006,10 +4006,10 @@
 icons
 False
 
-  
+  
 True
 False
-.uno:Presentation
+.uno:MergeCells
   
   
 False
@@ -4017,10 +4017,10 @@
   
 
 
-  
+  
 True
 False
-.uno:PresentationCurrentSlide
+.uno:SplitCell
   
   
 False
@@ -4028,10 +4028,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertPage
+.uno:TableDialog
   
   
 False
@@ -4039,10 +4039,10 @@
   
 
 
-  
+  
 True
 False
-.uno:AssignLayout
+.uno:OptimizeTable
   
   
 False
@@ -4061,8 +4061,8 @@
 True
 False
 
-  
-S_lide
+  
+_Table
 True
 True
 False
@@ -4099,6 +4099,213 @@
   
 
 
+  
+True
+False
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
+  
+True
+False
+vertical
+
+  
+True
+True
+text
+False
+
+  
+True
+False
+.uno:Line
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+0
+  
+   

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[Libreoffice Gerrit user]

 icon-themes/colibre/cmd/32/datasort.png |binary
 icon-themes/colibre_svg/cmd/32/datasort.svg |   23 ++-
 icon-themes/colibre_svg/cmd/sc_datasort.svg |6 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 157763f0ccfa1bd3c976e010f4310fb145d0db4d
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:57:53 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 07:41:27 2018 +0100

Colibre icons: fix 32px datasort icon

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

diff --git a/icon-themes/colibre/cmd/32/datasort.png 
b/icon-themes/colibre/cmd/32/datasort.png
index 8c00be5acff9..9feac77d6dc5 100644
Binary files a/icon-themes/colibre/cmd/32/datasort.png and 
b/icon-themes/colibre/cmd/32/datasort.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/datasort.svg 
b/icon-themes/colibre_svg/cmd/32/datasort.svg
index 86675cfe6911..e2c6306556ab 100644
--- a/icon-themes/colibre_svg/cmd/32/datasort.svg
+++ b/icon-themes/colibre_svg/cmd/32/datasort.svg
@@ -1 +1,22 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
+
+  
+  
+
+
+  
+
diff --git a/icon-themes/colibre_svg/cmd/sc_datasort.svg 
b/icon-themes/colibre_svg/cmd/sc_datasort.svg
index 79986646cda3..ccbaa63c2429 100644
--- a/icon-themes/colibre_svg/cmd/sc_datasort.svg
+++ b/icon-themes/colibre_svg/cmd/sc_datasort.svg
@@ -1 +1,5 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
___
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' - sd/uiconfig

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  517 +++---
 1 file changed, 291 insertions(+), 226 deletions(-)

New commits:
commit 514924931ad78abc4d5ac2e3c476e93a3adf7140
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:40:10 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 07:41:16 2018 +0100

nb groupedbar_compact impress sync table context menu

Change-Id: I31908adeab72a16a5b82fbc3bc8ac3cce9ea4a4f
Reviewed-on: https://gerrit.libreoffice.org/65232
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 82a6843b1184..5630e3920c3b 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -4006,10 +4006,10 @@
 icons
 False
 
-  
+  
 True
 False
-.uno:Presentation
+.uno:MergeCells
   
   
 False
@@ -4017,10 +4017,10 @@
   
 
 
-  
+  
 True
 False
-.uno:PresentationCurrentSlide
+.uno:SplitCell
   
   
 False
@@ -4028,10 +4028,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertPage
+.uno:TableDialog
   
   
 False
@@ -4039,10 +4039,10 @@
   
 
 
-  
+  
 True
 False
-.uno:AssignLayout
+.uno:OptimizeTable
   
   
 False
@@ -4061,8 +4061,8 @@
 True
 False
 
-  
-S_lide
+  
+_Table
 True
 True
 False
@@ -4099,6 +4099,213 @@
   
 
 
+  
+True
+False
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+0
+  
+
+
+  
+True
+False
+vertical
+
+  
+True
+True
+text
+False
+
+  
+True
+False
+.uno:Line
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+0
+  
+   

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source

[Libreoffice Gerrit user]

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |1 +
 scp2/source/ooo/ucrt.scp   |4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d87fa557ff58c3b9f5c9079a1d7595e095694111
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 00:23:24 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 05:22:36 2018 +0100

tdf#122134: use CurrentMajorVersionNumber to filter out Windows 10

On Windows 8.1, the one that is problematic to tell from Windows 10
(because the latter also exposes its version as 603 to the msiexec),
the registry value doesn't exist at
HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion
but let's play safe and also check for "#6" value just in case.

Reference:

https://stackoverflow.com/questions/31072543/reliable-way-to-get-windows-version-from-registry

Thanks to Mitchell  for the idea!

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 46ceccc26c60..cb0ca0c1ccbb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -6,3 +6,4 @@ INSTALLLOCATION installuser_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
 WIN81S14   win81s14
+WINMAJORVERWinMajorVer
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 1a7074acb7f8..b9b53a02e3ac 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index c082322086ad..7788815d3a6e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -5,3 +5,4 @@ installuser 1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
 installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
 installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
+WinMajorVer2   Software\Microsoft\Windows NT\CurrentVersion
CurrentMajorVersionNumber   2
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index 8cba6cfc3cd0..6df1d111f6fa 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -114,7 +114,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Source = "InstMSUBinary";
Target = "25000|Windows81-KB2999226-x64msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And VersionNT64", "check_win8x64_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And VersionNT64", 
"check_win8x64_ucrt");
Styles = "NO_FILE";
 End
 
@@ -150,7 +150,7 @@ WindowsCustomAction gid_Customaction_check_win81x32_ucrt
Source = "InstMSUBinary";
Target = "25000|Windows81-KB2999226-x86msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And Not VersionNT64", "check_win8x32_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And Not VersionNT64", 
"check_win8x32_ucrt");
Styles = "NO_FILE";
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Jan-Marek Glogowski]

Am 16. Dezember 2018 20:57:51 MEZ schrieb Luke Benes :
>The fix for Bug
>121685,
>https://cgit.freedesktop.org/libreoffice/core/commit/?id=7263d223ddf4
>​
>Is causing the core Unit Test CppunitTest_chart2_xshape to fail when
>you set,  Settings->Display->Scale=125%​

I had similar problems when I implemented 
https://cgit.freedesktop.org/libreoffice/core/commit?id=ada20402efa81273e03e46cbedc21f25b9daeeac

I'll just call this headless+, as this involves setting SAL_USE_VCLPLUGIN=svp 
and will only render output to bitmaps. The UI tests run this way without 
--headless, so they also get headless dialogs.

I found that various test failed, because DPI is an integer and our code 
results in various rounding errors sometimes adding up to large amounts. The 
headless / svp plugin already uses 96 DPI and now the headless+ mode in the osx 
plugin does the same. For similar reason IOS also explicitly sets 96 DPI.

The win plugin should also get a headless+ patch like the osx plugin, which 
just uses fixed 96 DPI. That's sufficient as a general test environment.

Actually it would also be nice to move the platform-independent stuff from Svp 
classes either into the Sal base classes or move platform stuff for IOS and 
Android into their own classes. My osx patch already duplicates code from 
headless, but I wanted that out without refactoring and breaking VCL again.
I had my share of unveiled bugs and breaking VCL this year. Maybe I'm more 
brave next year again ;-)

Jan-Marek

P.S. and maybe someone has some better / self-explaining name for the 
*BitmapRendering() functions. People complained but nobody proposed a better 
name yet.

P.P.S. implementing a SetHeadlessDPI-API might be a useable addition later. DPI 
already works per SalFrame, so a LO server should be able to render stuff for 
different DPIs. Actually that should already work, if you work with multiple 
screens with different DPIs, but at least in the osx backend the comments in 
the DPI detection code read as it is currently very broken.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1357 ++---
 1 file changed, 870 insertions(+), 487 deletions(-)

New commits:
commit 0825015ed3657f1bba7287362afc709b1beeb503
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:26:39 2018 +0100
Commit: andreas_kainz 
CommitDate: Sun Dec 16 22:34:57 2018 +0100

nb groupedbar_compact fix table layout to sync with others

Change-Id: Iac5a3144f9790457c2ccbe0fb916b66421443a6c
Reviewed-on: https://gerrit.libreoffice.org/65216
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit b3f4cf6b256c1ed6f6645db009247ba08c44a53b)
Reviewed-on: https://gerrit.libreoffice.org/65227

diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui 
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index d0c3d24c784a..68826d119c23 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -3797,7 +3797,6 @@
 
   
   
-  
 
   
   
@@ -3840,10 +3839,10 @@
 icons
 False
 
-  
+  
 True
 False
-.uno:InsertGraphic
+.uno:SplitCell
   
   
 False
@@ -3851,10 +3850,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertObjectChart
+.uno:MergeCells
   
   
 False
@@ -3862,10 +3861,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertPage
+.uno:TableDialog
   
   
 False
@@ -3873,10 +3872,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertTable
+.uno:OptimizeTable
   
   
 False
@@ -3895,8 +3894,8 @@
 True
 False
 
-  
-_Insert
+  
+_Table
 True
 True
 False
@@ -3933,11 +3932,11 @@
   
 
 
-  
+  
 True
 False
 
-  
+  
 True
 False
 5
@@ -3952,51 +3951,96 @@
   
 
 
-  
+  
 True
 False
 vertical
 
-  
+  
+True
+True
+text
+False
+
+  
+True
+False
+.uno:Line
+  
+  
+False
+False
+

Re: CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Kaganski Mike]

Hi Luke!

On 12/16/2018 10:57 PM, Luke Benes wrote:
> The fix for *Bug 121685* 
> , 
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=7263d223ddf4
> ​
> Is causing the core Unit Test CppunitTest_chart2_xshape to fail when you 
> set,  Settings->Display->Scale=125%​

Unfortunately cannot repro locally. Possibly it's worth trying to only 
add manifest to soffice.bin, not to all console applications. Will try 
that tomorrow.

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

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

[Libreoffice Gerrit user]

 sd/source/filter/ppt/pptin.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e6aaa9467391488a1399642df67c63f85821dcf9
Author: Caolán McNamara 
AuthorDate: Sun Dec 16 19:49:42 2018 +
Commit: Caolán McNamara 
CommitDate: Sun Dec 16 21:56:36 2018 +0100

crashtesting: assert on import of ooo121169-1.ppt

Change-Id: I3b57bdd9a29ef41900bbb244daa27bf6d8c673c7
Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)).
Reviewed-on: https://gerrit.libreoffice.org/65228
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4ab0fdf1032e..f5d10bfde69b 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1492,14 +1492,12 @@ struct Ppt97AnimationStlSortHelper
 bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, 
Ppt97AnimationPtr >& p1, const std::pair< SdrObject*, Ppt97AnimationPtr >& p2 )
 {
 if( !p1.second.get() || !p2.second.get() )
-return true;
+return p1.second.get() < p2.second.get();
 if( *p1.second < *p2.second )
 return true;
 if( *p1.second > *p2.second )
 return false;
-if( p1.first->GetOrdNum() < p2.first->GetOrdNum() )
-return true;
-return false;
+return p1.first->GetOrdNum() < p2.first->GetOrdNum();
 }
 
 void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool 
bNewAnimationsUsed )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 writerfilter/source/rtftok/rtfdispatchvalue.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7176211382cc288750273e16ea7eb206854be33f
Author: Caolán McNamara 
AuthorDate: Sun Dec 16 20:02:29 2018 +
Commit: Caolán McNamara 
CommitDate: Sun Dec 16 21:57:01 2018 +0100

crashtesting: clamp languagetype param value

e.g. MSVR-34956-mergedlo_utl_ConfigManager-PoC5.rtf

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

diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index a83d35701020..a72fd00db2c3 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -501,7 +501,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 case RTF_DEFLANG:
 case RTF_ADEFLANG:
 {
-LanguageTag aTag((LanguageType(nParam)));
+LanguageTag aTag((LanguageType(static_cast(nParam;
 auto pValue = new RTFValue(aTag.getBcp47());
 putNestedAttribute(m_aStates.top().aCharacterSprms,
(nKeyword == RTF_DEFLANG ? 
NS_ooxml::LN_EG_RPrBase_lang
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit a7603be5ccb1ec9a66fc4e163a53e4b8e8e85538
Author: Stephan Bergmann 
AuthorDate: Sun Dec 16 20:25:59 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Dec 16 21:45:31 2018 +0100

Add back still-relevant part of external/graphite/ubsan.patch

...which had been removed completely with
6b84708914f9c026776b28a300ac6d278272881f "graphite: update to 1.3.12".  See
:

> /workdir/UnpackedTarball/graphite/src/gr_face.cpp:98:16: runtime error: 
downcast of address 0x60f8c3b0 which does not point to an object of type 
'gr_face'
> 0x60f8c3b0: note: object is of type 'graphite2::Face'
>  2a 00 00 61  d0 17 e7 ff 99 2b 00 00  36 00 be be be be be be  88 d8 0e 
00 d0 61 00 00  80 38 05 00
>   ^~~
>   vptr for 'graphite2::Face'
> #0 0x2b99fdaae105 in gr_make_face_with_ops 
/workdir/UnpackedTarball/graphite/src/gr_face.cpp:98:16
> #1 0x2b99fdaaeabe in gr_make_face 
/workdir/UnpackedTarball/graphite/src/gr_face.cpp:107:12
> #2 0x2b99fdfd6dc7 in _hb_graphite2_shaper_face_data_create 
/workdir/UnpackedTarball/harfbuzz/src/hb-graphite2.cc:114:18
> #3 0x2b99fdfd62f0 in hb_graphite2_shaper_face_data_ensure 
/workdir/UnpackedTarball/harfbuzz/src/hb-graphite2.cc:37:1
> #4 0x2b99fddb6a10 in hb_shape_plan_create_cached2 
/workdir/UnpackedTarball/harfbuzz/src/./hb-shaper-list.hh:35:1
> #5 0x2b99fddb1478 in hb_shape_full 
/workdir/UnpackedTarball/harfbuzz/src/hb-shape.cc:133:33
> #6 0x2b99fc5867df in GenericSalLayout::LayoutText(ImplLayoutArgs&, 
SalLayoutGlyphs const*) /vcl/source/gdi/CommonSalLayout.cxx:440:23
> #7 0x2b99fb2345e4 in OutputDevice::ImplLayout(rtl::OUString const&, 
int, int, Point const&, long, long const*, SalLayoutFlags, vcl::TextLayoutCache 
const*, SalLayoutGlyphs const*) const /vcl/source/outdev/text.cxx:1310:36
> #8 0x2b99fb236220 in OutputDevice::GetTextArray(rtl::OUString const&, 
long*, int, int, vcl::TextLayoutCache const*, SalLayoutGlyphs const*) const 
/vcl/source/outdev/text.cxx:960:45
> #9 0x2b99fb235c56 in OutputDevice::GetTextWidth(rtl::OUString const&, 
int, int, vcl::TextLayoutCache const*, SalLayoutGlyphs const*) const 
/vcl/source/outdev/text.cxx:881:19
> #10 0x2b99fd105281 in 
ImplFontMetricData::ImplInitTextLineSize(OutputDevice const*) 
/vcl/source/font/fontmetric.cxx:325:30
> #11 0x2b99fb1c128c in OutputDevice::ImplNewFont() const 
/vcl/source/outdev/font.cxx:1062:38
> #12 0x2b99fb1bd46c in 
OutputDevice::GetFontFeatures(std::__debug::vector >&) const /vcl/source/outdev/font.cxx:171:10
> #13 0x2b9a1a3c8607 in FontFeatureTest::testGetFontFeatures() 
/vcl/qa/cppunit/FontFeatureTest.cxx:58:5
> #14 0x2b9a1a401f2c in void std::__invoke_impl(std::__invoke_memfun_deref, void 
(FontFeatureTest::*&)(), FontFeatureTest*&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14
> #15 0x2b9a1a401b0f in std::__invoke_result::type std::__invoke(void (FontFeatureTest::*&)(), 
FontFeatureTest*&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14
> #16 0x2b9a1a40195c in void std::_Bind::__call(std::tuple<>&&, 
std::_Index_tuple<0ul>) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:467:11
> #17 0x2b9a1a401533 in void std::_Bind::operator()() 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:549:17
> #18 0x2b9a1a400340 in std::_Function_handler >::_M_invoke(std::_Any_data const&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:316:2
> #19 0x2b9a1a40259c in std::function::operator()() const 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:706:14
> #20 0x2b9a1a3ff580 in CppUnit::TestCaller::runTest() 
/workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175:7
> #21 0x2b99d930dab8 in CppUnit::TestCaseMethodFunctor::operator()() 
const /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
> #22 0x2b99f39cf332 in (anonymous 
namespace)::Protector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) /test/source/vclbootstrapprotector.cxx:49:14
> #23 0x2b99d92de5fa in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
/workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
> #24 0x2b99e850d672 in (anonymous 
namespace)::Prot::protect(

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   56 ---
 1 file changed, 56 deletions(-)

New commits:
commit ee8881b794c5c0cce531d62a4ebe3aa87ae7c642
Author: Caolán McNamara 
AuthorDate: Fri Dec 14 16:17:26 2018 +
Commit: Caolán McNamara 
CommitDate: Sun Dec 16 21:25:30 2018 +0100

drop scroll-wheel moves notebook page workaround

now that the double-decker monstrosity is in place

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 6d67c761da09..1825fe9703e2 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3112,7 +3112,6 @@ private:
 gulong m_nSwitchPageSignalId;
 gulong m_nOverFlowSwitchPageSignalId;
 gulong m_nSizeAllocateSignalId;
-gulong m_nScrollSignalId;
 bool m_bOverFlowBoxActive;
 bool m_bOverFlowBoxIsStart;
 int m_nStartTabCount;
@@ -3207,59 +3206,6 @@ private:
 enable_notify_events();
 }
 
-static gboolean signalScroll(GtkWidget*, GdkEventScroll* event, gpointer 
widget)
-{
-GtkInstanceNotebook* pThis = static_cast(widget);
-return pThis->signal_scroll(event);
-}
-
-bool signal_scroll(GdkEventScroll* event)
-{
-GtkWidget* pEventWidget = 
gtk_get_event_widget(reinterpret_cast(event));
-if (!pEventWidget)
-return false;
-
-/* ignore page content scroll events */
-GtkWidget* pPage = gtk_notebook_get_nth_page(m_pNotebook, 
gtk_notebook_get_current_page(m_pNotebook));
-if (gtk_widget_is_ancestor(pEventWidget, pPage) || pPage == 
pEventWidget)
-return false;
-
-bool bNext(false), bPrev(false);
-switch (event->direction)
-{
-case GDK_SCROLL_RIGHT:
-case GDK_SCROLL_DOWN:
-bNext = true;
-break;
-case GDK_SCROLL_LEFT:
-case GDK_SCROLL_UP:
-bPrev = true;
-break;
-case GDK_SCROLL_SMOOTH:
-{
-switch (gtk_notebook_get_tab_pos(m_pNotebook))
-{
-case GTK_POS_LEFT:
-case GTK_POS_RIGHT:
-bNext = event->delta_y > 0;
-bPrev = event->delta_y < 0;
-break;
-case GTK_POS_TOP:
-case GTK_POS_BOTTOM:
-bNext = event->delta_x > 0;
-bPrev = event->delta_x < 0;
-break;
-}
-break;
-}
-}
-if (bNext)
-gtk_notebook_next_page(m_pNotebook);
-else if (bPrev)
-gtk_notebook_prev_page(m_pNotebook);
-return true;
-}
-
 static OString get_page_ident(GtkNotebook *pNotebook, guint nPage)
 {
 const GtkWidget* pTabWidget = gtk_notebook_get_tab_label(pNotebook, 
gtk_notebook_get_nth_page(pNotebook, nPage));
@@ -3540,7 +3486,6 @@ public:
 , m_nEndTabCount(0)
 {
 gtk_widget_add_events(GTK_WIDGET(pNotebook), GDK_SCROLL_MASK);
-m_nScrollSignalId = g_signal_connect(pNotebook, "scroll-event", 
G_CALLBACK(signalScroll), this);
 if (get_n_pages() > 6)
 m_nSizeAllocateSignalId = g_signal_connect_after(pNotebook, 
"size-allocate", G_CALLBACK(signalSizeAllocate), this);
 else
@@ -3710,7 +3655,6 @@ public:
 {
 if (m_nSizeAllocateSignalId)
 g_signal_handler_disconnect(m_pNotebook, m_nSizeAllocateSignalId);
-g_signal_handler_disconnect(m_pNotebook, m_nScrollSignalId);
 g_signal_handler_disconnect(m_pNotebook, m_nSwitchPageSignalId);
 g_signal_handler_disconnect(m_pOverFlowNotebook, 
m_nOverFlowSwitchPageSignalId);
 gtk_widget_destroy(GTK_WIDGET(m_pOverFlowNotebook));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Luke Benes]

Mike,
The fix for Bug 
121685, 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=7263d223ddf4
​
Is causing the core Unit Test CppunitTest_chart2_xshape to fail when you set,  
Settings->Display->Scale=125%​
​
Setting Scale=100% allows the build to pass with no errors. ​
​
Build log:​
https://pastebin.com/SpSiCm6u

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

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1357 ++---
 1 file changed, 870 insertions(+), 487 deletions(-)

New commits:
commit b3f4cf6b256c1ed6f6645db009247ba08c44a53b
Author: andreas kainz 
AuthorDate: Tue Dec 11 16:26:39 2018 +0100
Commit: andreas_kainz 
CommitDate: Sun Dec 16 20:33:40 2018 +0100

nb groupedbar_compact fix table layout to sync with others

Change-Id: Iac5a3144f9790457c2ccbe0fb916b66421443a6c
Reviewed-on: https://gerrit.libreoffice.org/65216
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 d0c3d24c784a..68826d119c23 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -3797,7 +3797,6 @@
 
   
   
-  
 
   
   
@@ -3840,10 +3839,10 @@
 icons
 False
 
-  
+  
 True
 False
-.uno:InsertGraphic
+.uno:SplitCell
   
   
 False
@@ -3851,10 +3850,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertObjectChart
+.uno:MergeCells
   
   
 False
@@ -3862,10 +3861,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertPage
+.uno:TableDialog
   
   
 False
@@ -3873,10 +3872,10 @@
   
 
 
-  
+  
 True
 False
-.uno:InsertTable
+.uno:OptimizeTable
   
   
 False
@@ -3895,8 +3894,8 @@
 True
 False
 
-  
-_Insert
+  
+_Table
 True
 True
 False
@@ -3933,11 +3932,11 @@
   
 
 
-  
+  
 True
 False
 
-  
+  
 True
 False
 5
@@ -3952,51 +3951,96 @@
   
 
 
-  
+  
 True
 False
 vertical
 
-  
+  
+True
+True
+text
+False
+
+  
+True
+False
+.uno:Line
+  
+  
+False
+False
+  
+
+  
+  
+ 

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

[Libreoffice Gerrit user]

 include/o3tl/string_view.hxx |   11 +--
 o3tl/qa/test-string_view.cxx |9 +
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit fc0e731611ad7d485ebd46c600e796bbf1e75537
Author: Stephan Bergmann 
AuthorDate: Sun Dec 16 12:52:56 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Dec 16 20:30:15 2018 +0100

Fix o3tl::string_view streaming operator <<

(The unnecessary os.setstate(std::ios_base::failbit) was due to a 
misreading of
C++17 [ostream.formatted.reqmts]/1.)

Change-Id: I7d8285230cb316c7af45c76029e9629517d05d56
Reviewed-on: https://gerrit.libreoffice.org/65217
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 0d2ac93f4a3bec9d2fe2719b270333193d20596b)
Reviewed-on: https://gerrit.libreoffice.org/65223

diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx
index bdc81e8d7261..abc6de416c4b 100644
--- a/include/o3tl/string_view.hxx
+++ b/include/o3tl/string_view.hxx
@@ -792,12 +792,13 @@ operator <<(
 std::basic_ostream & os,
 basic_string_view str)
 {
-typename std::basic_ostream::sentry sentry;
+typename std::basic_ostream::sentry sentry(os);
 if (sentry) {
 auto const w = os.width();
-auto const pad
-= std::max::type>(
-w < 0 ? 0 : w, str.size());
+auto pad
+= std::max::type>(
+  w < 0 ? 0 : w, str.size())
+  - str.size();
 auto const after = (os.flags() & std::ios_base::adjustfield)
 == std::ios_base::left;
 if (pad != 0 && !after) {
@@ -814,8 +815,6 @@ operator <<(
 }
 }
 os.width(0);
-} else {
-os.setstate(std::ios_base::failbit);
 }
 return os;
 }
diff --git a/o3tl/qa/test-string_view.cxx b/o3tl/qa/test-string_view.cxx
index 977cfebc460a..fb6239fca379 100644
--- a/o3tl/qa/test-string_view.cxx
+++ b/o3tl/qa/test-string_view.cxx
@@ -9,7 +9,9 @@
 
 #include 
 
+#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -27,6 +29,7 @@ private:
 CPPUNIT_TEST(testChar32Literal);
 CPPUNIT_TEST(testWcharLiteral);
 CPPUNIT_TEST(testOperations);
+CPPUNIT_TEST(testOutput);
 CPPUNIT_TEST_SUITE_END();
 
 void testCharLiteral() {
@@ -203,6 +206,12 @@ private:
 v.find_last_not_of("fxo", o3tl::string_view::npos, 2));
 CPPUNIT_ASSERT_EQUAL(npos, v.find_last_not_of("fxo"));
 }
+
+void testOutput() {
+std::ostringstream s;
+s << o3tl::string_view("foo");
+CPPUNIT_ASSERT_EQUAL(std::string("foo"), s.str());
+}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 8626e81d00c253696c6b60b9a2188079120817c7
Author: Julien Nabet 
AuthorDate: Sun Dec 16 14:21:37 2018 +0100
Commit: Julien Nabet 
CommitDate: Sun Dec 16 19:57:15 2018 +0100

tdf#122136: select first element if there's at least one

See bt from https://bugs.documentfoundation.org/attachment.cgi?id=147594

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

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 5f44c6d424f9..69b1b82c092d 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1014,9 +1014,9 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& 
_rPath )
 m_xPathList->append("", sPath, 
SvFileInformationManager::GetImageId(aURL));
 }
 while (nIdx>=0);
+// select first entry
+m_xPathList->select(0);
 }
-// select first entry
-m_xPathList->select(0);
 SelectHdl_Impl(*m_xPathList);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0e264f8263fb9c83ca4e5373ddf53278b7c1241
Author: Andras Timar 
AuthorDate: Sun Dec 16 19:10:11 2018 +0100
Commit: Andras Timar 
CommitDate: Sun Dec 16 19:10:11 2018 +0100

Updated checksum of Noto fonts zip

Change-Id: Idff367c5974eadaaf69896177cb3f2c7b792715c

diff --git a/download.lst b/download.lst
index da2b37f579ba..307d12adcb19 100644
--- a/download.lst
+++ b/download.lst
@@ -72,7 +72,7 @@ export FONT_EMOJIONE_COLOR_SHA256SUM := 
d1a08f7c10589f22740231017694af0a7a270760
 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
 export FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
-export FONT_NOTO_MORE_SHA256SUM := 
77decb00e17677b0f8182a9eeae7ddfaadfed064c926433bcc0c8617cd52899e
+export FONT_NOTO_MORE_SHA256SUM := 
837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae
 export FONT_NOTO_MORE_TARBALL := Noto-hinted.zip
 export FONT_NOTO_SANS_JP_SHA256SUM := 
6886c5526628c08f1e21a84f4658ab3daf6d0233de8dc54526ccf9f40bfab18e
 export FONT_NOTO_SANS_JP_TARBALL := NotoSansJP.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Libreoffice Gerrit user]

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

New commits:
commit 40328178414aac565a21799c9a76329b9e9e33cc
Author: sabri unal 
AuthorDate: Tue Dec 11 07:14:21 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Dec 16 18:40:37 2018 +0100

Update git submodules

* Update dictionaries from branch 'master'
  - Related: tdf#121610 Do dictionary option titles Title Case

Change-Id: I3ab12669bec1265ad06288a122661c5b77733e1b
Reviewed-on: https://gerrit.libreoffice.org/64916
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index 86921a78c42f..37f536403a17 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 86921a78c42f4fd499d86a226e34ab97e8b85ed5
+Subproject commit 37f536403a1746d2e1422ad06a941e67d01577f6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: en/dialog hu_HU/dialog pt_BR/dialog ru_RU/dialog

[Libreoffice Gerrit user]

 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu|2 +-
 hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 pt_BR/dialog/OptionsDialog.xcu |2 +-
 pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 37f536403a1746d2e1422ad06a941e67d01577f6
Author: sabri unal 
AuthorDate: Tue Dec 11 07:14:21 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Dec 16 18:40:37 2018 +0100

Related: tdf#121610 Do dictionary option titles Title Case

Change-Id: I3ab12669bec1265ad06288a122661c5b77733e1b
Reviewed-on: https://gerrit.libreoffice.org/64916
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index f5995c7..a867a59 100644
--- a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -12,7 +12,7 @@
 org.openoffice.en.hunspell.dictionaries
 
 
-English sentence 
checking
+English Sentence 
Checking
 
 
 %origin%/en.xdl
diff --git a/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 73b4347..9bc53f5 100644
--- a/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -12,7 +12,7 @@
 org.openoffice.hu.hunspell.dictionaries
 
 
-Hungarian sentence 
checking
+Hungarian Sentence 
Checking
 
 
 %origin%/hu_HU.xdl
diff --git a/pt_BR/dialog/OptionsDialog.xcu b/pt_BR/dialog/OptionsDialog.xcu
index e9d8698..0a81dbf 100644
--- a/pt_BR/dialog/OptionsDialog.xcu
+++ b/pt_BR/dialog/OptionsDialog.xcu
@@ -13,7 +13,7 @@
 
org.openoffice.pt_BR.hunspell.dictionaries
 
 
-Grammar checking 
(Portuguese)
+Grammar Checking 
(Portuguese)
 Corretor Gramatical (Português 
- Brasil)
 
 
diff --git a/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index e3a4f6a..d8c9129 100644
--- a/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -13,7 +13,7 @@
 org.openoffice.pt.hunspell.dictionaries
   
   
-Grammar checking (Portuguese)
+Grammar Checking (Portuguese)
 Corretor Gramatical (Português - 
Brasil)
   
   
diff --git a/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 109c8a6..96a1f3f 100644
--- a/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -12,7 +12,7 @@
 org.openoffice.ru.hunspell.dictionaries
 
 
-Grammar checking 
(Russian)
+Grammar Checking 
(Russian)
 
 
 %origin%/ru_RU.xdl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/01/06140100.xhp |4 ++--
 source/text/shared/01/06140300.xhp |9 ++---
 source/text/shared/01/06140400.xhp |   10 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit e9bc80d965b96aeef905c9485825acdb5ad84dd6
Author: Stanislav Horacek 
AuthorDate: Sat Dec 15 20:03:07 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Dec 16 18:36:56 2018 +0100

update description of customization dialogs

Change-Id: I0d79cadf06f97e937c91908f5ffe7083c1a83291
Reviewed-on: https://gerrit.libreoffice.org/65205
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 77c68eec99a72504cc9a69adf48649b0ecd4938b)
Reviewed-on: https://gerrit.libreoffice.org/65225
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/06140100.xhp 
b/source/text/shared/01/06140100.xhp
index 608f233c3..3c4200800 100644
--- a/source/text/shared/01/06140100.xhp
+++ b/source/text/shared/01/06140100.xhp
@@ -51,10 +51,10 @@
 Select the menu where the customization is to 
be applied. The current set of functions is displayed in the box 
below.
 
 Add
-Click on the Add button to add a new 
menu.
+Click on the gear icon and then choose Add to 
add a new menu.
 
 Remove
-Click on the remove button to delete the 
menu.
+Click on the gear icon and then choose Delete 
to delete the menu.
 You can only 
delete custom menus and custom menu entries.
 
 Right Arrow button
diff --git a/source/text/shared/01/06140300.xhp 
b/source/text/shared/01/06140300.xhp
index 742da1941..c40678dad 100644
--- a/source/text/shared/01/06140300.xhp
+++ b/source/text/shared/01/06140300.xhp
@@ -37,15 +37,10 @@
 Displays the results of the combination of the search string 
and category of the desired function.
 Description
 The text box contains a short description of the selected 
command.
-Location
+Scope
 Select the location where the context menu is to be attached. 
If attached to a %PRODUCTNAME module, the context menu is available for all 
files opened in that module. If attached to the file, the context menu will be 
available only when that file is opened and active.
-Menu
+Target
 Select the Context Menu where the customization is to be 
applied. The current set of functions is displayed in the box below.
-Add
-Click on the Add button to add a new context menu.
-Remove
-Click on the remove button to delete the context 
menu.
-You can only 
delete custom context menus and custom context menu entries.
 Right Arrow button
 Click on the right arrow button to select a function on the 
left display box and copy to the right display box. This will add the function 
to the selected context menu.
 Left Arrow button
diff --git a/source/text/shared/01/06140400.xhp 
b/source/text/shared/01/06140400.xhp
index a13ba33f4..d89687ea1 100644
--- a/source/text/shared/01/06140400.xhp
+++ b/source/text/shared/01/06140400.xhp
@@ -46,14 +46,14 @@
 Displays the results of the combination of the search string 
and category of the desired function.
 Description
 The 
text box contains a short description of the selected command.
-Location
+Scope
 Select 
the location where the toolbar is to be attached. If attached to a %PRODUCTNAME 
module, the toolbar is available for all files opened in that module. If 
attached to the file, the toolbar will be available only when that file is 
opened and active.
-Toolbar
+Target
 Select 
the toolbar where the customization is to be applied. The current set of 
functions is displayed in the box below.
 Add
-Click 
on the Add button to add a new toolbar.
-Remove
-Click 
on the remove button to delete the toolbar.
+Click 
on the gear icon and then choose Add to add a new toolbar.
+Delete
+Click 
on the gear icon and then choose Delete to delete the toolbar.
 You can only delete 
custom toolbar and custom toolbar entries.
 Right Arrow button
 Click 
on the right arrow button to select a function on the left display box and copy 
to the right display box. This will add the function to the selected 
toolbar.
___
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 a1c90cc656a0afe39c7a25490e22aea1965f81b6
Author: Stanislav Horacek 
AuthorDate: Sat Dec 15 20:03:07 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Dec 16 18:36:24 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - update description of customization dialogs

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

diff --git a/helpcontent2 b/helpcontent2
index 5e146b7503d8..77c68eec99a7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5e146b7503d8ff3ede71083301a9bb9cd93d77d3
+Subproject commit 77c68eec99a72504cc9a69adf48649b0ecd4938b
___
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/06140100.xhp |4 ++--
 source/text/shared/01/06140300.xhp |9 ++---
 source/text/shared/01/06140400.xhp |   10 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit 77c68eec99a72504cc9a69adf48649b0ecd4938b
Author: Stanislav Horacek 
AuthorDate: Sat Dec 15 20:03:07 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Dec 16 18:36:24 2018 +0100

update description of customization dialogs

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

diff --git a/source/text/shared/01/06140100.xhp 
b/source/text/shared/01/06140100.xhp
index 608f233c3..3c4200800 100644
--- a/source/text/shared/01/06140100.xhp
+++ b/source/text/shared/01/06140100.xhp
@@ -51,10 +51,10 @@
 Select the menu where the customization is to 
be applied. The current set of functions is displayed in the box 
below.
 
 Add
-Click on the Add button to add a new 
menu.
+Click on the gear icon and then choose Add to 
add a new menu.
 
 Remove
-Click on the remove button to delete the 
menu.
+Click on the gear icon and then choose Delete 
to delete the menu.
 You can only 
delete custom menus and custom menu entries.
 
 Right Arrow button
diff --git a/source/text/shared/01/06140300.xhp 
b/source/text/shared/01/06140300.xhp
index 742da1941..c40678dad 100644
--- a/source/text/shared/01/06140300.xhp
+++ b/source/text/shared/01/06140300.xhp
@@ -37,15 +37,10 @@
 Displays the results of the combination of the search string 
and category of the desired function.
 Description
 The text box contains a short description of the selected 
command.
-Location
+Scope
 Select the location where the context menu is to be attached. 
If attached to a %PRODUCTNAME module, the context menu is available for all 
files opened in that module. If attached to the file, the context menu will be 
available only when that file is opened and active.
-Menu
+Target
 Select the Context Menu where the customization is to be 
applied. The current set of functions is displayed in the box below.
-Add
-Click on the Add button to add a new context menu.
-Remove
-Click on the remove button to delete the context 
menu.
-You can only 
delete custom context menus and custom context menu entries.
 Right Arrow button
 Click on the right arrow button to select a function on the 
left display box and copy to the right display box. This will add the function 
to the selected context menu.
 Left Arrow button
diff --git a/source/text/shared/01/06140400.xhp 
b/source/text/shared/01/06140400.xhp
index a13ba33f4..d89687ea1 100644
--- a/source/text/shared/01/06140400.xhp
+++ b/source/text/shared/01/06140400.xhp
@@ -46,14 +46,14 @@
 Displays the results of the combination of the search string 
and category of the desired function.
 Description
 The 
text box contains a short description of the selected command.
-Location
+Scope
 Select 
the location where the toolbar is to be attached. If attached to a %PRODUCTNAME 
module, the toolbar is available for all files opened in that module. If 
attached to the file, the toolbar will be available only when that file is 
opened and active.
-Toolbar
+Target
 Select 
the toolbar where the customization is to be applied. The current set of 
functions is displayed in the box below.
 Add
-Click 
on the Add button to add a new toolbar.
-Remove
-Click 
on the remove button to delete the toolbar.
+Click 
on the gear icon and then choose Add to add a new toolbar.
+Delete
+Click 
on the gear icon and then choose Delete to delete the toolbar.
 You can only delete 
custom toolbar and custom toolbar entries.
 Right Arrow button
 Click 
on the right arrow button to select a function on the left display box and copy 
to the right display box. This will add the function to the selected 
toolbar.
___
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' - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 4f9e7da4ecbce74dc6ecc2b348160d80471ba29a
Author: Stanislav Horacek 
AuthorDate: Sat Dec 15 20:03:07 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Dec 16 18:36:56 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - update description of customization dialogs

Change-Id: I0d79cadf06f97e937c91908f5ffe7083c1a83291
Reviewed-on: https://gerrit.libreoffice.org/65205
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 77c68eec99a72504cc9a69adf48649b0ecd4938b)
Reviewed-on: https://gerrit.libreoffice.org/65225
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 0afeaf5e8ace..e9bc80d965b9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0afeaf5e8ace28ccb5365ffdc763197f8084fb50
+Subproject commit e9bc80d965b96aeef905c9485825acdb5ad84dd6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: new contributor

[Michael Weghorn]

Hi,

welcome and thanks for your interest in contributing to LibreOffice!

> where i can see the beginner level bugs to get hold of libreoffice environment

Those are called "Easy Hacks". The wiki page
https://wiki.documentfoundation.org/Development/EasyHacks contains more
information on those (and links at the end that will get you to a list
of existing Easy Hacks).

On 15/12/2018 15.43, jayaraj s wrote:
> I am interested in contributing to libreoffice.
> 
> As i read in get involved page
> 
> I am accepting that all of my past&future contribution to
> Libreoffice may be licensed under the MPLv2/LGPLv3+ dual license.
> 
> where i can see the beginner level bugs to get hold of libreoffice
> environment
> 
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 



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

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

[Libreoffice Gerrit user]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 294c38229a37604fe2d0d82a6ebc7bcd086963f4
Author: Sumit Chauhan 
AuthorDate: Sun Dec 16 14:24:39 2018 +0530
Commit: Heiko Tietze 
CommitDate: Sun Dec 16 17:41:08 2018 +0100

tdf#121638 , Different angle shown between sidebar & size and position 
dialog

Bug solved , Changed the nTmp = 360+nTmp ,if nTmp <0.

Change-Id: I855e634540c55ab91e8bbe5824014d304d87c8e9
Reviewed-on: https://gerrit.libreoffice.org/65211
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5b6bfc6d8caa..1df15cf8b4b2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -731,6 +731,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 if(pItem)
 {
 long nTmp = pItem->GetValue();
+nTmp = nTmp < 0 ? 36000+nTmp : nTmp;
 
 mpMtrAngle->SetValue( nTmp );
 mpDial->SetRotation( nTmp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/o3tl o3tl/qa

[Libreoffice Gerrit user]

 include/o3tl/string_view.hxx |   11 +--
 o3tl/qa/test-string_view.cxx |9 +
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 0d2ac93f4a3bec9d2fe2719b270333193d20596b
Author: Stephan Bergmann 
AuthorDate: Sun Dec 16 12:52:56 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Dec 16 17:14:33 2018 +0100

Fix o3tl::string_view streaming operator <<

(The unnecessary os.setstate(std::ios_base::failbit) was due to a 
misreading of
C++17 [ostream.formatted.reqmts]/1.)

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

diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx
index b605da65ac90..2bc182034342 100644
--- a/include/o3tl/string_view.hxx
+++ b/include/o3tl/string_view.hxx
@@ -732,12 +732,13 @@ operator <<(
 std::basic_ostream & os,
 basic_string_view str)
 {
-typename std::basic_ostream::sentry sentry;
+typename std::basic_ostream::sentry sentry(os);
 if (sentry) {
 auto const w = os.width();
-auto const pad
-= std::max::type>(
-w < 0 ? 0 : w, str.size());
+auto pad
+= std::max::type>(
+  w < 0 ? 0 : w, str.size())
+  - str.size();
 auto const after = (os.flags() & std::ios_base::adjustfield)
 == std::ios_base::left;
 if (pad != 0 && !after) {
@@ -754,8 +755,6 @@ operator <<(
 }
 }
 os.width(0);
-} else {
-os.setstate(std::ios_base::failbit);
 }
 return os;
 }
diff --git a/o3tl/qa/test-string_view.cxx b/o3tl/qa/test-string_view.cxx
index 977cfebc460a..fb6239fca379 100644
--- a/o3tl/qa/test-string_view.cxx
+++ b/o3tl/qa/test-string_view.cxx
@@ -9,7 +9,9 @@
 
 #include 
 
+#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -27,6 +29,7 @@ private:
 CPPUNIT_TEST(testChar32Literal);
 CPPUNIT_TEST(testWcharLiteral);
 CPPUNIT_TEST(testOperations);
+CPPUNIT_TEST(testOutput);
 CPPUNIT_TEST_SUITE_END();
 
 void testCharLiteral() {
@@ -203,6 +206,12 @@ private:
 v.find_last_not_of("fxo", o3tl::string_view::npos, 2));
 CPPUNIT_ASSERT_EQUAL(npos, v.find_last_not_of("fxo"));
 }
+
+void testOutput() {
+std::ostringstream s;
+s << o3tl::string_view("foo");
+CPPUNIT_ASSERT_EQUAL(std::string("foo"), s.str());
+}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 uui/inc/strings.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9bc346dc55bd62f68b8d943d522810b28d84b0dc
Author: Roman Kuznetsov 
AuthorDate: Thu Dec 13 11:14:04 2018 +0100
Commit: Mike Kaganski 
CommitDate: Sun Dec 16 17:10:13 2018 +0100

tdf#119217  Deleting of unnecessary empty space in Document in use dialog

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

diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index 7c327b579738..ed2d00550273 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -47,8 +47,8 @@
 #define STR_LOCKFAILED_OPENREADONLY_BTN 
NC_("STR_LOCKFAILED_OPENREADONLY_BTN", "Open ~Read-Only")
 
 #define STR_OPENLOCKED_TITLENC_("STR_OPENLOCKED_TITLE", 
"Document in Use")
-#define STR_OPENLOCKED_MSG  NC_("STR_OPENLOCKED_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document 
read-only or open a copy of the document for editing.\n\n$(ARG3)")
-#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "You may also ignore the file locking and 
open the document for editing.")
+#define STR_OPENLOCKED_MSG  NC_("STR_OPENLOCKED_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document 
read-only or open a copy of the document for editing.$(ARG3)")
+#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "\nYou may also ignore the file locking 
and open the document for editing.")
 #define STR_OPENLOCKED_OPENREADONLY_BTN 
NC_("STR_OPENLOCKED_OPENREADONLY_BTN", "Open ~Read-Only")
 #define STR_OPENLOCKED_OPENCOPY_BTN 
NC_("STR_OPENLOCKED_OPENCOPY_BTN", "Open ~Copy")
 #define STR_UNKNOWNUSER NC_("STR_UNKNOWNUSER", 
"Unknown User")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source setup_native/source

[Libreoffice Gerrit user]

 instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt |1 
 scp2/source/ooo/ucrt.scp|   15 -
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx   |  114 
--
 4 files changed, 69 insertions(+), 64 deletions(-)

New commits:
commit 0b6884b9f1f60db48983de6c5bd53e25e1f68eeb
Author: Mike Kaganski 
AuthorDate: Mon Dec 10 16:20:42 2018 +0300
Commit: Mike Kaganski 
CommitDate: Sun Dec 16 15:10:47 2018 +0100

tdf#121987 follow-up: never fail MSU install; warn instead.

This replaces commit 53058090beede6a399e2f408f62c28a2921ff8ab. Now
not only failure to start WU service, but also other errors during
MSU installation won't break installation. E.g., running WU service
as Guest does not prevent the service from starting; but installing
updates fail, which makes previous solution incomplete.

Instead, show a warning in those rare cases when an error happens,
and continue. It will allow users to see the reason if they see
"api-ms-win-*.dll missing" message later after installation. Of
course, some small percentage of these warnings will be false, e.g.
those on Windows 10. But those false messages must be really small
minority, because only when (1) the installation fails (2) on a
system with the component already present, such a message would be
false. And it will not prevent the installation.

This will not block unattended installations, since in those cases,
MsiProcessMessage() will do nothing.

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index a14f45e0cd54..315e35fe0b33 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -406,4 +406,7 @@ en-US = "This setup requires Internet Information Server 
4.0 or higher for confi
 [OOO_ERROR_130]
 en-US = "This setup requires Administrator privileges for configuring IIS 
Virtual Roots."
 
+[OOO_ERROR_131]
+en-US = "Installing a pre-requisite KB2999226 failed. You might need to 
manually install it from Microsoft site to be able to run the product. [2]"
+
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
index 2f3a5912817d..52cc797c643e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
@@ -131,3 +131,4 @@ i2  L0
 1932   OOO_ERROR_128
 1933   OOO_ERROR_129
 1934   OOO_ERROR_130
+25000  OOO_ERROR_131
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index ae2eb27a4dbe..8cba6cfc3cd0 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -85,11 +85,14 @@ WindowsCustomAction gid_Customaction_cleanup_msu
Assignment1 = ("InstallExecuteSequence", "Not Installed And 
cleanup_msu", "inst_msu");
 End
 
+/* The "InstMSUBinary" property contains an error message number and a binary 
name, separated by "|".
+   The former is used when installing the MSU fails.
+*/
 WindowsCustomAction gid_Customaction_check_win7x64_ucrt
Name = "check_win7x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows61-KB2999226-x64msu";
+   Target = "25000|Windows61-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
601 And VersionNT64", "FileCost");
Styles = "NO_FILE";
@@ -99,7 +102,7 @@ WindowsCustomAction gid_Customaction_check_win8x64_ucrt
Name = "check_win8x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows8-RT-KB2999226-x64msu";
+   Target = "25000|Windows8-RT-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
602 And VersionNT64", "check_win7x64_ucrt");
Styles = "NO_FILE";
@@ -109,7 +112,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Name = "check_win81x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows81-KB2999226-x64msu";
+   Target = "25000|Windows81-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And VersionNT64", "check_win8x64_ucrt");
Styles = "NO_FILE";
@@ -125,7 +128,7 @@ WindowsCustomAction gid_Customaction_check_win7x32_ucrt
Name = "check_win7x32_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows61-KB2999226-x86msu";
+ 

gtk3 include handling - Improving IDE support

[Michael Weghorn]

Hi,

one issue with the existing Qt Creator integration for LibreOffice,
provided by the 'qtcreator-ide-integration' make target, is that gtk3
includes cannot be found in Qt Creator (leading to incorrect
code-completion, error detection, ...).

As far as I understand, the following is basically what happens (with
steps 1 and 2 being part of the "normal" build process, steps 3 and 4
specific to building the IDE integration):

1) 'configure.ac': the gtk3-related compiler flags are determined using
'PKG_CHECK_MODULES' and exported as 'GTK3_CFLAGS'.

2) 'vcl/Library_vclplug_gtk3.mk': 'gb_Library_add_cxxflags' is called to
set the flags, using the 'GTK3_CFLAGS' variable set in step 1

3) 'gbuildtojson' writes the JSON file
'workdir/GbuildToJson/Library/libvclplug_gtk3lo.so', based on the
information set among others in step 2

4) 'bin/gbuild-to-ide' reads that JSON file and generates IDE-specific
config files (e.g. '.pro' files in the case of Qt Creator)


Looking at the JSON file generated in step 3, one can see that the
'-isystem' compiler flags end up in the 'CXXFLAGS' section, while only
the 'INCLUDE' section is taken into account for includes when generating
the '.pro' file for Qt Creator in step 4, thus eventually causing the
problem that included files are not found by Qt Creator.


2 potential approaches to improve this came to my mind:


1) make sure the include-related compiler flags actually end up in the
'INCLUDE' section in the generated JSON file

As far as I can see, 'gb_Library_set_include' is the way to set the
'-I'/'-isystem' compiler flags in gbuild, and that approach is used for
pretty much all other libraries.
https://gerrit.libreoffice.org/#/c/65207 demonstrates this approach.


2) adapt gbuild-to-ide to detect include-related compiler flags even if
set via 'gb_Library_add_cxxflags'

https://gerrit.libreoffice.org/#/c/65206 demonstrates a way to do this
for Qt Creator.


To me, approach 1 seems cleaner, but since I'm far from being a gbuild
expert, I'm unable to assess all the implications and would be very
thankful for any opinions on this, either here or in the corresponding
gerrit changes.

Regards,
Michael


PS: Another approach might be to have the IDE use *all* compiler flags,
but at least for qtcreator, that would at least require splitting up the
project into more '.pro' files (one per library/executable, if not even
further). Currently, one '.pro' file is generated per top-level directory.

PPS: While I just encountered this for 'vclplug_gtk3' so far, the same
might be the case for other targets.



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

Re: [libreoffice-website] Infra call on Tue, Dec 18 at 17:30 UTC

[Brett Cornwall]

On 12/15/18 11:53pm, Guilhem Moulin wrote:

The next infra call will take place at `date -d 'Tue Dec 18 17:30:00 UTC 2018'`
(18:30:00 Berlin time).


I'll be on a plane at that time, so I'll miss the call. I'm still 
getting myself familiar with the Matomo stuff and will try to find some 
time to hack on it during the holidays.

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

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

[Libreoffice Gerrit user]

 sc/qa/uitest/calc_tests/data/tdf119954.ods |binary
 sc/qa/uitest/range_name/tdf119954.py   |   84 +
 2 files changed, 84 insertions(+)

New commits:
commit 7e7e203c26f0b22973aa65f163a8590d8313250d
Author: Zdeněk Crhonek 
AuthorDate: Sat Dec 15 13:42:09 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Sun Dec 16 14:03:10 2018 +0100

uitest for bug tdf#119954

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

diff --git a/sc/qa/uitest/calc_tests/data/tdf119954.ods 
b/sc/qa/uitest/calc_tests/data/tdf119954.ods
new file mode 100644
index ..12a1123519fb
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf119954.ods differ
diff --git a/sc/qa/uitest/range_name/tdf119954.py 
b/sc/qa/uitest/range_name/tdf119954.py
new file mode 100644
index ..8b3eeed8d2a8
--- /dev/null
+++ b/sc/qa/uitest/range_name/tdf119954.py
@@ -0,0 +1,84 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.uihelper.keyboard import select_all
+from uitest.debug import sleep
+# import org.libreoffice.unotest
+# import pathlib
+from uitest.path import get_srcdir_url
+
+def get_url_for_data_file(file_name):
+#return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+
+#Bug 119954 - Using a second defined database range in formula expression 
switches to first range.
+
+class tdf119954(UITestCase):
+   def test_tdf119954_second_db_range(self):
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf119954.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+#* new document
+#* in A1 enter 1
+#* in C3 enter 2
+#* on A1 define a database range 'aaa' with $Sheet1.$A$1
+#* on C3 define a database range 'bbb' with $Sheet2.$C$3
+#* in any cell enter formula =bbb
+#  => result is 1 instead of 2
+#* place cell cursor on that formula cell again
+#  => see that the formula is =aaa instead of =bbb
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+
self.ui_test.execute_modeless_dialog_through_command(".uno:DefineDBName")
+xDefineNameDlg = self.xUITest.getTopFocusWindow()
+
+xEntryBox = xDefineNameDlg.getChild("entry")
+type_text(xEntryBox, "aaa")
+add = xDefineNameDlg.getChild("add")
+assign = xDefineNameDlg.getChild("assign")
+add.executeAction("CLICK", tuple())
+xOkBtn = xDefineNameDlg.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+
self.ui_test.execute_modeless_dialog_through_command(".uno:DefineDBName")
+xDefineNameDlg = self.xUITest.getTopFocusWindow()
+xEntryBox = xDefineNameDlg.getChild("entry")
+assign = xDefineNameDlg.getChild("assign")
+select_all(xEntryBox)
+type_text(xEntryBox, "bbb")
+select_all(assign)
+type_text(assign, "$Sheet2.$C$3")
+add.executeAction("CLICK", tuple())
+
+xOkBtn = xDefineNameDlg.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+enter_text_to_cell(gridwin, "B2", "=bbb")
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
+self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 2)
+
+enter_text_to_cell(gridwin, "C2", "=aaa")
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
+self.assertEqual(get_cell_by_position(document, 0, 2, 1).getValue(), 1)
+
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(get_cell_by_position(document, 0, 2, 1).getValue(), 0)
+self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 0)
+self.assertEqual(get_cell_by_position(document, 0, 1, 2).getFormula(), 
"")
+self.assertEqual(get_cell_by_position(document, 0, 1, 1).getFormula(), 
"")
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 soft

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit d32e6d0c49deb5015fd61e68dc7deb3e18549e18
Author: Stanislav Horacek 
AuthorDate: Sun Dec 16 11:58:37 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Dec 16 12:59:57 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - fix small typo

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

diff --git a/helpcontent2 b/helpcontent2
index c3381937b13c..5e146b7503d8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c3381937b13c57e127fbd9da21c9eda5692a2317
+Subproject commit 5e146b7503d8ff3ede71083301a9bb9cd93d77d3
___
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/image_compression.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e146b7503d8ff3ede71083301a9bb9cd93d77d3
Author: Stanislav Horacek 
AuthorDate: Sun Dec 16 11:58:37 2018 +0100
Commit: Julien Nabet 
CommitDate: Sun Dec 16 12:59:57 2018 +0100

fix small typo

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

diff --git a/source/text/shared/01/image_compression.xhp 
b/source/text/shared/01/image_compression.xhp
index 72361f32a..1da9311c1 100644
--- a/source/text/shared/01/image_compression.xhp
+++ b/source/text/shared/01/image_compression.xhp
@@ -39,7 +39,7 @@
 
 Compression
 JPEG Quality
-Use 
the slider to adjust the level of quality of he JPEG compression, from 0 to 
100. A value of 100 means no quality loss and a value of 0 may result in a very 
poor image. The default value of 90 produces very good results and significant 
image data size reduction.
+Use 
the slider to adjust the level of quality of the JPEG compression, from 0 to 
100. A value of 100 means no quality loss and a value of 0 may result in a very 
poor image. The default value of 90 produces very good results and significant 
image data size reduction.
 The 
compression values are not standardized between different JPEG image 
compression software.
 
 PNG Compression
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:47 +

CODE-4-RC1p

Changes since CODE-4-RC1-23:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - debian/changelog debian/control loolwsd.spec.in

[Libreoffice Gerrit user]

 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 3c3bc88cf491cf3b30183002905ef4ac6ed35c0f
Author: Andras Timar 
AuthorDate: Sun Dec 16 11:47:00 2018 +0100
Commit: Andras Timar 
CommitDate: Sun Dec 16 11:47:00 2018 +0100

Bump package version to 4.0.0-2

Change-Id: Ic983ef65bf13df321b595436f4ec1c2c645ff953

diff --git a/debian/changelog b/debian/changelog
index 4c2eb01c6..0a966df74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.0-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool4
+
+ -- Andras Timar   Sun, 16 Dec 2018 11:00:00 +0100
+
 loolwsd (4.0.0-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool4
diff --git a/debian/control b/debian/control
index cf64111c8..fa8e5576e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, 
libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis6.0-calc (>= 
6.0.10.17), collaboraofficebasis6.0-core (>= 6.0.10.17), 
collaboraofficebasis6.0-graphicfilter (>= 6.0.10.17), 
collaboraofficebasis6.0-images (>= 6.0.10.17), collaboraofficebasis6.0-impress 
(>= 6.0.10.17), collaboraofficebasis6.0-ooofonts (>= 6.0.10.17), 
collaboraofficebasis6.0-writer (>= 6.0.10.17), collaboraoffice6.0 (>= 
6.0.10.17), collaboraoffice6.0-ure (>= 6.0.10.17), 
collaboraofficebasis6.0-en-us (>= 6.0.10.17), collaboraofficebasis6.0-draw (>= 
6.0.10.17), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.17), 
collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.17), 
collaboraoffice6.0-dict-en (>= 6.0.10.17)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, 
libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis6.0-calc (>= 
6.0.10.18), collaboraofficebasis6.0-core (>= 6.0.10.18), 
collaboraofficebasis6.0-graphicfilter (>= 6.0.10.18), 
collaboraofficebasis6.0-images (>= 6.0.10.18), collaboraofficebasis6.0-impress 
(>= 6.0.10.18), collaboraofficebasis6.0-ooofonts (>= 6.0.10.18), 
collaboraofficebasis6.0-writer (>= 6.0.10.18), collaboraoffice6.0 (>= 
6.0.10.18), collaboraoffice6.0-ure (>= 6.0.10.18), 
collaboraofficebasis6.0-en-us (>= 6.0.10.18), collaboraofficebasis6.0-draw (>= 
6.0.10.18), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.18), 
collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.18), 
collaboraoffice6.0-dict-en (>= 6.0.10.18)
 Conflicts: collaboraofficebasis6.0-gnome-integration, 
collaboraofficebasis6.0-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 9289821bf..19ebc6b26 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice6.0 >= 6.0.10.17 collaboraoffice6.0-ure >= 
6.0.10.17 collaboraofficebasis6.0-core >= 6.0.10.17 
collaboraofficebasis6.0-writer >= 6.0.10.17 collaboraofficebasis6.0-impress >= 
6.0.10.17 collaboraofficebasis6.0-graphicfilter >= 6.0.10.17 
collaboraofficebasis6.0-en-US >= 6.0.10.17 collaboraofficebasis6.0-calc >= 
6.0.10.17 collaboraofficebasis6.0-ooofonts >= 6.0.10.17 
collaboraofficebasis6.0-images >= 6.0.10.17 collaboraofficebasis6.0-draw >= 
6.0.10.17 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.17 
collaboraofficebasis6.0-ooolinguistic >= 6.0.10.17 collaboraoffice6.0-dict-en 
>= 6.0.10.17
+Requires:   collaboraoffice6.0 >= 6.0.10.18 collaboraoffice6.0-ure >= 
6.0.10.18 collaboraofficebasis6.0-core >= 6.0.10.18 
collaboraofficebasis6.0-writer >= 6.0.10.18 collaboraofficebasis6.0-impress >= 
6.0.10.18 collaboraofficebasis6.0-graphicfilter >= 6.0.10.18 
collaboraofficebasis6.0-en-US >= 6.0.10.18 collaboraofficebasis6.0-calc >= 
6.0.10.18 collaboraofficebasis6.0-ooofonts >= 6.0.10.18 
collaboraofficebasis6.0-images >= 6.0.10.18 collaboraofficebasis6.0-draw >= 
6.0.10.18 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.18 
collaboraofficebasis6.0-ooolinguistic >= 6.0.10.18 collaboraoffice6.0-dict-en 
>= 6.0.10.18
 Conflicts:  collaboraofficebasis6.0-kde-integration 
collaboraofficebasis6.0-gnome-integration
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6

[Libreoffice-commits] online.git: Branch 'refs/tags/CODE-4-RC1p' - 0 commits -

[Libreoffice Gerrit user]

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:39 +

CODE-4-RC1p

Changes since CODE-4-RC1-22:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:18 +

CODE-4-RC1p

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:18 +

CODE-4-RC1p

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:18 +

CODE-4-RC1p

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/CODE-4-RC1p'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1p' created by Andras Timar  at 
2018-12-16 10:18 +

CODE-4-RC1p

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

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

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-18' created by Andras Timar  at 
2018-12-16 10:14 +

cp-6.0-18

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

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-18' created by Andras Timar  at 
2018-12-16 10:14 +

cp-6.0-18

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

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-18' created by Andras Timar  at 
2018-12-16 10:14 +

cp-6.0-18

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-18' created by Andras Timar  at 
2018-12-16 10:14 +

cp-6.0-18

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

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

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

[Libreoffice Gerrit user]

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

New commits:
commit e74e5982cc014ac0a0602bcd891b73aefb314e06
Author: Andras Timar 
AuthorDate: Thu Dec 6 14:47:43 2018 +0100
Commit: Andras Timar 
CommitDate: Sun Dec 16 11:13:10 2018 +0100

Bump version to 6.0-18

Change-Id: I0231b0541f626fedec3d5bed97adf5bb23f5f2f3
(cherry picked from commit 41a232eed11bb7bc0ca16127958e19ff33a6e7fd)

diff --git a/configure.ac b/configure.ac
index 782edf1891c1..e4142899c824 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.0.10.17],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.0.10.18],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/uiconfig editeng/source include/editeng officecfg/registry

[Libreoffice Gerrit user]

 cui/uiconfig/ui/acorexceptpage.ui  |6 +++---
 editeng/source/misc/svxacorr.cxx   |8 
 include/editeng/svxacorr.hxx   |8 +++-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
 4 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit bab0fc531cf063880c27b7d7081d4acbd40b649a
Author: Mike Kaganski 
AuthorDate: Fri Dec 7 13:10:57 2018 +0300
Commit: Andras Timar 
CommitDate: Sun Dec 16 11:02:36 2018 +0100

tdf#121779: extend TWo CApitals list to also ignore sMALL iNITIALS

Now this list is used also in rules for capitalizing first letter of
every sentence, and for correcting accidental use of Caps Lock key.

Change-Id: I4fbdbccbae32743d5e9a6757344361eefd88e167
Reviewed-on: https://gerrit.libreoffice.org/64759
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Sophie Gautier 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/65087
Tested-by: Mike Kaganski 
Reviewed-by: Andras Timar 

diff --git a/cui/uiconfig/ui/acorexceptpage.ui 
b/cui/uiconfig/ui/acorexceptpage.ui
index 0dab0855818e..403f479e0662 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -250,7 +250,7 @@
 True
 
   
-New words with 
two initial capitals
+New words with 
two initial capitals or small initial
   
 
   
@@ -286,7 +286,7 @@
 True
 
   
-Delete words 
with two initial capitals
+Delete words 
with two initial capitals or small initial
   
 
   
@@ -334,7 +334,7 @@
   
 True
 False
-Words With TWo INitial CApitals
+Words With TWo INitial CApitals or sMALL 
iNITIAL
 
   
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 9c8eeb9d2dac..bf52a5cf2a69 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -902,6 +902,10 @@ bool SvxAutoCorrect::FnCapitalStartSentence( 
SvxAutoCorrDoc& rDoc,
 return false; // no valid separator -> no replacement
 }
 
+// No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+if (FindInWrdSttExceptList(eLang, OUString(pWordStt, pDelim - pWordStt)))
+return false;
+
 if( bAtStart )  // at the beginning of a paragraph?
 {
 // Check out the previous paragraph, if it exists.
@@ -1119,6 +1123,10 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& 
rDoc, const OUString& rT
 aConverted += rCC.uppercase(OUString(rTxt[nSttPos]));
 aConverted += rCC.lowercase(OUString(rTxt[nSttPos+1]));
 
+// No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+if (FindInWrdSttExceptList(eLang, rTxt.copy(nSttPos, nEndPos - nSttPos)))
+return false;
+
 for( sal_Int32 i = nSttPos+2; i < nEndPos; ++i )
 {
 if ( IsLowerLetter(rCC.getCharacterType(rTxt, i)) )
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index a7d03a9a971a..46c2b0e9dadf 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -64,7 +64,7 @@ const long SetINetAttr  = 0x0040;   // Set 
INetAttribut
 const long Autocorrect  = 0x0080;   // Call AutoCorrect
 const long ChgQuotes= 0x0100;   // replace double quotes
 const long SaveWordCplSttLst= 0x0200;   // Save Auto correction of Capital 
letter at beginning of sentence.
-const long SaveWordWrdSttLst= 0x0400;   // Save Auto correction of 2 
Capital letter at beginning of word.
+const long SaveWordWrdSttLst= 0x0400;   // Save Auto correction of TWo 
INitial CApitals or sMALL iNITIAL.
 const long IgnoreDoubleSpace= 0x0800;   // Ignore 2 Spaces
 const long ChgSglQuotes = 0x1000;   // Replace simple quotes
 const long CorrectCapsLock  = 0x2000;   // Correct accidental use of cAPS 
LOCK key
@@ -204,8 +204,7 @@ public:
 SvStringsISortDtor* GetCplSttExceptList();
 bool AddToCplSttExceptList(const OUString& rNew);
 
-// Load, Set, Get the exception list for 2 Capital letters at the
-// beginning of a word.
+// Load, Set, Get the exception list for TWo INitial CApitals or sMALL 
iNITIAL
 SvStringsISortDtor* LoadWrdSttExceptList();
 void SaveWrdSttExceptList();
 void SetWrdSttExceptList( SvStringsISortDtor* pList );
@@ -360,8 +359,7 @@ public:
 // Adds a single word. The list will be immediately written to the file!
 bool AddCplSttException( const OUString&