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

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/badcellstyles.png |binary
 icon-themes/colibre/cmd/32/goodcellstyles.png|binary
 icon-themes/colibre/cmd/32/insertfixedtext.png   |binary
 icon-themes/colibre/cmd/32/neutralcellstyles.png |binary
 icon-themes/colibre/cmd/32/showtoolbar.png   |binary
 icon-themes/colibre/cmd/lc_badcellstyles.png |binary
 icon-themes/colibre/cmd/lc_goodcellstyles.png|binary
 icon-themes/colibre/cmd/lc_insertfixedtext.png   |binary
 icon-themes/colibre/cmd/lc_neutralcellstyles.png |binary
 icon-themes/colibre/cmd/lc_showtoolbar.png   |binary
 icon-themes/colibre/cmd/sc_insertfixedtext.png   |binary
 icon-themes/colibre/cmd/sc_showtoolbar.png   |binary
 icon-themes/colibre/links.txt|8 
 icon-themes/colibre/res/printeradmin_16.png  |binary
 icon-themes/colibre/res/printeradmin_32.png  |binary
 icon-themes/colibre_svg/cmd/32/badcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/32/goodcellstyles.svg|1 +
 icon-themes/colibre_svg/cmd/32/insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/32/neutralcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/32/showtoolbar.svg   |1 +
 icon-themes/colibre_svg/cmd/lc_badcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/lc_goodcellstyles.svg|1 +
 icon-themes/colibre_svg/cmd/lc_insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/lc_neutralcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/lc_showtoolbar.svg   |1 +
 icon-themes/colibre_svg/cmd/sc_insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/sc_showtoolbar.svg   |1 +
 icon-themes/colibre_svg/res/printeradmin_16.svg  |2 ++
 icon-themes/colibre_svg/res/printeradmin_32.svg  |1 +
 29 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 9fa90a80c6aafe894bb3cdd5fdfacc254d0df6b6
Author: Rizal Muttaqin 
AuthorDate: Mon Oct 12 13:58:12 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Oct 13 06:34:49 2020 +0200

tdf#137369 Add missing targeted icons as defined by links.txt

Change-Id: I030368a09905f236ce43fa5d08740641d694fbad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104199
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 4f8b13267559e8e89a306a6c522f905322396bd0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104159

diff --git a/icon-themes/colibre/cmd/32/badcellstyles.png 
b/icon-themes/colibre/cmd/32/badcellstyles.png
new file mode 100644
index ..d73a8feba70c
Binary files /dev/null and b/icon-themes/colibre/cmd/32/badcellstyles.png differ
diff --git a/icon-themes/colibre/cmd/32/goodcellstyles.png 
b/icon-themes/colibre/cmd/32/goodcellstyles.png
new file mode 100644
index ..2d0910665f7b
Binary files /dev/null and b/icon-themes/colibre/cmd/32/goodcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/32/insertfixedtext.png 
b/icon-themes/colibre/cmd/32/insertfixedtext.png
new file mode 100644
index ..a31618084ab2
Binary files /dev/null and b/icon-themes/colibre/cmd/32/insertfixedtext.png 
differ
diff --git a/icon-themes/colibre/cmd/32/neutralcellstyles.png 
b/icon-themes/colibre/cmd/32/neutralcellstyles.png
new file mode 100644
index ..3b5b6508aedc
Binary files /dev/null and b/icon-themes/colibre/cmd/32/neutralcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/32/showtoolbar.png 
b/icon-themes/colibre/cmd/32/showtoolbar.png
new file mode 100644
index ..be8ad61c5602
Binary files /dev/null and b/icon-themes/colibre/cmd/32/showtoolbar.png differ
diff --git a/icon-themes/colibre/cmd/lc_badcellstyles.png 
b/icon-themes/colibre/cmd/lc_badcellstyles.png
new file mode 100644
index ..1bafb1ec40cb
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_badcellstyles.png differ
diff --git a/icon-themes/colibre/cmd/lc_goodcellstyles.png 
b/icon-themes/colibre/cmd/lc_goodcellstyles.png
new file mode 100644
index ..1d56c701a7f7
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_goodcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_insertfixedtext.png 
b/icon-themes/colibre/cmd/lc_insertfixedtext.png
new file mode 100644
index ..b791ced5d8a4
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_insertfixedtext.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_neutralcellstyles.png 
b/icon-themes/colibre/cmd/lc_neutralcellstyles.png
new file mode 100644
index ..b04c92c3dff5
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_neutralcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_showtoolbar.png 
b/icon-themes/colibre/cmd/lc_showtoolbar.png
new file mode 100644
index ..c21fd217c74c
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_showtoolbar.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertfixedtext.png 
b/icon-themes/colibre/cmd/sc

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

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/badcellstyles.png |binary
 icon-themes/colibre/cmd/32/goodcellstyles.png|binary
 icon-themes/colibre/cmd/32/insertfixedtext.png   |binary
 icon-themes/colibre/cmd/32/neutralcellstyles.png |binary
 icon-themes/colibre/cmd/32/showtoolbar.png   |binary
 icon-themes/colibre/cmd/lc_badcellstyles.png |binary
 icon-themes/colibre/cmd/lc_goodcellstyles.png|binary
 icon-themes/colibre/cmd/lc_insertfixedtext.png   |binary
 icon-themes/colibre/cmd/lc_neutralcellstyles.png |binary
 icon-themes/colibre/cmd/lc_showtoolbar.png   |binary
 icon-themes/colibre/cmd/sc_insertfixedtext.png   |binary
 icon-themes/colibre/cmd/sc_showtoolbar.png   |binary
 icon-themes/colibre/links.txt|8 
 icon-themes/colibre/res/printeradmin_16.png  |binary
 icon-themes/colibre/res/printeradmin_32.png  |binary
 icon-themes/colibre_svg/cmd/32/badcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/32/goodcellstyles.svg|1 +
 icon-themes/colibre_svg/cmd/32/insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/32/neutralcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/32/showtoolbar.svg   |1 +
 icon-themes/colibre_svg/cmd/lc_badcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/lc_goodcellstyles.svg|1 +
 icon-themes/colibre_svg/cmd/lc_insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/lc_neutralcellstyles.svg |1 +
 icon-themes/colibre_svg/cmd/lc_showtoolbar.svg   |1 +
 icon-themes/colibre_svg/cmd/sc_insertfixedtext.svg   |1 +
 icon-themes/colibre_svg/cmd/sc_showtoolbar.svg   |1 +
 icon-themes/colibre_svg/res/printeradmin_16.svg  |2 ++
 icon-themes/colibre_svg/res/printeradmin_32.svg  |1 +
 29 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 4f8b13267559e8e89a306a6c522f905322396bd0
Author: Rizal Muttaqin 
AuthorDate: Mon Oct 12 13:58:12 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Oct 13 05:42:59 2020 +0200

tdf#137369 Add missing targeted icons as defined by links.txt

Change-Id: I030368a09905f236ce43fa5d08740641d694fbad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104199
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/cmd/32/badcellstyles.png 
b/icon-themes/colibre/cmd/32/badcellstyles.png
new file mode 100644
index ..d73a8feba70c
Binary files /dev/null and b/icon-themes/colibre/cmd/32/badcellstyles.png differ
diff --git a/icon-themes/colibre/cmd/32/goodcellstyles.png 
b/icon-themes/colibre/cmd/32/goodcellstyles.png
new file mode 100644
index ..2d0910665f7b
Binary files /dev/null and b/icon-themes/colibre/cmd/32/goodcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/32/insertfixedtext.png 
b/icon-themes/colibre/cmd/32/insertfixedtext.png
new file mode 100644
index ..a31618084ab2
Binary files /dev/null and b/icon-themes/colibre/cmd/32/insertfixedtext.png 
differ
diff --git a/icon-themes/colibre/cmd/32/neutralcellstyles.png 
b/icon-themes/colibre/cmd/32/neutralcellstyles.png
new file mode 100644
index ..3b5b6508aedc
Binary files /dev/null and b/icon-themes/colibre/cmd/32/neutralcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/32/showtoolbar.png 
b/icon-themes/colibre/cmd/32/showtoolbar.png
new file mode 100644
index ..be8ad61c5602
Binary files /dev/null and b/icon-themes/colibre/cmd/32/showtoolbar.png differ
diff --git a/icon-themes/colibre/cmd/lc_badcellstyles.png 
b/icon-themes/colibre/cmd/lc_badcellstyles.png
new file mode 100644
index ..1bafb1ec40cb
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_badcellstyles.png differ
diff --git a/icon-themes/colibre/cmd/lc_goodcellstyles.png 
b/icon-themes/colibre/cmd/lc_goodcellstyles.png
new file mode 100644
index ..1d56c701a7f7
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_goodcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_insertfixedtext.png 
b/icon-themes/colibre/cmd/lc_insertfixedtext.png
new file mode 100644
index ..b791ced5d8a4
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_insertfixedtext.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_neutralcellstyles.png 
b/icon-themes/colibre/cmd/lc_neutralcellstyles.png
new file mode 100644
index ..b04c92c3dff5
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_neutralcellstyles.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_showtoolbar.png 
b/icon-themes/colibre/cmd/lc_showtoolbar.png
new file mode 100644
index ..c21fd217c74c
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_showtoolbar.png differ
diff --git a/icon-themes/colibre/cmd/sc_insertfixedtext.png 
b/icon-themes/colibre/cmd/sc_insertfixedtext.png
new file mode 100644
index ..ed64b4a5c3a8
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_insert

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/02/0117.xhp |   31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 122b2b34063444e185cafd039801b1ec4fd37b0e
Author: Seth Chaiklin 
AuthorDate: Mon Oct 12 00:33:31 2020 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Oct 12 23:12:15 2020 +0200

tdf#93739 clarify instructions about inserting form controls

  -revise instruction about inserting form controls
  -correct grammatical problem with holding down keys
  -remove obsolete  about specifying HTML version
  -update to ,, some ,
  -add 
  -add missing table id

Change-Id: I18a4722c2076e54dbaea4543e2693f1c83d08621
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104153
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/shared/02/0117.xhp 
b/source/text/shared/02/0117.xhp
index afaabb620..8ed1ceac4 100644
--- a/source/text/shared/02/0117.xhp
+++ b/source/text/shared/02/0117.xhp
@@ -51,7 +51,7 @@
 The Form Controls 
toolbar or sub-menu contains tools that you need to create an interactive 
form. You can use the toolbar or sub-menu to add controls to 
a form in a text, drawing, spreadsheet, presentation, or HTML document, for 
example a button that runs a macro.
 
 
-Choose View - Toolbars - Form 
Controls.
+Choose View - Toolbars - Form 
Controls.
 Icon on the 
Insert toolbar (you may need to enable this initially invisible 
icon):
 
 
@@ -66,22 +66,21 @@
 
 
 
-XML Form documents (XForms) use the 
same controls.
+XML Form documents (XForms) use the 
same controls.
 To create a 
form, open a document and use the Form Controls toolbar to add and define the 
form controls. If you want, you can also link the form to a database, so that 
you can use the controls to manipulate a database.
 When you 
create a form in an HTML document, you can use the form to send data over the 
Internet.
-%PRODUCTNAME only 
exports the form properties that are supported by the HTML version that you 
export to. To specify the HTML version, choose %PRODUCTNAME - 
PreferencesTools - 
Options - Load/Save - HTML 
Compatibility.
-To add 
a control to a document
+To add a control to a document
 
   
 On the 
Form Controls toolbar, click the icon of the control that you want 
to add.
   
   
-In the 
document, drag to create the control.
-To create a 
square control field, hold down the Shift key while you 
drag.
+Then click 
in the document, and drag to create the control.
+To create a square control field, 
hold down the Shift key while you drag.
   
 
-To add a field from 
the field list of a table or query to a form, drag a cell into the form. In a 
text document, you can also drag a column header to add a field to a form. To 
include a label for the field, hold down the CommandCtrl+Shift
 key down when you drag a column head.
-Modifying a Control
+To add a field from the field list of 
a table or query to a form, drag a cell into the form. In a text document, you 
can also drag a column header to add a field to a form. To include a label for 
the field, hold down CommandCtrl+Shift
 when you drag a column head.
+Modifying a Control
 
   
 Right-click the control and choose Control. A 
dialog opens where you can define the properties of the control.
@@ -94,11 +93,11 @@
   
 
 
-Selectcontrols and design bars
-
+Selectcontrols and design 
bars
+
   
 
-  Icon
+  Icon
 
 
   This 
icon switches the mouse pointer to the select mode, or deactivates this mode. 
The select mode is used to select the controls of the current form.
@@ -115,7 +114,7 @@
 
 
 
-Check 
Boxcontrols bar
+Check Boxcontrols 
bar
 
   
 
@@ -129,7 +128,7 @@
 
 
 
-Text 
Boxcontrols bar
+Text Boxcontrols 
bar
 
   
 
@@ -143,7 +142,7 @@
 
 
 
-Formatted Fieldcontrols bar
+Formatted Fieldcontrols 
bar
 
   
 
@@ -402,7 +401,7 @@
   
 
 If you assign 
the "Dropdown" property to the date field, the user can open a calendar to 
select a date under the date field. This also applies to a date field within a 
Table Control field.
-Date fields can be 
easily edited by the user with the up arrow and down arrow keys. Depending on 
the cursor position, the day, month, or the year is can be increased or 
decreased using the arrow keys.
+Date fields can be easily edited by 
the user with the up arrow and down arrow keys. Depending on the cursor 
position, the day, month, or the year is can be increased or decreased using 
the arrow keys.
 Specific Remarks on Date Fields.
 
 
@@ -418,7 +417,7 @@
 
   
 
-Time fields can be 
easily edited by the user with the up and down arrow keys. Depending on the 
cursor position, the hours, minutes, or the seconds are increased or decreased 
using the arrow keys.
+Time fields can be easily edited by 
the user with the up and down arrow keys. Depending on the cursor position, the 
hours, minutes, or the seconds are incr

Status of Data Provider feature

[Travis Stewart]

There have been a number of requests to improve the documentation for the
Data Provider, but the feature was removed from the menu in patch 85541
 because it wasn't ready for
production. I noticed people have patched the Data Provider code a few
times since then. Should it be added to the menu again, or is is still not
ready, or will it be permanently removed?

-- 
Travis Stewart
tstewart.wri...@gmail.com
https://www.linkedin.com/in/travis-stewart-73b75571/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/05230100.xhp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d6f2fd44fcb8aeb98e5ec9f4ef1d55cf8310b695
Author: Seth Chaiklin 
AuthorDate: Mon Oct 12 18:57:21 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Mon Oct 12 20:33:16 2020 +0200

tdf#137141 update Position & Size tab help for "Protect" and "Adapt"

   - correct mistake in Protect - Position control
   - add  that "Adapt" is for text boxes, and give menu sequence
   to get controls to adapt text to shapes


Change-Id: I7699410a3823fd670324d7fbe90a3cc7b22a210a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104157
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/01/05230100.xhp 
b/source/text/shared/01/05230100.xhp
index 0223bbef3..4f8505d23 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -94,7 +94,7 @@
 Protect
 
 Position
-Prevents changes to the position or 
the size of the selected object.
+Prevents changes to the position and 
size of the selected object.
 
 Size
 Prevents you from resizing the 
object.
@@ -113,6 +113,7 @@
 
 Fit height to text
 Expands the height of the 
object to the height of the text, if the object is smaller than the 
text.
+Adapt is only available for Text Boxes. To 
adapt Shapes to text, use Format - 
Object - Text
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 468a531b1bf0a7cd8d7d523272ea84be7192db16
Author: Caolán McNamara 
AuthorDate: Mon Oct 12 17:40:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 20:27:56 2020 +0200

use dot not comma for decimal place

wrong since...

commit acb1c390539730957fb509f18f469fc7f6133082
Date:   Thu Oct 1 15:44:32 2020 +0200

Resolves tdf#137187 - More dictionaries via extensions dialog

Change-Id: I01010d07d356dd696fd3432971b20194008c9487
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104218
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 8537e0d27d9e..203393979ca6 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -106,7 +106,7 @@
   
 True
 6
-0,5000
+0.5000
 
   
   
@@ -233,7 +233,7 @@
   
 True
 6
-0,5000
+0.5000
 
   
   
@@ -422,7 +422,7 @@
   
 True
 6
-0,5000
+0.5000
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 desktop/source/app/dispatchwatcher.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61932fa0d8612c03f432101e9b3eed004f39be37
Author: Miklos Vajna 
AuthorDate: Mon Oct 12 17:52:20 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 12 19:19:44 2020 +0200

desktop: fix misleading comment

REQUEST_START is triggered with --show.

Change-Id: I83fec4f0ae4df15ed7974f484b3001e886f82a65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104217
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index ec566181ce52..50b92ecb7834 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -469,7 +469,7 @@ bool DispatchWatcher::executeDispatchRequests( const 
std::vectorhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/00/00040502.xhp  |   18 +++---
 source/text/shared/01/05230100.xhp  |2 +-
 source/text/swriter/01/05060100.xhp |2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 3908abbfca18fdc7cbe75fa55098886a666f4d38
Author: Seth Chaiklin 
AuthorDate: Sat Oct 10 15:37:03 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Mon Oct 12 18:45:39 2020 +0200

tdf#137141 change control label on Position-Size tab help page

  incorrect label on dialog box in UI was fixed with tdf#137382
  -corrected label and description added to help page
  -small adjustments in "howto" access commands.

Change-Id: Id91769c1cc0e5db2de177c4fd7405eb135f12dbe
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104149
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index 71cca2e61..83fa5af8f 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -198,15 +198,27 @@
 Open the context menu 
for the object - choose Description.
 
 
-Click on textbox or 
shape to select.
+Click on textbox or 
shape to select, then...
 Choose 
Format - 
   Text Box and Shape - 

   Object - 
   Object and Shape -  

Position and Size - Position and Size tab.
-   Icon Position and Size
-  
+ 
 Open context menu for 
selected object - choose Position and Size - 
Position and Size tab.
+
+
+
+
+Icon Position and Size
+
+   
+ 
+   Position 
and Size menu icon
+   
+
+ 
+
 
 
 
diff --git a/source/text/shared/01/05230100.xhp 
b/source/text/shared/01/05230100.xhp
index ec097d6b3..0223bbef3 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -102,7 +102,7 @@
 
   
   
-Follow text flow
+  
 
 
 Adapt
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index ec11bffef..a533b9576 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -134,9 +134,11 @@
 
 
 
+
 Keep inside text boundaries
 Keeps the selected object within the layout boundaries of the text that 
the object is anchored to. To place the selected object anywhere in your 
document, do not select this option.
 By default, the 
Keep inside text boundaries option is selected when you open a 
document that was created in a version of Writer older than OpenOffice.org 2.0. 
However, this option is not selected when you create a document or when you 
open a document in Microsoft Word format (*.doc).
+
 
 The green 
rectangle represents the selected object and the red rectangle represents the 
alignment reference point. If you anchor the object as a character, the 
reference rectangle changes to a red line.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/icgm/bitmap.cxx |  313 ++--
 1 file changed, 159 insertions(+), 154 deletions(-)

New commits:
commit 06687acf67f7846bb521a9a242733e23f330c09c
Author: Caolán McNamara 
AuthorDate: Mon Oct 12 16:30:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 18:26:18 2020 +0200

reindent CGMBitmap::ImplGetBitmap

no logic change

Change-Id: I1172e97feb5e78b68ed395231a698459687493aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index 26b837f3be04..75a958474979 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -79,189 +79,189 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc 
)
 return;
 }
 
-try {
-
-if (rDesc.mnScanSize) {
-
-vcl::bitmap::RawBitmap aBitmap( Size( rDesc.mnX, rDesc.mnY ), 24 );
-
-// the picture may either be read from left to right or right to left, 
from top to bottom ...
-
-long nxCount = rDesc.mnX + 1;   // +1 because we are using prefix 
decreasing
-long nyCount = rDesc.mnY + 1;
-longnx, ny, nxC;
-
-switch ( rDesc.mnDstBitsPerPixel ) {
-case 1 : {
-bool bOk = true;
-std::vector palette(2);
-if ( rDesc.mnLocalColorPrecision == 1 )
-palette = ImplGeneratePalette( rDesc );
-else {
-palette[0] = BMCOL( mpCGM->pElement->nBackGroundColor );
-palette[1] = ( mpCGM->pElement->nAspectSourceFlags & 
ASF_FILLINTERIORSTYLE )
- ? BMCOL( mpCGM->pElement->pFillBundle->GetColor() )
- : BMCOL( mpCGM->pElement->aFillBundle.GetColor() );
-};
-for (ny = 0; bOk && --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize) {
-nxC = nxCount;
-for ( nx = 0; --nxC; nx++ ) {
-// this is not fast, but a one bit/pixel format is rarely used
-const sal_uInt8* pPos = rDesc.mpBuf + (nx >> 3);
-if (pPos >= rDesc.mpEndBuf)
-{
-SAL_WARN("filter.icgm", "buffer is too small");
-bOk = false;
-break;
+try
+{
+if (rDesc.mnScanSize)
+{
+vcl::bitmap::RawBitmap aBitmap( Size( rDesc.mnX, rDesc.mnY ), 24 );
+
+// the picture may either be read from left to right or right to 
left, from top to bottom ...
+
+long nxCount = rDesc.mnX + 1;   // +1 because we are using prefix 
decreasing
+long nyCount = rDesc.mnY + 1;
+longnx, ny, nxC;
+
+switch ( rDesc.mnDstBitsPerPixel ) {
+case 1 : {
+bool bOk = true;
+std::vector palette(2);
+if ( rDesc.mnLocalColorPrecision == 1 )
+palette = ImplGeneratePalette( rDesc );
+else {
+palette[0] = BMCOL( mpCGM->pElement->nBackGroundColor );
+palette[1] = ( mpCGM->pElement->nAspectSourceFlags & 
ASF_FILLINTERIORSTYLE )
+ ? BMCOL( 
mpCGM->pElement->pFillBundle->GetColor() )
+ : BMCOL( 
mpCGM->pElement->aFillBundle.GetColor() );
+};
+for (ny = 0; bOk && --nyCount; ny++, rDesc.mpBuf += 
rDesc.mnScanSize) {
+nxC = nxCount;
+for ( nx = 0; --nxC; nx++ ) {
+// this is not fast, but a one bit/pixel format is 
rarely used
+const sal_uInt8* pPos = rDesc.mpBuf + (nx >> 3);
+if (pPos >= rDesc.mpEndBuf)
+{
+SAL_WARN("filter.icgm", "buffer is too small");
+bOk = false;
+break;
+}
+sal_uInt8 colorIndex = static_cast((*pPos 
>> ((nx & 7)^7))) & 1;
+aBitmap.SetPixel(ny, nx, palette[colorIndex]);
+}
 }
-sal_uInt8 colorIndex = static_cast((*pPos >> ((nx & 
7)^7))) & 1;
-aBitmap.SetPixel(ny, nx, palette[colorIndex]);
 }
-}
-}
-break;
-
-case 2 : {
-bool bOk = true;
-auto palette = ImplGeneratePalette( rDesc );
-for (ny = 0; bOk && --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize) {
-nxC = nxCount;
-for ( nx = 0; --nxC; nx++ ) {
-// this is not fast, but a two bits/pixel format is rarely used
-const sal_uInt8* pPos = rDesc.mpBuf + (nx >> 2);
-if (pPos >= rDesc.mpEndBuf)
-{
-SAL_WARN("filter.icgm", "buffer is too small");
-b

[Libreoffice-commits] core.git: cui/source cui/uiconfig instsetoo_native/util officecfg/registry postprocess/CustomTarget_registry.mk sfx2/source

[Heiko Tietze (via logerrit)]

 cui/source/inc/optlingu.hxx  |2 
 cui/source/options/optlingu.cxx  |   15 ++
 cui/uiconfig/ui/optlingupage.ui  |7 +--
 instsetoo_native/util/openoffice.lst.README  |3 -
 instsetoo_native/util/openoffice.lst.in  |4 -
 officecfg/registry/data/org/openoffice/Office/Common.xcu |5 --
 postprocess/CustomTarget_registry.mk |1 
 sfx2/source/appl/appserv.cxx |   33 ++-
 8 files changed, 25 insertions(+), 45 deletions(-)

New commits:
commit acb1c390539730957fb509f18f469fc7f6133082
Author: Heiko Tietze 
AuthorDate: Thu Oct 1 15:44:32 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Oct 12 17:05:42 2020 +0200

Resolves tdf#137187 - More dictionaries via extensions dialog

UNO command and linkbutton interaction replaced with the internal dialog
DICT_REPO_URL removed, README adjusted

Change-Id: I401737b538da229ac0d432007e7564105672ff40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103769
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 6edc093cb169..365acfbbb0fb 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -66,6 +66,7 @@ class SvxEditModulesDlg : public weld::GenericDialogController
 DECL_LINK( BackHdl_Impl, weld::Button&, void );
 DECL_LINK( LangSelectListBoxHdl_Impl, weld::ComboBox&, void );
 DECL_LINK( BoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
+DECL_STATIC_LINK( SvxEditModulesDlg, OnLinkClick, weld::LinkButton&, bool);
 void LangSelectHdl_Impl(const SvxLanguageBox* pBox);
 
 public:
@@ -128,6 +129,7 @@ private:
 DECL_LINK( ModulesBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, 
void );
 DECL_LINK( DicsBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, 
void );
 DECL_LINK( PostDblClickHdl_Impl, void *, void);
+DECL_STATIC_LINK( SvxLinguTabPage, OnLinkClick, weld::LinkButton&, bool);
 
 voidUpdateModulesBox_Impl();
 voidUpdateDicBox_Impl();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8d099ad0c884..09cdb0d9e1b5 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -871,6 +872,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, 
weld::DialogController*
 m_xLinguOptionsCLB->connect_changed( LINK( this, SvxLinguTabPage, 
SelectHdl_Impl ));
 m_xLinguOptionsCLB->connect_row_activated(LINK(this, SvxLinguTabPage, 
BoxDoubleClickHdl_Impl));
 
+m_xMoreDictsLink->connect_activate_link(LINK(this, SvxLinguTabPage, 
OnLinkClick));
 if (officecfg::Office::Security::Hyperlinks::Open::get() == 
SvtExtendedSecurityOptions::OPEN_NEVER)
 m_xMoreDictsLink->hide();
 
@@ -1535,6 +1537,12 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 }
 }
 
+IMPL_STATIC_LINK_NOARG(SvxLinguTabPage, OnLinkClick, weld::LinkButton&, bool)
+{
+comphelper::dispatchCommand(".uno:MoreDictionaries", {});
+return true;
+}
+
 SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& 
rData)
 : GenericDialogController(pParent, "cui/ui/editmodulesdialog.ui", 
"EditModulesDialog")
 , sSpell(CuiResId(RID_SVXSTR_SPELL))
@@ -1568,6 +1576,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* 
pParent, SvxLinguData_Impl& r
 m_xPrioUpPB->set_sensitive( false );
 m_xPrioDownPB->set_sensitive( false );
 
+m_xMoreDictsLink->connect_activate_link(LINK(this, SvxEditModulesDlg, 
OnLinkClick));
 if (officecfg::Office::Security::Hyperlinks::Open::get() == 
SvtExtendedSecurityOptions::OPEN_NEVER)
 m_xMoreDictsLink->hide();
 
@@ -1961,4 +1970,10 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl, 
weld::Button&, void)
 LangSelectHdl_Impl(nullptr);
 }
 
+IMPL_STATIC_LINK_NOARG(SvxEditModulesDlg, OnLinkClick, weld::LinkButton&, bool)
+{
+comphelper::dispatchCommand(".uno:MoreDictionaries", {});
+return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 3f574d3be664..8537e0d27d9e 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -106,7 +106,7 @@
   
 True
 6
-0.5000
+0,5000
 
   
   
@@ -233,7 +233,7 @@
   
 True
 6
-0.5000

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig icon-themes/breeze icon-themes/breeze_dark icon-themes/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-them

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc|2 
 cui/source/dialogs/AdditionsDialog.cxx |   58 +++-
 cui/source/inc/AdditionsDialog.hxx |3 
 cui/uiconfig/ui/additionsdialog.ui |   31 +-
 cui/uiconfig/ui/additionsfragment.ui   |  402 +++--
 icon-themes/breeze/links.txt   |3 
 icon-themes/breeze_dark/links.txt  |3 
 icon-themes/colibre/links.txt  |3 
 icon-themes/elementary/links.txt   |3 
 icon-themes/karasa_jaga/links.txt  |2 
 icon-themes/sifr/links.txt |3 
 icon-themes/sifr_dark/links.txt|3 
 icon-themes/sukapura/links.txt |3 
 13 files changed, 317 insertions(+), 202 deletions(-)

New commits:
commit 479363562b2148481b3808250575379ca2c9c37e
Author: Heiko Tietze 
AuthorDate: Thu Oct 8 11:29:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Oct 12 16:59:52 2020 +0200

Resolves tdf#135270 - Make the tight extensions dialog shiny

Information rearranged, empty icons instead of hidden,
background and scaling of thumbnail

Change-Id: Iae095134a717cb50670bf5d1786774c6424d283e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104079
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e96e76e85fd2..19b7730b60a4 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -394,8 +394,6 @@
 #define RID_SVXSTR_ADDITIONS_INSTALLBUTTON  
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
 #define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
 #define RID_SVXSTR_ADDITIONS_INSTALLING 
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
-#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
-#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
 #define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 7d5d953ad976..ad8f5de0928b 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -282,6 +282,8 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo, 
OUString& sPreviewFile)
 
 void LoadImage(const OUString& rPreviewFile, std::shared_ptr 
pCurrentItem)
 {
+const sal_Int8 Margin = 6;
+
 SolarMutexGuard aGuard;
 
 GraphicFilter aFilter;
@@ -292,11 +294,30 @@ void LoadImage(const OUString& rPreviewFile, 
std::shared_ptr pCur
 // for VCL to be able to create bitmaps / do visual changes in the thread
 aFilter.ImportGraphic(aGraphic, aURLObj);
 BitmapEx aBmp = aGraphic.GetBitmapEx();
+Size aBmpSize = aBmp.GetSizePixel();
+Size aThumbSize(pCurrentItem->m_xImageScreenshot->get_size_request());
+if (!aBmp.IsEmpty())
+{
+double aScale;
+if (aBmpSize.Width() > aThumbSize.Width() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Width()) / 
(aThumbSize.Width() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() / 
aScale));
+}
+else if (aBmpSize.Height() > aThumbSize.Height() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Height()) / 
(aThumbSize.Height() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() / 
aScale));
+};
+aBmpSize = aBmp.GetSizePixel();
+}
 
 ScopedVclPtr xVirDev = 
pCurrentItem->m_xImageScreenshot->create_virtual_device();
-xVirDev->SetOutputSizePixel(aBmp.GetSizePixel());
-xVirDev->DrawBitmapEx(Point(0, 0), aBmp);
-
+xVirDev->SetOutputSizePixel(aThumbSize);
+//white background since images come with a white border
+xVirDev->SetBackground(Wallpaper(COL_WHITE));
+xVirDev->Erase();
+xVirDev->DrawBitmapEx(Point(aThumbSize.Width() / 2 - aBmpSize.Width() / 2, 
Margin), aBmp);
 pCurrentItem->m_xImageScreenshot->set_image(xVirDev.get());
 xVirDev.disposeAndClear();
 }
@@ -606,12 +627,13 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent, 
AdditionsDialog* pParentDial
 , m_xContainer(m_xBuilder->weld_widget("additionsEntry"))
 , m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot"))
 , m_xButtonInstall(m_xBuilder->weld_button("buttonInstall"))
-, m_xLinkButtonName(m_xBuilder->weld_link_button("linkButtonName"))
+, m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite"))
+, m_xLabelName(m_xBuilder->weld_label("lbName"))
 , m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor"))
 , m_xLabelDesc(m_xBuilder->w

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

[Luboš Luňák (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 0fa9920391ed3bb6aa6ef0f5220050f2c694f859
Author: Luboš Luňák 
AuthorDate: Mon Oct 12 12:12:07 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:53:48 2020 +0200

don't disable the fast path in DrawDeviceAlphaBitmap() (tdf#137311)

Only OpenGL and Skia implement the BlendBitmap*() calls, and so I
disabled the direct path in an attempt to avoid forcing the mirroring
if it takes place. But there's also the DrawAlphaBitmap() call
that is implemented for other backends. So always do the mirroring
already there if it takes place.

Change-Id: I8c4c96ea18ac55ebad041e0d28c4228542d9b2e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104206
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 2a013fe119b2..c584a1d82848 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -650,16 +650,8 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 if (aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty())
 return;
 
-bool bTryDirectPaint = false;
-if(SkiaHelper::isVCLSkiaEnabled())
-bTryDirectPaint = true;
-#if HAVE_FEATURE_OPENGL
-if(OpenGLHelper::isVCLOpenGLEnabled())
-bTryDirectPaint = true;
-#endif
 static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA");
-if(pDisableNative)
-bTryDirectPaint = false;
+bool bTryDirectPaint = !pDisableNative;
 
 if (bTryDirectPaint)
 {
@@ -701,7 +693,12 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 if (mpGraphics->DrawAlphaBitmap(aTR, *pSalSrcBmp, *pSalAlphaBmp, 
this))
 return;
 }
-assert(false);
+
+// we need to make sure OpenGL never reaches this slow code path
+#if HAVE_FEATURE_OPENGL
+assert(!OpenGLHelper::isVCLOpenGLEnabled());
+#endif
+assert(!SkiaHelper::isVCLSkiaEnabled());
 }
 
 tools::Rectangle aBmpRect(Point(), rBmp.GetSizePixel());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/weldeditview.cxx |5 +
 vcl/unx/gtk3/gtk3gtksalmenu.cxx|   13 +
 2 files changed, 18 insertions(+)

New commits:
commit 3a5808f5e43f5e190b3f1c759563a951b5bb0d08
Author: Caolán McNamara 
AuthorDate: Mon Oct 12 10:48:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 15:28:59 2020 +0200

CaptureMouse on mouse-down and ReleaseMouse on mouse-up

Change-Id: I6a2096151bbe7b2bdf9210b3d023926270a9987a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104211
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/dialog/weldeditview.cxx 
b/svx/source/dialog/weldeditview.cxx
index 9d79d78c961c..e7d90fab15b8 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -132,6 +132,9 @@ bool WeldEditView::MouseMove(const MouseEvent& rMEvt)
 
 bool WeldEditView::MouseButtonDown(const MouseEvent& rMEvt)
 {
+if (!IsMouseCaptured())
+CaptureMouse();
+
 if (!HasFocus())
 {
 GrabFocus();
@@ -143,6 +146,8 @@ bool WeldEditView::MouseButtonDown(const MouseEvent& rMEvt)
 
 bool WeldEditView::MouseButtonUp(const MouseEvent& rMEvt)
 {
+if (IsMouseCaptured())
+ReleaseMouse();
 return m_xEditView && m_xEditView->MouseButtonUp(rMEvt);
 }
 
commit f3692a9260f6f51be89f460ec9cb3bd517952b95
Author: Caolán McNamara 
AuthorDate: Mon Oct 12 10:12:56 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 15:28:35 2020 +0200

similar to tdf#120764 dismiss tooltips on showing popup menu

Change-Id: I4a3dd3d30fcab84bf9987f71a9c9cf0657ecfbb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104210
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 94e2134e151a..9c02cf50e329 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -433,6 +433,16 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const tools::Rectangl
 GMainLoop* pLoop = g_main_loop_new(nullptr, true);
 g_signal_connect_swapped(G_OBJECT(pWidget), "deactivate", 
G_CALLBACK(g_main_loop_quit), pLoop);
 
+
+// tdf#120764 It isn't allowed under wayland to have two visible popups 
that share
+// the same top level parent. The problem is that since gtk 3.24 tooltips 
are also
+// implemented as popups, which means that we cannot show any popup if 
there is a
+// visible tooltip.
+// hide any current tooltip
+mpFrame->HideTooltip();
+// don't allow any more to appear until menu is dismissed
+mpFrame->BlockTooltip();
+
 #if GTK_CHECK_VERSION(3,22,0)
 if (gtk_check_version(3, 22, 0) == nullptr)
 {
@@ -509,6 +519,9 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const tools::Rectangl
 g_object_unref(mpActionGroup);
 ClearActionGroupAndMenuModel();
 
+// undo tooltip blocking
+mpFrame->UnblockTooltip();
+
 mpFrame = nullptr;
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 43365359a817c85d6d7e138b1cc773352ebb6e07
Author: Caolán McNamara 
AuthorDate: Mon Oct 12 09:36:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 15:28:21 2020 +0200

Resolves: tdf#137345 increment by a full second on up/down

Change-Id: I9884c1cd579fff85c425ffe51e1ed60f7095ad90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104209
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index ecccd4d145fd..e66c97c1e0e5 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -4,13 +4,13 @@
   
   
 1000
-0.01
-1
+1
+10
   
   
 1000
-0.01
-1
+1
+10
   
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 include/sfx2/objsh.hxx   |8 +++
 sfx2/source/appl/sfxpicklist.cxx |5 --
 sfx2/source/doc/objcont.cxx  |   83 +++
 sfx2/source/doc/sfxbasemodel.cxx |2 
 4 files changed, 77 insertions(+), 21 deletions(-)

New commits:
commit 59cca1a28df4cdc94450d68cc1e247a8fb5ff6f3
Author: Luboš Luňák 
AuthorDate: Fri Oct 9 13:21:34 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:13:17 2020 +0200

render document thumbnail directly to bitmap, without metafile

I don't see the point of taking the detour via GDIMetaFile and
then immediately drawing using it to a bitmap. Simply draw directly
to a bitmap. Especially given that when drawing to a metafile
some fast cases are skipped, e.g. DrawTransformedBitmapEx()
avoids DrawTransformBitmapExDirect() and resorts to using the slow
BitmapEx::getTransformed(). E.g. with tdf#136223. this makes
SfxPickListImpl::AddDocumentToPickList() go from 30% to 13%
of the total document loading time.

Change-Id: Ib1643eddfc2b75a3d7be60138fb5226352805826
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104114
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 78a1f3eb22e6..e106d7f3a367 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -64,6 +65,7 @@ class Color;
 class Fraction;
 class SvGlobalName;
 class InfobarData;
+class VirtualDevice;
 
 enum class SfxModelFlags;
 enum class SfxEventHintId;
@@ -445,6 +447,10 @@ public:
 SizeGetFirstPageSize() const;
 boolDoClose();
 std::shared_ptr GetPreviewMetaFile( bool bFullContent = false 
) const;
+BitmapExGetPreviewBitmap(
+bool bFullContent = false,
+BmpConversion nColorConversion = 
BmpConversion::N24Bit,
+BmpScaleFlag nScaleFlag = 
BmpScaleFlag::BestQuality) const;
 virtual voidCancelTransfers();
 
 boolGenerateAndStoreThumbnail(
@@ -681,7 +687,7 @@ public:
 bool bShowCloseButton = true);
 std::vector& getPendingInfobars();
 
-SAL_DLLPRIVATE std::shared_ptr 
CreatePreviewMetaFile_Impl(bool bFullContent) const;
+SAL_DLLPRIVATE bool CreatePreview_Impl(bool bFullContent, VirtualDevice* 
pDevice, GDIMetaFile* pFile) const;
 
 SAL_DLLPRIVATE static bool IsPackageStorageFormat_Impl(const SfxMedium &);
 
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index ec32dd038d3d..82775fd9a328 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -118,9 +118,8 @@ void SfxPickListImpl::AddDocumentToPickList( const 
SfxObjectShell* pDocSh )
 }
 else
 {
-std::shared_ptr xMetaFile = 
pDocSh->GetPreviewMetaFile();
-BitmapEx aResultBitmap;
-if (xMetaFile->CreateThumbnail(aResultBitmap))
+BitmapEx aResultBitmap = pDocSh->GetPreviewBitmap();
+if (!aResultBitmap.IsEmpty())
 {
 SvMemoryStream aStream(65535, 65535);
 vcl::PNGWriter aWriter(aResultBitmap);
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 0a98bab1263d..3159f6d7ac84 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -94,11 +95,32 @@ bool operator> (const util::DateTime& i_rLeft, const 
util::DateTime& i_rRight)
 std::shared_ptr
 SfxObjectShell::GetPreviewMetaFile( bool bFullContent ) const
 {
-return CreatePreviewMetaFile_Impl( bFullContent );
+auto xFile = std::make_shared();
+ScopedVclPtrInstance< VirtualDevice > pDevice;
+pDevice->EnableOutput( false );
+if(!CreatePreview_Impl(bFullContent, pDevice, xFile.get()))
+return std::shared_ptr();
+return xFile;
 }
 
-std::shared_ptr
-SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const
+BitmapEx SfxObjectShell::GetPreviewBitmap( bool bFullContent, BmpConversion 
nColorConversion,
+BmpScaleFlag nScaleFlag) const
+{
+ScopedVclPtrInstance< VirtualDevice > pDevice;
+pDevice->SetAntialiasing(AntialiasingFlags::Enable | 
pDevice->GetAntialiasing());
+if(!CreatePreview_Impl(bFullContent, pDevice, nullptr))
+return BitmapEx();
+Size size = pDevice->GetOutputSizePixel();
+BitmapEx aBitmap = pDevice->GetBitmapEx( Point(), size);
+// Scale down the image to the desired size from the 4*size from 
CreatePreview_Impl().
+size = Size( size.Width() / 4, size.Height() / 4 );
+aBitmap.Scale(size, nScaleFlag);
+if (!aBitmap.IsEmpty())
+aBitmap.Convert(nColorConversio

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

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e78b576cdbe4d938ef8eeabd9083f62f92416be
Author: Heiko Tietze 
AuthorDate: Wed Oct 7 11:14:51 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Oct 12 15:11:58 2020 +0200

Resolves tdf#137408 - Bad positioning of first items in extension dialog

Change-Id: Ic54ac8377bbfbd2c5b5b995ef8615bf0961bd100
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104051
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 7eb277b3d0f8..7d5d953ad976 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -631,7 +631,7 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent, 
AdditionsDialog* pParentDial
 
 // AdditionsItem set location
 m_xContainer->set_grid_left_attach(0);
-m_xContainer->set_grid_top_attach(pParentDialog->m_aAdditionsItems.size() 
- 1);
+m_xContainer->set_grid_top_attach(pParentDialog->m_aAdditionsItems.size());
 
 // Set maximum length of the extension title
 OUString sExtensionName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |1 +
 vcl/source/filter/jpeg/jpegc.cxx   |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit 7c90ea5ebc18d36d44870fc829475e471c675a95
Author: Luboš Luňák 
AuthorDate: Fri Oct 9 20:52:05 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:11:28 2020 +0200

try to read JPEGs as BGR if wanted and available

BGR(A) is actually the format used by most VCL backends (Cairo and
Skia at least).

Change-Id: I1574aadabafcea274049d4c7021352913813bae2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104130
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c1fbb535a8e4..0270cc448e82 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -231,6 +231,12 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* 
pJPEGReader, void* pInputS
 nPixelSize = 1;
 }
 #if defined(JCS_EXTENSIONS)
+else if (eFinalFormat == ScanlineFormat::N24BitTcBgr)
+{
+best_out_color_space = JCS_EXT_BGR;
+eScanlineFormat = eFinalFormat;
+nPixelSize = 3;
+}
 else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
 {
 best_out_color_space = JCS_EXT_BGRA;
commit e1eb5d616b701853532f8c6ba2e89366d596789e
Author: Heiko Tietze 
AuthorDate: Mon Oct 12 08:26:28 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Oct 12 15:11:11 2020 +0200

Resolves tdf#137189 - Fixes crash at CheckInstalledExtensions()

SolarMutex added

Change-Id: I18c6683e7a26892ce7f1d019cb1ee59ce03981ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104198
Reviewed-by: Muhammet Kara 
Tested-by: Jenkins

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index ebd23ba077d9..7eb277b3d0f8 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -408,6 +408,7 @@ void SearchAndParseThread::CheckInstalledExtensions()
 }
 else
 {
+SolarMutexGuard aGuard;
 rInfo->m_xButtonInstall->set_sensitive(false);
 rInfo->m_xButtonInstall->set_label(
 CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/source/gdi/bmpfast.cxx |   34 ++
 1 file changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 77809fba7d4bf5e0b604ffa3937c18d5530c2d56
Author: Luboš Luňák 
AuthorDate: Fri Oct 9 19:28:49 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:10:44 2020 +0200

implement ImplFastBitmapConversion() for 8bit gray source

With some documents SvpSalGraphics::drawTransformedBitmap()
ends up calling StretchAndConvert() with 8bit grayscale source
bitmap (e.g. OutputDevice::DrawTransformBitmapExDirect() uses them
as dummy alpha masks). But ImplFastBitmapConversion() doesn't
handle this case, so StretchAndConvert() falls back to doing it
manually, easily making this 3x slower. But 8bit grayscale
bitmaps sort of are actually non-paletted, so this is easy
to optimize.

Change-Id: I93aa3f283c8a182d76f3aa267ebd471e63d945e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104129
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 76a5239d4ceb..5528d9fcf455 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -173,20 +173,21 @@ public:
 }
 };
 
+// This assumes the content uses the grayscale palette (needs to be checked
+// by code allowing the use of the format).
+// Only reading color is implemented, since e.g. 24bpp input couldn't be
+// easily guaranteed to be grayscale.
 template <>
-class TrueColorPixelPtr : public BasePixelPtr
+class TrueColorPixelPtr : public BasePixelPtr
 {
 public:
 voidoperator++(){ mpPixel += 1; }
-PIXBYTE GetAlpha() const{ return mpPixel[0]; }
-};
 
-// TODO: for some reason many Alpha maps are ScanlineFormat::N8BitPal
-// they should be ScanlineFormat::N8BitTcMask
-template <>
-class TrueColorPixelPtr
-: public TrueColorPixelPtr
-{};
+PIXBYTE GetRed() const  { return mpPixel[0]; }
+PIXBYTE GetGreen() const{ return mpPixel[0]; }
+PIXBYTE GetBlue() const { return mpPixel[0]; }
+static PIXBYTE GetAlpha()   { return 255; }
+};
 
 }
 
@@ -251,7 +252,8 @@ static void ImplBlendLines( const 
TrueColorPixelPtr& rDst,
 TrueColorPixelPtr aSrc( rSrc );
 while( --nPixelCount >= 0 )
 {
-ImplBlendPixels(aDst, aSrc, aMsk.GetAlpha());
+// VCL masks store alpha as color, hence the GetRed() and not 
GetAlpha().
+ImplBlendPixels(aDst, aSrc, aMsk.GetRed());
 ++aDst;
 ++aSrc;
 ++aMsk;
@@ -424,7 +426,6 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const 
BitmapBuffer& rSrc,
 case ScanlineFormat::N1BitLsbPal:
 case ScanlineFormat::N4BitMsnPal:
 case ScanlineFormat::N4BitLsnPal:
-case ScanlineFormat::N8BitPal:
 break;
 
 case ScanlineFormat::N8BitTcMask:
@@ -433,6 +434,11 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const 
BitmapBuffer& rSrc,
 //return ImplConvertFromBitmap( 
rDst, rSrc );
 break;
 
+case ScanlineFormat::N8BitPal:
+if(rSrc.maPalette.IsGreyPalette8Bit())
+return ImplConvertFromBitmap( rDst, 
rSrc );
+break;
+
 case ScanlineFormat::N24BitTcBgr:
 return ImplConvertFromBitmap( rDst, 
rSrc );
 case ScanlineFormat::N24BitTcRgb:
@@ -737,7 +743,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess const & 
rDstWA,
 case ScanlineFormat::N1BitLsbPal:
 case ScanlineFormat::N4BitMsnPal:
 case ScanlineFormat::N4BitLsnPal:
-case ScanlineFormat::N8BitPal:
 break;
 
 case ScanlineFormat::N8BitTcMask:
@@ -746,6 +751,11 @@ bool ImplFastBitmapBlending( BitmapWriteAccess const & 
rDstWA,
 //return ImplBlendFromBitmap( rDst, 
rSrc );
 break;
 
+case ScanlineFormat::N8BitPal:
+if(rSrc.maPalette.IsGreyPalette8Bit())
+return ImplBlendFromBitmap( rDst, 
rSrc, rMsk );
+break;
+
 case ScanlineFormat::N24BitTcBgr:
 return ImplBlendFromBitmap( rDst, 
rSrc, rMsk );
 case ScanlineFormat::N24BitTcRgb:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/source/gdi/bmpfast.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3aaed31c05d6c5964c830b44550432cbfb7c15af
Author: Luboš Luňák 
AuthorDate: Fri Oct 9 20:30:18 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:10:10 2020 +0200

the alpha used by our 32bpp formats is true alpha, not transparency

Apparently this code path has never been tested.

Change-Id: I112543ad4f403bb50e5789ceacf57e0c009a9ef7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104128
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 1fe9a9ae543a..76a5239d4ceb 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -62,7 +62,7 @@ public:
 PIXBYTE GetRed() const { return mpPixel[0]; }
 PIXBYTE GetGreen() const   { return mpPixel[1]; }
 PIXBYTE GetBlue() const{ return mpPixel[2]; }
-static PIXBYTE GetAlpha()  { return 0; }
+static PIXBYTE GetAlpha()  { return 255; }
 static void SetAlpha( PIXBYTE ) {}
 
 void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
@@ -82,7 +82,7 @@ public:
 PIXBYTE GetRed() const  { return mpPixel[2]; }
 PIXBYTE GetGreen() const{ return mpPixel[1]; }
 PIXBYTE GetBlue() const { return mpPixel[0]; }
-static PIXBYTE GetAlpha()   { return 0; }
+static PIXBYTE GetAlpha()   { return 255; }
 static void SetAlpha( PIXBYTE ) {}
 
 void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/inc/bmpfast.hxx|5 ++
 vcl/source/gdi/bmpacc.cxx  |   20 +
 vcl/source/gdi/bmpfast.cxx |   97 +
 3 files changed, 114 insertions(+), 8 deletions(-)

New commits:
commit 6036b2486cdc5ba8eac8636b2e087658e3550586
Author: Luboš Luňák 
AuthorDate: Fri Oct 9 15:20:43 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 12 15:09:27 2020 +0200

implement fast bitmap variant for CopyScanline()

JPEG reads RGB, but e.g. with Skia the default bitmap format is BGRA.

Change-Id: Iad1a9e99f286b03db0fa683c14d70b8ad48d3d9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104120
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index f9a1f891bb47..ebdb431fc941 100644
--- a/vcl/inc/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_BMPFAST_HXX
 
 #include 
+#include 
 
 class BitmapWriteAccess;
 class BitmapReadAccess;
@@ -34,6 +35,10 @@ struct SalTwoRect;
 VCL_DLLPUBLIC bool ImplFastBitmapConversion( BitmapBuffer& rDst, const 
BitmapBuffer& rSrc,
 const SalTwoRect& rTwoRect );
 
+bool ImplFastCopyScanline( long nY, BitmapBuffer& rDst, const BitmapBuffer& 
rSrc);
+bool ImplFastCopyScanline( long nY, BitmapBuffer& rDst, ConstScanline 
aSrcScanline,
+ScanlineFormat nSrcScanlineFormat, sal_uInt32 nSrcScanlineSize);
+
 bool ImplFastBitmapBlending( BitmapWriteAccess const & rDst,
 const BitmapReadAccess& rSrc, const BitmapReadAccess& rMask,
 const SalTwoRect& rTwoRect );
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index a406951cd7f7..3994f9c1889a 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -344,11 +345,14 @@ void BitmapWriteAccess::CopyScanline( long nY, const 
BitmapReadAccess& rReadAcc
 }
 else
 {
-// TODO: use fastbmp infrastructure
-Scanline pScanline = GetScanline( nY );
-Scanline pScanlineRead = rReadAcc.GetScanline(nY);
-for( long nX = 0, nWidth = std::min( mpBuffer->mnWidth, 
rReadAcc.Width() ); nX < nWidth; nX++ )
-SetPixelOnData( pScanline, nX, rReadAcc.GetPixelFromData( 
pScanlineRead, nX ) );
+long nWidth = std::min( mpBuffer->mnWidth, rReadAcc.Width() );
+if(!ImplFastCopyScanline( nY, *ImplGetBitmapBuffer(), 
*rReadAcc.ImplGetBitmapBuffer()))
+{
+Scanline pScanline = GetScanline( nY );
+Scanline pScanlineRead = rReadAcc.GetScanline(nY);
+for( long nX = 0; nX < nWidth; nX++ )
+SetPixelOnData( pScanline, nX, rReadAcc.GetPixelFromData( 
pScanlineRead, nX ) );
+}
 }
 }
 
@@ -371,13 +375,13 @@ void BitmapWriteAccess::CopyScanline( long nY, 
ConstScanline aSrcScanline,
 memcpy(GetScanline(nY), aSrcScanline, nCount);
 else
 {
+if(ImplFastCopyScanline( nY, *ImplGetBitmapBuffer(), aSrcScanline, 
nSrcScanlineFormat, nSrcScanlineSize ))
+return;
+
 DBG_ASSERT( nFormat != ScanlineFormat::N8BitTcMask &&
 nFormat != ScanlineFormat::N32BitTcMask,
 "No support for pixel formats with color masks yet!" );
-
-// TODO: use fastbmp infrastructure
 FncGetPixel pFncGetPixel;
-
 switch( nFormat )
 {
 case ScanlineFormat::N1BitMsbPal:pFncGetPixel = 
GetPixelForN1BitMsbPal; break;
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 9ee00b7bdd40..1fe9a9ae543a 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -457,6 +457,103 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const 
BitmapBuffer& rSrc,
 return false;
 }
 
+static inline ConstScanline ImplGetScanline( const BitmapBuffer& rBuf, long nY 
)
+{
+if( rBuf.mnFormat & ScanlineFormat::TopDown )
+return rBuf.mpBits + nY * rBuf.mnScanlineSize;
+else
+return rBuf.mpBits + (rBuf.mnHeight - 1 - nY) * rBuf.mnScanlineSize;
+}
+
+static inline Scanline ImplGetScanline( BitmapBuffer& rBuf, long nY )
+{
+return const_cast(ImplGetScanline( const_cast(rBuf), nY ));
+}
+
+template 
+static bool ImplCopyToScanline( long nY, BitmapBuffer& rDst, 
TrueColorPixelPtr& rSrcLine, long nSrcWidth )
+{
+TrueColorPixelPtr aDstType;
+aDstType.SetRawPtr( ImplGetScanline( rDst, nY ));
+ImplConvertLine( aDstType, rSrcLine, std::min( nSrcWidth, rDst.mnWidth ));
+return true;
+}
+
+template 
+static bool ImplCopyFromScanline( long nY, BitmapBuffer& rDst, ConstScanline 
aSrcScanline, long nSrcWidth )
+{
+TrueColorPixelPtr aSrcType;
+aSrcType.SetRawPtr( const_cast( aSrcScanline ));
+// select the matching instantiation for the destination's bitmap format
+switch( RemoveScanline( rDst.mnFormat ))
+{
+case ScanlineFormat::N24BitTcBgr:
+return ImplCopyToScanline( nY, r

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

[DaeHyun Sung (via logerrit)]

 officecfg/registry/data/org/openoffice/VCL.xcu |   52 -
 unotools/source/config/fontcfg.cxx |2 
 2 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit a879daa45f40fd84373a92242e098eaf6a493508
Author: DaeHyun Sung 
AuthorDate: Sun Oct 11 22:11:34 2020 +0900
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 13:27:01 2020 +0200

Changed font order for Korean locale tdf#137392

changed font order priority.

1. put 'Noto Sans KR' ahead of 'Noto Sans CJK KR'.
Because, New Noto Sans CJK font change the name.

New Noto Sans CJK V2.001 released on 10 Apr 2019.

In these font files, removed 'CJK' on names.

Nowadays, New Linux distributions includes Noto CJK font V2.0.
In Korean Linux environments, Noto CJK font v2.0 'Noto Sans KR' & 'Noto 
Serif KR' are already set default.

2. fixed Windows fonts for Korean on LibreOffice
I watched Windows 10's Korean Font List

Microsoft Docs: Font List Windows 10 - Typography; Korean Supplemental Fonts

https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list#korean-supplemental-fonts

I missed 굴림체;GulimChe, 돋움체;DotumChe, 굴림체;GulimChe.
So. I added MS Default Korean fonts.

As a result, I changed font order and add default Windows font names.

Ref.
1: Google Noto CJK fonts Repository: https://github.com/googlefonts/noto-cjk
2: Microsoft Docs: Font List Windows's Korean supplemental fonts

https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list#korean-supplemental-fonts

cf.Apple Docs - Format Chinese, Japanese, or Korean text in Pages on Mac

https://support.apple.com/guide/pages/format-chinese-japanese-or-korean-text-tanfbd4156e/mac

Change-Id: I12594aa8f3122c05810a07a718aae7ec185ba481
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104189
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 271731c28e65..4780080f89a2 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -388,55 +388,55 @@
 
 
   
-Noto Sans Mono CJK KR;Noto Sans Mono KR;Source Han Mono 
KR;Source Han Mono;D2 Coding;Nanum Gothic Coding;Noto Sans CJK KR;Noto Sans 
KR;Source Han Sans KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 
옛한글;NanumBarunGothic YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 
고딕;Malgun Gothic;애플 SD 산돌고딕 Neo;Apple SD Gothic 
Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk 
Gulim;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans 
Typewriter;Lucida Typewriter;Monaco;Monospaced
+Noto Sans Mono CJK KR;Source Han Mono KR;Source Han Mono;D2 
Coding;Nanum Gothic Coding;Noto Sans CJK KR;Noto Sans KR;Source Han Sans 
KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic 
YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 
산돌고딕 Neo;Apple SD Gothic 
Neo;돋음;Dotum;돋움체;DotumChe;굴림;Gulim;굴림체;GulimChe;바탕;Batang;바탕체;BatangChe;애플고딕;Apple
 Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Cumberland AMT;Cumberland;Courier 
New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida 
Typewriter;Monaco;Monospaced
   
   
-Noto Sans CJK KR;Noto Sans KR;Source Han Sans 
KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic 
YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 
산돌고딕 Neo;Apple SD Gothic Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 
돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Albany AMT;Albany;Arial;Nimbus Sans 
L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Noto Sans KR;Noto Sans CJK KR;Source Han Sans 
KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic 
YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 
산돌고딕 Neo;Apple SD Gothic 
Neo;돋음;Dotum;돋움체;DotumChe;굴림;Gulim;굴림체;GulimChe;바탕;Batang;바탕체;BatangChe;애플고딕;Apple
 Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Albany AMT;Albany;Arial;Nimbus Sans 
L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
-Noto Sans CJK KR;Noto Sans KR;Source Han Sans 
KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic 
YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 
산돌고딕 Neo;Apple SD Gothic Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 
돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Albany AMT;Albany;Arial;Nimbus Sans 
L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Noto Sans KR;Noto Sans CJK KR;Source Han Sans 
KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic 
YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 
산돌고딕 Neo;Apple SD Gothic 
Neo;돋음

Re: Crash test update

[Caolán McNamara]

On Sun, 2014-08-10 at 08:27 +, crashtest.libreoff...@gmail.com
wrote:
> New crashtest update available at 
> www.dev-builds.libreoffice.org/crashtest/afbbc4cf4ceea9445cbb584b50d511c512e5133f

FWIW

soffice.bin --headless --convert-to odt ooo12626-10.odt

is failing since

commit e366c928819c44b5c253c45dca6dae40b71c9808
Date:   Thu Oct 1 17:31:21 2020 +0200

sw: ODF import: convert the simplest sub-tables to rowspan tables

with this bt:

https://dev-builds.libreoffice.org/crashtest/ad054256a4d914e57d380539b3aed245890064af/backtraces/task129-core.backtrace.txt

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/mariadb-connector-c

[Julien Nabet (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3c2dcceb0e885a5a2c76bb69eac6e2dbba98d6d
Author: Julien Nabet 
AuthorDate: Sat Oct 10 18:14:47 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 12 11:23:03 2020 +0200

Related tdf#122560 tdf#135202: build plugin caching_sha2_pw for 
MariaDb/Mysql

Taking a look at:

https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authentication.html
"caching_sha2_password" is better than "sha256_password" plugin
Notice that "sha2" in "caching_sha2_password" refers, as the quoted url 
indicates:
'more generally to the SHA-2 class of encryption algorithms, of which 
256-bit encryption is one instance'

Change-Id: Icbbe45f4f20345da2fb5a262b4d85bce3a1fecd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104172
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
(cherry picked from commit ee8d735f0a59f41fb1f5cbabfe089c222ca948e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104150
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 89d4bfbe954e..86d127c2af62 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -64,6 +64,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: calc: jumbo sheets on windows (never gonna happen)

[Noel Grandin]

First small step of my proposed solution here:

https://gerrit.libreoffice.org/c/core/+/104203
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 sw/inc/fmtanchr.hxx  |2 
 sw/inc/unotxdoc.hxx  |   24 ++---
 sw/source/core/access/AccessibilityCheck.cxx |8 -
 sw/source/core/layout/atrfrm.cxx |   10 +-
 sw/source/uibase/uno/unotxdoc.cxx|  122 +--
 5 files changed, 83 insertions(+), 83 deletions(-)

New commits:
commit 1ff072e3b672d864f119efdeba93248f47042ad1
Author: Miklos Vajna 
AuthorDate: Mon Oct 12 09:02:47 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 12 10:08:49 2020 +0200

sw: prefix members of SwFormatAnchor, SwXDocumentPropertyHelper, ...

... SwXLinkNameAccessWrapper and TableHeadingCheck

See tdf#94879 for motivation.

Change-Id: I1108abc0d4ee6179c0b4d4dbe18af0730edbd2ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104200
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index d04b2afcd488..59c165cab701 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem
 
 /// #i28701# - getting anchor positions ordered
 sal_uInt32 m_nOrder;
-static sal_uInt32 m_nOrderCounter;
+static sal_uInt32 s_nOrderCounter;
 
 public:
 SwFormatAnchor( RndStdIds eRnd = RndStdIds::FLY_AT_PAGE, sal_uInt16 
nPageNum = 0 );
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index cf950c259c22..4ecd5ba57f7e 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -510,11 +510,11 @@ class SwXLinkNameAccessWrapper final : public 
cppu::WeakImplHelper
 css::document::XLinkTargetSupplier
 >
 {
-css::uno::Reference< css::container::XNameAccess >xRealAccess;
-const SfxItemPropertySet* pPropSet;
-const OUStringsLinkSuffix;
-const OUStringsLinkDisplayName;
-SwXTextDocument*  pxDoc;
+css::uno::Reference< css::container::XNameAccess >m_xRealAccess;
+const SfxItemPropertySet* m_pPropSet;
+const OUStringm_sLinkSuffix;
+const OUStringm_sLinkDisplayName;
+SwXTextDocument*  m_pxDoc;
 
 public:
 SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess 
>  const & xAccess,
@@ -585,13 +585,13 @@ enum class SwCreateDrawTable {
 
 class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable
 {
-css::uno::Reference < css::uno::XInterface > xDashTable;
-css::uno::Reference < css::uno::XInterface > xGradientTable;
-css::uno::Reference < css::uno::XInterface > xHatchTable;
-css::uno::Reference < css::uno::XInterface > xBitmapTable;
-css::uno::Reference < css::uno::XInterface > xTransGradientTable;
-css::uno::Reference < css::uno::XInterface > xMarkerTable;
-css::uno::Reference < css::uno::XInterface > xDrawDefaults;
+css::uno::Reference < css::uno::XInterface > m_xDashTable;
+css::uno::Reference < css::uno::XInterface > m_xGradientTable;
+css::uno::Reference < css::uno::XInterface > m_xHatchTable;
+css::uno::Reference < css::uno::XInterface > m_xBitmapTable;
+css::uno::Reference < css::uno::XInterface > m_xTransGradientTable;
+css::uno::Reference < css::uno::XInterface > m_xMarkerTable;
+css::uno::Reference < css::uno::XInterface > m_xDrawDefaults;
 
 SwDoc*  m_pDoc;
 public:
diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index e3699d9038b0..08e8f1d47051 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -697,18 +697,18 @@ class TableHeadingCheck : public NodeCheck
 {
 private:
 // Boolean indicating if heading-in-table warning is already triggered.
-bool bPrevPassed;
+bool m_bPrevPassed;
 
 public:
 TableHeadingCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
 : NodeCheck(rIssueCollection)
-, bPrevPassed(true)
+, m_bPrevPassed(true)
 {
 }
 
 void check(SwNode* pCurrent) override
 {
-if (!bPrevPassed)
+if (!m_bPrevPassed)
 return;
 
 const SwTextNode* textNode = pCurrent->GetTextNode();
@@ -719,7 +719,7 @@ public:
 
 if (parentTable)
 {
-bPrevPassed = false;
+m_bPrevPassed = false;
 lclAddIssue(m_rIssueCollection, SwResId(STR_HEADING_IN_TABLE));
 }
 }
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 6202099748fc..b7dddc1a2466 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1495,7 +1495,7 @@ SwFormatAnchor::SwFormatAnchor( RndStdIds nRnd, 
sal_uInt16 nPage )
 m_eAnchorI

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

[Caolán McNamara (via logerrit)]

 editeng/source/rtf/svxrtf.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 47da5a7e95ef45efcc9e13f225273e728d1fbc58
Author: Caolán McNamara 
AuthorDate: Sun Oct 11 20:20:34 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 09:48:06 2020 +0200

ofz#24932 collatoral ubsan failure seen in TimeOut case

unsigned integer overflow: 0 - 1 cannot be represented in type size_t

Change-Id: Iba74ce28752e4024e0921f91f28866fd9eaf248e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104195
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index a5c1217ff3e7..affc44b8f5f2 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1085,7 +1085,8 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& 
rParser )
 // It can be merged
 aAttrSet.Put( aMrgSet );
 
-for (size_t n = 0; n < m_pChildList->size(); ++n)
+size_t n = 0, nChildLen = m_pChildList->size();
+while (n < nChildLen)
 {
 pTmp = (*m_pChildList)[n].get();
 pTmp->aAttrSet.Differentiate( aMrgSet );
@@ -1093,8 +1094,10 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& 
rParser )
 if (!pTmp->m_pChildList && !pTmp->aAttrSet.Count() && !pTmp->nStyleNo)
 {
 m_pChildList->erase( m_pChildList->begin() + n );
---n;
+--nChildLen;
+continue;
 }
+++n;
 }
 if (m_pChildList->empty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8scan.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f7e5b8e289645f2561844c0018bc4283b0e63b21
Author: Caolán McNamara 
AuthorDate: Sat Oct 10 21:22:04 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 09:47:29 2020 +0200

IsSizeLegalCheckSize is a silly name

Change-Id: If39302042d3e53798aaa8564fddc8ddd6e539712
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104179
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 65a5818abb48..09b43d02f52f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5171,7 +5171,7 @@ void WW8PLCFMan::RestoreAllPLCFx( const WW8PLCFxSaveAll& 
rSave )
 
 namespace
 {
-bool IsSizeLegalCheckSize(long nSprmLen, sal_Int32 nSprmsLen)
+bool IsSizeLegal(long nSprmLen, sal_Int32 nSprmsLen)
 {
 if (nSprmLen > nSprmsLen)
 {
@@ -5237,7 +5237,7 @@ void WW8PLCFMan::GetSprmStart( short nIdx, 
WW8PLCFManResult* pRes ) const
 {
 // Length of actual sprm
 pRes->nMemLen = maSprmParser.GetSprmSize(pRes->nSprmId, pRes->pMemPos, 
p->nSprmsLen);
-if (!IsSizeLegalCheckSize(pRes->nMemLen, p->nSprmsLen) || 
!IsSprmLegalForCategory(pRes->nSprmId, nIdx))
+if (!IsSizeLegal(pRes->nMemLen, p->nSprmsLen) || 
!IsSprmLegalForCategory(pRes->nSprmId, nIdx))
 {
 pRes->nSprmId = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8scan.cxx |   25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 7ddb7d30d44008f5873d20dbcd11a1afd46a3ec5
Author: Caolán McNamara 
AuthorDate: Sun Oct 11 16:10:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 09:47:47 2020 +0200

ofz#23602 Timeout processing huge SEPX full of non-SEP properties

Change-Id: If95bf624e4bd18368f41b350fc3675e2675576c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104190
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 09b43d02f52f..bc7275ea3d6b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5191,22 +5191,25 @@ bool WW8PLCFMan::IsSprmLegalForCategory(sal_uInt16 
nSprmId, short nIdx) const
 bool bRet;
 ww::WordVersion eVersion = maSprmParser.GetFIBVersion();
 if (eVersion <= ww::eWW2)
-{
 bRet = nSprmId >= 112 && nSprmId <= 145;
-SAL_WARN_IF(!bRet, "sw.ww8", "sprm, id " << nSprmId << " wrong 
category for section properties");
-assert(bRet && "once off crashtesting scan for real world cases");
-}
-else if (eVersion < ww::eWW8) // just check ww6/7 for now
-{
+else if (eVersion < ww::eWW8)
 bRet = nSprmId >= NS_sprm::v6::sprmSScnsPgn && nSprmId <= 
NS_sprm::v6::sprmSDMPaperReq;
-SAL_WARN_IF(!bRet, "sw.ww8", "sprm, id " << nSprmId << " wrong 
category for section properties");
-}
 else
 {
-// we could pull the sgc from the SprmId in this case
-bRet = true;
+/*
+  Sprm bits: 10-12  sgc   sprm group; type of sprm (PAP, CHP, etc)
+
+  sgc value type of sprm
+  1 PAP
+  2 CHP
+  3 PIC
+  4 SEP
+  5 TAP
+*/
+auto nSGC = ((nSprmId & 0x1C00) >> 10);
+bRet = nSGC == 4;
 }
-
+SAL_WARN_IF(!bRet, "sw.ww8", "sprm, id " << nSprmId << " wrong category 
for section properties");
 return bRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8scan.cxx |   35 +--
 sw/source/filter/ww8/ww8scan.hxx |4 
 2 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit 4e56a0a4b60f293cfddda67af68352de36ccc1ef
Author: Caolán McNamara 
AuthorDate: Sat Oct 10 21:17:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 09:46:47 2020 +0200

ofz#23523 Timeout processing huge SEPX full of non-SEP properties

ignore properties in SEPX which aren't section properties

Change-Id: I191acbd8d602d0c59ce541cecb847d7d57c1bc3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104178
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1b3c738823bd..65a5818abb48 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5182,6 +5182,34 @@ namespace
 }
 }
 
+bool WW8PLCFMan::IsSprmLegalForCategory(sal_uInt16 nSprmId, short nIdx) const
+{
+const WW8PLCFxDesc* p = &m_aD[nIdx];
+if (p != m_pSep) // just check sep for now
+return true;
+
+bool bRet;
+ww::WordVersion eVersion = maSprmParser.GetFIBVersion();
+if (eVersion <= ww::eWW2)
+{
+bRet = nSprmId >= 112 && nSprmId <= 145;
+SAL_WARN_IF(!bRet, "sw.ww8", "sprm, id " << nSprmId << " wrong 
category for section properties");
+assert(bRet && "once off crashtesting scan for real world cases");
+}
+else if (eVersion < ww::eWW8) // just check ww6/7 for now
+{
+bRet = nSprmId >= NS_sprm::v6::sprmSScnsPgn && nSprmId <= 
NS_sprm::v6::sprmSDMPaperReq;
+SAL_WARN_IF(!bRet, "sw.ww8", "sprm, id " << nSprmId << " wrong 
category for section properties");
+}
+else
+{
+// we could pull the sgc from the SprmId in this case
+bRet = true;
+}
+
+return bRet;
+}
+
 void WW8PLCFMan::GetSprmStart( short nIdx, WW8PLCFManResult* pRes ) const
 {
 memset( pRes, 0, sizeof( WW8PLCFManResult ) );
@@ -5209,7 +5237,7 @@ void WW8PLCFMan::GetSprmStart( short nIdx, 
WW8PLCFManResult* pRes ) const
 {
 // Length of actual sprm
 pRes->nMemLen = maSprmParser.GetSprmSize(pRes->nSprmId, pRes->pMemPos, 
p->nSprmsLen);
-if (!IsSizeLegalCheckSize(pRes->nMemLen, p->nSprmsLen))
+if (!IsSizeLegalCheckSize(pRes->nMemLen, p->nSprmsLen) || 
!IsSprmLegalForCategory(pRes->nSprmId, nIdx))
 {
 pRes->nSprmId = 0;
 }
@@ -5306,7 +5334,10 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
 if( bStart )
 {
 const sal_uInt16 nLastId = GetId(p);
-p->pIdStack->push(nLastId);   // remember Id for attribute end
+
+const sal_uInt16 nLastAttribStarted = IsSprmLegalForCategory(nLastId, 
nIdx) ? nLastId : 0;
+
+p->pIdStack->push(nLastAttribStarted);   // remember Id for attribute 
end
 
 if( p->nSprmsLen )
 {   /*
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 0b606d316e95..edf22104f65b 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -147,6 +147,8 @@ public:
 /// Returns the offset to data of the first sprm of id nId, 0
 //  if not found. nLen must be the <= length of pSprms
 SprmResult findSprmData(sal_uInt16 nId, sal_uInt8* pSprms, sal_Int32 nLen) 
const;
+
+ww::WordVersion GetFIBVersion() const { return meVersion; }
 };
 
 //Read a Pascal-style, i.e. single byte string length followed
@@ -962,6 +964,8 @@ private:
 void AdvNoSprm(short nIdx, bool bStart);
 sal_uInt16 GetId(const WW8PLCFxDesc* p ) const;
 
+bool IsSprmLegalForCategory(sal_uInt16 nSprmId, short nIdx) const;
+
 public:
 WW8PLCFMan(const WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
 bool bDoingDrawTextBox = false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[DaeHyun Sung (via logerrit)]

 svtools/source/misc/sampletext.cxx |   60 -
 1 file changed, 39 insertions(+), 21 deletions(-)

New commits:
commit c8e8860f8b1453f0a51c6202ce8ff90b7c4ba515
Author: DaeHyun Sung 
AuthorDate: Sun Aug 2 21:00:53 2020 +0900
Commit: Caolán McNamara 
CommitDate: Mon Oct 12 09:42:34 2020 +0200

tdf#134742 Distinguishing all CJK fonts such as Noto CJK Fonts.

Distinguishing both Korean and Japanese fonts from all 
CJK[Chinese-Japanese-Korean] fonts such as Noto CJK font series and Source Han 
Sans series, etc.

For the first time, I added  Hardcode script for "Noto" CJK fonts.
 The "Noto" CJK fonts support to Simplified Chinese, Traditional Chinese, 
Traditional Chinese HK, Japanese, and Korean (Pan-CJK fonts).

Nowadays, Noto CJK Fonts are shown '简繁'.

Noto font's KR(Korean, 한국어/한글) & JP(Japanese,日本語) represent Korean(KR, 
It shows '한글') and Japanese(JP, It shows '日本語'), respectively. These are not 
expressed in Chinese fonts, such as Simplified Chinese(简) and Traditional 
Chinese(繁).
Also, Both TC(Traditional Chinese) and HK(Hong Kong) represent 繁. It 
don't shown 简繁.
so, SC(Simplified Chinese) represent 简, It don't shown 简繁

   So, I fixed Font select option's Noto CJK-series font Examples on 
LibreOffice
Noto Sans CJK HK 简繁 -> Noto Sans CJK HK 繁
Noto Sans CJK JP 简繁 -> Noto Sans CJK JP 日本語
Noto Sans CJK KR 简繁 -> Noto Sans CJK KR 한글
Noto Sans CJK SC 简繁 -> Noto Sans CJK SC 简
Noto Sans CJK TC 简繁 -> Noto Sans CJK TC 繁

Noto Sans Mono CJK HK 简繁 -> Noto Sans Mono CJK HK 繁
Noto Sans Mono CJK JP 简繁 -> Noto Sans Mono CJK JP 日本語
Noto Sans Mono CJK KR 简繁 -> Noto Sans Mono CJK KR 한글
Noto Sans Mono CJK SC 简繁 -> Noto Sans Mono CJK SC 简
Noto Sans Mono CJK TC 简繁 -> Noto Sans Mono CJK TC 繁

Noto Serif CJK JP 简繁 -> Noto Serif CJK JP 日本語
Noto Serif CJK KR 简繁 -> Noto Serif CJK KR 한글
Noto Serif CJK SC 简繁 -> Noto Serif CJK SC 简
Noto Serif CJK TC 简繁 -> Noto Serif CJK TC 繁

However, It is only support to Noto CJK fonts and lack of distinguish fonts 
for all CJK[Chinese-Japanese-Korean) fonts.

So, I think that change the code and improving the ability to distinguish 
fonts between Korean, Chinese and Japanese.

1. `remove  Hardcode script for "Noto" CJK fonts
2. add hardcode script at attemptToDisambiguateHan(UScriptCode eScript, 
OutputDevice const &rDevice) and change distinguish among Korean, Japanese and 
Chinese fonts.

Former
-static const sal_Unicode aKorean[] = { 0x3131 };
-static const sal_Unicode aJapanese[] = { 0x3007, 0x9F9D };
-static const sal_Unicode aTraditionalChinese[] = { 0x570B };
-static const sal_Unicode aSimplifiedChinese[] = { 0x56FD };
Korean: U+3131 ㄱ   Hangul Letter Kiyeok
Japanese: U+3007 〇 Ideographic Number Zero & U+9F9D 龝
Traditional Chinese: U+570B
Simplified Chinese: U+56FD

That code’s problem
Both Japaese kanji U+3007 〇 and  U+9F9D 龝 also uses in Korean & Chinese.

U+3007 〇
Definition: zero
It uses in CJK(Chinese, Japanese and Korean)
It usually uses number expression in MS Excel, LibreOffice.

U+9F9D 龝
Definition: autumn, fall; year
Mandarin Chinese reads qiū
Korean Hanja sound is 추 chu
Japanese Kun sound is ‘AKI' or ‘TOKI’
Japanese On sound is ‘SHUU’
That meaning likes ‘秋’.

Korean
[한자 너 어디 있었니?] 54. 분탕 焚蕩 
http://www.incheonilbo.com/news/articleView.html?idxno=1019040
참고로 가을날 벼에 달라붙은 메뚜기 모양을 한 글자인 龝(추)는 秋의 고자(古字)로 서예가들이 멋을 부리기 위해 사용하기도 한다.
Japanese
「龝」の漢字‐読み方・意味・部首・画数 - 漢字辞典 https://kanjitisiki.com/jis2/2-3/020.html
漢字の「龝」についてです。「秋」の異体字です。
Chinese
龝 - 中國哲學書電子化計劃 https://ctext.org/dictionary.pl?if=gb&char=%E9%BE%9D
《康熙字典·四》:秋：〔古文〕龝《唐韻》七由切《集韻》《韻會》雌由切《正韻》此由切，音鰌。

Also, Both U+570B 國 and U+56FD 国 doesn't distinguish CJK languages.
Because, 'U+570B 國’ uses in Traditional Chinese,  Korean, Japanese texts.
U+570B 國
Korean: 國
21國 정상급 26명 온다…평창서 `외교 올림픽` 
https://www.mk.co.kr/news/politics/view/2018/01/66693/
핵융합발전 프로젝트 韓國이 주도..."ITER 부품의 70~80% 도맡아" 
http://www.dt.co.kr/contents.html?article_no=2020072802109931731004
Japanese: 國
ORANGE RANGE、母校の吹奏楽部・琉球國祭り太鼓とのライブを公開 
https://news.yahoo.co.jp/articles/c6a7e9bb83e46662a8638cd5373a5c71d144cb8b
Traditional Chinese: 國
國家森林遊樂區免費入園一次 上路一週最熱門是這地方   
https://news.ltn.com.tw/news/life/breakingnews/3237355

Also, 'U+56FD 国’ uses in both Simplified Chinese and Japanese.
U+56FD 国
Japanese: 国
日本人の子ども連れ去りは国ぐるみの誘拐？ 批准した国際条約、国内で適用せずは許されるのか 
https://www.47news.jp/news/5057377.html
Simplified Chinese: 国
中国国际云书馆上线运行 http://world.people.com.cn/n1/2020/0726/c1002-31797808.html

My suggestion to change code

Changed
+static

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

[Szymon Kłos (via logerrit)]

 vcl/source/window/window2.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 306891f88b859c5544b8e1e4a1b2f3bec1896b17
Author: Szymon Kłos 
AuthorDate: Wed Sep 30 19:09:32 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Oct 12 09:13:31 2020 +0200

Allow invalidate after queue_resize for lok in sidebar

This is a fix for regression introduced by
61a35560cb412d7ab0e3d0574eec4a790e3b9dfd

Sidebar wasn't properly refreshed in Online eg.
in Impress change 'Background' in sidebar 'Slide' deck
to 'Color' -> resulted in overlapping content

Change-Id: Id64f5d8694908d28cf5fa9787b65e555fb317e35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103724
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104012
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 23557868dd4c..e435d890861e 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1311,6 +1311,19 @@ void Window::InvalidateSizeCache()
 pWindowImpl->mnOptimalHeightCache = -1;
 }
 
+static bool HasParentDockingWindow(const vcl::Window* pWindow)
+{
+while( pWindow )
+{
+if( pWindow->IsDockingWindow() )
+return true;
+
+pWindow = pWindow->GetParent();
+}
+
+return pWindow && pWindow->IsDockingWindow();
+}
+
 void Window::queue_resize(StateChangedType eReason)
 {
 if (IsDisposed())
@@ -1346,7 +1359,8 @@ void Window::queue_resize(StateChangedType eReason)
 if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 Size aSize = GetSizePixel();
-if (!aSize.IsEmpty() && GetParentDialog() && !pParent->IsInInitShow())
+if (!aSize.IsEmpty() && !pParent->IsInInitShow()
+&& (GetParentDialog() || HasParentDockingWindow(this)))
 LogicInvalidate(nullptr);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[gokaysatir (via logerrit)]

 sc/sdi/scalc.sdi   |2 +-
 sc/source/ui/inc/viewfunc.hxx  |2 +-
 sc/source/ui/view/tabvwshf.cxx |   20 +++-
 sc/source/ui/view/viewfun2.cxx |6 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 53bd76e8f193baf667077eb52d06e3c244964819
Author: gokaysatir 
AuthorDate: Wed Sep 30 15:48:44 2020 +0300
Commit: Szymon Kłos 
CommitDate: Mon Oct 12 09:12:49 2020 +0200

Online: Hide right clicked sheet.

On core side, if user clicks on a tab with right mouse button, clicked tab 
is selected.
So, for core side, if this feature will be desired, some more modification 
will be needed.

Change-Id: Ic4755b27b8ba98d3a6aa086b2e0a3566d095ba16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103685
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104078
Tested-by: Jenkins

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 93a6b67be6e5..86ae80497a77 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2593,7 +2593,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL
 
 
 SfxVoidItem Hide FID_TABLE_HIDE
-(SfxStringItem aTableName FID_TABLE_HIDE)
+(SfxInt16Item nTabNumber FID_TABLE_HIDE)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 7780e74bc790..5a7ad681c628 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -285,7 +285,7 @@ public:
 const OUString& rSource );
 
 voidShowTable( const std::vector& rNames );
-voidHideTable( const ScMarkData& rMark );
+voidHideTable( const ScMarkData& rMark, SCTAB nTabToSelect = 
-1);
 
 voidMakeScenario(const OUString& rName, const OUString& 
rComment,
  const Color& rColor, ScScenarioFlags nFlags);
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 95e566267ae1..98ce2db58fa7 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -107,7 +107,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 if ( rDoc.IsDocEditable() )
 {
 ScMarkData& rMark = rViewData.GetMarkData();
-HideTable( rMark );
+SCTAB nActiveTab = -1;
+// For the cases when user right clicks on a non-active 
tab and hides it. This case is possible for Online.
+if (pReqArgs)
+{
+const SfxPoolItem *pItem;
+if( pReqArgs->HasItem( FID_TABLE_HIDE, &pItem ) )
+{
+SCTAB nTabNumber = static_cast(pItem)->GetValue();
+// Does selected sheets (tabs) list include the 
sheet to be hidden?
+std::set::iterator it = 
rMark.GetSelectedTabs().find(nTabNumber);
+if (it == rMark.GetSelectedTabs().end())
+{
+// No it doesn't, so we won't shift the 
selected tab. Let's remember its position.
+nActiveTab = GetViewData().GetTabNo();
+}
+rMark.SelectOneTable(nTabNumber);
+}
+}
+HideTable( rMark, nActiveTab );
 }
 }
 break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 90ddff57df08..572b62cf4036 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3146,7 +3146,7 @@ void ScViewFunc::ShowTable( const std::vector& 
rNames )
 }
 }
 
-void ScViewFunc::HideTable( const ScMarkData& rMark )
+void ScViewFunc::HideTable( const ScMarkData& rMark, SCTAB nTabToSelect )
 {
 ScDocShell* pDocSh = GetViewData().GetDocShell();
 ScDocument& rDoc = pDocSh->GetDocument();
@@ -3181,6 +3181,10 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
 undoTabs.push_back(nTab);
 }
 }
+
+if (nTabToSelect != -1)
+SetTabNo(nTabToSelect);
+
 if (bUndo)
 {
 pDocSh->GetUndoManager()->AddUndoAction( 
std::make_unique( pDocSh, undoTabs, false ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits