[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

2019-03-21 Thread Libreoffice Gerrit user
 dev/null  |binary
 icon-themes/sifr/cmd/lc_attributepagesize.png |binary
 icon-themes/sifr/cmd/lc_autoformat.png|binary
 icon-themes/sifr/cmd/lc_autooutline.png   |binary
 icon-themes/sifr/cmd/lc_autopilotmenu.png |binary
 icon-themes/sifr/cmd/lc_autosum.png   |binary
 icon-themes/sifr/cmd/lc_closemasterview.png   |binary
 icon-themes/sifr/cmd/lc_customshowdialog.png  |binary
 icon-themes/sifr/cmd/lc_dataimport.png|binary
 icon-themes/sifr/cmd/lc_delete.png|binary
 icon-themes/sifr/cmd/lc_deletemasterpage.png  |binary
 icon-themes/sifr/cmd/lc_dia.png   |binary
 icon-themes/sifr/cmd/lc_diaauto.png   |binary
 icon-themes/sifr/cmd/lc_diaspeed.png  |binary
 icon-themes/sifr/cmd/lc_diatime.png   |binary
 icon-themes/sifr/cmd/lc_editdoc.png   |binary
 icon-themes/sifr/cmd/lc_equalizeheight.png|binary
 icon-themes/sifr/cmd/lc_equalizewidth.png |binary
 icon-themes/sifr/cmd/lc_exportdialog.png  |binary
 icon-themes/sifr/cmd/lc_exportto.png  |binary
 icon-themes/sifr/cmd/lc_extendedhelp.png  |binary
 icon-themes/sifr/cmd/lc_formatpaintbrush.png  |binary
 icon-themes/sifr/cmd/lc_framedialog.png   |binary
 icon-themes/sifr/cmd/lc_goalseekdialog.png|binary
 icon-themes/sifr/cmd/lc_grid.png  |binary
 icon-themes/sifr/cmd/lc_gridfront.png |binary
 icon-themes/sifr/cmd/lc_griduse.png   |binary
 icon-themes/sifr/cmd/lc_gridvisible.png   |binary
 icon-themes/sifr/cmd/lc_helpindex.png |binary
 icon-themes/sifr/cmd/lc_importdialog.png  |binary
 icon-themes/sifr/cmd/lc_importfromfile.png|binary
 icon-themes/sifr/cmd/lc_outlinebullet.png |binary
 icon-themes/sifr/cmd/lc_outlinecollapse.png   |binary
 icon-themes/sifr/cmd/lc_outlinecollapseall.png|binary
 icon-themes/sifr/cmd/lc_outlineexpand.png |binary
 icon-themes/sifr/cmd/lc_outlineexpandall.png  |binary
 icon-themes/sifr/cmd/lc_outlinemode.png   |binary
 icon-themes/sifr/cmd/lc_presentation.png  |binary
 icon-themes/sifr/cmd/lc_presentationcurrentslide.png  |binary
 icon-themes/sifr/cmd/lc_presentationdialog.png|binary
 icon-themes/sifr/cmd/lc_presentationlayout.png|binary
 icon-themes/sifr/cmd/lc_presentationminimizer.png |binary
 icon-themes/sifr/cmd/lc_ruler.png |binary
 icon-themes/sifr/cmd/lc_shell3d.png   |binary
 icon-themes/sifr/cmd/lc_slidemasterpage.png   |binary
 icon-themes/sifr/cmd/lc_snapborder.png|binary
 icon-themes/sifr/cmd/lc_snapframe.png |binary
 icon-themes/sifr/cmd/lc_snappoints.png|binary
 icon-themes/sifr/cmd/lc_sphere.png|binary
 icon-themes/sifr/cmd/lc_torus.png |binary
 icon-themes/sifr/cmd/lc_vruler.png|binary
 icon-themes/sifr/cmd/lc_watermark.png |binary
 icon-themes/sifr/cmd/sc_closemasterview.png   |binary
 icon-themes/sifr_dark/cmd/lc_attributepagesize.png|binary
 icon-themes/sifr_dark/cmd/lc_autoformat.png   |binary
 icon-themes/sifr_dark/cmd/lc_autooutline.png  |binary
 icon-themes/sifr_dark/cmd/lc_autopilotmenu.png|binary
 icon-themes/sifr_dark/cmd/lc_autosum.png  |binary
 icon-themes/sifr_dark/cmd/lc_closemasterview.png  |binary
 icon-themes/sifr_dark/cmd/lc_customshowdialog.png |binary
 icon-themes/sifr_dark/cmd/lc_dataimport.png   |binary
 icon-themes/sifr_dark/cmd/lc_delete.png   |binary
 icon-themes/sifr_dark/cmd/lc_deletemasterpage.png |binary
 icon-themes/sifr_dark/cmd/lc_dia.png  |binary
 icon-themes/sifr_dark/cmd/lc_diaauto.png  |binary
 icon-themes/sifr_dark/cmd/lc_diaspeed.png |binary
 icon-themes/sifr_dark/cmd/lc_diatime.png  |binary
 icon-themes/sifr_dark/cmd/lc_editdoc.png  |binary
 icon-themes/sifr_dark/cmd/lc_equalizeheight.png   |binary
 icon-themes/sifr_dark/cmd/lc_equalizewidth.png|binary
 icon-themes/sifr_dark/cmd/lc_exportdialog.png |binary
 icon-themes/sifr_dark/cmd/lc_exportto.png |binary
 icon-themes/sifr_dark/cmd/lc_extendedhelp.png |binary
 icon-themes/sifr_dark/cmd/lc_formatpaintbrush.png |binary
 icon-themes/sifr_dark/cmd/lc_framedialog

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

2019-03-21 Thread Libreoffice Gerrit user
 dbaccess/source/core/api/RowSetCache.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4930ad1e5dabecd9594cf8b237f973e6017798cf
Author: Andrea Gelmini 
AuthorDate: Wed Mar 20 16:09:27 2019 +
Commit: Julien Nabet 
CommitDate: Fri Mar 22 07:10:37 2019 +0100

Fix typo

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

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 7eaca7c70a6b..f05caa68c3c1 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1136,7 +1136,7 @@ bool ORowSetCache::absolute( sal_Int32 row )
 if(row < 0)
 {
 // here we have to scroll from the last row to backward so we have to 
go to last row and
-// and two the previous
+// and to the previous
 if(m_bRowCountFinal || last())
 {
 m_nPosition = m_nRowCount + row + 1; // + row because row is 
negative and +1 because row==-1 means last row
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 include/rtl/ustring.hxx |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 20ea90a557b5bc744fd234e3a20ab1db484cf88b
Author: Christophe JAILLET 
AuthorDate: Sun Mar 17 09:42:25 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Mar 22 03:05:52 2019 +0100

Fix some doxygen-generated documentation.

Doxygen is misled by the "127." at the beginning of a sentence and
converts it to "..."

So it is erroneously rendered as:
all ASCII characters are in the allowed range between 0 and
   1. The ASCII string must be NULL-terminated.

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

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 35e0ca7756be..ecb4958761af 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1037,8 +1037,8 @@ public:
   the strings and return a value indicating their relationship.
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated.
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated.
   This function can't be used for language specific sorting.
 
   @param  asciiStr  the 8-Bit ASCII character string to be compared.
@@ -1058,8 +1058,8 @@ public:
   the strings and return a value indicating their relationship.
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated.
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated.
   This function can't be used for language specific sorting.
 
   @deprecated  This is a confusing overload with unexpectedly different
@@ -1113,8 +1113,8 @@ public:
   represents the same sequence of characters as the first string.
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated.
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated.
   This function can't be used for language specific comparison.
 
   @paramasciiStrthe 8-Bit ASCII character string to be 
compared.
@@ -1134,8 +1134,8 @@ public:
   represents the same sequence of characters as the first string.
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated and must be greater than
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated and must be greater than
   or equal to asciiStrLength.
   This function can't be used for language specific comparison.
 
@@ -1163,8 +1163,8 @@ public:
   values between 97 and 122 (ASCII a-z).
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated.
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated.
   This function can't be used for language specific comparison.
 
   @paramasciiStrthe 8-Bit ASCII character string to be 
compared.
@@ -1183,8 +1183,8 @@ public:
   the strings and return a value indicating their relationship.
   Since this method is optimized for performance, the ASCII character
   values are not converted in any way. The caller has to make sure that
-  all ASCII characters are in the allowed range between 0 and
-  127. The ASCII string must be NULL-terminated.
+  all ASCII characters are in the allowed range between 0 and 127.
+  The ASCII string must be NULL-terminated.
   This function can't be used for language specific sorting.
 
   @param  asciiStr  the 8-Bit ASCII character string to be compared.
@@ -1234,8 +1234,8 @@ public:
   of this string, at the given position.
   Since this method is optimized for performance, the ASCII character

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

2019-03-21 Thread Libreoffice Gerrit user
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35739db1d2855e83755a314ec34ad98873b8289c
Author: Olivier Hallot 
AuthorDate: Thu Mar 21 10:38:34 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Mar 22 03:02:07 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - Backport of Help online donnation button

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

diff --git a/helpcontent2 b/helpcontent2
index 9361babc015c..6543664118f1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9361babc015c25a240777c243e8a075b1506ffae
+Subproject commit 6543664118f1ddaa7ec4ecfec7a42889fa8f76a9
___
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' - help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl

2019-03-21 Thread Libreoffice Gerrit user
 help3xsl/default.css  |  281 ++---
 help3xsl/help2.js |   56 -
 help3xsl/online_transform.xsl |  468 +-
 3 files changed, 451 insertions(+), 354 deletions(-)

New commits:
commit 6543664118f1ddaa7ec4ecfec7a42889fa8f76a9
Author: Olivier Hallot 
AuthorDate: Thu Mar 21 10:38:34 2019 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Mar 22 03:02:07 2019 +0100

Backport of Help online donnation button

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index e6a59ad8b..391403e72 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -39,14 +39,15 @@ h5,
 h6,
 .listitem,
 .listitemintable,
-.tablecontent,
-.input {
+.tablecontent {
 font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, 
Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", 
Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", 
Taprom;
 }
 .input {
+background-color: rgba(0,0,0,0.04);
 transition-property: background-color;
 transition-duration: 150ms;
 border-bottom: 1px dashed rgba(0,0,0,0.1);
+font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida 
Sans Typewriter", "Courier New", Courier, Monaco, monospace;
 }
 [data-tooltip]{
   position:relative;
@@ -85,7 +86,7 @@ h6,
 pointer-events: auto;
 }
 body {
-background-color: #F4F7F7;
+background-color: #F7F8F7;
 margin: 0;
 line-height: normal;
 }
@@ -94,11 +95,11 @@ body {
 }
 a {
 text-decoration: none;
-color: #0369AE;
+color: #0379BC;
 }
 a:hover {
 text-decoration: underline;
-color: #1C99E0;
+color: #0499EE;
 }
 pre,
 .code,
@@ -115,6 +116,11 @@ pre,
 padding: 1px 3px;
 font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida 
Sans Typewriter", "Courier New", Courier, Monaco, monospace;
 }
+.smathcode {
+border-radius: 2px;
+padding: 1px 3px;
+font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida 
Sans Typewriter", "Courier New", Courier, Monaco, monospace;
+}
 .acronym {
 font-weight: bold;
 }
@@ -124,10 +130,23 @@ pre,
 border-top: 1px solid black;
 }
 .emph,
-.menuitem,
-.keycode {
+.menuitem {
 font-weight: bold;
 }
+.keycode {
+/*font-weight: bold;*/
+font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida 
Sans Typewriter", "Courier New", Courier, Monaco, monospace;
+}
+.widget{
+padding: 1px 10px;
+background: #f0f0f0;
+background: linear-gradient(to bottom,#f0f0f0,#fcfcfc);
+border-radius: 3px;
+color: #303030;
+border: 1px solid #a0a0a0;
+border-bottom-width: 2px;
+white-space: nowrap;
+}
 /* div's for warning, tip and note */
 .note,
 .tip,
@@ -140,25 +159,18 @@ pre,
 margin-top: 15px;
 }
 .note {
-border-left: 4px solid #FFDE09;
-background-color: #FFF4D0;
+border-left: 4px solid #61897C;
+background-color: #D9E7E2;
 }
 .tip {
-border-left: 4px solid #38618C;
-background-color: #DAE2EA;
+border-left: 4px solid #4866AD;
+background-color: #CDD5E8;
 }
 .warning {
-border-left: 4px solid #FF5964;
-background-color: #FFE0E2;
-}
-.noteicon {
-padding:0.3em;
-transition: transform .2s; /* Animation */
+border-left: 4px solid #D5B177;
+background-color: #F9EEDC;
 }
-.noteicon:hover {
-transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it 
will go outside of the viewport) */
-}
-.notetext {
+.noteicon, .notetext {
 padding:0.3em;
 }
 
@@ -177,17 +189,13 @@ pre,
 .iconcell {
 padding:0.3em;
 }
-.imageicon {
-transition: transform .2s; /* Animation */
-}
-.imageicon:hover{
-transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it 
will go outside of the viewport) */
-}
 
 table {
-box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px;
+background: #FEFEFE;
+box-shadow: rgba(0,0,0,0.08) 0 1px 5px 0;
 border-collapse: collapse;
-background: #fefefe;
+margin-left: auto;
+margin-right: auto;
 }
 table, th, td {
 border-top: 0;
@@ -220,13 +228,13 @@ p,
 ol,
 td {
 font-size: 1.17rem;
-margin: 2px 2px 2px 2px;
+margin: 2px 0 2px 0;
 }
 h1 {
 font-size: 1.83rem;
 font-weight: 300;
 border-bottom: 2px solid #148603;
-padding-bottom: 6px;
+margin-bottom: 1.67rem;
 }
 h1 a {
 text-decoration: none;
@@ -242,20 +250,12 @@ h5,
 h6 {
 font-size: 1.17rem;
 }
-.avis {
-/*background-color: #EE;*/
-}
 .relatedtopics {
 font-weight: normal;
 }
-.relatedbody {
-margin-top: 2px;
-margin-bottom: 2px;
-margin-left: 5px;
-}
 .howtoget {
-background: #CCF4C6;
-border-left: 4px solid #148603;
+background: #EBE7E9;
+border-left: 4px sol

MacUpdate - your app listing has been updated

2019-03-21 Thread MacUpdate
Title: Untitled Document








  




  




  




  

  
  

  
  

  

  

   App Listing Updated
  Hi The Document Foundation, We have updated your application listing for LibreOffice 6.2.2.2 on MacUpdate.com. Please take a moment to review your application's information to make sure that everything is correct. 
 	
  
  

  
View your updated app listing 
  

  
  
You can login to your Developer Account to reply to comments and view stats, or submit new updates and changes to your app listing.
  

  

  
  

  

		
		
  

		
		
 
		
		
  
  
Desktop Install Compatibility
  MacUpdate Desktop 6 is helping developers  make it easier for users to fully install and use their apps. Download Desktop 6 and to ensure your app works with the “Install” link on our download pages.
		  
		  
   
		  
		  
		  
  
	  
	  
	  

  

  
  

  

Advertise With MacUpdate
The best Mac devs advertise their apps on MacUpdate.com because it’s the most targeted, highly performing Mac app advertising you can find on the web. Contact a...@macupdate.com to guarantee your annual ad campaigns get booked and expand your app’s audience.

  
  



  
Learn more

  



  

  
  

  
Questions? Contact our Content Update Team upda...@macupdate.com.
  

  
  

  
  

  
You are receiving this offer because you have an app listed on MacUpdate.com. Add us to your address book or white list to ensure reliable delivery.
	
  © 2018 MacUpdate  - All Rights Reserved
  526 W. 14th St. #100 • Traverse City, MI 49684
  

  




  




  




  








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

Compilation error: mailconfigpage.cxx:(.text+0x3171): undefined reference to `non-virtual thunk to cppu::PartialWeakComponentImplHelper::acquire()'

2019-03-21 Thread David Rohr
Hello,

During compilation on gentoo linux 64 bit with GCC 8.3 of libreoffice
6.2.1.2 I get the following error:

mailconfigpage.cxx:(.text+0x3171): undefined reference to `non-virtual
thunk to
cppu::PartialWeakComponentImplHelper::acquire()'

I can fix this by appending
template class
cppu::PartialWeakComponentImplHelper;
at the end of mailconfigpage.cxx

I filed a bug report here
(https://bugs.documentfoundation.org/show_bug.cgi?id=124225) but was
asked to write to the mailing list instead.

Kind Regards
David Rohr









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

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

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/tabpages/tpbitmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e56c7e5858b4d69bf1674ffeec27ae5d2c9ee79
Author: Caolán McNamara 
AuthorDate: Thu Mar 21 14:46:29 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Mar 21 22:48:56 2019 +0100

Resolves: tdf#122804 make bitmap page 'add' dialog title localized

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

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index d8d0ea3ca01f..f73301e373a2 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -714,7 +714,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, 
weld::MetricSpinButton&,
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void)
 {
-SvxOpenGraphicDialog aDlg("Import", GetDialogFrameWeld());
+SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_ADD_IMAGE), 
GetDialogFrameWeld());
 aDlg.EnableLink(false);
 long nCount = m_pBitmapList->Count();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 sw/source/uibase/dbui/dbtree.cxx |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 5a907fe76bc628629fddb5501727642468d38dae
Author: Caolán McNamara 
AuthorDate: Thu Mar 21 14:56:00 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 21 22:20:23 2019 +0100

fix db field page database refresh

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

diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 444ba7b54ec9..a0fb9e06af4d 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -318,19 +318,20 @@ OUString SwDBTreeList::GetDBName(OUString& rTableName, 
OUString& rColumnName, sa
 {
 OUString sDBName;
 std::unique_ptr xIter(m_xTreeView->make_iterator());
-if (m_xTreeView->get_selected(xIter.get()) && 
m_xTreeView->get_iter_depth(*xIter))
+if (m_xTreeView->get_selected(xIter.get()))
 {
-if (m_xTreeView->get_iter_depth(*xIter) > 1)
+if (m_xTreeView->get_iter_depth(*xIter) == 2)
 {
 rColumnName = m_xTreeView->get_text(*xIter);
 m_xTreeView->iter_parent(*xIter); // column name was selected
 }
-if (pbIsTable)
+if (m_xTreeView->get_iter_depth(*xIter) == 1)
 {
-*pbIsTable = m_xTreeView->get_id(*xIter).isEmpty();
+if (pbIsTable)
+*pbIsTable = m_xTreeView->get_id(*xIter).isEmpty();
+rTableName = m_xTreeView->get_text(*xIter);
+m_xTreeView->iter_parent(*xIter);
 }
-rTableName = m_xTreeView->get_text(*xIter);
-m_xTreeView->iter_parent(*xIter);
 sDBName = m_xTreeView->get_text(*xIter);
 }
 return sDBName;
@@ -348,7 +349,10 @@ void SwDBTreeList::Select(const OUString& rDBName, const 
OUString& rTableName, c
 if (rDBName == m_xTreeView->get_text(*xParent))
 {
 if (!m_xTreeView->iter_has_child(*xParent))
+{
+RequestingChildrenHdl(*xParent);
 m_xTreeView->expand_row(*xParent);
+}
 std::unique_ptr 
xChild(m_xTreeView->make_iterator(xParent.get()));
 if (!m_xTreeView->iter_children(*xChild))
 continue;
@@ -362,7 +366,10 @@ void SwDBTreeList::Select(const OUString& rDBName, const 
OUString& rTableName, c
 if (bShowColumns && !rColumnName.isEmpty())
 {
 if (!m_xTreeView->iter_has_child(*xParent))
+{
+RequestingChildrenHdl(*xParent);
 m_xTreeView->expand_row(*xParent);
+}
 
 bNoChild = true;
 if (m_xTreeView->iter_children(*xChild))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/tabpages/tpbitmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2708a37e99ac6c923940573eca7627620557ccce
Author: Caolán McNamara 
AuthorDate: Thu Mar 21 14:46:29 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 21 22:19:29 2019 +0100

Resolves: tdf#122804 make bitmap page 'add' dialog title localized

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

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index d4871d1dbfe0..d60e121c44e9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -713,7 +713,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, 
weld::MetricSpinButton&,
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void)
 {
-SvxOpenGraphicDialog aDlg("Import", GetDialogFrameWeld());
+SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_ADD_IMAGE), 
GetDialogFrameWeld());
 aDlg.EnableLink(false);
 long nCount = m_pBitmapList->Count();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract139' - drawinglayer/source

2019-03-21 Thread Libreoffice Gerrit user
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   78 ++---
 drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx |6 +
 2 files changed, 69 insertions(+), 15 deletions(-)

New commits:
commit c1c641fdf500e22cae445f844309f943e21d87d8
Author: Katarina Behrens 
AuthorDate: Thu Mar 21 13:27:03 2019 +0100
Commit: Katarina Behrens 
CommitDate: Thu Mar 21 21:49:32 2019 +0100

Nested list L must be a child of parent's LBody

Implement this as

https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G13.2259746
describes. The example implementation in Annex H8.2

https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G21.1021285
where nested L is a sibling of its parent LI contradicts the
specification and is prolly wrong

Change-Id: I2bd4a6692ac0cbe02ff6f1746656f104de3fe1f2

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index c2259341781c..036b8d14e8ea 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -555,6 +555,35 @@ namespace drawinglayer
 }
 }
 
+void VclMetafileProcessor2D::popListItem()
+{
+if (!maListElements.empty())
+{
+if (maListElements.top() == vcl::PDFWriter::LIBody)
+{
+maListElements.pop();
+mpPDFExtOutDevData->EndStructureElement();
+}
+if (maListElements.top() == vcl::PDFWriter::ListItem)
+{
+maListElements.pop();
+mpPDFExtOutDevData->EndStructureElement();
+}
+}
+}
+
+void VclMetafileProcessor2D::popList()
+{
+if (!maListElements.empty())
+{
+if (maListElements.top() == vcl::PDFWriter::List)
+{
+maListElements.pop();
+mpPDFExtOutDevData->EndStructureElement();
+}
+}
+}
+
 // init static break iterator
 uno::Reference< css::i18n::XBreakIterator > 
VclMetafileProcessor2D::mxBreakIterator;
 
@@ -1233,7 +1262,10 @@ namespace drawinglayer
 
 // this is a part of list item, start LILabel ( = bullet)
 if(mbInListItem)
+{
+maListElements.push(vcl::PDFWriter::LILabel);
 
mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::LILabel);
+}
 
 // process recursively and add MetaFile comment
 process(rBulletPrimitive);
@@ -1241,8 +1273,12 @@ namespace drawinglayer
 
 if(mbInListItem)
 {
-mpPDFExtOutDevData->EndStructureElement(); // end LILabel
-mbBulletPresent = true;
+if (maListElements.top() == vcl::PDFWriter::LILabel)
+{
+maListElements.pop();
+mpPDFExtOutDevData->EndStructureElement(); // end LILabel
+mbBulletPresent = true;
+}
 }
 }
 
@@ -1286,29 +1322,41 @@ namespace drawinglayer
 if(nNewOutlineLevel > mnCurrentOutlineLevel)
 {
 // increase List level
-for(sal_Int16 a(mnCurrentOutlineLevel); a != 
nNewOutlineLevel; a++)
+for(sal_Int16 a(mnCurrentOutlineLevel); a != 
nNewOutlineLevel; ++a)
 {
+maListElements.push(vcl::PDFWriter::List);
 mpPDFExtOutDevData->BeginStructureElement( 
vcl::PDFWriter::List );
 }
 }
 else // if(nNewOutlineLevel < mnCurrentOutlineLevel)
 {
-// decrease List level
-for(sal_Int16 a(mnCurrentOutlineLevel); a != 
nNewOutlineLevel; a--)
+// close list levels below nNewOutlineLevel completely by 
removing
+// list items as well as list tag itself
+for(sal_Int16 a(nNewOutlineLevel); a < 
mnCurrentOutlineLevel; ++a)
 {
-mpPDFExtOutDevData->EndStructureElement();
+popListItem(); // end LBody and LI
+popList(); // end L
 }
-}
+
+// on nNewOutlineLevel close the previous list item
+popListItem();
+ }
 
 // Remember new current OutlineLevel
 mnCurrentOutlineLevel = nNewOutlineLevel;
 }
+else // the same list level
+{
+// close the previous list item
+popListItem();
+}
 
 const

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   32 
 1 file changed, 32 deletions(-)

New commits:
commit 3df74ac693f21a9add889d95d3368c26d70cae46
Author: Andras Timar 
AuthorDate: Thu Mar 21 15:12:46 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 20:40:33 2019 +0100

license: JDOM is not included in LibreOffice

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index d74f42c93171..44785fd53599 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -581,38 +581,6 @@
 The Graphics Interchange Format(c) is the Copyright property of 
CompuServe Incorporated.  GIF(sm) is a
 Service Mark property of CompuServe Incorporated."
 
-JDOM
-The following software may be included in this product: JDOM. Use of 
any of this software is governed by the
-terms of the license below:
-Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights 
reserved.
-Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the
-following conditions are met:
-1. Redistribution of source code must retain the above copyright 
notice, this list of conditions, and the
-following disclaimer.
-2. Redistribution in binary form must reproduce the above copyright 
notice, this list of conditions, and the
-disclaimer that follows these conditions in the documentation and/or other 
materials provided with the
-distribution.
-3. The name "JDOM" must not be used to endorse or promote products 
derived from this software without prior
-written permission. For written permission, please contact 
.
-4. Products derived from this software may not be called "JDOM", nor 
may "JDOM" appear in their name, without
-prior written permission from the JDOM Project Management 
.
-In addition, we request (but do not require) that you include in the 
end-user documentation provided with the
-redistribution and/or in the software itself an acknowledgement equivalent 
to the following:
-"This product includes software developed by the JDOM Project (http://www.jdom.org/";>http://www.jdom.org/)."
-Alternatively, the acknowledgment may be graphical using the logos 
available at http://www.jdom.org/images/logos";>http://www.jdom.org/images/logos.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
ARE DISCLAIMED. IN NO EVENT SHALL THE
-JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-This software consists of voluntary contributions made by many 
individuals on behalf of the JDOM Project and was
-originally created by Jason Hunter  and 
Brett McLaughlin
-. For more information on the JDOM Project, 
please see http://www.jdom.org/";>http://www.jdom.org/.
 
 libatomic_ops
 The following software may be included in this product: 
libatomic_ops. Use of any of this software is
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 80326820f1bd48dc13236a37c422777949698ca3
Author: Andras Timar 
AuthorDate: Thu Mar 21 16:34:00 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 20:39:30 2019 +0100

license: fix libe-book

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 8ddd6ae65a13..d74f42c93171 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -684,6 +684,12 @@
 otherwise to promote the sale, use or other dealings in this Software 
without prior written authorization of
 the copyright holder.
 
+
+libe-book
+The following software may be included in this product: libe-book. 
Use of any of this software is governed
+by the terms of the license below:
+Jump to MPL Version 2.0
+
 
 libeot
 The following software may be included in this product: libeot. Use 
of any of this software is governed by
@@ -696,12 +702,6 @@
 by the terms of the license below:
 Jump to MPL Version 2.0
 
-libe-book
-The following software may be included in this product: libe-book. Use 
of any of this software is governed by
-the terms of the license below:
-LGPL v2.1+ / MPL 2+
-Jump to LGPL Version 2.1
-Jump to MPL Version 2.0
 
 libetonyek
 The following software may be included in this product: libetonyek. 
Use of any of this software is governed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 892fb2370c181b39cd2107aa9900165cb188bca2
Author: Andras Timar 
AuthorDate: Thu Mar 21 16:30:46 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 20:38:24 2019 +0100

license: add libepubgen

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index f93e8be5695c..8ddd6ae65a13 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -690,6 +690,12 @@
 the terms of the license below:
 Jump to MPL Version 2.0
 
+
+libepubgen
+The following software may be included in this product: libepubgen. 
Use of any of this software is governed
+by the terms of the license below:
+Jump to MPL Version 2.0
+
 libe-book
 The following software may be included in this product: libe-book. Use 
of any of this software is governed by
 the terms of the license below:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 39e3c719ac20bb247151bff7dfc66f6d75b69e30
Author: Andras Timar 
AuthorDate: Thu Mar 21 16:24:40 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 20:37:25 2019 +0100

license: libatomic_ops: the portion needed for Firebird is MIT licensed

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 20ade0084df3..f93e8be5695c 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -617,7 +617,37 @@
 libatomic_ops
 The following software may be included in this product: 
libatomic_ops. Use of any of this software is
 governed by the terms of the license below:
-Jump to GPL Version 2
+Our intent is to make it easy to use libatomic_ops, in both free 
and proprietary software. Hence most code
+that we expect to be linked into a client application is covered by an 
MIT-style license.
+A few library routines are covered by the GNU General Public License. These
+are put into a separate library, libatomic_ops_gpl.a.
+The low-level part of the library is mostly covered by the 
following license:
+
+Copyright (c) ...
+Permission is hereby granted, free of charge, to any person 
obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without 
restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, 
sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, 
subject to the following conditions:
+The above copyright notice and this permission notice shall be 
included in all copies or substantial
+portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+A few files in the sysdeps directory were inherited in part from 
the Boehm-Demers-Weiser conservative
+garbage collector, and are covered by its license, which is similar in 
spirit:
+
+Copyright (c) ...
+THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY 
EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN
+RISK.
+Permission is hereby granted to use or copy this program for any 
purpose, provided the above notices are
+retained on all copies. Permission to modify the code and to 
distribute modified code is granted, provided the
+above notices are retained, and a notice that the code was modified is 
included with the above copyright
+notice.
+
+Note: the portion needed for Firebird (libatomic_ops) is MIT 
licensed.
 
 
 libcdr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 external/libatomic_ops/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5327dfd8639d3667d4fecef0bcfd2747d7a68133
Author: Andras Timar 
AuthorDate: Thu Mar 21 15:21:26 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 20:37:02 2019 +0100

Typo: ibatomic_ops -> libatomic_ops

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

diff --git a/external/libatomic_ops/README b/external/libatomic_ops/README
index 61255d7c8e05..3dcb7ef7a1b3 100644
--- a/external/libatomic_ops/README
+++ b/external/libatomic_ops/README
@@ -1,4 +1,4 @@
 From [https://github.com/ivmai/libatomic_ops/].
 
 Note that some files (linked into libatomic_ops_gpl) are GPL'd, the portion
-needed for Firebird (ibatomic_ops) is however MIT licensed. 
+needed for Firebird (libatomic_ops) is however MIT licensed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing interface for importing external data in calc

2019-03-21 Thread smooth_vaibhav
Thanks.

A very frank query.Any advice on how do I get along understanding the code
better in the files you mentioned would be helpful.
also, is the interface implementation in the files you mentioned the orcus
interface??



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-03-21 Thread Libreoffice Gerrit user
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   36 
 include/vcl/floatwin.hxx|1 
 vcl/source/window/floatwin.cxx  |   14 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit 428d5f2449df8556b87c22663a7a48d1eec06bb7
Author: Ilhan Yesil 
AuthorDate: Tue Nov 27 09:39:41 2018 +0100
Commit: Katarina Behrens 
CommitDate: Thu Mar 21 18:51:00 2019 +0100

tdf#121671 Floating toolbars remain their position after reopen

Calculate the relative position of the floating toolbars by calling
the ImplCallMove function, where the current position is read from
the real window.

Change-Id: I6a142055c3340dda2339980fbc5a7ebb431e228b
Reviewed-on: https://gerrit.libreoffice.org/64093
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 9396171848f2..1bd85e56b171 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star;
@@ -428,10 +429,6 @@ bool ToolbarLayoutManager::requestToolbar( const OUString& 
rResourceURL )
 
 bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible && 
!aRequestedToolbar.m_bMasterHide );
 
-uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow, 
uno::UNO_QUERY );
-if ( xContainerWindow.is() && aRequestedToolbar.m_bFloating )
-bCreateOrShowToolbar &= bool( xContainerWindow->isActive());
-
 if ( bCreateOrShowToolbar )
 bNotify = bMustCallCreate ? createToolbar( rResourceURL ) : 
showToolbar( rResourceURL );
 
@@ -1835,7 +1832,7 @@ void 
ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD
 xDockAreaWindow = m_xDockAreaWindows[static_cast(eDockingArea)];
 for (auto const& elem : m_aUIElements)
 {
-if ( elem.m_aDockedData.m_nDockedArea == eDockingArea && 
elem.m_bVisible && !elem.m_bFloating )
+if ( elem.m_aDockedData.m_nDockedArea == eDockingArea && 
elem.m_bVisible )
 {
 uno::Reference< ui::XUIElement > xUIElement( elem.m_xUIElement );
 if ( xUIElement.is() )
@@ -1844,8 +1841,33 @@ void 
ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD
 uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, 
uno::UNO_QUERY );
 if ( xDockWindow.is() )
 {
-// docked windows
-aWindowVector.push_back(elem);
+if (!elem.m_bFloating)
+{
+// docked windows
+aWindowVector.push_back(elem);
+}
+else
+{
+// floating windows
+VclPtr pWindow = 
VCLUnoHelper::GetWindow(xWindow);
+DockingManager* pDockMgr = 
vcl::Window::GetDockingManager();
+if (pDockMgr != nullptr)
+{
+ImplDockingWindowWrapper* pWrapper = 
pDockMgr->GetDockingWindowWrapper(pWindow);
+if (pWrapper != nullptr && 
pWrapper->GetFloatingWindow())
+{
+// update the position data of the floating 
window
+if 
(pWrapper->GetFloatingWindow()->UpdatePositionData())
+{
+awt::Rectangle aTmpRect = 
xWindow->getPosSize();
+UIElement uiElem = elem;
+uiElem.m_aFloatingData.m_aPos = 
awt::Point(aTmpRect.X, aTmpRect.Y);
+implts_setToolbar(uiElem);
+implts_writeWindowStateData(uiElem);
+}
+}
+}
+}
 }
 }
 }
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index a9ac32958110..75dd4c1fec10 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -153,6 +153,7 @@ public:
 voidSetPopupModeEndHdl( const Link& 
rLink ) { maPopupModeEndHdl = rLink; }
 
 boolGrabsFocus() const { return mbGrabFocus; }
+boolUpdatePositionData();
 
 static PointCalcFloatingPosition( vcl::Window* pWindow, const 
tools::Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex );
 };
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index e632f97696b3..d6b44034c5bf 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatw

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

On Fri, Mar 22, 2019 at 12:46 AM smooth_vaibhav 
wrote:

> Is there any documentation for the already available UI implementation and
> the data import code files. I have already gone through the data import
> code
> files like the ones residing in sc/source/ui/dataprovider/.
>

As you might have discovered this is the data provider and data
transformation code.

Can you provide me with some code pointers for the UI implementation of the
> data import functionality that you mentioned.
>


The corresponding UI code is in sc/source/ui/miscdlgs/dataproviderdlg.cxx
and sc/source/ui/inc/dataproviderdlg.hxx but as I mentioned it is quite
rough and might need some UX rethinking.

Regards,
Markus


>
>
>
>
> --
> Sent from:
> http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing interface for importing external data in calc

2019-03-21 Thread smooth_vaibhav
Is there any documentation for the already available UI implementation and
the data import code files. I have already gone through the data import code
files like the ones residing in sc/source/ui/dataprovider/. 
Can you provide me with some code pointers for the UI implementation of the
data import functionality that you mentioned. 





--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

On Thu, Mar 21, 2019 at 5:37 PM smooth_vaibhav 
wrote:

> I have been keen about the project idea of implementing the import
> functionality of external data in calc. I have some queries regarding it.
>
> 1) There are numerous possibilities of external data sources like database,
> files. So should the implementation should be independent of external
> source
> of data or is it the case that we first gonna store it in a ScDBdata.
>

The project is about adding some external data sources and the possibility
to extend that through extensions. We already have a few providers for
external sources from last year's GSoC project. The second step of
transforming the data before we actually write it to the calc document
itself is independent of the actual source.


> 2) Its given that the user can select the range of data to be selected and
> imported. Does that imply we provide them with a UI such that they can
> choose the number of columns and rows to be imported.
>
> I acknowledge the fact that the Mail list is to be used just for important
> purposes but I have some queries to clear for better understanding of the
> project idea.
>


Yes. There is already a really ugly UI that I hacked together a year ago.
In a current master build just go to Data->Data Provider and play around.
You might need to define a DB Range before actually being able to import
the data into the document.

As can be seen by the ugly UI there is quite some work necessary to make
the feature user friendly and I think this should be a central part of this
year's GSoC project.

Regards,
Markus

>
> Thanks.
>
>
>
> --
> Sent from:
> http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/dialogs/cuigaldlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e33e0e00788c268a6567520bcaaf0ebe23bc261c
Author: Caolán McNamara 
AuthorDate: Thu Mar 21 14:41:33 2019 +
Commit: Xisco Faulí 
CommitDate: Thu Mar 21 17:29:57 2019 +0100

Resolves: tdf#122803 make gallery 'add' dialog title localized

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

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 0595c2680be2..f54c1b3cf727 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -927,7 +927,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, 
weld::Button&, void)
 
 if (!m_xLbxFound->count_selected_rows() || !bEntriesFound)
 {
-SvxOpenGraphicDialog aDlg("Gallery", GetDialogFrameWeld());
+SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_KEY_GALLERY_DIR), 
GetDialogFrameWeld());
 aDlg.EnableLink(false);
 aDlg.AsLink(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' - cui/source

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/dialogs/cuigaldlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ddf479c183ef906ddc7eaff96c0fb9992d34aae1
Author: Caolán McNamara 
AuthorDate: Thu Mar 21 14:41:33 2019 +
Commit: Xisco Faulí 
CommitDate: Thu Mar 21 17:30:09 2019 +0100

Resolves: tdf#122803 make gallery 'add' dialog title localized

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

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 42329f0e95b0..20034936de80 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -926,7 +926,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, 
weld::Button&, void)
 
 if (!m_xLbxFound->count_selected_rows() || !bEntriesFound)
 {
-SvxOpenGraphicDialog aDlg("Gallery", GetDialogFrameWeld());
+SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_KEY_GALLERY_DIR), 
GetDialogFrameWeld());
 aDlg.EnableLink(false);
 aDlg.AsLink(false);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

please ignore this email. The original email is about a GSoC project and
not about macro progamming.

Kind regards,
Markus

On Fri, Mar 22, 2019 at 12:12 AM sos  wrote:

> hallo,
>
> you can import data into a spreadsheet in 2 ways
>
> Fast = connecting the Calcdoc to a databasedoc and using buildin
> "Importer" service oDBRange.getReferredCells.doImport(oDesc())
>
> Slow = import cell by cell using a dataset or a array
>
> fast
>
> function ConnectCalc_to_DBdoc(Optional sqlcalc as String, sDocURL as
> String , optional sArea as string)
> dim extt as string
> extt = right(bstandnm , 3)
> SearchFlags = com.sun.star.frame.FrameSearchFlag.CREATE +
> com.sun.star.frame.FrameSearchFlag.ALL
>
> if ucase(extt) = "OTS" then 'calc template
>  Dim args(3) As New com.sun.star.beans.PropertyValue
> Dim URL As String
>' URL = convertToUrl("T:\Template\TOOLS\Berichten_spreadsheet.ots")
> URL = convertToUrl(sDocurl)
> args(0).Name = "AsTemplate"
> args(0).Value = True
> args(1).Name = "MacroExecutionMode"
> args(1).Value =
> com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
> args(2).Name = "FilterName"
> args(2).Value = "calc8_template"
> args(3).Name = "Hidden"
> args(3).Value = false
> ODS = StarDeskTop.LoadComponentFromUrl(URL, "_blank", 0, args())
> else
>  ODS =
> StarDesktop.loadComponentFromURL("private:factory/scalc","_blank",SearchFlags,Array())
>endif
>
> oSheet = ODS.Sheets.getByIndex(0)
> if ismissing(sArea) then
> sArea = "A1"
> endif
> area = osheet.getCellRangeByName(sArea).getRangeAddress()' adres is
> nodig, niet de range opzich
> if not oDS.DatabaseRanges.hasByName("MyImport") then
> oDS.DatabaseRanges.addNewByName("MyImport",area)
> endif
> oDBRange = oDS.DataBaseRanges.getByName("MyImport")
> oDBcontext = CreateUnoService("com.sun.star.sdb.DatabaseContext")
> if oDBcontext.hasbyname("mysql_native")then
> oDBcontext.revokeDatabaseLocation("mysql_native")
> endif
>
>
> oDBcontext.registerDatabaseLocation("mysql_native",converttoURL("\\your
> DBdoclocation")
>
> oDB = oDBcontext.GetByName("mysql_native")
> oDB.Password = "yourpassword"
>
> ' we make first a QUERY because a simple  SQLstring in the
> ImportDescritor only works with  OO-SQL en not with a native SQL  (this is
> a bug)
>
> oQdefs = oDB.QueryDefinitions
> oQ = createUnoService("com.sun.star.sdb.QueryDefinition")
> oQ.EscapeProcessing = False
> oQ.command = sqlcalc
> If oQDefs.hasByName("calcdoc") Then
>   oQDefs.removeByName("calcdoc")', oQueryObject)
>End If
> oQDefs.insertByName("calcdoc", oQ)
>
> Dim oDesc(3) as new com.sun.star.beans.PropertyValue
> oDesc(0).Name = "DatabaseName"
> oDesc(0).Value = "mysql_native"
> oDesc(1).Name = "SourceType"
> oDesc(1).Value = com.sun.star.sheet.DataImportMode.QUERY
> oDesc(2).Name = "SourceObject"
> oDesc(2).Value = "calcdoc"
>  '   oDesc(3).Name = "IsNative"  'must been false  !
>   '  oDesc(3).Value = false
> oDBRange.getReferredCells.doImport(oDesc())
> oDBcontext.revokeDatabaseLocation("mysql_native")
> oDS.DatabaseRanges.removeByName("MyImport")
>
> Dim FileProperties(1) As New com.sun.star.beans.PropertyValue
> Url = "file:///" & sDocurl
>FileProperties(0).Name = "Overwrite"
> FileProperties(0).Value = True
> FileProperties(1).Name = "FilterName"
> if lcase(extt) = "xls" then
> FileProperties(1).Value = "MS Excel 97"
> else
> FileProperties(1).Value = ""
> end if
>
> If NOT IsMissing(sDocurl) and len(sDocurl) > 5 and
> ucase(right(sDocurl,3)) <> "OTS" Then
> oDS.storeAsURL(Url, FileProperties())
> end if
> ConnectionviaDBdoc = ODS
> end FUNCTION
>
> slow
>
> Sub ResultSetToCalc(oResultGet)
> Dim args(3) As New com.sun.star.beans.PropertyValue
> args(1).Name = "MacroExecutionMode"
> args(1).Value =
> com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
> args(2).name = "Hidden"
> args(2).Value = true
> ods = nothing
> ODS =
> StarDesktop.LoadComponentFromUrl("private:factory/scalc","_default",0,args())
> oSheet = ODS.Sheets.getByIndex(0)
> oCellCursor = oSheet.createCursor()
>
> xPos = 0
> yPos = 3
>
> For i = 0 To oResultGet.MetaData.ColumnCount - 1
> Cell = oSheet.getCellByPosition(xPos + i, yPos)
> Cell.String = oResultGet.MetaData.getColumnName(i+1)
> Next i
> oResultGet.beforeFirst()
> while oResultGet.next()
> yPos = yPos + 1
> For i = 0 To oResultGet.MetaData.ColumnCount - 1
> Cell = oSheet.getCellByPosition(xPos + i, yPos)
> Cell.String =
> oResultGet.getString(oResultGet.findColumn(oResultGet.MetaData.getColumnName(i+1)))
> Next i
> wend
>
> oCellCursor.gotoStartOfUsedArea(true)
> oCellCursor.gotoEndOfUsedArea(true)

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

2019-03-21 Thread Libreoffice Gerrit user
 slideshow/source/engine/animationnodes/basecontainernode.cxx |   16 ---
 slideshow/source/engine/animationnodes/basenode.cxx  |   24 ---
 slideshow/source/inc/basecontainernode.hxx   |1 
 3 files changed, 29 insertions(+), 12 deletions(-)

New commits:
commit 6be929b4ec00d69c24c25e16b39a00f79363d878
Author: Mark Hung 
AuthorDate: Sat Feb 16 08:44:36 2019 +0800
Commit: Thorsten Behrens 
CommitDate: Thu Mar 21 17:15:39 2019 +0100

tdf#77186 handle time container indefinite repetition.

Indefinite duration isn't necessary for indefinite repetition,
so simply check the number of iteration left and do not decrease
the number when the repetition is indefinite.

Note: a known issue is that the next effect starts before
"until click" or "until next slide" if the starting time of
the next slide is "after previous". A workaround is to set
the starting time of the next slide to "click".

Change-Id: Ie9c73b472dc400bc41501029ff19ecc3e3fab2df
Reviewed-on: https://gerrit.libreoffice.org/67896
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit cacdb1ae9d9e249737d0b3732e6fd198cfdd9d82)
Reviewed-on: https://gerrit.libreoffice.org/69100
Tested-by: Xisco Faulí 
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx 
b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index bb3c7e3739a7..d48df81161cb 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -41,6 +41,7 @@ BaseContainerNode::BaseContainerNode(
   maChildren(),
   mnFinishedChildren(0),
   mnLeftIterations(0),
+  mbRepeatIndefinite(xNode->getRepeatCount().hasValue() && 
isIndefiniteTiming(xNode->getRepeatCount())),
   mbDurationIndefinite( isIndefiniteTiming( xNode->getEnd() ) &&
 isIndefiniteTiming( xNode->getDuration() ) )
 {
@@ -137,12 +138,9 @@ bool BaseContainerNode::notifyDeactivatedChild(
 ++mnFinishedChildren;
 bool bFinished = (mnFinishedChildren >= nSize);
 
-// all children finished, and we've got indefinite duration?
-// think of ParallelTimeContainer::notifyDeactivating()
-// if duration given, we will be deactivated by some end event
-// @see fillCommonParameters()
-if (bFinished && isDurationIndefinite()) {
-if( mnLeftIterations >= 1.0 )
+// Handle repetition here.
+if (bFinished) {
+if(!mbRepeatIndefinite && mnLeftIterations >= 1.0)
 {
 mnLeftIterations -= 1.0;
 }
@@ -155,7 +153,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
"BaseContainerNode::repeat");
 getContext().mrEventQueue.addEvent( aRepetitionEvent );
 }
-else
+else if (isDurationIndefinite())
 {
 deactivate();
 }
@@ -166,6 +164,10 @@ bool BaseContainerNode::notifyDeactivatedChild(
 
 void BaseContainerNode::repeat()
 {
+// Prevent repeat event scheduled before deactivation.
+if (getState() == FROZEN || getState() == ENDED)
+return;
+
 forEachChildNode( std::mem_fn(&AnimationNode::end), ~ENDED );
 bool bState = init_children();
 if( bState )
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx 
b/slideshow/source/engine/animationnodes/basenode.cxx
index bfe066e5b5a9..560cd407c5a0 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -539,12 +539,26 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr 
const& pEvent )
 // if anim base node has no activity, this is called to schedule 
deactivation,
 // but what if it does not schedule anything?
 
-// TODO(F2): Handle end time attribute, too
 auto self(mpSelf);
-mpCurrentEvent = generateEvent(
-mxAnimationNode->getDuration(),
-[self] () { self->deactivate(); },
-maContext, 0.0 );
+if (mxAnimationNode->getEnd().hasValue())
+{
+// TODO: We may need to calculate the duration if the end value is 
numeric.
+// We expect that the end value contains EventTrigger::ON_NEXT 
here.
+// LibreOffice does not generate numeric values, so we can leave it
+// until we find a test case.
+mpCurrentEvent = generateEvent(
+mxAnimationNode->getEnd(),
+[self] () { self->deactivate(); },
+maContext, 0.0 );
+
+}
+else
+{
+mpCurrentEvent = generateEvent(
+mxAnimationNode->getDuration(),
+[self] () { self->deactivate(); },
+maContext, 0.0 );
+}
 }
 }
 
diff --git a/slideshow/source/inc/basecontainernode.hxx 
b/slideshow/source/inc/basecontainernode

[Libreoffice-commits] dev-tools.git: ciabot/run-libreoffice-ciabot.pl

2019-03-21 Thread Libreoffice Gerrit user
 ciabot/run-libreoffice-ciabot.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 668fb6d83f5b969cdb075fdd7b3d3c9f3c8ad183
Author: Michael Stahl 
AuthorDate: Tue Mar 12 16:11:13 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Mar 21 17:13:09 2019 +0100

ciabot: ignore "feature/" branches too

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

diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c23d7ee..dfe0e9f 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -90,7 +90,7 @@ sub report($$$) {
 foreach my $key ( keys %new ) {
 my $branch_name = $key;
 $branch_name = '' if ( $branch_name eq 'master' );
-if ($branch_name =~ /aoo\/|distro\/|private\//) {
+if ($branch_name =~ /aoo\/|distro\/|private\/|feature\//) {
 next;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 vcl/inc/qt5/Qt5Menu.hxx |1 +
 vcl/qt5/Qt5Menu.cxx |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit f7de88aa5c19c3fd0ecc453bb1623bc9142b3e3b
Author: Katarina Behrens 
AuthorDate: Fri Mar 15 23:29:55 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Mar 21 17:12:15 2019 +0100

tdf#123379: implement native menu bar toggle on/off

qt5 didn't provide implementation of virtual SalMenu::ShowMenuBar
so native menu bar was visible at all times. Hopefully notebookbar
fans are happier now

Change-Id: Ie581397521369160e16f40231bade40100dcd6f6
Reviewed-on: https://gerrit.libreoffice.org/69327
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 612650147cb85e52d317142d022db99a28c0d98a)
Reviewed-on: https://gerrit.libreoffice.org/69512
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index fb2f7e17027b..76563008a893 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -51,6 +51,7 @@ public:
 virtual void SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, 
unsigned nPos) override;
 virtual void SetFrame(const SalFrame* pFrame) override;
 const Qt5Frame* GetFrame() const;
+virtual void ShowMenuBar(bool bVisible) override;
 Qt5Menu* GetTopLevel();
 virtual void SetItemBits(unsigned nPos, MenuItemBits nBits) override;
 virtual void CheckItem(unsigned nPos, bool bCheck) override;
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 49de2c0305a7..87b4ba4e457e 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -541,6 +541,12 @@ Qt5Menu* Qt5Menu::GetTopLevel()
 return pMenu;
 }
 
+void Qt5Menu::ShowMenuBar(bool bVisible)
+{
+if (mpQMenuBar && (bVisible != mpQMenuBar->isVisible()))
+bVisible ? mpQMenuBar->show() : mpQMenuBar->hide();
+}
+
 const Qt5Frame* Qt5Menu::GetFrame() const
 {
 SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing interface for importing external data in calc

2019-03-21 Thread sos
hallo,

you can import data into a spreadsheet in 2 ways

Fast = connecting the Calcdoc to a databasedoc and using buildin "Importer" 
service oDBRange.getReferredCells.doImport(oDesc())

Slow = import cell by cell using a dataset or a array

fast

function ConnectCalc_to_DBdoc(Optional sqlcalc as String, sDocURL as String , 
optional sArea as string)
dim extt as string
extt = right(bstandnm , 3)
SearchFlags = com.sun.star.frame.FrameSearchFlag.CREATE +  
com.sun.star.frame.FrameSearchFlag.ALL

if ucase(extt) = "OTS" then 'calc template
 Dim args(3) As New com.sun.star.beans.PropertyValue
Dim URL As String
   ' URL = convertToUrl("T:\Template\TOOLS\Berichten_spreadsheet.ots")
URL = convertToUrl(sDocurl)
args(0).Name = "AsTemplate"
args(0).Value = True
args(1).Name = "MacroExecutionMode"
args(1).Value = com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
args(2).Name = "FilterName"
args(2).Value = "calc8_template"
args(3).Name = "Hidden"
args(3).Value = false
ODS = StarDeskTop.LoadComponentFromUrl(URL, "_blank", 0, args())
else
 ODS = 
StarDesktop.loadComponentFromURL("private:factory/scalc","_blank",SearchFlags,Array())
   endif

oSheet = ODS.Sheets.getByIndex(0)
if ismissing(sArea) then
sArea = "A1"
endif
area = osheet.getCellRangeByName(sArea).getRangeAddress()' adres is nodig, 
niet de range opzich
if not oDS.DatabaseRanges.hasByName("MyImport") then
oDS.DatabaseRanges.addNewByName("MyImport",area)
endif
oDBRange = oDS.DataBaseRanges.getByName("MyImport")
oDBcontext = CreateUnoService("com.sun.star.sdb.DatabaseContext")
if oDBcontext.hasbyname("mysql_native")then
oDBcontext.revokeDatabaseLocation("mysql_native")
endif

 oDBcontext.registerDatabaseLocation("mysql_native",converttoURL("\\your 
DBdoclocation")

oDB = oDBcontext.GetByName("mysql_native")
oDB.Password = "yourpassword"

' we make first a QUERY because a simple  SQLstring in the  ImportDescritor 
only works with  OO-SQL en not with a native SQL  (this is a bug)

oQdefs = oDB.QueryDefinitions
oQ = createUnoService("com.sun.star.sdb.QueryDefinition")
oQ.EscapeProcessing = False
oQ.command = sqlcalc
If oQDefs.hasByName("calcdoc") Then
  oQDefs.removeByName("calcdoc")', oQueryObject)
   End If
oQDefs.insertByName("calcdoc", oQ)

Dim oDesc(3) as new com.sun.star.beans.PropertyValue
oDesc(0).Name = "DatabaseName"
oDesc(0).Value = "mysql_native"
oDesc(1).Name = "SourceType"
oDesc(1).Value = com.sun.star.sheet.DataImportMode.QUERY
oDesc(2).Name = "SourceObject"
oDesc(2).Value = "calcdoc"
 '   oDesc(3).Name = "IsNative"  'must been false  !
  '  oDesc(3).Value = false
oDBRange.getReferredCells.doImport(oDesc())
oDBcontext.revokeDatabaseLocation("mysql_native")
oDS.DatabaseRanges.removeByName("MyImport")

Dim FileProperties(1) As New com.sun.star.beans.PropertyValue
Url = "file:///" & sDocurl
   FileProperties(0).Name = "Overwrite"
FileProperties(0).Value = True
FileProperties(1).Name = "FilterName"
if lcase(extt) = "xls" then
FileProperties(1).Value = "MS Excel 97"
else
FileProperties(1).Value = ""
end if

If NOT IsMissing(sDocurl) and len(sDocurl) > 5 and ucase(right(sDocurl,3)) 
<> "OTS" Then
oDS.storeAsURL(Url, FileProperties())
end if
ConnectionviaDBdoc = ODS
end FUNCTION

slow

Sub ResultSetToCalc(oResultGet)
Dim args(3) As New com.sun.star.beans.PropertyValue
args(1).Name = "MacroExecutionMode"
args(1).Value = com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
args(2).name = "Hidden"
args(2).Value = true
ods = nothing
ODS = 
StarDesktop.LoadComponentFromUrl("private:factory/scalc","_default",0,args())
oSheet = ODS.Sheets.getByIndex(0)
oCellCursor = oSheet.createCursor()

xPos = 0
yPos = 3

For i = 0 To oResultGet.MetaData.ColumnCount - 1
Cell = oSheet.getCellByPosition(xPos + i, yPos)
Cell.String = oResultGet.MetaData.getColumnName(i+1)
Next i
oResultGet.beforeFirst()
while oResultGet.next()
yPos = yPos + 1
For i = 0 To oResultGet.MetaData.ColumnCount - 1
Cell = oSheet.getCellByPosition(xPos + i, yPos)
Cell.String = 
oResultGet.getString(oResultGet.findColumn(oResultGet.MetaData.getColumnName(i+1)))
Next i
wend

oCellCursor.gotoStartOfUsedArea(true)
oCellCursor.gotoEndOfUsedArea(true)
nFirstCol = oCellCursor.getRangeAddress().StartColumn
nLastCol = oCellCursor.getRangeAddress().EndColumn
nStartRow = oCellCursor.getRangeAddress().StartRow
nLastRow = oCellCursor.getRangeAddress().EndRow

oRange = oSheet.getCellRangeByPosition(nFirstCol, nStartRow, nLastCol, 
nStartRow)'Rij met de kolomnamen
oRange.CharWeight = com.sun.star.awt.FontWeight.BOLD
oRange.CellBackColor

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - include/svl svl/CppunitTest_svl_items.mk svl/qa svl/source sw/inc sw/source

2019-03-21 Thread Libreoffice Gerrit user
 include/svl/stylepool.hxx |6 +-
 svl/CppunitTest_svl_items.mk  |1 
 svl/qa/unit/items/stylepool.cxx   |   91 ++
 svl/source/items/stylepool.cxx|   57 +
 sw/inc/istyleaccess.hxx   |3 -
 sw/source/core/doc/swstylemanager.cxx |8 +-
 sw/source/core/txtnode/ndtxt.cxx  |2 
 7 files changed, 152 insertions(+), 16 deletions(-)

New commits:
commit b2a5a44003203487c555ca640800b4e8f82cf9f1
Author: Miklos Vajna 
AuthorDate: Wed Mar 20 14:49:15 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Mar 21 17:11:13 2019 +0100

sw: make ODT export of paragraph auto-styles deterministic

If a complex enough document is loaded into Writer and saved as ODT,
then the content.xml's automatic paragraph styles (P) are
re-ordered on each save, which leads to unnecessary noise.

The actual random order is created during import by the time we convert
direct formatting (e.g. from HTML import) to autostyles, as
StylePoolImpl::maRoot stores autostyles in a map that orders autostyle
parents based on their pointer address.

This has benefits like automatic ordering of item sets and fast
comparison, so don't change that, but extend the svl API to also track
the name of those parents.

This way by the time StylePool::createIterator() would iterate over
those autostyles, it can order the parents by their name, so two
import->export runs will result in the same autostyle ordering.

(This appears to be the only indeterminism in content.xml for a test
HTML input, while meta.xml and settings.xml still changes all the time.)

(cherry picked from commit eb128a7d6bbc27b4dbbf9461c81c90e40203b114)

Conflicts:
svl/source/items/stylepool.cxx

Change-Id: I1cfcae2c664a5c5c3dee48be733046979c1593ed

diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx
index fc8a6802d10f..04dcdaa8be17 100644
--- a/include/svl/stylepool.hxx
+++ b/include/svl/stylepool.hxx
@@ -40,9 +40,13 @@ public:
 @param SfxItemSet
 the SfxItemSet to insert
 
+@param pParentName
+Name of the parent of rSet. If set, createIterator() can be more 
deterministic by iterating
+over item sets ordered by parent names.
+
 @return a shared pointer to the SfxItemSet
 */
-std::shared_ptr insertItemSet( const SfxItemSet& rSet );
+std::shared_ptr insertItemSet( const SfxItemSet& rSet, const 
OUString* pParentName = nullptr );
 
 /** Create an iterator
 
diff --git a/svl/CppunitTest_svl_items.mk b/svl/CppunitTest_svl_items.mk
index c8e5e0699635..28e8772d71ad 100644
--- a/svl/CppunitTest_svl_items.mk
+++ b/svl/CppunitTest_svl_items.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,svl_items))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,svl_items, \
svl/qa/unit/items/test_IndexedStyleSheets \
+   svl/qa/unit/items/stylepool \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,svl_items, \
diff --git a/svl/qa/unit/items/stylepool.cxx b/svl/qa/unit/items/stylepool.cxx
new file mode 100644
index ..bf89fd30cb83
--- /dev/null
+++ b/svl/qa/unit/items/stylepool.cxx
@@ -0,0 +1,91 @@
+/* -*- 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 
+
+namespace
+{
+/// Tests svl StylePool.
+class StylePoolTest : public CppUnit::TestFixture
+{
+void testIterationOrder();
+
+CPPUNIT_TEST_SUITE(StylePoolTest);
+CPPUNIT_TEST(testIterationOrder);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void StylePoolTest::testIterationOrder()
+{
+// Set up a style pool with multiple parents.
+SfxStringItem aDefault1(1);
+std::vector aDefaults{ &aDefault1 };
+SfxItemInfo const aItems[] = { { 1, false } };
+
+SfxItemPool* pPool = new SfxItemPool("test", 1, 1, aItems);
+pPool->SetDefaults(&aDefaults);
+{
+// Set up parents in mixed order to make sure we do not sort by 
pointer address.
+SfxItemSet aParent1(*pPool, 1, 1);
+SfxItemSet aChild1(*pPool, 1, 1);
+aChild1.SetParent(&aParent1);
+SfxStringItem aItem1(1, "Item1");
+aChild1.Put(aItem1);
+
+SfxItemSet aParent3(*pPool, 1, 1);
+SfxItemSet aChild3(*pPool, 1, 1);
+aChild3.SetParent(&aParent3);
+SfxStringItem aItem3(1, "Item3");
+aChild3.Put(aItem3);
+
+SfxItemSet aParent2(*pPool, 1, 1);
+SfxItemSet aChild2(*pPool, 1, 1);
+aChild2.SetParent(&aParent2);
+SfxStringItem aItem2(1, "Item2");
+aChild2.Put(aItem2);
+
+  

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

2019-03-21 Thread Libreoffice Gerrit user
 vcl/inc/qt5/Qt5Frame.hxx |1 +
 vcl/qt5/Qt5Frame.cxx |   16 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit c4e9ed5f2614ae69f838cfca4621e1ecc56cba9b
Author: Katarina Behrens 
AuthorDate: Tue Feb 26 15:07:51 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Mar 21 17:11:06 2019 +0100

tdf#120791: restore window geometry coming back from fullscreen

Change-Id: I1492423fe6110bdc79aa68c715e968770f6767ab
Reviewed-on: https://gerrit.libreoffice.org/68672
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit e8e274b50658e1f9c2f40ce05249f7c857aeba64)
Reviewed-on: https://gerrit.libreoffice.org/69510
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 4a1dc6767d95..239666ca179f 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -81,6 +81,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public 
SalFrame
 bool m_bDefaultSize;
 bool m_bDefaultPos;
 bool m_bFullScreen;
+QRect m_aRestoreGeometry;
 
 void Center();
 Size CalcDefaultSize();
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 57a2cb219b52..3172b769f550 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -612,9 +612,19 @@ void Qt5Frame::ShowFullScreen(bool bFullScreen, sal_Int32 
nScreen)
 if (!isWindow())
 m_pTopLevel->show();
 
-// do that before going fullscreen
-SetScreenNumber(nScreen);
-m_bFullScreen ? windowHandle()->showFullScreen() : 
windowHandle()->showNormal();
+if (m_bFullScreen)
+{
+m_aRestoreGeometry = m_pTopLevel->geometry();
+// do that before going fullscreen
+SetScreenNumber(nScreen);
+windowHandle()->showFullScreen();
+}
+else
+{
+windowHandle()->showNormal();
+m_pTopLevel->setGeometry(m_aRestoreGeometry);
+m_aRestoreGeometry = QRect();
+}
 }
 
 void Qt5Frame::StartPresentation(bool)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes of ESC call

2019-03-21 Thread Miklos Vajna
* Present:
+ Heiko, Stephan, Xisco, Eduard A, Michael W, Gabriel, Miklos, Caolan, 
Olivier, Sophie, Thorsten

* Completed Action Items:
+ create Paris hack-fest wiki page (Sophie)

* Pending Action Items:
+ next time we see write_tests5 fail - chop out that sub-test (Miklos)
+ add monitoring for build bot daily failure rates (Christian)
  [ not applied yet, but monitoring jenkins build slaves due to
connectivity issues at Manitu ]
+ review/update GSOC ideas page! (Mentors)
  + https://wiki.documentfoundation.org/Development/GSoC/Ideas

* Eduard A Intro:
+ Interested in Online, from 1&1
+ first commits are already coming
+ welcome (all)

* Release Engineering update (Xisco)
+ 6.2.2 rc2 status → announced
+ 6.2.3 rc1 → tagging next week
+ 6.1.6 rc1: April 9
+ 6.3 alpha1: early May
+ Remotes → no updates
+ Android viewer
   + Maven repo is not up-to-date, working on it. (Christian)
+ Online: Andras tagged the 6.2.2.2

* Documentation (Olivier)
+ New Help:
  + Improvements in donation button (buovjaga)
  + Backported to 6.2 (ohallot)
+ Help Contents 2
  + More pages on undocumented Basic (ohallot)
  + Housekeeping on Help pages (M. Robbinson, A Timar)
  + Pages on Hyperlink dialog (Shubham Goyal)
+ Guides.
   + team ramping up in update of Calc Guide 6.x

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
249(249) (topicUI) bugs open, 224(224) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  4(0) 14(1) 27(0)   78(-7)
 commented 57(12)   175(20)   422(7) 1383(-24)
   removed  1(-1) 6(1)  8(-1)  20(1)
  resolved  8(4) 19(3) 51(2)  128(0)
+ top 10 contributors:
  Tietze, Heiko made 111 changes in 1 month, and 592 changes in 1 year
  Mehrbrodt, Samuel made 41 changes in 1 month, and 71 changes in 1 year
  Foote, V Stuart made 35 changes in 1 month, and 202 changes in 1 year
  Xisco Faulí made 32 changes in 1 month, and 252 changes in 1 year
  Dieter Praas made 25 changes in 1 month, and 140 changes in 1 year
  Thomas Lendo made 19 changes in 1 month, and 256 changes in 1 year
  Roman Kuznetsov made 15 changes in 1 month, and 122 changes in 1 year
  Cor Nouws made 9 changes in 1 month, and 109 changes in 1 year
  和尚蟹 made 9 changes in 1 month, and 17 changes in 1 year
  Brinzing, Oliver made 8 changes in 1 month, and 14 changes in 1 year
 + New needsUXEval

   * tabbed toolbar notebookbarshortcuts.xml vertical center align
 + https://bugs.documentfoundation.org/show_bug.cgi?id=123292
 => accepted

   * VIEWING zoom 100% really 91%
 + https://bugs.documentfoundation.org/show_bug.cgi?id=123969
 => NAB

   * FORMCONTROLS: Add "bottom" or "underline" as border option
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124189
   * ImageMap to Tools menubar
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124198
   * TABLE: Difference between default style as template and default style
 as style is not clear
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124206
=> in discussion

 + New easyhacks
   * Place focus on header/footer frame menu button when header/footer
 is empty
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124041
 + has code pointers

* Crash Testing (Caolan)
+ 3(+0) import failure, 2(+0) export failures
+ coverity suspended
  - back but we now need c++17
+ Google / ossfuzz:
  - 12 (+0) issues, 9 timeouts, 1 OOM, 1 Build Failure
  + need to find time to look at these
  + some deep stack issue.
+ ForcePoint, round 9
+ ?? a few minor issues lingering
+ CNA process
+ First block of 10 assigned

* Crash Reporting (Xisco)
  + http://crashreport.libreoffice.org/stats/version/6.1.4.2
+ 791 (-121)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 634 656 (-22)
  + http://crashreport.libreoffice.org/stats/version/6.2.0.3
+ 1236 (-262)
  + http://crashreport.libreoffice.org/stats/version/6.2.1.2
+ 1148 (+75)
  + numbers looking good – but have a problem where we get dynamic libs
instead of crash signatures.
 + not informative: ‘libmergedlo.dll’ is all we get.
 + unclear what happens there.

* Hackfests & Events (Thorsten)
   + this year hackfests coming up:
+ Tirana perhaps (Xisco)
  + April 25th/28th → overlaps Orthodox Easter
 => so will not be these days.
  + May 4th / 5th  → conflict with German meetings
  + https://forum.openlabs.cc/t/libreoffice-hackfest-tirana-2019/1658
  + poke Bjoern / Eike / Xisco to chase / decide…
 +

[Libreoffice-commits] online.git: loleaflet/Makefile.am

2019-03-21 Thread Libreoffice Gerrit user
 loleaflet/Makefile.am |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 74f19fce6f91a1651efce415fb4b495a89faff23
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 17:17:56 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 17:20:27 2019 +0200

We insert global.js in loleaflet.html and shouldn't include it in bundle.js

Also, make loleaflet.html depend also on the two files that are inserted 
into
it with the m4 syscmd thing, bundle.css and global.js.

Change-Id: Iba261aeff70786eec114e5508b748dadd8663038

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5f51a91a4..6a9b0cb37 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -175,7 +175,6 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
$(builddir)/dist/w2ui-1.5.rc1.js
@touch $@
@@ -201,12 +200,10 @@ $(builddir)/dist/global.js: $(srcdir)/js/global.js
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
-   $(srcdir)/js/global.js \
$(L10N_IOS_ALL_JS) \
$(NODE_MODULES_JS) \
$(srcdir)/js/jquery.mCustomScrollbar.js \
@@ -215,7 +212,8 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
--output $@
 endif
 
-$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) \
+$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) $(builddir)/dist/bundle.css $(builddir)/dist/global.js \
+\
$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
@echo "Generating loleaflet.html..."
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 sw/source/core/text/itradj.cxx  |   11 +++
 sw/source/core/text/portxt.cxx  |3 +--
 sw/source/core/txtnode/fntcache.cxx |9 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 0a8e9cc5c1782f1cd50ef338ec2aa4f6776a4c0e
Author: Khaled Hosny 
AuthorDate: Thu Mar 21 15:00:22 2019 +0200
Commit: Xisco Faulí 
CommitDate: Thu Mar 21 15:45:41 2019 +0100

tdf#124109: Revert "Only do kashida insertion with fonts that have non-zero 
width kashidas"

This reverts commit c45b23377bb2fe44c26f1287ff38495344e4ca50.

This commit breaks Kashida justification when a document is first opened 
(the
kashida justification will be disabled and spaces will be used untill the 
text
is changed). Probably it is checking for width of Kashida glyph too early. 
Also
I'm not sure what the reverted commit was trying to fix since we already do
kashida justification in fonts that has non-zero width Kashida and it has 
been
the case for a long time.

This does not fix the original issue in the document attched with the bug
report, but if fixes kashida not being applied when opening the document.

Change-Id: Ic95859bca94fa792793e3223d2adb465bc6d880f
Reviewed-on: https://gerrit.libreoffice.org/69509
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 047e26b6220e..0065e7e5c5e8 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -113,9 +113,6 @@ void SwTextAdjuster::FormatBlock( )
 static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& 
rInf, SwTextIter& rItr,
 sal_Int32& rKashidas, TextFrameIndex& nGluePortion)
 {
-if ( rInf.GetOut()->GetMinKashida() <= 0 )
-return false;
-
 // i60594 validate Kashida justification
 TextFrameIndex nIdx = rItr.GetStart();
 TextFrameIndex nEnd = rItr.GetEnd();
@@ -153,6 +150,12 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf,
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 if (nKashidasInAttr > 0)
 {
+// Kashida glyph looks suspicious, skip Kashida justification
+if ( rInf.GetOut()->GetMinKashida() <= 0 )
+{
+return false;
+}
+
 sal_Int32 nKashidasDropped = 0;
 if ( !SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - 
nIdx ) )
 {
@@ -212,7 +215,7 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, 
SwTextSizeInfo& rInf, SwT
 sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, 
nIdx, nNext - nIdx );
 
 long nFontMinKashida = rInf.GetOut()->GetMinKashida();
-if ( nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( 
rInf.GetText(), nIdx, nNext - nIdx ) )
+if ( nFontMinKashida && nKashidasInAttr > 0 && 
SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) )
 {
 sal_Int32 nKashidasDropped = 0;
 while ( rKashidas && nGluePortion && nKashidasInAttr > 0 &&
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index eb3937d10702..fdf8925fb31f 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -115,8 +115,7 @@ static TextFrameIndex lcl_AddSpace(const SwTextSizeInfo 
&rInf,
 // Kashida Justification: Insert Kashidas
 if ( nEnd > nPos && pSI && COMPLEX == nScript )
 {
-if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
rInf.GetOut()->GetMinKashida()
-&& pSI->CountKashida() )
+if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && 
pSI->CountKashida() )
 {
 const sal_Int32 nKashRes = pSI->KashidaJustify( nullptr, nullptr, 
nPos, nEnd - nPos );
 // i60591: need to check result of KashidaJustify
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index f9352dcc5936..ed39672d4f5a 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1319,8 +1319,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontScript::CTL == nActual && nSpaceAdd )
 {
-if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() )
-&& rInf.GetOut().GetMinKashida() )
+if ( SwScriptInfo::IsArabicText( rInf.GetText(), 
rInf.GetIdx(), rInf.GetLen() ) )
 {
 if ( pSI && pSI->CountKashida() &&
 pSI->KashidaJustify( pKernArray.get(), nullptr, 
rInf.GetIdx(),
@@ -1530,8 +1529,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 // Kashida Justification
 if ( SwFontSc

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

2019-03-21 Thread Libreoffice Gerrit user
 svx/qa/unit/customshapes.cxx  |   26 ++
 svx/qa/unit/data/tdf124212_handle_position.odg|binary
 svx/source/customshapes/EnhancedCustomShape2d.cxx |3 ++
 3 files changed, 29 insertions(+)

New commits:
commit 1ee8547003e50e212c00df1f8d2ec3f6fc50f819
Author: Regina Henschel 
AuthorDate: Tue Mar 19 20:10:12 2019 +0100
Commit: Regina Henschel 
CommitDate: Thu Mar 21 15:42:34 2019 +0100

tdf#124212 make adjustment handle work always

In method SetHandleControllerPosition() all transformations are
reversed to get the coordinates in shape inner coordinate system
from the outer position. The error was, that the first
transformation, the move in method GetPoint was forgotten. In case
of default viewBox '0 0 21600 21600' it is not visible. But the
error is noticeable, if left or top do not equal zero.

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

diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 33384f56c83b..e2444b50f967 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -250,6 +250,32 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, 
testTdf121845_two_commands_U)
 CPPUNIT_ASSERT_EQUAL_MESSAGE("count polygons", static_cast(2),
  aPolyPolygon.count());
 }
+
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf124212_handle_position)
+{
+// tdf124212 Adjustment handle reacts wrongly, if custom shape has a non
+// default viewBox. Load a document with svg:viewBox="10800 0 10800 21600"
+// Error was, that moving the controller results in a handle position that
+// does not reflect the movement.
+const OUString sFileName("tdf124212_handle_position.odg");
+OUString sURL = m_directories.getURLFromSrc(sDataDirectory) + sFileName;
+mxComponent = loadFromDesktop(sURL, 
"com.sun.star.comp.drawing.DrawingDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+uno::Reference xShape(getShape(0));
+// The shape has one, horizontal adjust handle.
+SdrObjCustomShape& rSdrObjCustomShape(
+static_cast(*GetSdrObjectFromXShape(xShape)));
+EnhancedCustomShape2d aCustomShape2d(rSdrObjCustomShape);
+Point aInitialPosition;
+aCustomShape2d.GetHandlePosition(0, aInitialPosition);
+css::awt::Point aDesiredPosition(aInitialPosition.X() + 1000, 
aInitialPosition.Y());
+aCustomShape2d.SetHandleControllerPosition(0, aDesiredPosition);
+Point aObservedPosition;
+aCustomShape2d.GetHandlePosition(0, aObservedPosition);
+sal_Int32 nDesiredX(aDesiredPosition.X); // awt::Point
+sal_Int32 nObservedX(aObservedPosition.X()); // tools::Point
+CPPUNIT_ASSERT_EQUAL_MESSAGE("handle X coordinate", nDesiredX, nObservedX);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/qa/unit/data/tdf124212_handle_position.odg 
b/svx/qa/unit/data/tdf124212_handle_position.odg
new file mode 100644
index ..7a4eb05175ad
Binary files /dev/null and b/svx/qa/unit/data/tdf124212_handle_position.odg 
differ
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
old mode 100644
new mode 100755
index bc143c47c971..b8b859f7b82e
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1223,6 +1223,9 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( 
const sal_uInt32 nIndex
 double fPos2 = aP.Y();  //( bFlipV ) ? aLogicRect.GetHeight() 
-aP.Y() : aP.Y();
 fPos1 = !basegfx::fTools::equalZero(fXScale) ? (fPos1 / fXScale) : 
SAL_MAX_INT32;
 fPos2 = !basegfx::fTools::equalZero(fYScale) ? (fPos2 / fYScale) : 
SAL_MAX_INT32;
+// revert -nCoordLeft and -nCoordTop aus GetPoint()
+fPos1 += nCoordLeft;
+fPos2 += nCoordTop;
 
 // Used for scaling the adjustment values based on handle positions
 double fWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 loleaflet/src/layer/vector/CircleMarker.js   |4 
 loleaflet/src/layer/vector/Path.Transform.js |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3e0ae523da10f3b82c0f83c53259ec320645cd5f
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 16:04:58 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 16:08:17 2019 +0200

Make the image resize and rotate handles larger in a mobile app

diff --git a/loleaflet/src/layer/vector/CircleMarker.js 
b/loleaflet/src/layer/vector/CircleMarker.js
index 837471440..fd9a2e1fa 100644
--- a/loleaflet/src/layer/vector/CircleMarker.js
+++ b/loleaflet/src/layer/vector/CircleMarker.js
@@ -14,6 +14,8 @@ L.CircleMarker = L.Path.extend({
L.setOptions(this, options);
this._latlng = L.latLng(latlng);
this._radius = this.options.radius;
+   if (window.ThisIsAMobileApp)
+   this._radius *= 3;
},
 
setLatLng: function (latlng) {
@@ -28,6 +30,8 @@ L.CircleMarker = L.Path.extend({
 
setRadius: function (radius) {
this.options.radius = this._radius = radius;
+   if (window.ThisIsAMobileApp)
+   this._radius *= 3;
return this.redraw();
},
 
diff --git a/loleaflet/src/layer/vector/Path.Transform.js 
b/loleaflet/src/layer/vector/Path.Transform.js
index 50171d4ea..f7efd72cc 100644
--- a/loleaflet/src/layer/vector/Path.Transform.js
+++ b/loleaflet/src/layer/vector/Path.Transform.js
@@ -534,7 +534,7 @@ L.Handler.PathTransform = L.Handler.extend({
L.PathTransform.pointOnLine(
map.latLngToLayerPoint(bottom),
map.latLngToLayerPoint(topPoint),
-   this.options.handleLength)
+   (window.ThisIsAMobileApp ? this.options.handleLength * 
3 : this.options.handleLength))
);
 
this._handleLine = new L.Polyline([topPoint, handlerPosition],
___
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' - loleaflet/plugins loleaflet/src

2019-03-21 Thread Libreoffice Gerrit user
 loleaflet/plugins/path-transform/src/Path.Transform.js |2 +-
 loleaflet/src/layer/vector/CircleMarker.js |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3cc714b49b6e29429d45818a281cd77a209dbec2
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 16:04:58 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 16:05:25 2019 +0200

Make the image resize and rotate handles larger in a mobile app

diff --git a/loleaflet/plugins/path-transform/src/Path.Transform.js 
b/loleaflet/plugins/path-transform/src/Path.Transform.js
index 50171d4ea..f7efd72cc 100644
--- a/loleaflet/plugins/path-transform/src/Path.Transform.js
+++ b/loleaflet/plugins/path-transform/src/Path.Transform.js
@@ -534,7 +534,7 @@ L.Handler.PathTransform = L.Handler.extend({
L.PathTransform.pointOnLine(
map.latLngToLayerPoint(bottom),
map.latLngToLayerPoint(topPoint),
-   this.options.handleLength)
+   (window.ThisIsAMobileApp ? this.options.handleLength * 
3 : this.options.handleLength))
);
 
this._handleLine = new L.Polyline([topPoint, handlerPosition],
diff --git a/loleaflet/src/layer/vector/CircleMarker.js 
b/loleaflet/src/layer/vector/CircleMarker.js
index 837471440..fd9a2e1fa 100644
--- a/loleaflet/src/layer/vector/CircleMarker.js
+++ b/loleaflet/src/layer/vector/CircleMarker.js
@@ -14,6 +14,8 @@ L.CircleMarker = L.Path.extend({
L.setOptions(this, options);
this._latlng = L.latLng(latlng);
this._radius = this.options.radius;
+   if (window.ThisIsAMobileApp)
+   this._radius *= 3;
},
 
setLatLng: function (latlng) {
@@ -28,6 +30,8 @@ L.CircleMarker = L.Path.extend({
 
setRadius: function (radius) {
this.options.radius = this._radius = radius;
+   if (window.ThisIsAMobileApp)
+   this._radius *= 3;
return this.redraw();
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

~/.recently-used

2019-03-21 Thread Stephan Bergmann
At least on Linux, LO might write a file ~/.recently-used (containing 
some XML-formatted information about recently opened documents, 
apparently), see 
 for details.


That bugzilla comment also argues that that functionality is likely 
unused (at least LO itself never appears to read that file, only write 
it) and could probably be removed.


Does anybody know whether that ~/.recently-used is actually usefuly, and 
we should continue writing it?


( "Fix 
hardcoded location for .recently-used file" about removing that 
functionality has recently been turned into an EasyHack, and I'd like to 
have it clarified here whether removal is actually OK before some 
EasyHacker starts working on it.)

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

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

2019-03-21 Thread Libreoffice Gerrit user
 desktop/source/lib/init.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3526a576cd74ae33e6cc0722c91a5178f8886caf
Author: Jan Holesovsky 
AuthorDate: Thu Mar 21 14:18:35 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 14:27:39 2019 +0100

lok: Keep the temporary user profile set during the entire preload.

Otherwise the core likes to crash due to the keyboard accellerators
being read, but the configuration is missing.

Change-Id: I94193f47462227b5975a49ce11709d7bf415a519
Reviewed-on: https://gerrit.libreoffice.org/69507
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d79d086b66f9..ee34831af726 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4442,9 +4442,6 @@ static void preloadData()
 }
 std::cerr << "\n";
 
-// Set user profile's path back to the original one
-rtl::Bootstrap::set("UserInstallation", sUserPath);
-
 css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
 xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
 comphelper::getProcessComponentContext());
@@ -4484,6 +4481,9 @@ static void preloadData()
 nLang = 
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
 false), COMPLEX);
 OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, 
GetDefaultFontFlags::OnlyOne);
 }
+
+// Set user profile's path back to the original one
+rtl::Bootstrap::set("UserInstallation", sUserPath);
 }
 
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const 
char* pUserProfileUrl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 stoc/source/corereflection/criface.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df3fed52760a72b2a729f7b685adaa2da86d7f76
Author: Juergen Funk 
AuthorDate: Thu Mar 21 09:22:03 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 14:23:46 2019 +0100

pUnoReturn should be null when UNO methode is VOID

the problem is that at least the msvc_win32_x86-64 bridge's
unoInterfaceProxyDispatch
(bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx)
requires pUnoReturn to be a nullptr when the UNO method has VOID
return type (see computation of retKind in cpp_call in the same file),
but that IdlInterfaceMethodImpl::invoke doesn't set up the arguments
according to that expectation.


Change-Id: I187a997300571cd9822de2eeacf7ad887ad00a4f
Reviewed-on: https://gerrit.libreoffice.org/69495
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 14a11ab5dfa2ea34049866517ee78170922aee4e)
Reviewed-on: https://gerrit.libreoffice.org/69502
Tested-by: Jenkins

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index 25839f741f5f..4ce3b0fc8ae0 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -594,7 +594,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 // end of a "short" struct by writing the full contents of a "long"
 // register); so create enough space here (assuming that no ABI 
requires
 // padding larger than 16 byte boundaries):
-void * pUnoReturn = alloca( multipleOf16(pReturnType->nSize) );
+void * pUnoReturn = (pReturnType->nSize == 0) ? nullptr : alloca( 
multipleOf16(pReturnType->nSize) );
 void ** ppUnoArgs = static_cast(alloca( sizeof(void *) * 
nParams *2 ));
 typelib_TypeDescription ** ppParamTypes = 
reinterpret_cast(ppUnoArgs + nParams);
 
___
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/libreoffice-6.2.2.2'

2019-03-21 Thread Libreoffice Gerrit user
Tag 'libreoffice-6.2.2.2' created by Andras Timar  
at 2019-03-21 13:14 +

libreoffice-6.2.2.2

Changes since libreoffice-6.2.1.2-5:
---
 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 'libreoffice-6-2' - 2 commits - configure.ac loleaflet/po

2019-03-21 Thread Libreoffice Gerrit user
 configure.ac  |2 +-
 loleaflet/po/ui-tr.po |   38 --
 2 files changed, 13 insertions(+), 27 deletions(-)

New commits:
commit 981298a8c26636b2ca2a613c476dfa473ad622ca
Author: Andras Timar 
AuthorDate: Thu Mar 21 14:09:35 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 14:09:35 2019 +0100

Bump version to 6.2.2.2

Change-Id: If6a411a5330e6dbcc3e2e492bd7f947970deddb6

diff --git a/configure.ac b/configure.ac
index 2a367f301..164ec055a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [6.2.1.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [6.2.2.2], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit be55e1a4afa3fd3e6bf3717dd98f2bed935a6f88
Author: Andras Timar 
AuthorDate: Thu Mar 21 14:06:56 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 14:07:49 2019 +0100

Updated Turkish translation

Change-Id: Ic116cb502b89dc2cbb92febeff8155154412cb80

diff --git a/loleaflet/po/ui-tr.po b/loleaflet/po/ui-tr.po
index eb928ba0b..154a7b7b5 100644
--- a/loleaflet/po/ui-tr.po
+++ b/loleaflet/po/ui-tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 13:24+0100\n"
+"POT-Creation-Date: 2019-03-21 14:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 2.2.5\n"
 "X-Pootle-Path: /tr/libo_online/loleaflet-ui-tr.po\n"
-"X-Pootle-Revision: 3650823\n"
+"X-Pootle-Revision: 3784870\n"
 
 #: admin/admin.strings.js:6
 msgid "Admin console"
@@ -242,7 +242,7 @@ msgstr "Şekil ekle"
 
 #: js/toolbar.js:689
 msgid "Insert Local Image"
-msgstr ""
+msgstr "Yerel Resim Ekle"
 
 #: js/toolbar.js:717 js/toolbar.js:1031
 msgid "Always follow the editor"
@@ -294,7 +294,7 @@ msgstr "Belgeyi imzala"
 
 #: js/toolbar.js:951
 msgid "Logout"
-msgstr ""
+msgstr "Çıkış"
 
 #: js/toolbar.js:991 src/control/Control.Menubar.js:297
 msgid "Fullscreen presentation"
@@ -429,11 +429,11 @@ msgstr ""
 "Birden fazla kullanıcının Geri Al/Yeniden Yap eylemi çakıştı. Bunu çözmek "
 "için belge kurtarmayı kullanın"
 
-#: js/toolbar.js:2139 src/control/Control.DocumentRepair.js:95
+#: js/toolbar.js:2143 src/control/Control.DocumentRepair.js:95
 msgid "You"
 msgstr "Siz"
 
-#: js/toolbar.js:2145
+#: js/toolbar.js:2149
 msgid "Readonly"
 msgstr "Salt okunur"
 
@@ -487,7 +487,7 @@ msgstr "Duruma atla"
 
 #: src/control/Control.Menubar.js:21
 msgid "Share..."
-msgstr ""
+msgstr "Paylaş..."
 
 #: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:235
 #: src/control/Control.Menubar.js:316
@@ -528,7 +528,7 @@ msgstr "Onar"
 #: src/control/Control.Menubar.js:69 src/control/Control.Menubar.js:264
 #: src/control/Control.Menubar.js:341
 msgid "Local Image..."
-msgstr ""
+msgstr "Yerel Resim..."
 
 #: src/control/Control.Menubar.js:85 src/control/Control.Menubar.js:87
 msgid "All"
@@ -617,11 +617,11 @@ msgstr "Yeni sayfa adını girin"
 
 #: src/control/Ruler.js:95
 msgid "Left Margin"
-msgstr ""
+msgstr "Sol Kenar Boşluğu"
 
 #: src/control/Ruler.js:96
 msgid "Right Margin"
-msgstr ""
+msgstr "Sağ Kenar Boşluğu"
 
 #: src/control/Toolbar.js:75 src/control/Toolbar.js:84
 msgid "Downloading..."
@@ -897,20 +897,6 @@ msgstr "Yükleniyor..."
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
-#: src/map/handler/Map.WOPI.js:273
+#: src/map/handler/Map.WOPI.js:276
 msgid "Creating copy..."
-msgstr ""
-
-#~ msgid "N/A"
-#~ msgstr "YOK"
-
-#, fuzzy
-#~ msgid "Type:"
-#~ msgstr "Tür"
-
-#~ msgid "Signed and validated"
-#~ msgstr "İmzalı ve doğrulanmış"
-
-#, fuzzy
-#~ msgid "Signed but not validated"
-#~ msgstr "İmzalı ve doğrulanmış"
+msgstr "Kopya oluşturuluyor..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 loleaflet/html/loleaflet.html.m4 |   61 +++
 1 file changed, 30 insertions(+), 31 deletions(-)

New commits:
commit eb332fdde087adc633fa2533bca310134e57d223
Author: Florin Ciornei 
AuthorDate: Thu Mar 21 11:28:05 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Mar 21 14:05:23 2019 +0100

android: Move window.ThisIsAMobileApp etc before they are used in global.js

It was causing the code to connect to a real socket instead of the
FakeWebSocket.

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

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 272464a66..242af92f5 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -32,6 +32,36 @@ ifelse(MOBILEAPP,[],
   window.addEventListener('message', PostMessageReadyListener, false);
 )dnl
 
+dnl# For use in conditionals in JS: window.ThisIsAMobileApp, 
window.ThisIsTheiOSApp,
+dnl# and window.ThisIsTheGtkApp
+
+ifelse(MOBILEAPP,[true],
+  [   window.ThisIsAMobileApp = true;
+   window.MobileAppName='MOBILEAPPNAME';],
+  [   window.ThisIsAMobileApp = false;]
+)
+ifelse(IOSAPP,[true],
+  [   window.ThisIsTheiOSApp = true;
+   window.postMobileMessage = function(msg) { 
window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
+   window.postMobileError   = function(msg) { 
window.webkit.messageHandlers.error.postMessage(msg, '*'); };
+   window.postMobileDebug   = function(msg) { 
window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
+  [   window.ThisIsTheiOSApp = false;]
+)
+ifelse(GTKAPP,[true],
+  [   window.ThisIsTheGtkApp = true;
+   window.postMobileMessage = function(msg) { 
window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
+   window.postMobileError   = function(msg) { 
window.webkit.messageHandlers.error.postMessage(msg, '*'); };
+   window.postMobileDebug   = function(msg) { 
window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
+  [   window.ThisIsTheGtkApp = false;]
+)
+ifelse(ANDROIDAPP,[true],
+  [   window.ThisIsTheAndroidApp = true;
+   window.postMobileMessage = function(msg) { 
window.LOOLMessageHandler.postMobileMessage(msg); };
+   window.postMobileError   = function(msg) { 
window.LOOLMessageHandler.postMobileError(msg); };
+   window.postMobileDebug   = function(msg) { 
window.LOOLMessageHandler.postMobileDebug(msg); };],
+  [   window.ThisIsTheAndroidApp = false;]
+)
+
 var Base64ToArrayBuffer = function(base64Str) {
   var binStr = atob(base64Str);
   var ab = new ArrayBuffer(binStr.length);
@@ -171,37 +201,6 @@ ifelse(MOBILEAPP,[true],
   window.tileSize = 256;])
 syscmd([cat ]GLOBAL_JS)dnl
 
-  
-
-dnl# For use in conditionals in JS: window.ThisIsAMobileApp, 
window.ThisIsTheiOSApp,
-dnl# and window.ThisIsTheGtkApp
-ifelse(MOBILEAPP,[true],
-  [   window.ThisIsAMobileApp = true;
-   window.MobileAppName='MOBILEAPPNAME';],
-  [   window.ThisIsAMobileApp = false;]
-)
-ifelse(IOSAPP,[true],
-  [   window.ThisIsTheiOSApp = true;
-   window.postMobileMessage = function(msg) { 
window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
-   window.postMobileError   = function(msg) { 
window.webkit.messageHandlers.error.postMessage(msg, '*'); };
-   window.postMobileDebug   = function(msg) { 
window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
-  [   window.ThisIsTheiOSApp = false;]
-)
-ifelse(GTKAPP,[true],
-  [   window.ThisIsTheGtkApp = true;
-   window.postMobileMessage = function(msg) { 
window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
-   window.postMobileError   = function(msg) { 
window.webkit.messageHandlers.error.postMessage(msg, '*'); };
-   window.postMobileDebug   = function(msg) { 
window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
-  [   window.ThisIsTheGtkApp = false;]
-)
-ifelse(ANDROIDAPP,[true],
-  [   window.ThisIsTheAndroidApp = true;
-   window.postMobileMessage = function(msg) { 
window.LOOLMessageHandler.postMobileMessage(msg); };
-   window.postMobileError   = function(msg) { 
window.LOOLMessageHandler.postMobileError(msg); };
-   window.postMobileDebug   = function(msg) { 
window.LOOLMessageHandler.postMobileDebug(msg); };],
-  [   window.ThisIsTheAndroidApp = false;]
-)
-  
 
 ifelse(MOBILEAPP,[true],
   ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
___
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' - stoc/source

2019-03-21 Thread Libreoffice Gerrit user
 stoc/source/corereflection/criface.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f735f010a876a531532b9c6759f8f1cf48c5a6fa
Author: Juergen Funk 
AuthorDate: Thu Mar 21 09:22:03 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 14:00:16 2019 +0100

pUnoReturn should be null when UNO methode is VOID

the problem is that at least the msvc_win32_x86-64 bridge's
unoInterfaceProxyDispatch
(bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx)
requires pUnoReturn to be a nullptr when the UNO method has VOID
return type (see computation of retKind in cpp_call in the same file),
but that IdlInterfaceMethodImpl::invoke doesn't set up the arguments
according to that expectation.


Change-Id: I187a997300571cd9822de2eeacf7ad887ad00a4f
Reviewed-on: https://gerrit.libreoffice.org/69495
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 14a11ab5dfa2ea34049866517ee78170922aee4e)
Reviewed-on: https://gerrit.libreoffice.org/69501
Tested-by: Jenkins

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index c37108081fbe..4ddeecb5954d 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -578,7 +578,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 // end of a "short" struct by writing the full contents of a "long"
 // register); so create enough space here (assuming that no ABI 
requires
 // padding larger than 16 byte boundaries):
-void * pUnoReturn = alloca( multipleOf16(pReturnType->nSize) );
+void * pUnoReturn = (pReturnType->nSize == 0) ? nullptr : alloca( 
multipleOf16(pReturnType->nSize) );
 void ** ppUnoArgs = static_cast(alloca( sizeof(void *) * 
nParams *2 ));
 typelib_TypeDescription ** ppParamTypes = 
reinterpret_cast(ppUnoArgs + nParams);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 wsd/DocumentBroker.cpp |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c459ad77a1f278dc51d947f6b2a5fa559f279612
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 14:25:15 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 14:36:46 2019 +0200

tdf#124055: Idle timeout is pointless in mobile apps

We don't want to unload the document and show any "Idle document -
please click to reload and resume editing" overlay.

What the iOS (and presumably Android) app *would* need, though, is
proper restore functionality. I.e. if you have a document open, and
the app is put in the background (i.e. the user does something else),
and the OS kills it (as is perfectly normal for iOS or Android to do
to idle background apps), then when the user returs to the app, it
should reopen the same document and restore the view location and zoom
level.

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index cc4068bc3..8524725ff 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -246,10 +246,11 @@ void DocumentBroker::pollThread()
 LOG_INF("Doc [" << _docKey << "] attached to child [" << 
_childProcess->getPid() << "].");
 
 static const bool AutoSaveEnabled = !std::getenv("LOOL_NO_AUTOSAVE");
+
+#if !MOBILEAPP
 static const size_t IdleDocTimeoutSecs = LOOLWSD::getConfigValue(
   
"per_document.idle_timeout_secs", 3600);
 
-#if !MOBILEAPP
 // Used to accumulate B/W deltas.
 uint64_t adminSent = 0;
 uint64_t adminRecv = 0;
@@ -320,9 +321,11 @@ void DocumentBroker::pollThread()
 last30SecCheckTime = std::chrono::steady_clock::now();
 }
 
+if (false)
+;
+#if !MOBILEAPP
 // Remove idle documents after 1 hour.
-const bool idle = (isLoaded() && getIdleTimeSecs() >= 
IdleDocTimeoutSecs);
-if (idle)
+else if (isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs)
 {
 // Stop if there is nothing to save.
 LOG_INF("Autosaving idle DocumentBroker for docKey [" << 
getDocKey() << "] to kill.");
@@ -332,6 +335,7 @@ void DocumentBroker::pollThread()
 stop("idle");
 }
 }
+#endif
 else if (_sessions.empty() && (isLoaded() || _markToDestroy))
 {
 // If all sessions have been removed, no reason to linger.
___
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' - wsd/DocumentBroker.cpp

2019-03-21 Thread Libreoffice Gerrit user
 wsd/DocumentBroker.cpp |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d843dbcd3b612c44a9e917e792927c6781eaac2d
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 14:25:15 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 14:32:33 2019 +0200

tdf#124055: Idle timeout is pointless in mobile apps

We don't want to unload the document and show any "Idle document -
please click to reload and resume editing" overlay.

What the iOS (and presumably Android) app *would* need, though, is
proper restore functionality. I.e. if you have a document open, and
the app is put in the background (i.e. the user does something else),
and the OS kills it (as is perfectly normal for iOS or Android to do
to idle background apps), then when the user returs to the app, it
should reopen the same document and restore the view location and zoom
level.

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d9b205801..31d952101 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -257,10 +257,11 @@ void DocumentBroker::pollThread()
 LOG_INF("Doc [" << _docKey << "] attached to child [" << 
_childProcess->getPid() << "].");
 
 static const bool AutoSaveEnabled = !std::getenv("LOOL_NO_AUTOSAVE");
+
+#ifndef MOBILEAPP
 static const size_t IdleDocTimeoutSecs = LOOLWSD::getConfigValue(
   
"per_document.idle_timeout_secs", 3600);
 
-#ifndef MOBILEAPP
 // Used to accumulate B/W deltas.
 uint64_t adminSent = 0;
 uint64_t adminRecv = 0;
@@ -331,9 +332,11 @@ void DocumentBroker::pollThread()
 last30SecCheckTime = std::chrono::steady_clock::now();
 }
 
+if (false)
+;
+#ifndef MOBILEAPP
 // Remove idle documents after 1 hour.
-const bool idle = (isLoaded() && getIdleTimeSecs() >= 
IdleDocTimeoutSecs);
-if (idle)
+else if ((isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs))
 {
 // Stop if there is nothing to save.
 LOG_INF("Autosaving idle DocumentBroker for docKey [" << 
getDocKey() << "] to kill.");
@@ -343,6 +346,7 @@ void DocumentBroker::pollThread()
 stop("idle");
 }
 }
+#endif
 else if (_sessions.empty() && (isLoaded() || _markToDestroy))
 {
 // If all sessions have been removed, no reason to linger.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 05f5c18959cb86c7893b4a2bb45cce52f1f58c53
Author: Katarina Behrens 
AuthorDate: Tue Mar 12 15:30:35 2019 +0100
Commit: Katarina Behrens 
CommitDate: Thu Mar 21 13:21:29 2019 +0100

Close all opened List elements at the end of the page

Change-Id: I7c1e11ec57537441417f6b1cebe137587883d8c1
Reviewed-on: https://gerrit.libreoffice.org/69259
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 40eec9fc4245..43676ae674f7 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1338,6 +1338,14 @@ namespace drawinglayer
 // add MetaFile comment, process recursively and add MetaFile 
comment
 mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
 process(rBlockPrimitive);
+
+if (mnCurrentOutlineLevel >= 0 )
+{
+// end any opened List structure elements
+for(sal_Int16 i(0); i <= mnCurrentOutlineLevel; ++i)
+mpPDFExtOutDevData->EndStructureElement();
+}
+
 mpMetaFile->AddAction(new MetaCommentAction(aCommentStringB));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 drawinglayer/source/primitive2d/structuretagprimitive2d.cxx  |7 ++-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |   23 ---
 include/drawinglayer/primitive2d/structuretagprimitive2d.hxx |7 ++-
 sd/source/ui/unoidl/unomodel.cxx |3 -
 4 files changed, 29 insertions(+), 11 deletions(-)

New commits:
commit a0fd6c4d1ea6d40573ad91922bf4e37992e87143
Author: Katarina Behrens 
AuthorDate: Wed Mar 6 17:22:21 2019 +0100
Commit: Katarina Behrens 
CommitDate: Thu Mar 21 13:20:46 2019 +0100

Limit tagging of background objects to images

i.e. don't tag custom shapes and other than bitmap background fills

Change-Id: I1d42012420f59e1e7b62affb8aca5a8c85688423
Reviewed-on: https://gerrit.libreoffice.org/69258
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx 
b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 41f5577efa16..c1aedc84a587 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -31,10 +31,12 @@ namespace drawinglayer
 StructureTagPrimitive2D::StructureTagPrimitive2D(
 const vcl::PDFWriter::StructElement& rStructureElement,
 bool bBackground,
+bool bIsImage,
 const Primitive2DContainer& rChildren)
 :   GroupPrimitive2D(rChildren),
 maStructureElement(rStructureElement),
-mbBackground(bBackground)
+mbBackground(bBackground),
+mbIsImage(bIsImage)
 {
 }
 
@@ -44,7 +46,8 @@ namespace drawinglayer
 {
 const StructureTagPrimitive2D& rCompare = static_cast(rPrimitive);
 
-return (isBackground() == rCompare.isBackground());
+return (isBackground() == rCompare.isBackground() &&
+isImage() == rCompare.isImage());
 }
 
 return false;
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 1c3e73fc85b3..40eec9fc4245 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2213,20 +2213,31 @@ namespace drawinglayer
 {
 // structured tag primitive
 const vcl::PDFWriter::StructElement& 
rTagElement(rStructureTagCandidate.getStructureElement());
-const bool bTagUsed(vcl::PDFWriter::NonStructElement != 
rTagElement);
-const bool bIsBackground(rStructureTagCandidate.isBackground());
+bool bTagUsed((vcl::PDFWriter::NonStructElement != rTagElement));
 
 if(mpPDFExtOutDevData && bTagUsed)
 {
-// Write start tag. For background elements use 
NonStructElement instead of real element type (e.g. Figure)
-// to guarantee it gets exported as artifact (tagged PDF)
-mpPDFExtOutDevData->BeginStructureElement(bIsBackground ? 
vcl::PDFWriter::NonStructElement : rTagElement);
+// foreground object: tag as regular structure element
+if (!rStructureTagCandidate.isBackground())
+{
+mpPDFExtOutDevData->BeginStructureElement(rTagElement);
+}
+// background object
+else
+{
+// background image: tag as artifact
+if (rStructureTagCandidate.isImage())
+
mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::NonStructElement);
+// any other background object: do not tag
+else
+bTagUsed = false;
+}
 }
 
 // process children normally
 process(rStructureTagCandidate.getChildren());
 
-if(mpPDFExtOutDevData &&  bTagUsed)
+if(mpPDFExtOutDevData && bTagUsed)
 {
 // write end tag
 mpPDFExtOutDevData->EndStructureElement();
diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx 
b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index b6e9ad94ede8..255dc5e64f56 100644
--- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -48,20 +48,23 @@ namespace drawinglayer
 /// the PDF structure element this grouping represents
 vcl::PDFWriter::StructElement   maStructureElement;
 
-///Z flag for background contenht that may be handled as
-/// Tagged PDF '/Artifact'
+/// flag for background object
 boolmbBackground;
+/// flag for image (OBJ_GRAF)
+ 

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

2019-03-21 Thread Libreoffice Gerrit user
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c312dfb523f29acf40c2ccf74af30cce19be6697
Author: Katarina Behrens 
AuthorDate: Wed Mar 6 14:26:40 2019 +0100
Commit: Katarina Behrens 
CommitDate: Thu Mar 21 13:19:41 2019 +0100

Correct hierarchy of L, LI structure elements

in particular, don't terminate L prematurely

Change-Id: Iaf642f547b072b12ccbf861536825a2526b8798a
Reviewed-on: https://gerrit.libreoffice.org/69257
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 30cc3063c4a7..1c3e73fc85b3 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1326,8 +1326,8 @@ namespace drawinglayer
 mpPDFExtOutDevData->EndStructureElement(); // end ListItem
 mbInListItem = false;
 }
-
-mpPDFExtOutDevData->EndStructureElement();
+else
+mpPDFExtOutDevData->EndStructureElement(); // end Paragraph
 }
 
 void 
VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(const 
primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive)
___
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-5-2+backports' - stoc/source

2019-03-21 Thread Libreoffice Gerrit user
 stoc/source/corereflection/criface.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7787dd094de34556abdd6293e6a6166615eef238
Author: Juergen Funk 
AuthorDate: Thu Mar 21 09:22:03 2019 +0100
Commit: Juergen Funk (CIB) 
CommitDate: Thu Mar 21 13:13:30 2019 +0100

pUnoReturn should be null when UNO methode is VOID

the problem is that at least the msvc_win32_x86-64 bridge's
unoInterfaceProxyDispatch
(bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx)
requires pUnoReturn to be a nullptr when the UNO method has VOID
return type (see computation of retKind in cpp_call in the same file),
but that IdlInterfaceMethodImpl::invoke doesn't set up the arguments
according to that expectation.


Change-Id: I187a997300571cd9822de2eeacf7ad887ad00a4f
Reviewed-on: https://gerrit.libreoffice.org/69495
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 14a11ab5dfa2ea34049866517ee78170922aee4e)
Reviewed-on: https://gerrit.libreoffice.org/69504
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index 391742cef8f1..6cdb19788908 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -631,7 +631,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 // end of a "short" struct by writing the full contents of a "long"
 // register); so create enough space here (assuming that no ABI 
requires
 // padding larger than 16 byte boundaries):
-void * pUnoReturn = alloca( multipleOf16(pReturnType->nSize) );
+void * pUnoReturn = (pReturnType->nSize == 0) ? nullptr : alloca( 
multipleOf16(pReturnType->nSize) );
 void ** ppUnoArgs = static_cast(alloca( sizeof(void *) * 
nParams *2 ));
 typelib_TypeDescription ** ppParamTypes = 
reinterpret_cast(ppUnoArgs + nParams);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 vcl/opengl/scale.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5715c738fd9257360aa8bd6e3d39322dae193b26
Author: Luboš Luňák 
AuthorDate: Thu Mar 14 14:30:28 2019 +0100
Commit: Luboš Luňák 
CommitDate: Thu Mar 21 13:12:39 2019 +0100

add missing else in an if-else chain

No functional change, but avoid the warning.

Change-Id: Ia552c6199806a9e029800e9d65c0852baa370bd8
Reviewed-on: https://gerrit.libreoffice.org/69270
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 6459933cb81b..ae7146b6d6bf 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -349,7 +349,7 @@ void OpenGLSalBitmap::ImplScale( const double& rScaleX, 
const double& rScaleY, B
 {
 ImplScaleFilter( xContext, rScaleX, rScaleY, GL_NEAREST );
 }
-if( nScaleFlag == BmpScaleFlag::BiLinear )
+else if( nScaleFlag == BmpScaleFlag::BiLinear )
 {
 ImplScaleFilter( xContext, rScaleX, rScaleY, GL_LINEAR );
 }
@@ -360,7 +360,7 @@ void OpenGLSalBitmap::ImplScale( const double& rScaleX, 
const double& rScaleY, B
 ImplScaleConvolution( xContext, rScaleX, rScaleY, aKernel );
 }
 else if( nScaleFlag == BmpScaleFlag::BestQuality && rScaleX <= 1 && 
rScaleY <= 1 )
-{ // Use are scaling for best quality, but only if downscaling.
+{ // Use area scaling for best quality, but only if downscaling.
 ImplScaleArea( xContext, rScaleX, rScaleY );
 }
 else if( nScaleFlag == BmpScaleFlag::Lanczos || nScaleFlag == 
BmpScaleFlag::BestQuality  )
___
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-5-2+backports' - stoc/source

2019-03-21 Thread Libreoffice Gerrit user
 stoc/source/corereflection/criface.cxx |   21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

New commits:
commit ebdb378fa876a77db29abb145f664eefa9d4b46f
Author: Stephan Bergmann 
AuthorDate: Fri Sep 29 18:37:15 2017 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Thu Mar 21 13:12:32 2019 +0100

Make sure space handed to C/C++ ABI is padded large enough

PythonTest_pyuno_pytests_testcollections had failed with -fsanitize=address:

> ==6341==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 
0x7ffe5cf77048 at pc 0x7f6be12e51ba bp 0x7ffe5cf76810 sp 0x7ffe5cf76808
> WRITE of size 8 at 0x7ffe5cf77048 thread T0
> #0 0x7f6be12e51b9 in 
x86_64::fill_struct(_typelib_TypeDescriptionReference*, unsigned long const*, 
double const*, void*) bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
> #1 0x7f6be1307f03 in gcc3::callVirtualMethod(void*, unsigned int, 
void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, 
unsigned long*, double*) 
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:171:17
> #2 0x7f6be130346d in 
cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, 
bridges::cpp_uno::shared::VtableSlot, _typelib_TypeDescriptionReference*, int, 
_typelib_MethodParameter*, void*, void**, _uno_Any**) 
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:233:13
> #3 0x7f6be1301c56 in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch(_uno_Interface*, 
_typelib_TypeDescription const*, void*, void**, _uno_Any**) 
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:420:13
> #4 0x7f6be0be09ff in 
stoc_corefl::IdlInterfaceMethodImpl::invoke(com::sun::star::uno::Any const&, 
com::sun::star::uno::Sequence&) 
stoc/source/corereflection/criface.cxx:679:9
> #5 0x7f6be0be304c in non-virtual thunk to 
stoc_corefl::IdlInterfaceMethodImpl::invoke(com::sun::star::uno::Any const&, 
com::sun::star::uno::Sequence&) 
stoc/source/corereflection/criface.cxx
> #6 0x7f6be0375ef9 in (anonymous 
namespace)::IntrospectionAccessStatic_Impl::getPropertyValueByIndex(com::sun::star::uno::Any
 const&, int) const stoc/source/inspect/introspection.cxx:609:33
> #7 0x7f6be03753eb in (anonymous 
namespace)::IntrospectionAccessStatic_Impl::getPropertyValue(com::sun::star::uno::Any
 const&, rtl::OUString const&) const 
stoc/source/inspect/introspection.cxx:519:16
> #8 0x7f6be036bd75 in (anonymous 
namespace)::ImplIntrospectionAccess::getPropertyValue(rtl::OUString const&) 
stoc/source/inspect/introspection.cxx:1040:26
> #9 0x7f6be037102c in non-virtual thunk to (anonymous 
namespace)::ImplIntrospectionAccess::getPropertyValue(rtl::OUString const&) 
stoc/source/inspect/introspection.cxx
> #10 0x7f6be0f95805 in 
stoc_inv::Invocation_Impl::getValue(rtl::OUString const&) 
stoc/source/invocation/invocation.cxx:495:35
> #11 0x7f6be0f95fcc in non-virtual thunk to 
stoc_inv::Invocation_Impl::getValue(rtl::OUString const&) 
stoc/source/invocation/invocation.cxx
> #12 0x7f6be665d69a in pyuno::PyUNO_getattr(_object*, char*) 
pyuno/source/module/pyuno.cxx:1424:52
> #13 0x7f6bf34b1a5f in PyObject_GetAttr 
workdir/UnpackedTarball/python3/Objects/object.c:894:16
> #14 0x7f6bf39f10f9 in PyEval_EvalFrameEx 
workdir/UnpackedTarball/python3/Python/ceval.c:2793:29
...

Change-Id: I7c8aa0f0e153a022c19c981165730725a566a0b2
Reviewed-on: https://gerrit.libreoffice.org/42946
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 43b02c4532d88ef24c688ecd32bc8bfd6e1f57ff)
Reviewed-on: https://gerrit.libreoffice.org/69503
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index 22b12db3abae..391742cef8f1 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -18,6 +18,11 @@
  */
 
 #include 
+
+#include 
+#include 
+#include 
+
 #ifdef SAL_UNX
 #include 
 #endif
@@ -39,6 +44,15 @@ using namespace css::lang;
 using namespace css::reflection;
 using namespace css::uno;
 
+namespace {
+
+std::size_t multipleOf16(std::size_t n) {
+assert(n <= std::numeric_limits::max() - 15);
+return (n + 15) & ~std::size_t(15);
+}
+
+}
+
 namespace stoc_corefl
 {
 
@@ -612,7 +626,12 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 TYPELIB_DANGER_GET(
 &pReturnType, getMethodTypeDescr()->pReturnTypeRef );
 
-void * pUnoReturn = alloca( pReturnType->nSize );
+// C/C++ ABIs typically assume that structs are padded at the end, and
+// that those padding bytes may be written to (e.g., to write into the
+// end of a "short" struct by writing the full contents of a "long"
+// register); so create enough space here (assuming that no ABI 
requires
+// padding 

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

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/options/cfgchart.cxx |   12 
 cui/source/options/cfgchart.hxx |9 +++---
 cui/source/options/optchart.cxx |   60 +++-
 cui/source/options/optchart.hxx |7 +++-
 4 files changed, 39 insertions(+), 49 deletions(-)

New commits:
commit e53f380cbae0741ee4b39483a6422898bb580d28
Author: Armin Le Grand 
AuthorDate: Thu Mar 21 10:41:06 2019 +0100
Commit: Armin Le Grand 
CommitDate: Thu Mar 21 13:06:43 2019 +0100

Make SvxChartColorTableItem more const

SvxChartColorTableItem has non-const members (aka modifiers)
which is bad for SfxItems in general, see comments in change.
Adapt SvxChartColorTableItem and it's usage in
SvxDefaultColorOptPage as needed.
This is also preparation for possible SfxItem refactoring

Change-Id: Ia7982b4e7bbfa736229223e55ce63e02143b8cf7
Reviewed-on: https://gerrit.libreoffice.org/69499
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 685b6f9db6f2..52ddde097f4c 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -285,16 +285,4 @@ bool SvxChartColorTableItem::operator==( const 
SfxPoolItem& rAttr ) const
 return false;
 }
 
-void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const
-{
-if ( pOpts )
-pOpts->SetDefaultColors( m_aColorTable );
-}
-
-
-void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const 
XColorEntry & _rEntry )
-{
-m_aColorTable.replace( _nIndex, _rEntry );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 91adbf17cda3..debb2372d81c 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -79,7 +79,11 @@ public:
 
 
 // items
-
+// Make Item read-only (no non-const access methods). Two reasons:
+// (1) Preparation for Item refactor
+// (2) Dangerous due to SfxItem may not be what you expect (e.g. when
+// ::Set in SfxItemSet, not your instance may be used there, no control
+// about what will happen wothout deep knowledge about 
SfxItems/SfxItemSets)
 class SvxChartColorTableItem : public SfxPoolItem
 {
 public:
@@ -87,11 +91,8 @@ public:
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 virtual booloperator==( const SfxPoolItem& ) const override;
-voidSetOptions( SvxChartOptions* pOpts ) const;
 
 const SvxChartColorTable & GetColorList() const  { return m_aColorTable;}
-SvxChartColorTable &   GetColorList() { return m_aColorTable;}
-voidReplaceColorByIndex( size_t _nIndex, const 
XColorEntry & _rEntry );
 
 private:
 SvxChartColorTable  m_aColorTable;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 4645f4ea10d0..0ddd786c71c6 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -82,15 +82,14 @@ void SvxDefaultColorOptPage::ModifyColorEntry(const 
XColorEntry& rEntry, sal_Int
 
 void SvxDefaultColorOptPage::FillBoxChartColorLB()
 {
-if (!pColorConfig)
+if (!m_SvxChartColorTableUniquePtr)
 return;
 
-const SvxChartColorTable & rTab = pColorConfig->GetColorList();
 m_pLbChartColors->SetUpdateMode(false);
 ClearColorEntries();
-long nCount = rTab.size();
+const long nCount(m_SvxChartColorTableUniquePtr->size());
 for (long i = 0; i < nCount; ++i)
-InsertColorEntry(rTab[i]);
+InsertColorEntry((*m_SvxChartColorTableUniquePtr)[i]);
 m_pLbChartColors->SetUpdateMode(true);
 }
 
@@ -114,19 +113,19 @@ 
SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt
 m_pValSetColorBox->SetStyle( m_pValSetColorBox->GetStyle()
 | WB_ITEMBORDER | WB_NAMEFIELD | 
WB_VSCROLL );
 
-pChartOptions.reset(new SvxChartOptions);
+m_SvxChartOptionsUniquePtr.reset(new SvxChartOptions);
 
 const SfxPoolItem* pItem = nullptr;
 if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == 
SfxItemState::SET )
 {
-pColorConfig.reset(static_cast< SvxChartColorTableItem* 
>(pItem->Clone()));
+m_SvxChartColorTableUniquePtr = std::make_unique(
+static_cast(pItem)->GetColorList());
 }
 else
 {
-SvxChartColorTable aTable;
-aTable.useDefault();
-pColorConfig.reset(new SvxChartColorTableItem( SID_SCH_EDITOPTIONS, 
aTable ));
-pColorConfig->SetOptions( pChartOptions.get() );
+m_SvxChartColorTableUniquePtr = std::make_unique();
+m_SvxChartColorTableUniquePtr->useDefault();
+
m_SvxChartOptionsUniquePtr->SetDefaultColors(*m_SvxChartColorTableUniquePtr.get());
 }
 
 Construct();
@@ -139,11 +138,8 @@ SvxDefaultColorOptPage::~SvxDefaultColorOptPage()
 
 void SvxDefaultColorOptPa

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

2019-03-21 Thread Libreoffice Gerrit user
 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ddf1e93c740901503c92e289c70cb4d54c38dd6e
Author: Henry Castro 
AuthorDate: Thu Mar 14 09:16:59 2019 -0400
Commit: Aron Budea 
CommitDate: Thu Mar 21 12:48:26 2019 +0100

lok: intercept the UNO command ".uno:ThesaurusDialog"

Change-Id: I085cb646037f260ada4d4d04c2419638dd235048
Reviewed-on: https://gerrit.libreoffice.org/69264
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bc5c9b74beba..84d9b4b59976 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2087,7 +2087,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertPageFooter"),
 OUString(".uno:OnlineAutoFormat"),
 OUString(".uno:InsertSymbol"),
-OUString(".uno:EditRegion")
+OUString(".uno:EditRegion"),
+OUString(".uno:ThesaurusDialog")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d25601a362ca..4a18c9fc587e 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1079,7 +1079,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "OutlineBullet" ||
  aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
  aEvent.FeatureURL.Path == "TransformDialog" ||
- aEvent.FeatureURL.Path == "EditRegion")
+ aEvent.FeatureURL.Path == "EditRegion" ||
+ aEvent.FeatureURL.Path == "ThesaurusDialog")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 stoc/source/corereflection/criface.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14a11ab5dfa2ea34049866517ee78170922aee4e
Author: Juergen Funk 
AuthorDate: Thu Mar 21 09:22:03 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 12:41:45 2019 +0100

pUnoReturn should be null when UNO methode is VOID

the problem is that at least the msvc_win32_x86-64 bridge's
unoInterfaceProxyDispatch
(bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx)
requires pUnoReturn to be a nullptr when the UNO method has VOID
return type (see computation of retKind in cpp_call in the same file),
but that IdlInterfaceMethodImpl::invoke doesn't set up the arguments
according to that expectation.


Change-Id: I187a997300571cd9822de2eeacf7ad887ad00a4f
Reviewed-on: https://gerrit.libreoffice.org/69495
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index 041272a51a28..c4f5feab38ed 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -579,7 +579,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 // end of a "short" struct by writing the full contents of a "long"
 // register); so create enough space here (assuming that no ABI 
requires
 // padding larger than 16 byte boundaries):
-void * pUnoReturn = alloca( multipleOf16(pReturnType->nSize) );
+void * pUnoReturn = (pReturnType->nSize == 0) ? nullptr : alloca( 
multipleOf16(pReturnType->nSize) );
 void ** ppUnoArgs = static_cast(alloca( sizeof(void *) * 
nParams *2 ));
 typelib_TypeDescription ** ppParamTypes = 
reinterpret_cast(ppUnoArgs + nParams);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Calc recalculate bugs

2019-03-21 Thread Dennis Francis
Hi Eike,

I see that you are working on tdf#123714 and also on the related bugs
tdf#123736, tdf#120660 and tdf#120013 and you already have many fixes in.
It seems there are many sub issues mentioned by the reporter at least in
tdf#123714. I wonder if there are any sub issues there that you did/will
not get a chance to work on etc. In that case I'd be happy to help and try
fix some of the remaining ones if it is ok with you of course. Please do
let me know :)

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

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 726840421380f248e5b33fe81b32f4f8930debf1
Author: Andras Timar 
AuthorDate: Thu Mar 21 09:45:20 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 11:45:49 2019 +0100

license: liblangtag is LGPLv3+/MPLv2

See: http://tagoh.github.io/liblangtag/#sec2
or
workdir/UnpackedTarball/liblangtag/README

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index edf5ef4a3ae4..20ade0084df3 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -706,6 +706,7 @@
 The following software may be included in this product: liblangtag. 
Use of any of this software is governed
 by the terms of the license below:
 Jump to LGPL Version 3
+Jump to MPL Version 2.0
 
 
 libmspub
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 comphelper/source/misc/threadpool.cxx |   16 ++--
 include/comphelper/threadpool.hxx |9 +++--
 sc/source/core/data/documen2.cxx  |4 
 sc/source/core/data/formulacell.cxx   |6 --
 4 files changed, 25 insertions(+), 10 deletions(-)

New commits:
commit 769832cc1f592b1d0c39cda7795fe4548fc97566
Author: Dennis Francis 
AuthorDate: Wed Mar 20 20:07:58 2019 +0530
Commit: Michael Meeks 
CommitDate: Thu Mar 21 11:24:26 2019 +0100

Increase the life-cycle of threads in thread-pool...

to ScDocument lifetime if possible. This helps to avoid lots
of thread setup-cost while doing recalcs especially if there are
many formula-groups in the document and most of them are fairly
light-weight.

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

diff --git a/comphelper/source/misc/threadpool.cxx 
b/comphelper/source/misc/threadpool.cxx
index d0178e9aa9a7..89d80298432b 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -213,7 +213,7 @@ std::unique_ptr ThreadPool::popWorkLocked( 
std::unique_lock< std::mu
 return nullptr;
 }
 
-void ThreadPool::waitUntilDone(const std::shared_ptr& rTag)
+void ThreadPool::waitUntilDone(const std::shared_ptr& rTag, 
bool bJoinAll)
 {
 #if defined DBG_UTIL && (defined LINUX || defined _WIN32)
 assert(!gbIsWorkerThread && "cannot wait for tasks from inside a task");
@@ -232,12 +232,16 @@ void ThreadPool::waitUntilDone(const 
std::shared_ptr& rTag)
 
 rTag->waitUntilDone();
 
+if (bJoinAll)
+joinAll();
+}
+
+void ThreadPool::joinAll()
+{
+std::unique_lock< std::mutex > aGuard( maMutex );
+if (maTasks.empty()) // check if there are still tasks from another tag
 {
-std::unique_lock< std::mutex > aGuard( maMutex );
-if (maTasks.empty()) // check if there are still tasks from another tag
-{
-shutdownLocked(aGuard);
-}
+shutdownLocked(aGuard);
 }
 }
 
diff --git a/include/comphelper/threadpool.hxx 
b/include/comphelper/threadpool.hxx
index 092078199981..1cb9441cfdd1 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -63,8 +63,13 @@ public:
 /// push a new task onto the work queue
 voidpushTask( std::unique_ptr pTask);
 
-/// wait until all queued tasks associated with the tag are completed
-voidwaitUntilDone(const std::shared_ptr&);
+/** Wait until all queued tasks associated with the tag are completed
+@param  bJoinAll - if set it joins all threads at the end if no other 
tasks from other tags.
+*/
+voidwaitUntilDone(const std::shared_ptr&, bool 
bJoinAll = true);
+
+/// join all threads if there are no tasks presently.
+voidjoinAll();
 
 /// return the number of live worker threads
 sal_Int32   getWorkerCount() const { return mnWorkers; }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 321c4535e10b..0892025b242a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -307,6 +308,9 @@ ScDocument::~ScDocument()
 {
 OSL_PRECOND( !bInLinkUpdate, "bInLinkUpdate in dtor" );
 
+// Join any pending(recalc) threads in global threadpool
+comphelper::ThreadPool::getSharedOptimalPool().joinAll();
+
 bInDtorClear = true;
 
 // first of all disable all refresh timers by deleting the control
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 17dc29811ae5..9edddf0bfc54 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4758,8 +4758,10 @@ bool 
ScFormulaCell::InterpretFormulaGroupThreading(sc::FormulaLogger::GroupScope
 nStartOffset, 
nEndOffset));
 }
 
-SAL_INFO("sc.threaded", "Joining threads");
-rThreadPool.waitUntilDone(aTag);
+SAL_INFO("sc.threaded", "Waiting for threads to finish work");
+// Do not join the threads here. They will get joined in 
ScDocument destructor
+// if they don't get joined from elsewhere before (via 
ThreadPool::waitUntilDone).
+rThreadPool.waitUntilDone(aTag, false);
 
 pDocument->SetThreadedGroupCalcInProgress(false);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 sd/source/ui/view/Outliner.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 3d9f973e6648c5819608237f390df523b6a32ed8
Author: Julien Nabet 
AuthorDate: Sun Mar 10 11:37:55 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Mar 21 10:48:43 2019 +0100

Related tdf#122788: avoid assert

See:
- https://bugs.documentfoundation.org/attachment.cgi?id=149853
- https://bugs.documentfoundation.org/attachment.cgi?id=149854
- https://bugs.documentfoundation.org/show_bug.cgi?id=122788#c5
- https://bugs.documentfoundation.org/show_bug.cgi?id=122788#c6

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

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e86136bb79a4..df322f51706b 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1422,6 +1422,12 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
 pViewShell->GetDispatcher()->ExecuteList(SID_TEXTEDIT,
 SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
 
+if (mpView->IsTextEdit())
+{
+// end text edition before starting it again
+mpView->SdrEndTextEdit();
+}
+
 // To be consistent with the usual behaviour in the Office the text
 // object that is put into edit mode would have also to be selected.
 // Starting the text edit mode is not enough so we do it here by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Implementing interface for importing external data in calc

2019-03-21 Thread smooth_vaibhav
I have been keen about the project idea of implementing the import
functionality of external data in calc. I have some queries regarding it.

1) There are numerous possibilities of external data sources like database,
files. So should the implementation should be independent of external source
of data or is it the case that we first gonna store it in a ScDBdata.

2) Its given that the user can select the range of data to be selected and
imported. Does that imply we provide them with a UI such that they can
choose the number of columns and rows to be imported.

I acknowledge the fact that the Mail list is to be used just for important
purposes but I have some queries to clear for better understanding of the
project idea. 

Thanks.



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-03-21 Thread Libreoffice Gerrit user
 i18npool/source/collator/data/hu_charset.txt |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7618490d334409c3fc4167f32732537ef738647f
Author: László Németh 
AuthorDate: Tue Feb 19 13:42:58 2019 +0100
Commit: László Németh 
CommitDate: Thu Mar 21 09:44:48 2019 +0100

tdf#123204 hu_HU collation: don't ignore special characters

to show/handle them in Calc AutoFilter.

Partial revert of "tdf#11 fix Hungarian sorting"
(commit 7b1eb6313c0d2621c364df1724c69d28f8267841).

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

diff --git a/i18npool/source/collator/data/hu_charset.txt 
b/i18npool/source/collator/data/hu_charset.txt
index 2b6677e0dc1b..f38ecfd5c7b6 100644
--- a/i18npool/source/collator/data/hu_charset.txt
+++ b/i18npool/source/collator/data/hu_charset.txt
@@ -22,7 +22,11 @@
 
 [caseLevel on]
 [caseFirst lower]
-[alternate shifted]
+
+# Because of the different requirements of Writer and Calc,
+# don't ignore the special characters, yet.
+# See tdf#123204 "EDITING Not all special characters appear in the AutoFilter 
window"
+# [alternate shifted]
 
 & c < cs <<< Cs <<< CS
 & d < dz <<< DZ < dzs <<< Dzs <<< DZS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 sc/IwyuFilter_sc.yaml  |7 +
 sc/inc/scitems.hxx |1 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx|9 ---
 sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx |   11 -
 sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx   |1 
 sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx|1 
 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |   12 
--
 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx  |   12 
--
 sc/source/ui/StatisticsDialogs/FTestDialog.cxx |   12 
--
 sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx   |   11 -
 sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx |   12 
--
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx |4 ---
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx|8 --
 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx  |4 ---
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx |8 --
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |8 --
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx |   12 
--
 sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |   12 
--
 sc/source/ui/inc/undocell.hxx  |1 
 sc/source/ui/pagedlg/areasdlg.cxx  |1 
 sc/source/ui/pagedlg/hfedtdlg.cxx  |2 -
 sc/source/ui/pagedlg/scuitphfedit.cxx  |   12 
--
 sc/source/ui/pagedlg/tphf.cxx  |2 -
 sc/source/ui/pagedlg/tphfedit.cxx  |5 
 sc/source/ui/pagedlg/tptable.cxx   |1 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx|5 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx|4 ---
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx   |5 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx   |8 ++
 sc/source/ui/sidebar/CellBorderStyleControl.cxx|4 ---
 sc/source/ui/sidebar/CellLineStyleControl.cxx  |4 ---
 sc/source/ui/sidebar/NumberFormatControl.cxx   |1 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |1 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx |8 --
 sc/source/ui/sidebar/ScPanelFactory.cxx|4 ---
 sc/source/ui/styleui/styledlg.cxx  |4 ---
 sc/source/ui/uitest/uiobject.cxx   |1 
 sc/source/ui/undo/refundo.cxx  |4 ---
 sc/source/ui/undo/undobase.cxx |1 
 sc/source/ui/undo/undoblk.cxx  |4 ---
 sc/source/ui/undo/undoblk2.cxx |3 --
 sc/source/ui/undo/undoblk3.cxx |9 ---
 sc/source/ui/undo/undocell.cxx |7 -
 sc/source/ui/undo/undodat.cxx  |5 
 sc/source/ui/undo/undodraw.cxx |2 -
 sc/source/ui/undo/undorangename.cxx|3 --
 sc/source/ui/undo/undotab.cxx  |1 
 47 files changed, 30 insertions(+), 227 deletions(-)

New commits:
commit 7c7a4675ad5d61add70dd073f680ea37012962ce
Author: Gabor Kelemen 
AuthorDate: Mon Mar 18 00:34:00 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Mar 21 09:10:18 2019 +0100

tdf#42949 Fix IWYU warnings in sc/source/ui/pagedlg...undo

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

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index d04da62d06f1..fc77866f682d 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -867,3 +867,10 @@ blacklist:
 # Complete type is needed
 - com/sun/star/sheet/XFormulaParser.hpp
 - com/sun/star/sheet/XFormulaOpCodeMapper.hpp
+sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx:
+# Needed for implicit dtor
+- editeng/editobj.hxx
+sc/source/ui/undo/undoolk.cxx:
+# Avoid loplugin:unreffun error
+- undoolk.hxx
+
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index d2e982d82083..159e6e013706 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -49,6 +49,7 @@ class SvxHorJustifyItem;
 class SvxVerJustifyItem;
 class SvxBrushItem;
 class SvxBoxItem;
+class ScCondFormatItem;
 
 //  EditEngi

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

2019-03-21 Thread Libreoffice Gerrit user
 svx/qa/unit/XTableImportExportTest.cxx |   11 +---
 svx/qa/unit/customshapes.cxx   |   41 +++--
 svx/qa/unit/unodraw.cxx|   11 +---
 svx/qa/unit/xoutdev.cxx|   11 +---
 4 files changed, 15 insertions(+), 59 deletions(-)

New commits:
commit ba83043d679b11740323708e0c9da8b1e4cae488
Author: Miklos Vajna 
AuthorDate: Wed Mar 20 21:42:07 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Mar 21 09:07:02 2019 +0100

CppunitTest_svx_unit: use CPPUNIT_TEST_FIXTURE()

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

diff --git a/svx/qa/unit/XTableImportExportTest.cxx 
b/svx/qa/unit/XTableImportExportTest.cxx
index 564920f801d3..cc86393577e3 100644
--- a/svx/qa/unit/XTableImportExportTest.cxx
+++ b/svx/qa/unit/XTableImportExportTest.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -30,20 +31,14 @@ using namespace css;
 class XTableImportExportTest : public CppUnit::TestFixture
 {
 public:
-void testImportExport();
-
 virtual void setUp() override
 {
 CppUnit::TestFixture::setUp();
 SfxApplication::GetOrCreate();
 }
-
-CPPUNIT_TEST_SUITE(XTableImportExportTest);
-CPPUNIT_TEST(testImportExport);
-CPPUNIT_TEST_SUITE_END();
 };
 
-void XTableImportExportTest::testImportExport()
+CPPUNIT_TEST_FIXTURE(XTableImportExportTest, testImportExport)
 {
 utl::TempFile aTempFile(nullptr, true);
 aTempFile.EnableKillingFile();
@@ -87,6 +82,4 @@ void XTableImportExportTest::testImportExport()
 }
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(XTableImportExportTest);
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 23d3fb676770..33384f56c83b 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -34,9 +34,8 @@ const OUString sDataDirectory("svx/qa/unit/data/");
 /// Tests for svx/source/customshapes/ code.
 class CustomshapesTest : public test::BootstrapFixture, public 
unotest::MacrosTest
 {
+protected:
 uno::Reference mxComponent;
-
-private:
 // get shape nShapeIndex from page 0
 uno::Reference getShape(sal_uInt8 nShapeIndex);
 
@@ -55,26 +54,6 @@ public:
 }
 test::BootstrapFixture::tearDown();
 }
-
-void testViewBoxLeftTop();
-void testAccuracyCommandX();
-void testToggleCommandXY();
-void testMultipleMoveTo();
-void testWidthOrientationCommandU();
-void testHalfEllipseVML();
-void testLargeSwingAngleVML();
-void testTdf121845_two_commands_U();
-
-CPPUNIT_TEST_SUITE(CustomshapesTest);
-CPPUNIT_TEST(testViewBoxLeftTop);
-CPPUNIT_TEST(testAccuracyCommandX);
-CPPUNIT_TEST(testToggleCommandXY);
-CPPUNIT_TEST(testMultipleMoveTo);
-CPPUNIT_TEST(testWidthOrientationCommandU);
-CPPUNIT_TEST(testHalfEllipseVML);
-CPPUNIT_TEST(testLargeSwingAngleVML);
-CPPUNIT_TEST(testTdf121845_two_commands_U);
-CPPUNIT_TEST_SUITE_END();
 };
 
 uno::Reference CustomshapesTest::getShape(sal_uInt8 
nShapeIndex)
@@ -90,7 +69,7 @@ uno::Reference 
CustomshapesTest::getShape(sal_uInt8 nShapeIndex
 return xShape;
 }
 
-void CustomshapesTest::testViewBoxLeftTop()
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testViewBoxLeftTop)
 {
 // tdf#121890 formula values "left" and "top" are wrongly calculated
 // Load a document with two custom shapes of type "non-primitive"
@@ -123,7 +102,7 @@ void CustomshapesTest::testViewBoxLeftTop()
 CPPUNIT_ASSERT_LESS(static_cast(3), labs(aFrameRectTB.Y - 
aBoundRectTB.Y));
 }
 
-void CustomshapesTest::testAccuracyCommandX()
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testAccuracyCommandX)
 {
 // 121761 Increase accuracy of quarter circles drawn by command X or Y
 // The loaded document has a quarter circle with radius 1 (unit 1/100 
mm)
@@ -145,7 +124,7 @@ void CustomshapesTest::testAccuracyCommandX()
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("segment height out of tolerance", 
2942.0, fHeight, 8.0);
 }
 
-void CustomshapesTest::testToggleCommandXY()
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testToggleCommandXY)
 {
 // 121952 Toggle x- and y-direction if command X has several parameters
 // The loaded document has a shape with command X and two parameter placed 
on a diagonal.
@@ -168,7 +147,7 @@ void CustomshapesTest::testToggleCommandXY()
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("segment height out of tolerance", 
5871.0, fHeight, 16.0);
 }
 
-void CustomshapesTest::testMultipleMoveTo()
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testMultipleMoveTo)
 {
 // tdf122964 Multiple moveTo has to be treated as lineTo in 
draw:enhanced-path
 // Load a document with path "M 0 0 5 10 10 0 N"
@@ -187,7 +166,7 @@ void CustomshapesTest::testMultipleMoveTo()
 CPPUNIT_ASSERT_MESSAGE("Path is empty", !bIsZ

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   28 
 1 file changed, 28 insertions(+)

New commits:
commit 5bcad163b67e1d83ab44ac31ae29d3f5c4bb3eb9
Author: Andras Timar 
AuthorDate: Wed Mar 20 23:00:24 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:49:57 2019 +0100

license: added bzip2

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 53adbd6e8e23..edf5ef4a3ae4 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -127,6 +127,34 @@
 copies of this file in any form for internal or external distribution 
as long as this notice remains
 attached.
 
+
+Bzip2
+The following software may be included in this product: bzip2, a 
free and open-source file compression
+program. Use of any of this software is governed by the terms of the 
license below:
+This program, "bzip2", the associated library "libbzip2", and all 
documentation, are copyright (C) 1996-2010
+Julian R Seward. All rights reserved.
+Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that
+the following conditions are met:
+
+Redistributions of source code must retain the above copyright 
notice, this list of conditions and the
+following disclaimer.
+The origin of this software must not be misrepresented; you 
must not claim that you wrote the original
+software. If you use this software in a product, an acknowledgment 
in the product documentation would be
+appreciated but is not required.
+Altered source versions must be plainly marked as such, and 
must not be misrepresented as being the
+original software.
+The name of the author may not be used to endorse or promote 
products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Julian Seward, jsew...@bzip.org
+
 
 Cairo
 The following software may be included in this product: Cairo. Use 
of any of this software is governed by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 4d6c7cae03835ca5b2b352559a1cc5d462da7dba
Author: Andras Timar 
AuthorDate: Wed Mar 20 22:36:04 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:49:11 2019 +0100

license: added PDFium

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 1627dcd82cc5..79a80d79d9c0 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1326,6 +1326,30 @@
 changed. i.e. this code cannot simply be copied and put under another 
distribution license [including the GNU
 Public License.]
 
+
+PDFium
+The following software may be included in this product: PDFium. Use 
of any of this software is governed by
+the terms of the license below:
+Copyright 2014 PDFium Authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that
+the following conditions are met:
+
+Redistributions of source code must retain the above copyright 
notice, this list of conditions and the
+following disclaimer.
+Redistributions in binary form must reproduce the above 
copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other 
materials provided with the distribution.
+Neither the name of Google Inc. nor the names of its 
contributors may be used to endorse or promote
+products derived from this software without specific prior written 
permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
"AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
 
 Pentaho Reporting Flow Engine
 The following software may be included in this product: Pentaho 
Reporting Flow Engine (including core,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   70 +++--
 1 file changed, 36 insertions(+), 34 deletions(-)

New commits:
commit 2778b56effb9ce675a9a174fe5497d80725701fc
Author: Andras Timar 
AuthorDate: Wed Mar 20 22:43:10 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:49:37 2019 +0100

license: internal Pixman is used, when internal Cairo is used

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 79a80d79d9c0..53adbd6e8e23 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1357,40 +1357,42 @@
 Use of any of this software is governed by the terms of the license 
below:
 Jump to LGPL Version 2.1
 
-Pixman
-The following software may be included in this product: Pixman 
(libpixman). Use of any of this software is
-governed by the terms of the license below:
-The following is the MIT license, agreed upon by most contributors.
-Copyright holders of new code should use this license statement where 
possible. They may also add themselves to
-the list below.
-Copyright 1987, 1988, 1989, 1998  The Open Group
-Copyright 1987, 1988, 1989 Digital Equipment Corporation
-Copyright 1999, 2004, 2008 Keith Packard
-Copyright 2000 SuSE, Inc.
-Copyright 2000 Keith Packard, member of The XFree86 Project, Inc.
-Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc.
-Copyright 2004 Nicholas Miell
-Copyright 2005 Lars Knoll & Zack Rusin, Trolltech
-Copyright 2005 Trolltech AS
-Copyright 2007 Luca Barbato
-Copyright 2008 Aaron Plattner, NVIDIA Corporation
-Copyright 2008 Rodrigo Kumpera
-Copyright 2008 André Tupinambá
-Copyright 2008 Mozilla Corporation
-Copyright 2008 Frederic Plourde
-Copyright 2009, Oracle and/or its affiliates. All rights reserved.
-Copyright 2009, 2010 Nokia Corporation
-Permission is hereby granted, free of charge, to any person obtaining a 
copy of this software and associated
-documentation files (the "Software"), to deal in the Software without 
restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, 
and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to the 
following conditions: The above copyright
-notice and this permission notice (including the next paragraph) shall be 
included in all copies or substantial
-portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+
+Pixman
+The following software may be included in this product: Pixman 
(libpixman). Use of any of this software is
+governed by the terms of the license below:
+The following is the MIT license, agreed upon by most 
contributors.
+Copyright holders of new code should use this license statement 
where possible. They may also add themselves to
+the list below.
+Copyright 1987, 1988, 1989, 1998  The Open Group
+Copyright 1987, 1988, 1989 Digital Equipment Corporation
+Copyright 1999, 2004, 2008 Keith Packard
+Copyright 2000 SuSE, Inc.
+Copyright 2000 Keith Packard, member of The XFree86 Project, Inc.
+Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc.
+Copyright 2004 Nicholas Miell
+Copyright 2005 Lars Knoll & Zack Rusin, Trolltech
+Copyright 2005 Trolltech AS
+Copyright 2007 Luca Barbato
+Copyright 2008 Aaron Plattner, NVIDIA Corporation
+Copyright 2008 Rodrigo Kumpera
+Copyright 2008 André Tupinambá
+Copyright 2008 Mozilla Corporation
+Copyright 2008 Frederic Plourde
+Copyright 2009, Oracle and/or its affiliates. All rights reserved.
+Copyright 2009, 2010 Nokia Corporation
+Permission is hereby granted, free of charge, to any person 
obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without 
restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, 
and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to 
the following conditions: The

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   36 
 1 file changed, 36 insertions(+)

New commits:
commit e4b43cdc8044ffb1958f652d671b63cdef222c61
Author: Andras Timar 
AuthorDate: Wed Mar 20 22:22:43 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:48:12 2019 +0100

license: added Google breakpad

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 866ee8ba88bc..1627dcd82cc5 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -91,6 +91,42 @@
 LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
OF OR IN CONNECTION WITH THE SOFTWARE OR
 THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+Breakpad
+The following software may be included in this product: Google 
breakpad crash-reporting library. Use of any
+of this software is governed by the terms of the license below:
+Copyright (c) 2006, Google Inc.
+All rights reserved.
+Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that
+the following conditions are met:
+
+Redistributions of source code must retain the above copyright 
notice, this list of conditions and the
+following disclaimer.
+Redistributions in binary form must reproduce the above 
copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other 
materials provided with the distribution.
+Neither the name of Google Inc. nor the names of its 
contributors may be used to endorse or promote
+products derived from this software without specific prior written 
permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
"AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+Copyright 2001-2004 Unicode, Inc.
+Disclaimer
+This source code is provided as is by Unicode, Inc. No claims are 
made as to fitness for any particular
+purpose. No warranties of any kind are expressed or implied. The 
recipient agrees to determine applicability of
+information provided. If this file has been purchased on magnetic or 
optical media from Unicode, Inc., the sole
+remedy for any claim will be exchange of defective media within 90 
days of receipt.
+Limitations on Rights to Redistribute This Code Unicode, Inc. 
hereby grants the right to freely use the
+information supplied in this file in the creation of products 
supporting the Unicode Standard, and to make
+copies of this file in any form for internal or external distribution 
as long as this notice remains
+attached.
+
 
 Cairo
 The following software may be included in this product: Cairo. Use 
of any of this software is governed by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   53 -
 1 file changed, 53 deletions(-)

New commits:
commit acc328e401cfa3b3da42ae6ce66ca9d5add9b6d8
Author: Andras Timar 
AuthorDate: Wed Mar 20 22:10:34 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:47:09 2019 +0100

license: STLPort is not included in LibreOffice

Change-Id: I081ceab1c54b01ed6a3c6ad2702fd69f82b4493e
Reviewed-on: https://gerrit.libreoffice.org/69486
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 00500cd0cfa8..866ee8ba88bc 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1552,59 +1552,6 @@
 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This file declares SANE application interface. See the SANE standard 
for a detailed explanation of the
 interface.
-STLPort
-The following software may be included in this product:STLport. Use of 
any of this software is governed by the
-terms of the license below:
-License Agreement
-Boris Fomitchev grants Licensee a non-exclusive,
-non-transferable, royalty-free license to use STLport and its documentation without
-fee.
-By downloading, using, or copying STLport or 
any portion thereof, Licensee agrees to abide by the intellectual property laws and 
all other applicable laws of the United
-States of America, and to all of the terms and conditions of this 
Agreement.
-Licensee shall maintain the following copyright 
and permission notices on STLport sources and its documentation unchanged:
-Copyright 1999,2000 Boris Fomitchev
-This material is provided "as is", with absolutely no warranty 
expressed or implied. Any use is at your own
-risk.
-Permission to use or copy this software for any purpose is hereby 
granted without fee, provided the above
-notices are retained on all copies. Permission to modify the code and to 
distribute modified code is granted,
-provided the above notices are retained, and a notice that the code was 
modified is included with the above
-copyright notice.
-The Licensee may distribute binaries compiled 
with STLport
-(whether original or modified) without any royalties or restrictions.
-The Licensee may distribute original or 
modified STLport
-sources, provided that:
-
-
-•The 
conditions indicated in the above permission
-notice are met; 
-
-
-•The 
following copyright notices are retained when
-present, and conditions provided in accompanying permission 
notices are met: 
-
-
-Copyright 1994 Hewlett-Packard Company
-Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
-Copyright 1997 Moscow Center for SPARC Technology.
-Permission to use, copy, modify, distribute and sell this software and 
its documentation for any purpose is
-hereby granted without fee, provided that the above copyright notice 
appear in all copies and that both that
-copyright notice and this permission notice appear in supporting 
documentation. Hewlett-Packard Company makes no
-representations about the suitability of this software for any purpose. It 
is provided "as is" without express or
-implied warranty.
-Permission to use, copy, modify, distribute and sell this software and 
its documentation for any purpose is
-hereby granted without fee, provided that the above copyright notice 
appear in all copies and that both that
-copyright notice and this permission notice appear in supporting 
documentation. Silicon Graphics makes no
-representations about the suitability of this software for any purpose. It 
is provided "as is" without express or
-implied warranty.
-Permission to use, copy, modify, distribute and sell this software and 
its documentation for any purpose is
-hereby granted without fee, provided that the above copyright notice 
appear in all copies and that both that
-copyright notice and this permission notice appear in supporting 
documentation. Moscow Center for SPARC Technology
-makes no representations about the suitability of this software for any 
purpose. It is provided "as is" without
-express or implied warranty.
 SVGPathSeg polyfill
 The following software may be included in this product: SVGPathSeg 
polyfill. Use of any of this software is
 governed by the terms of the license below:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2019-03-21 Thread Libreoffice Gerrit user
 readlicense_oo/license/license.xml |   12 
 1 file changed, 12 insertions(+)

New commits:
commit b655804d083ec1e5dda73bc4b7cade579ce8c123
Author: Andras Timar 
AuthorDate: Wed Mar 20 22:07:05 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 21 08:46:41 2019 +0100

license: added APR and Serf

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 5c1bff921860..00500cd0cfa8 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -54,6 +54,18 @@
 Use of any of this software is governed by the terms of the license 
below:
 Jump to Apache License 
Version 2.0
 
+
+Apache Portable Runtime (APR)
+The following software may be included in this product: Apache 
Portable Runtime (APR).
+Use of any of this software is governed by the terms of the license 
below:
+Jump to Apache License 
Version 2.0
+
+
+Apache Serf
+The following software may be included in this product: Apache Serf.
+Use of any of this software is governed by the terms of the license 
below:
+Jump to Apache License 
Version 2.0
+
 
 beanshell
 The following software may be included in this product: beanshell. 
Use of any of this software is governed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 sw/source/uibase/wrtsh/wrtsh1.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 04bd1925706360414438b814046b543c5e317d0a
Author: Phil Krylov 
AuthorDate: Fri Mar 15 23:26:04 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Mar 21 08:13:23 2019 +0100

tdf#79717 save/restore character style on selection overwrite

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

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 8ea052499b4f..5d5745bb85fa 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -89,6 +89,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // -> #111827#
 #include 
@@ -188,7 +189,8 @@ void SwWrtShell::Insert( const OUString &rStr )
 
 SfxItemSet aCharAttrSet(
 GetAttrPool(),
-svl::Items{});
+svl::Items{});
 
 if( bHasSel || ( !m_bIns && SelectHiddenRange() ) )
 {
@@ -235,6 +237,7 @@ void SwWrtShell::Insert( const OUString &rStr )
 for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; ++i)
 if (i != sal_uInt16(RES_CHRATR_RSID))
 aAttribs.insert(aAttribs.end(), i);
+aAttribs.insert(aAttribs.end(), RES_TXTATR_CHARFMT);
 ResetAttr(aAttribs, &aPaM);
 
 SetAttrSet(aCharAttrSet, SetAttrMode::DEFAULT, &aPaM);
___
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' - cui/source vcl/unx

2019-03-21 Thread Libreoffice Gerrit user
 cui/source/tabpages/page.cxx |   14 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx |6 --
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 71e64623f08b162e18180cdae5ad532114e56190
Author: Caolán McNamara 
AuthorDate: Sat Mar 16 21:46:54 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Mar 21 08:11:39 2019 +0100

Resolves: tdf#123650 explicitly grab focus after modification

of the widget after gaining focus, otherwise gtk loses track
of where the focus should be

and tdf#124226 do fill-on-demand hack only on first visit

disconnect focus handler after the fill

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

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 81ad11e810f6..b8ed9094c06e 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -308,7 +308,6 @@ void SvxPageDescPage::Init_Impl()
 // adjust the handler
 m_xLayoutBox->connect_changed(LINK(this, SvxPageDescPage, LayoutHdl_Impl));
 
-m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, 
PaperBinHdl_Impl));
 m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, 
PaperSizeSelect_Impl));
 m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
 m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
@@ -410,6 +409,10 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 
 m_xPaperTrayBox->append(OUString::number(nPaperBin), aBinName);
 m_xPaperTrayBox->set_active_text(aBinName);
+// reset focus handler to default first so know none already connected
+m_xPaperTrayBox->connect_focus_in(Link());
+// update the list when widget gets focus
+m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, 
PaperBinHdl_Impl));
 
 Size aPaperSize = SvxPaperInfo::GetPaperSize( mpDefPrinter );
 pItem = GetItem( *rSet, SID_ATTR_PAGE_SIZE );
@@ -804,9 +807,8 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, 
weld::ComboBox&, void)
 
 IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::Widget&, void)
 {
-if (m_xPaperTrayBox->get_count() > 1)
-// already filled
-return;
+// tdf#124226 disconnect so not called again, unless Reset occurs
+m_xPaperTrayBox->connect_focus_in(Link());
 
 OUString aOldName = m_xPaperTrayBox->get_active_text();
 m_xPaperTrayBox->freeze();
@@ -826,6 +828,10 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, 
weld::Widget&, void)
 }
 m_xPaperTrayBox->set_active_text(aOldName);
 m_xPaperTrayBox->thaw();
+
+// tdf#123650 explicitly grab-focus after the modification otherwise gtk 
loses track
+// of there the focus should be
+m_xPaperTrayBox->grab_focus();
 }
 
 IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b130fe5d4747..95f6ccfa4c48 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1222,11 +1222,12 @@ protected:
 GtkWidget* m_pWidget;
 GtkInstanceBuilder* m_pBuilder;
 
-static void signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
+static gboolean signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
 {
 GtkInstanceWidget* pThis = static_cast(widget);
 SolarMutexGuard aGuard;
 pThis->signal_focus_in();
+return false;
 }
 
 void signal_focus_in()
@@ -1234,11 +1235,12 @@ protected:
 m_aFocusInHdl.Call(*this);
 }
 
-static void signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget)
+static gboolean signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget)
 {
 GtkInstanceWidget* pThis = static_cast(widget);
 SolarMutexGuard aGuard;
 pThis->signal_focus_out();
+return false;
 }
 
 void signal_focus_out()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user
 basctl/source/inc/layout.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7379a8084df6fd659591ec114d43122ef1686d00
Author: Andrea Gelmini 
AuthorDate: Wed Mar 20 16:09:31 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Mar 21 08:09:59 2019 +0100

Fix typo

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

diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx
index e054d32d23e0..9618f3c6bd8e 100644
--- a/basctl/source/inc/layout.hxx
+++ b/basctl/source/inc/layout.hxx
@@ -74,7 +74,7 @@ private:
 // when this window has at first (nonempty) size
 bool bFirstSize;
 
-// horizontal or vertical splitted strip
+// horizontal or vertical split strip
 class SplittedSide
 {
 public:
___
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

2019-03-21 Thread Libreoffice Gerrit user
 sw/source/uibase/utlui/content.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 660f6f7ef377c22599f5bd57b389553a2471609d
Author: Caolán McNamara 
AuthorDate: Wed Mar 20 09:16:28 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Mar 21 08:08:48 2019 +0100

rhbz#1690645 null deref of pEntry when GetCurEntry return null

in GetFocusRect at SvTreeList::GetDepth

code in since

commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Author: Steve Yin 
Date:   Fri Nov 29 13:03:27 2013 +

Integrate branch of IAccessible2

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index be0816cad53f..ce631a05e9d2 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2844,15 +2844,14 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
 //and realize multi-selection .
 else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
 {
-
 SvTreeListEntry* pEntry = GetCurEntry();
-if( GetChildCount( pEntry ) == 0 )
-m_bIsKeySpace = true;
-Point tempPoint = GetEntryPosition( pEntry );//Change from 
"GetEntryPos" to "GetEntryPosition" for acc migration
-m_aOldRectangle = GetFocusRect( pEntry,tempPoint.Y() );
-
 if(pEntry)
 {
+if( GetChildCount( pEntry ) == 0 )
+m_bIsKeySpace = true;
+Point tempPoint = GetEntryPosition( pEntry );//Change from 
"GetEntryPos" to "GetEntryPosition" for acc migration
+m_aOldRectangle = GetFocusRect(pEntry, tempPoint.Y());
+
 if (State::HIDDEN != m_eState)
 {
 if (State::CONSTANT == m_eState)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits