[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 93dd88bd538db825b35c0feaab96dfa073229dfc
Author: Seth Chaiklin 
AuthorDate: Sat Feb 18 04:15:35 2023 +
Commit: Gerrit Code Review 
CommitDate: Sat Feb 18 04:15:35 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 02ca13ee438eac0be0a811f86ffd43c2366eecfa
  - tdf#153549 update because Chapter Numbering -> Heading Numbering

   First of multipart patch to update help pages because of
   name change to the dialog that assigns numbering schemes
   to headings. Patch focuses on pages that describe the
   Tools - Heading Numbering dialog. Where possible, German
   Ids were renamed.

   For "Numbering" page, controls were reordered to correspond
   to the current order in the dialog.

Change-Id: I15f65e6f95dc2b2830f7acf6afd03d4896e22b57
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147127
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 198705620658..02ca13ee438e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 19870562065899332b16070b6724d628f8d1cb80
+Subproject commit 02ca13ee438eac0be0a811f86ffd43c2366eecfa

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

[Seth Chaiklin (via logerrit)]

 source/auxiliary/swriter.tree   |6 ++---
 source/text/shared/00/00040500.xhp  |2 -
 source/text/swriter/00/0406.xhp |6 ++---
 source/text/swriter/01/0606.xhp |   26 ++-
 source/text/swriter/01/06060100.xhp |   40 +---
 source/text/swriter/04/0102.xhp |2 -
 source/text/swriter/main0106.xhp|4 +--
 7 files changed, 45 insertions(+), 41 deletions(-)

New commits:
commit 02ca13ee438eac0be0a811f86ffd43c2366eecfa
Author: Seth Chaiklin 
AuthorDate: Fri Feb 17 01:33:03 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Feb 18 04:15:35 2023 +

tdf#153549 update because Chapter Numbering -> Heading Numbering

   First of multipart patch to update help pages because of
   name change to the dialog that assigns numbering schemes
   to headings. Patch focuses on pages that describe the
   Tools - Heading Numbering dialog. Where possible, German
   Ids were renamed.

   For "Numbering" page, controls were reordered to correspond
   to the current order in the dialog.

Change-Id: I15f65e6f95dc2b2830f7acf6afd03d4896e22b57
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147127
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index 879dea2898..aaad4d725e 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -134,7 +134,7 @@
   Inserting 
Sections
 
 
-  Chapter 
Numbering
+  Heading 
Numbering
   User-Defined 
Indexes
   Creating a Table 
of Contents
   Creating 
Alphabetical Indexes
@@ -188,9 +188,9 @@
   Hyphenation
 
 
-  Adding 
Chapter Numbers to Captions
+  Adding 
Heading Numbers to Captions
   Creating 
Numbered or Bulleted Lists as You Type
-  Chapter 
Numbering
+  Heading 
Numbering
   Changing the Outline 
Level of Numbered and Bulleted Lists
   Combining 
Numbered Lists
   Adding Line 
Numbers
diff --git a/source/text/shared/00/00040500.xhp 
b/source/text/shared/00/00040500.xhp
index 8db256724a..58e5d5758d 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -498,7 +498,7 @@
 Choose 
Format - Bullets and Numbering - Position 
tab.
 Choose 
View - Styles (Command+TF11)
 - choose List Styles - context menu of an entry - choose 
New/Modify - Position tab.
 Choose 
Styles - Manage Styles - choose List Styles - context menu 
of an entry - choose New/Modify - Position 
tab.
-Choose 
Tools - Chapter Numbering - Position tab.
+Choose 
Tools - Heading Numbering - Position tab.
 
 
 
diff --git a/source/text/swriter/00/0406.xhp 
b/source/text/swriter/00/0406.xhp
index fadd115a12..7f31d79815 100644
--- a/source/text/swriter/00/0406.xhp
+++ b/source/text/swriter/00/0406.xhp
@@ -30,8 +30,8 @@
 Tools Menu
 Choose Tools - Language - 
Hyphenation
 Choose Tools - Word Count
-Choose Tools - Chapter 
Numbering
-Choose Tools - Chapter Numbering - 
Numbering tab
+Choose Tools - Heading 
Numbering
+Choose Tools - Heading Numbering - 
Numbering tab
 Choose Tools - Line Numbering (not for HTML 
format)
 Choose Tools - Footnotes and 
Endnotes
 Choose Tools - Footnotes and Endnotes - Footnotes 
tab
@@ -68,7 +68,7 @@
 
   
 
-   Icon
+   Icon
 
 
   Mail 
Merge
diff --git a/source/text/swriter/01/0606.xhp 
b/source/text/swriter/01/0606.xhp
index 243460d4fe..db3fcd2f48 100644
--- a/source/text/swriter/01/0606.xhp
+++ b/source/text/swriter/01/0606.xhp
@@ -20,7 +20,7 @@
 
 
   
-Chapter Numbering
+Heading Numbering
 /text/swriter/01/0606.xhp
   
 
@@ -32,21 +32,23 @@
 
 
 
-Chapter Numbering
-Specifies the numbering 
scheme and outline format for chapter numbering in the current 
document.
+Heading Numbering
+Specify the numbering 
format used for automatic numbering of headings in the current 
document.
 
 
-
+
 
-Chapter 
numbering is achieved by assigning paragraph styles to outline levels, and a 
numbering scheme for each outline level. By default, the "Heading" paragraph 
styles (1-10) are assigned to the corresponding outline levels (1-10). You can 
use the dialog to assign a different paragraph style to an outline 
level.
-If you want numbered headings, choose 
Tools - Chapter 
Numbering. This command opens a dialog where numbering 
schemes can be assigned to paragraph styles used for headings. Do not use the 
Toggle Ordered List icon on 
the Formatting Bar or the 
Format - Bullets and 
Numbering dialog.
+Numbering on 
headings is achieved by setting a numbering scheme to paragraph styles used as 
headings. The outline level assigned to the paragraph style expresses the place 
of a heading in your document structure. A numbering scheme can be set for each 
outline level.
+By default, 
%PRODUCTNAM

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

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 6504514ecb8ceede450ec16c1ea1fcf79bdb5b04
Author: Seth Chaiklin 
AuthorDate: Fri Feb 17 21:45:32 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Feb 18 03:07:50 2023 +

tdf#153485  UI guideline corrections to outline level popup box

  - revise grammar of help message and add mention of headings
  - add missing colon to label with buddy control
  - use en-dash (U+2013) for number range

Change-Id: I6a3e20ca319153c7384d8a5080dcefcbe561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147248
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index b2d4c2e92e9e..7e41e6b08cae 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -683,8 +683,8 @@
 #define STR_OUTLINE_CONTENT_VISIBILITY_SHOW_ALL 
NC_("STR_OUTLINE_CONTENT_VISIBILITY_SHOW_ALL", "Unfold All")
 #define STR_OUTLINE_CONTENT_VISIBILITY_HIDE_ALL 
NC_("STR_OUTLINE_CONTENT_VISIBILITY_HIDE_ALL", "Fold All")
 #define STR_OUTLINE_LEVELS_SHOWN_TITLE  
NC_("STR_OUTLINE_LEVELS_SHOWN_TITLE", "Show Outline Content to Level")
-#define STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL 
NC_("STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL", "Level (1 - 10)")
-#define STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL 
NC_("STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL", "Enter the maximum outline level to 
show content for.")
+#define STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL 
NC_("STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL", "Level (1–10):")
+#define STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL 
NC_("STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL", "Enter maximum outline level allowed 
for a displayed heading.")
 
 #define STR_EXPANDALL   NC_("STR_EXPANDALL", "Expand 
All")
 #define STR_COLLAPSEALL NC_("STR_COLLAPSEALL", 
"Collapse All")

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 87b6c7c2a41e3908be0e4d3f2fed79b8a0065e94
Author: Seth Chaiklin 
AuthorDate: Sat Feb 18 03:03:25 2023 +
Commit: Gerrit Code Review 
CommitDate: Sat Feb 18 03:03:25 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 19870562065899332b16070b6724d628f8d1cb80
  - tdf#152605, tdf#137281 change "heading level" to "outline level"

 swriter/01/04120211.xhp (Insert/Edit Index)
   *put Title and Type in same order as dialog (no text changes)
   *corrections to "Outline"
   *move embedded "tip" to after Outline (no text changes)
   *corrections to "Additional Style" tip
   *corrections to "Assign Styles"

 swriter/04/0102.xhp  (Shortcut keys)
   *corrections on how to change outline levels with "Tab" and
   "Shift+Tab"

 swriter/guide/arrange_chapters.xhp
   +change heading level to outline level
   +update command names
   +change icon size to 1cm
   +refactor ,

Change-Id: I27ce871e4c14608066183c9d1c5433abc59bd1a9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146799
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index ff28b2273c76..198705620658 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ff28b2273c769b7085c031f135131724af25d2c7
+Subproject commit 19870562065899332b16070b6724d628f8d1cb80

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/04120211.xhp|   18 
 source/text/swriter/04/0102.xhp|8 +++
 source/text/swriter/guide/arrange_chapters.xhp |   28 -
 3 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 19870562065899332b16070b6724d628f8d1cb80
Author: Seth Chaiklin 
AuthorDate: Sun Feb 12 10:54:22 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Feb 18 03:03:24 2023 +

tdf#152605, tdf#137281 change "heading level" to "outline level"

 swriter/01/04120211.xhp (Insert/Edit Index)
   *put Title and Type in same order as dialog (no text changes)
   *corrections to "Outline"
   *move embedded "tip" to after Outline (no text changes)
   *corrections to "Additional Style" tip
   *corrections to "Assign Styles"

 swriter/04/0102.xhp  (Shortcut keys)
   *corrections on how to change outline levels with "Tab" and
   "Shift+Tab"

 swriter/guide/arrange_chapters.xhp
   +change heading level to outline level
   +update command names
   +change icon size to 1cm
   +refactor ,

Change-Id: I27ce871e4c14608066183c9d1c5433abc59bd1a9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146799
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/01/04120211.xhp 
b/source/text/swriter/01/04120211.xhp
index ea64b86df0..8baa71cc07 100644
--- a/source/text/swriter/01/04120211.xhp
+++ b/source/text/swriter/01/04120211.xhp
@@ -36,12 +36,12 @@
   
  Type and Title
  Specify the type and title of the index.
-
-Type
- Select the 
type of index that you want to insert or edit. The options available on 
this tab depend on the index type that you select. If the cursor is in an index 
when you choose the Insert - Table of Contents and Index - Table of 
Contents, Index or Bibliography, you can then edit that 
index.
 
 Title
  Enter a 
title for the selected index.
+
+Type
+ Select the 
type of index that you want to insert or edit. The options available on 
this tab depend on the index type that you select. If the cursor is in an index 
when you choose the Insert - Table of Contents and Index - Table of 
Contents, Index or Bibliography, you can then edit that 
index.
 
 Protected against manual changes
  Prevents 
the contents of the index from being changed. Manual changes that you 
make to an index are lost when the index is refreshed. If you want the cursor 
to scroll through a protected area, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Formatting Aids, and then select the Enable cursor check 
box in the Protected Areas section.
@@ -54,24 +54,24 @@
   
 
 Evaluate up to level
-  Enter the number of heading levels 
to include in the index.
+  Enter the number of outline levels 
to include in the index.
   Create from
   Use this 
area to specify which information to include in an index.
 
 Outline
-  Creates the index using 
outline levels. Paragraphs formatted with one of the predefined heading styles 
(Heading 1-10) are added to the index.
-  You can also assign outline levels to paragraphs in the Outline & List tab page of the 
Format - Paragraph dialog.
+  Creates the index using 
outline levels. Any paragraph with an outline level less than or equal to the 
outline level specified in Evaluate up to level is 
included in the index.
+   Paragraphs formatted with one of the predefined paragraph 
styles (“Heading 1–10”) have an outline level that corresponds to the number in 
the paragraph style. You can also assign outline levels to paragraphs in the 
Outline & List tab page of 
the Format - Paragraph dialog.
+  
 
 Additional Styles
   Includes the paragraph styles 
that you specify in the Assign Styles dialog as index entries. To 
select the paragraph styles that you want to include in the index, click the 
Assign Styles (...) button to the right of this box.
 
-You can include the Figure Index Heading or 
Bibliography Heading styles, as well as any other relevant heading style, to 
the Table of Contents.
+Use “Additional Styles” to 
include paragraphs in the Table of Contents with the “Figure Index Heading” or 
“Bibliography Heading” paragraph style, as well as any other relevant paragraph 
style.
   
 
 Assign styles
-Opens the Assign 
Styles dialog, where you can select the paragraph styles to include in 
the index. Choose the proper heading level on which the style will be included 
in the index.
+Opens the Assign 
Styles dialog, where you can select paragraph styles to include in the 
index. Choose a desired index level for where a style will be displayed in the 
index.
   
-  
   
 
 Index marks
diff --git a/source/text/swriter/04/0102.xhp 
b/source/text/swriter/04/0102.xhp
index 5e19

Re: Dead link in ooxml-export-notes.txt

[Kohei Yoshida]

On 17.02.2023 19:17, Kohei Yoshida wrote:


If I were to guess, the missing page contained his proposal to the
initial draft of the DrawingML standard.


I meant to say "probably contained" since I never saw the page myself. 
;-)


Kohei

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

[Eike Rathke (via logerrit)]

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

New commits:
commit 296c42cdb8e9dee5ac912d9777afdf3bab63efb9
Author: Eike Rathke 
AuthorDate: Sat Feb 18 00:23:22 2023 +0100
Commit: Eike Rathke 
CommitDate: Sat Feb 18 00:44:11 2023 +

Proper error is UnknownStackVariable

Change-Id: I79b27c279449022144c50300da3f96522c42f438
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147260
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index a6bd98320f71..853d76751732 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -1080,7 +1080,7 @@ inline bool 
ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct, shor
 assert(sp >= nAct);
 if (sp < nAct)
 {
-PushParameterExpected();
+PushError(FormulaError::UnknownStackVariable);
 return false;
 }
 return MustHaveParamCountMin( nAct, nMin);

Re: Dead link in ooxml-export-notes.txt

[Kohei Yoshida]

On 17.02.2023 18:14, Regina Henschel wrote:

Hi all,

the link [1] in line 23 of
https://opengrok.libreoffice.org/xref/core/oox/source/export/ooxml-export-notes.txt?r=c7008197#23
is dead.

[1] http://www.asahi-net.or.jp/~eb2m-mrt/ooxml/dependencies.html

Does someone know, what kind of information it had?


It is referenced from this page:

http://www.xmlmaster.org/murata/xmlblog/xb070622.html

If I were to guess, the missing page contained his proposal to the 
initial draft of the DrawingML standard.


Kohei

Dead link in ooxml-export-notes.txt

[Regina Henschel]

Hi all,

the link [1] in line 23 of 
https://opengrok.libreoffice.org/xref/core/oox/source/export/ooxml-export-notes.txt?r=c7008197#23 
is dead.


[1] http://www.asahi-net.or.jp/~eb2m-mrt/ooxml/dependencies.html

Does someone know, what kind of information it had?

This is tracked in bug tdf#153362.

Kind regards,
Regina

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx  |1 +
 i18nlangtag/source/isolang/mslangid.cxx |4 +++-
 include/i18nlangtag/lang.h  |1 +
 svtools/inc/langtab.hrc |3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9042340ef99e099a87630eea089b4cae7e38649e
Author: Eike Rathke 
AuthorDate: Fri Feb 17 18:03:23 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Feb 17 22:52:15 2023 +

Add Saraiki {skr-PK} [0x06B0] to language list, CTL, RTL

Change-Id: I2bc1462acbcc69023586333a4c6b10ba415e5ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147233
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index d64b00f0694a..2c9784a9c8c6 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -679,6 +679,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA, "es", "GQ", k0},
 { LANGUAGE_USER_SPANISH_PHILIPPINES,"es", "PH", k0},
 { LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0},
+{ LANGUAGE_USER_SARAIKI,   "skr", "PK", k0},
 // Add new languages ^^^ there.
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index cac12347fc54..caa983416a3d 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -246,7 +246,8 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 primary(LANGUAGE_SINDHI),
 primary(LANGUAGE_UIGHUR_CHINA),
 primary(LANGUAGE_USER_KYRGYZ_CHINA),
-primary(LANGUAGE_USER_NKO)))
+primary(LANGUAGE_USER_NKO),
+primary(LANGUAGE_USER_SARAIKI)))
 {
 return true;
 }
@@ -443,6 +444,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 primary(LANGUAGE_USER_LIMBU  ),
 primary(LANGUAGE_USER_MAITHILI_INDIA ),
 primary(LANGUAGE_USER_NKO),
+primary(LANGUAGE_USER_SARAIKI),
 primary(LANGUAGE_YIDDISH )))
 {
 nScript = css::i18n::ScriptType::COMPLEX;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 55be18878209..5a724644dcb4 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -782,6 +782,7 @@ namespace o3tl
 #define LANGUAGE_USER_CATALAN_FRANCELanguageType(0x8803)  /* 
makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_CATALAN_ITALY LanguageType(0x8C03)  /* 
makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809)  /* 
makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_SARAIKI   LanguageType(0x06B0)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 5d1ed4a7e987..a6c411bab910 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -439,7 +439,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Latin") , 
LANGUAGE_USER_INTERSLAVIC_LATIN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pennsylvania Dutch") , 
LANGUAGE_USER_PENNSYLVANIA_DUTCH },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI }
 };
 
 

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

[Khaled Hosny (via logerrit)]

 include/svtools/strings.hrc |2 ++
 svtools/source/control/ctrltool.cxx |   10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 0c9448bb31a32a3bf4004d45c4b1305debf1b5e2
Author: Khaled Hosny 
AuthorDate: Fri Feb 17 21:32:20 2023 +0200
Commit: خالد حسني 
CommitDate: Fri Feb 17 22:23:53 2023 +

tdf#147739: Medium is not a synonym of normal

For some reason, medium was thought to be a synonym of normal, but that
is not the case. Seems to be from:

commit b05701988492b051b3bb07bb46ae0397e23f032f
Author: th 
Date:   Fri Mar 9 14:44:26 2001 +

#83090# - Extensions for localized sytle names
#77189# - FontAlias should now also work
Extensions for Chinese fontsize numbers

Change-Id: Ic5e463b6e77c0fa88701108597c99c9fa0c6bf4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147258
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 96c3ef64e24a..c77d3f6cfe7d 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -153,6 +153,8 @@
 #define STR_SVT_STYLE_LIGHT_ITALIC  
NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic")
 #define STR_SVT_STYLE_NORMALNC_("STR_SVT_STYLE_NORMAL", 
"Regular")
 #define STR_SVT_STYLE_NORMAL_ITALIC 
NC_("STR_SVT_STYLE_NORMAL_ITALIC", "Italic")
+#define STR_SVT_STYLE_MEDIUMNC_("STR_SVT_STYLE_MEDIUM", 
"Medium")
+#define STR_SVT_STYLE_MEDIUM_ITALIC 
NC_("STR_SVT_STYLE_MEDIUM_ITALIC", "Medium Italic")
 #define STR_SVT_STYLE_BOLD  NC_("STR_SVT_STYLE_BOLD", 
"Bold")
 #define STR_SVT_STYLE_BOLD_ITALIC   
NC_("STR_SVT_STYLE_BOLD_ITALIC", "Bold Italic")
 #define STR_SVT_STYLE_BLACK NC_("STR_SVT_STYLE_BLACK", 
"Black")
diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index 508ee9b9092b..438b229c73a7 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -452,8 +452,6 @@ OUString FontList::GetStyleName(const FontMetric& rInfo) 
const
 aStyleName = maNormal;
 else if (aCompareStyleName == "regular")
 aStyleName = maNormal;
-else if (aCompareStyleName == "medium")
-aStyleName = maNormal;
 else if (aCompareStyleName == "light")
 aStyleName = maLight;
 else if (aCompareStyleName == "lightitalic")
@@ -483,15 +481,17 @@ OUString FontList::GetStyleName(const FontMetric& rInfo) 
const
 aStyleName = SvtResId(STR_SVT_STYLE_EXTRALIGHT);
 else if (aCompareStyleName == "extralightitalic")
 aStyleName = SvtResId(STR_SVT_STYLE_EXTRALIGHT_ITALIC);
-/* Medium is synonym with Normal */
-else if (aCompareStyleName == "mediumitalic")
-aStyleName = maNormalItalic;
 else if (aCompareStyleName == "oblique")
 aStyleName = SvtResId(STR_SVT_STYLE_OBLIQUE);
 else if (aCompareStyleName == "semibold")
 aStyleName = SvtResId(STR_SVT_STYLE_SEMIBOLD);
 else if (aCompareStyleName == "semibolditalic")
 aStyleName = SvtResId(STR_SVT_STYLE_SEMIBOLD_ITALIC);
+// tdf#147739 medium is not a synonym of normal
+else if (aCompareStyleName == "medium")
+aStyleName = SvtResId(STR_SVT_STYLE_MEDIUM);
+else if (aCompareStyleName == "mediumitalic")
+aStyleName = SvtResId(STR_SVT_STYLE_MEDIUM_ITALIC);
 
 // fix up StyleName, because the PS Printer driver from
 // W2000 returns wrong StyleNames (e.g. Bold instead of Bold Italic

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/swriter/ui/tocindexpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ead66494deda4590d9202a96d4aa9589751412a1
Author: Seth Chaiklin 
AuthorDate: Fri Feb 17 15:40:20 2023 +
Commit: Seth Chaiklin 
CommitDate: Fri Feb 17 21:59:03 2023 +

tdf#153596 "outline" -> "headings"

TOC displays "headings" if this option is checked.
The tooltip/extended tip explains the relation to outline level.

Change-Id: I28a7bc4da7da45398c859fa71be019bd127f53b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147240
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui 
b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 17712fa86184..c7a5f12786a8 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -347,7 +347,7 @@
 12
 
   
-Outline
+Headings
 True
 False
 True

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

[Seth Chaiklin (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2a6687bf6a7c49e851bf686cdd6afd0db7ac0a2
Author: Seth Chaiklin 
AuthorDate: Thu Feb 16 15:53:03 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Feb 17 20:34:30 2023 +

tdf#153549 change tip-of-day about chapter numbering

- rewritten in form of a question
- generalized to refer to headings, because not limited to chapters
- added additional detail about relevant location in dialog, but
  did not attempt detailed explanation, because
- added link to relevant help page
- added missing period.

Change-Id: Ie16c116b8e51e6b24de2c4060fee9617c6ef1e7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147121
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 37078706aa68..f610a671053f 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -210,7 +210,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Got many images in your Writer document? 
Speed up the display by disabling View ▸ Images and charts."), "", 
"tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet ▸ Fill Cells ▸ Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you 
define “Go to page” interactions and to have a summary more explicit than 
Slide1, Slide2…"), "", "tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text 
to be displayed before the chapter number. For example, type “Chapter ” to 
display “Chapter 1”"), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to display text before a heading 
number? Open the Numbering tab of the “Heading Numbering” dialog and enter the 
desired text in “Before”. For example, type “Chapter ” to display “Chapter 
1”."), "modules/swriter/ui/outlinenumberingpage/prefix", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Transpose a Writer table? Copy and paste in 
Calc, transpose with copy/paste special then copy/paste special ▸ Formatted 
text in Writer."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the 
Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸ 
Default languages for Documents ▸ Asian (and make the button visible with 
right-click and then Visible Buttons ▸ Vertical Text)."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "To quickly zoom in on range selection, 
right click on the zoom part of the status bar and choose Optimal."), "", 
"tipoftheday_c.png"},

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

[Tibor Nagy (via logerrit)]

 include/oox/drawingml/shape.hxx  |3 
 include/svx/svdmodel.hxx |4 
 oox/source/drawingml/shape.cxx   |4 
 oox/source/ppt/slidepersist.cxx  |  232 +--
 sd/qa/unit/data/pptx/standardConnectors.pptx |binary
 sd/qa/unit/import-tests.cxx  |   34 +++
 sd/source/ui/docshell/docshel4.cxx   |8 
 svx/source/svdraw/svdmodel.cxx   |   21 ++
 svx/source/svdraw/svdoedge.cxx   |   10 -
 9 files changed, 265 insertions(+), 51 deletions(-)

New commits:
commit a2c32afcae257e797ad69ab2346bbe3b6a2fa8ae
Author: Tibor Nagy 
AuthorDate: Thu Jan 26 09:17:56 2023 +0100
Commit: László Németh 
CommitDate: Fri Feb 17 20:01:46 2023 +

tdf#149756 tdf#152545 PPTX import: position of standard connector - part2

and add new compatibility option "ConnectorUseSnapRect".

Standard connectors (bentConnector3, bentConnector4, bentConnector5)
are improved. MSO calculates the edge track differently, so have
to add "ConnectorUseSnapRect" compatibility option:

- For PPTX file format, it is set to true and use the snap rectangle

- For ODP format, it is set to false by default and use the bounding
  rectangle.

Follow-up to commit eec48130271188cab63665acedbabf1ff5e850a2
"tdf#148926 tdf#151678 PPTX import: position of standard
connector - part1" (bentConnector2)

Change-Id: Icca84708d6e10d44ebf7262415d055ce9cfc157d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146162
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 36017132e83d..72ce51ef6476 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -137,6 +137,7 @@ public:
 CustomShapePropertiesPtr&   getCustomShapeProperties(){ return 
mpCustomShapePropertiesPtr; }
 
 OUString&   getConnectorName() { return 
msConnectorName; }
+std::vector&  getConnectorAdjustments() { return 
maConnectorAdjustmentList; };
 ConnectorShapePropertiesList&   getConnectorShapeProperties() { return 
maConnectorShapePropertiesList; }
 voidsetConnectorShape(bool bConnector) { 
mbConnector = bConnector; }
 boolisConnectorShape() const { return 
mbConnector; }
@@ -330,6 +331,8 @@ protected:
 css::awt::Size   maChSize; // only used for group shapes
 css::awt::Point  maChPosition; // only used for group shapes
 
+std::vector   maConnectorAdjustmentList; // only used for 
connector shapes
+
 TextBodyPtr mpTextBody;
 LinePropertiesPtr   mpLinePropertiesPtr;
 LinePropertiesPtr   mpShapeRefLinePropPtr;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 76c63a40d351..6d130dfe0599 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -574,6 +574,10 @@ public:
 void SetLegacySingleLineFontwork(bool bEnabled);
 bool IsLegacySingleLineFontwork() const;
 
+// tdf#149756 compatibility flag
+void SetConnectorUseSnapRect(bool bEnabled);
+bool IsConnectorUseSnapRect() const;
+
 void ReformatAllTextObjects();
 
 std::unique_ptr createOutliner( OutlinerMode nOutlinerMode );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b3162381534a..fac027376784 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1692,6 +1692,10 @@ Reference< XShape > const & Shape::createAndInsert(
 RTL_TEXTENCODING_UTF8);
 msConnectorName = sConnectorShapePresetTypeName;
 
+auto aAdjustmentList = 
mpCustomShapePropertiesPtr->getAdjustmentGuideList();
+for (size_t i = 0; i < aAdjustmentList.size(); i++)
+
maConnectorAdjustmentList.push_back(aAdjustmentList[i].maFormula);
+
 sal_Int32 nType = mpCustomShapePropertiesPtr->getShapePresetType();
 switch (nType)
 {
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index ca296561a52f..7298eea1247c 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -386,7 +386,7 @@ static void 
lcl_SetEdgeLineValue(uno::Reference& rXConnector,
 {
 sal_Int32 nEdge = 0;
 awt::Point aStartPt, aEndPt;
-tools::Rectangle aStartRect, aEndRect;
+tools::Rectangle aS, aE; // Start, End rectangle
 uno::Reference xStartSp, xEndSp;
 uno::Reference xPropSet(rXConnector, uno::UNO_QUERY);
 xPropSet->getPropertyValue("EdgeStartPoint") >>= aStartPt;
@@ -401,80 +401,218 @@ static void 
lcl_SetEdgeLineValue(uno::Reference& rXConnector,
 SdrObject* pStartObj = xStartSp.is() ? 
SdrObject::getSdrObjectFromXShape(xStartSp) : nullptr;
 SdrObject* pEndObj = xEndSp.is() ? 
SdrObject

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/core/inc/interpre.hxx  |   12 
 sc/source/core/tool/interpr1.cxx |4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit cf43a5ca4c00648a29bc70ef4d3a8039466f3a8f
Author: Eike Rathke 
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 19:39:35 2023 +

Stack check safety belt before fishing in muddy waters

Have it hit hard in debug builds.

Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147244
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 85d2955003af..a6bd98320f71 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -221,6 +221,7 @@ private:
 inline bool MustHaveParamCount( short nAct, short nMust );
 inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
 inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
 void PushParameterExpected();
 void PushIllegalParameter();
 void PushIllegalArgument();
@@ -1074,6 +1075,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short 
nAct, short nMin )
 return false;
 }
 
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct, 
short nMin )
+{
+assert(sp >= nAct);
+if (sp < nAct)
+{
+PushParameterExpected();
+return false;
+}
+return MustHaveParamCountMin( nAct, nMin);
+}
+
 inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
 {
 if (!std::isfinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d82acb37494c..405d9fe00023 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7643,7 +7643,7 @@ void ScInterpreter::ScVLookup()
 void ScInterpreter::ScSubTotal()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 2 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
 return;
 
 // We must fish the 1st parameter deep from the stack! And push it on top.
@@ -7690,7 +7690,7 @@ void ScInterpreter::ScSubTotal()
 void ScInterpreter::ScAggregate()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 3 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
 return;
 
 const FormulaError nErr = nGlobalError;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/core/inc/interpre.hxx  |   12 
 sc/source/core/tool/interpr1.cxx |4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 166a07062dd4ffedca6106f439a6fcddaeee5eb5
Author: Eike Rathke 
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 19:39:42 2023 +

Stack check safety belt before fishing in muddy waters

Have it hit hard in debug builds.

Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147245
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 30e79d9272bb..c1fc5f458dcb 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -221,6 +221,7 @@ private:
 inline bool MustHaveParamCount( short nAct, short nMust );
 inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
 inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
 void PushParameterExpected();
 void PushIllegalParameter();
 void PushIllegalArgument();
@@ -1074,6 +1075,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short 
nAct, short nMin )
 return false;
 }
 
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct, 
short nMin )
+{
+assert(sp >= nAct);
+if (sp < nAct)
+{
+PushParameterExpected();
+return false;
+}
+return MustHaveParamCountMin( nAct, nMin);
+}
+
 inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
 {
 if (!std::isfinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e09620605d35..eb77bf07e514 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7628,7 +7628,7 @@ void ScInterpreter::ScVLookup()
 void ScInterpreter::ScSubTotal()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 2 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
 return;
 
 // We must fish the 1st parameter deep from the stack! And push it on top.
@@ -7675,7 +7675,7 @@ void ScInterpreter::ScSubTotal()
 void ScInterpreter::ScAggregate()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 3 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
 return;
 
 const FormulaError nErr = nGlobalError;

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

[Caolán McNamara (via logerrit)]

 sw/inc/gotodlg.hxx |4 ++--
 sw/source/uibase/uiview/view2.cxx  |2 +-
 sw/source/uibase/utlui/gotodlg.cxx |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fc1c9d7ce98a5405785907d8d18db9354b32b824
Author: Caolán McNamara 
AuthorDate: Fri Feb 17 12:40:54 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 19:38:53 2023 +

use a reference here to flag its never null

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

diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx
index 0007bc2788cc..0d10da367f68 100644
--- a/sw/inc/gotodlg.hxx
+++ b/sw/inc/gotodlg.hxx
@@ -28,7 +28,7 @@ class SwView;
 class SwGotoPageDlg final : public weld::GenericDialogController
 {
 public:
-SwGotoPageDlg(weld::Window *parent, SfxBindings* _pBindings);
+SwGotoPageDlg(weld::Window *parent, SfxBindings& rBindings);
 
 sal_uInt16 GetPageSelection() const
 {
@@ -37,7 +37,7 @@ public:
 
 private:
 SwView   *m_pCreateView;
-SfxBindings  *m_rBindings;
+SfxBindings& m_rBindings;
 sal_uInt16   mnMaxPageCnt;
 
 std::unique_ptr mxMtrPageCtrl;
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index a4458aaf5b21..fea09391a051 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1195,7 +1195,7 @@ void SwView::Execute(SfxRequest &rReq)
 break;
 case FN_GOTO_PAGE:
 {
-SwGotoPageDlg aDlg(GetViewFrame().GetFrameWeld(), 
&GetViewFrame().GetBindings());
+SwGotoPageDlg aDlg(GetViewFrame().GetFrameWeld(), 
GetViewFrame().GetBindings());
 if (aDlg.run() == RET_OK)
 GetWrtShell().GotoPage(aDlg.GetPageSelection(), true);
 }
diff --git a/sw/source/uibase/utlui/gotodlg.cxx 
b/sw/source/uibase/utlui/gotodlg.cxx
index 666164495f63..711717ee44c1 100644
--- a/sw/source/uibase/utlui/gotodlg.cxx
+++ b/sw/source/uibase/utlui/gotodlg.cxx
@@ -26,10 +26,10 @@
 
 using namespace com::sun::star;
 
-SwGotoPageDlg::SwGotoPageDlg(weld::Window* pParent, SfxBindings* _pBindings)
+SwGotoPageDlg::SwGotoPageDlg(weld::Window* pParent, SfxBindings& rBindings)
 : GenericDialogController(pParent, "modules/swriter/ui/gotopagedialog.ui", 
"GotoPageDialog")
 , m_pCreateView(nullptr)
-, m_rBindings(_pBindings)
+, m_rBindings(rBindings)
 , mnMaxPageCnt(1)
 , mxMtrPageCtrl(m_xBuilder->weld_spin_button("page"))
 , mxPageNumberLbl(m_xBuilder->weld_label("page_count"))
@@ -71,7 +71,7 @@ SwView* SwGotoPageDlg::GetCreateView() const
 SwView* pView = SwModule::GetFirstView();
 while (pView)
 {
-if (&pView->GetViewFrame().GetBindings() == m_rBindings)
+if (&pView->GetViewFrame().GetBindings() == &m_rBindings)
 {
 const_cast(this)->m_pCreateView = pView;
 break;

[Libreoffice-commits] core.git: configmgr/qa test/user-template

[Stephan Bergmann (via logerrit)]

 configmgr/qa/unit/test.cxx   |8 
 test/user-template/registry-common/modifications.xcd |2 ++
 2 files changed, 10 insertions(+)

New commits:
commit 302a22cd19e6f6963fc8eb0b9a581c7eff5e5430
Author: Stephan Bergmann 
AuthorDate: Fri Feb 17 12:55:19 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 17 18:56:56 2023 +

Verify that zh-Hant-TW locale works in configmgr as intended

...after b52117c0be97c45824d2897657084f8ac7e9bf42 "Try an override locale as
first fallback"

Change-Id: I23d8459fff4d76fd9d542d098953bf97cf5397a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 03d44a9947ee..60d19be8472c 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -333,6 +333,14 @@ void Test::testLocalizedProperty() {
 
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*es-419") 
>>= v);
 CPPUNIT_ASSERT_EQUAL(OUString("es"), v);
 }
+{
+// See 

+// "configmgr: Use a proper LanguageTag-based locale fallback 
mechanism":
+OUString v;
+CPPUNIT_ASSERT(
+
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*zh-Hant-TW")
 >>= v);
+CPPUNIT_ASSERT_EQUAL(OUString("zh-TW"), v);
+}
 {
 // Make sure a degenerate passed-in "-" locale is handled gracefully:
 OUString v;
diff --git a/test/user-template/registry-common/modifications.xcd 
b/test/user-template/registry-common/modifications.xcd
index fff0045b08ee..a212242785ea 100644
--- a/test/user-template/registry-common/modifications.xcd
+++ b/test/user-template/registry-common/modifications.xcd
@@ -22,6 +22,8 @@
 en-US
 es
 pt-PT
+zh-CN
+zh-TW
   
   
 en-US

Re: 7.5.0.3 crashes

[Xisco Fauli]

On 17/2/23 17:53, Noel Grandin wrote:

On Thu, 16 Feb 2023 at 22:51, Caolán McNamara  wrote:

When it lists the "Last 4 UNO Commands", e.g. beside that most common
crasher of sw/source/uibase/utlui/content.cxx:4002, does it mean that


I'm pretty sure that crash would be fixed by
commit d784da48de7c9ecccf39cea55f49d8d4758cab58
Author: Jim Raykowski 
Date:   Sun Jan 1 17:47:11 2023 -0900
    SwNavigator: Improve mouse move handler for bringing objects to
but that's not a small change


If i'm not mistaken, that commit should fix 
, 
which is a regression in 7.5.


 
has been around since 2020/11/12.


--
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0

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

[Xisco Fauli (via logerrit)]

 starmath/source/cursor.cxx   |7 ---
 starmath/source/dialog.cxx   |7 +--
 starmath/source/document.cxx |8 +++-
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit a7fd1e067eb2af0ef329719c4c7dbb32cc5926b2
Author: Xisco Fauli 
AuthorDate: Fri Feb 17 15:50:29 2023 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 17 18:20:07 2023 +

check SmGetActiveView()

it might be null

See 
https://crashreport.libreoffice.org/stats/signature/SmPrintOptionsTabPage::~SmPrintOptionsTabPage()

Change-Id: I7bc17da230784e6e3fc9c0b33848423ac113ab29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147221
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index c7c27616b3f9..e8623517bcd7 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1330,9 +1330,10 @@ void SmCursor::EndEdit(){
 mpDocShell->GetEditEngine().QuickFormatDoc();
 }
 
-void SmCursor::RequestRepaint(){
-SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh ) {
+void SmCursor::RequestRepaint()
+{
+if (SmViewShell *pViewSh = SmGetActiveView())
+{
 if (comphelper::LibreOfficeKit::isActive())
 {
 pViewSh->SendCaretToLOK();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 2ffe14a816bf..19d5b4352b1b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -181,7 +181,8 @@ 
SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo
 
 SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
 {
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
 }
 
 bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
@@ -204,7 +205,9 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
 rSet->Put(SfxBoolItem(SID_AUTO_CLOSE_BRACKETS, 
m_xAutoCloseBrackets->get_active()));
 rSet->Put(SfxUInt16Item(SID_SMEDITWINDOWZOOM, 
sal::static_int_cast(m_xSmZoom->get_value(FieldUnit::PERCENT;
 
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
+
 return true;
 }
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 0e43fa1d6efb..51b548032f1c 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -150,7 +150,7 @@ void SmDocShell::SetText(const OUString& rBuffer)
 Parse();
 
 SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh )
+if (pViewSh)
 {
 pViewSh->GetViewFrame().GetBindings().Invalidate(SID_TEXT);
 if ( SfxObjectCreateMode::EMBEDDED == GetCreateMode() )
@@ -247,8 +247,7 @@ void SmDocShell::ArrangeFormula()
 // if necessary get another OutputDevice for which we format
 if (!pOutDev)
 {
-SmViewShell *pView = SmGetActiveView();
-if (pView)
+if (SmViewShell *pView = SmGetActiveView())
 pOutDev = 
&pView->GetGraphicWidget().GetDrawingArea()->get_ref_device();
 else
 {
@@ -533,8 +532,7 @@ void SmDocShell::Repaint()
 
 Size aVisSize = GetSize();
 SetVisAreaSize(aVisSize);
-SmViewShell* pViewSh = SmGetActiveView();
-if (pViewSh)
+if (SmViewShell* pViewSh = SmGetActiveView())
 pViewSh->GetGraphicWidget().Invalidate();
 
 if (bIsEnabled)

request of uploading external packages

[taichi]

* { font-size: 13px; font-family: 'MS Pゴシック', sans-serif;}p, ul, ol, blockquote 
{ margin: 0;}a { color: #0064c8; text-decoration: none;}a:hover { color: 
#0057af; text-decoration: underline;}a:active { color: #004c98;}
Excuse me, could someone please upload these packages on server ?




* openldap-2.6.4.tgz

* fontconfig-2.14.2.tar.xz

* Python-3.11.2.tar.xz

* freetype-2.13.0.tar.xz




URL:

https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.4.tgz

https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz

https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz

https://download.savannah.gnu.org/releases/freetype/freetype-2.13.0.tar.xz

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

[Eike Rathke (via logerrit)]

 sc/source/core/inc/interpre.hxx  |   12 
 sc/source/core/tool/interpr1.cxx |4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b
Author: Eike Rathke 
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Feb 17 17:04:46 2023 +

Stack check safety belt before fishing in muddy waters

Have it hit hard in debug builds.

Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 85d2955003af..a6bd98320f71 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -221,6 +221,7 @@ private:
 inline bool MustHaveParamCount( short nAct, short nMust );
 inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
 inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
 void PushParameterExpected();
 void PushIllegalParameter();
 void PushIllegalArgument();
@@ -1074,6 +1075,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short 
nAct, short nMin )
 return false;
 }
 
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct, 
short nMin )
+{
+assert(sp >= nAct);
+if (sp < nAct)
+{
+PushParameterExpected();
+return false;
+}
+return MustHaveParamCountMin( nAct, nMin);
+}
+
 inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
 {
 if (!std::isfinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 06bf2b44ed65..28523ff77a4a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7649,7 +7649,7 @@ void ScInterpreter::ScVLookup()
 void ScInterpreter::ScSubTotal()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 2 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
 return;
 
 // We must fish the 1st parameter deep from the stack! And push it on top.
@@ -7696,7 +7696,7 @@ void ScInterpreter::ScSubTotal()
 void ScInterpreter::ScAggregate()
 {
 sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 3 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
 return;
 
 const FormulaError nErr = nGlobalError;

Re: 7.5.0.3 crashes

[Noel Grandin]

On Thu, 16 Feb 2023 at 22:51, Caolán McNamara  wrote:

> When it lists the "Last 4 UNO Commands", e.g. beside that most common
> crasher of sw/source/uibase/utlui/content.cxx:4002, does it mean that
>

I'm pretty sure that crash would be fixed by
commit d784da48de7c9ecccf39cea55f49d8d4758cab58
Author: Jim Raykowski 
Date:   Sun Jan 1 17:47:11 2023 -0900
SwNavigator: Improve mouse move handler for bringing objects to
 but that's not a small change

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source

[Xisco Fauli (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 8afc7788b83152528ff2a72b16ae829bde9ace54
Author: Xisco Fauli 
AuthorDate: Fri Feb 17 12:44:03 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 16:31:31 2023 +

sc: fix divide by zero in ScGridWindow::DrawPagePreview

Seen in 
https://crashreport.libreoffice.org/stats/signature/ScGridWindow::DrawPagePreview(short,long,short,long,OutputDevice%20&)

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

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 07265d4cf23e..8af86b8601a0 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2041,13 +2041,16 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW 
nY1, SCCOL nX2, SCROW nY2,
 //  find right font size for DrawText
 aFont.SetFontSize( Size( 0,100 ) );
 rRenderContext.SetFont( aFont );
-Size aSize100(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );
 
-//  40% of width or 60% of height
-tools::Long nSizeX = 40 * ( aPageEnd.X() - 
aPageStart.X() ) / aSize100.Width();
-tools::Long nSizeY = 60 * ( aPageEnd.Y() - 
aPageStart.Y() ) / aSize100.Height();
-aFont.SetFontSize( Size( 
0,std::min(nSizeX,nSizeY) ) );
-rRenderContext.SetFont( aFont );
+Size aSize100(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );
+if (aSize100.Width() && aSize100.Height())
+{
+//  40% of width or 60% of height
+tools::Long nSizeX = 40 * ( aPageEnd.X() - 
aPageStart.X() ) / aSize100.Width();
+tools::Long nSizeY = 60 * ( aPageEnd.Y() - 
aPageStart.Y() ) / aSize100.Height();
+aFont.SetFontSize( Size( 
0,std::min(nSizeX,nSizeY) ) );
+rRenderContext.SetFont( aFont );
+}
 
 //  centered output with DrawText
 Size aTextSize(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - formula/source sc/source

[Eike Rathke (via logerrit)]

 formula/source/core/api/token.cxx |   13 +
 sc/source/core/tool/interpr4.cxx  |   10 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 32c0f09f9adb370cb4cbc126f887a63278be55ff
Author: Eike Rathke 
AuthorDate: Thu Feb 16 20:20:31 2023 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 17 16:17:11 2023 +

Obtain actual 0-parameter count for OR(), AND() and 1-parameter functions

OR and AND for legacy infix notation are classified as binary
operators but in fact are functions with parameter count. In case
no argument is supplied, GetByte() returns 0 and for that case the
implicit binary operator 2 parameters were wrongly assumed.
Similar for functions expecting 1 parameter, without argument 1
was assumed. For "real" unary and binary operators the compiler
already checks parameters. Omit OR and AND and 1-parameter
functions from this implicit assumption and return the actual 0
count.

Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129
Reviewed-by: Caolán McNamara 
(cherry picked from commit d6599a2af131994487d2d9223a4fd32a8c3ddc49)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147235
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 306dfe210814e538be803ff241fb6130e35a7554)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147239

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 37dd26979ced..c2b12cf3a145 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -93,17 +93,14 @@ sal_uInt8 FormulaToken::GetParamCount() const
 return 0;   // parameters and specials
 // ocIf... jump commands not for FAP, have cByte then
 //2do: bool parameter whether FAP or not?
-else if ( GetByte() )
+else if (GetByte())
 return GetByte();   // all functions, also ocExternal and ocMacro
-else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
-return 2;   // binary
-else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP)
-|| eOp == ocPercentSign)
-return 1;   // unary
+else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP && 
eOp != ocAnd && eOp != ocOr)
+return 2;   // binary operators, compiler checked; OR and AND 
legacy but are functions
+else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP) || 
eOp == ocPercentSign)
+return 1;   // unary operators, compiler checked
 else if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
 return 0;   // no parameter
-else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
-return 1;   // one parameter
 else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 return 1;   // only the condition counts as parameter
 else
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b9d34cd080a6..d5d8588fe49a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4022,7 +4022,15 @@ StackVar ScInterpreter::Interpret()
 else if (sp >= pCur->GetParamCount())
 nStackBase = sp - pCur->GetParamCount();
 else
-nStackBase = sp;// underflow?!?
+{
+SAL_WARN("sc.core", "Stack anomaly at " << aPos.Format(
+ScRefFlags::VALID | ScRefFlags::FORCE_DOC | 
ScRefFlags::TAB_3D, &mrDoc)
+<< "  eOp: " << static_cast(eOp)
+<< "  params: " << 
static_cast(pCur->GetParamCount())
+<< "  nStackBase: " << nStackBase << "  sp: " << 
sp);
+nStackBase = sp;
+assert(!"underflow");
+}
 }
 
 switch( eOp )

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

[Noel Grandin (via logerrit)]

 svl/source/passwordcontainer/passwordcontainer.cxx |   51 -
 svl/source/passwordcontainer/passwordcontainer.hxx |6 ++
 2 files changed, 35 insertions(+), 22 deletions(-)

New commits:
commit 49dd32a88d90097a1c50dc64dc42dc35645780b8
Author: Noel Grandin 
AuthorDate: Fri Feb 17 11:28:17 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 17 16:03:40 2023 +

osl::Mutex->std::mutex in PasswordContainer

Change-Id: I94113d714417447d5664a08d45fe1ad8dc0fb5e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147198
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx 
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 7f9cf4944ae7..365f952aa553 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -376,7 +376,7 @@ void StorageItem::ImplCommit()
 PasswordContainer::PasswordContainer( const Reference& 
rxContext )
 {
 // m_pStorageFile->Notify() can be called
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 mComponent.set( rxContext->getServiceManager(), UNO_QUERY );
 mComponent->addEventListener( this );
@@ -389,7 +389,7 @@ PasswordContainer::PasswordContainer( const 
Reference& rxCont
 
 PasswordContainer::~PasswordContainer()
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 m_xStorageFile.reset();
 
@@ -402,7 +402,7 @@ PasswordContainer::~PasswordContainer()
 
 void SAL_CALL PasswordContainer::disposing( const EventObject& )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 m_xStorageFile.reset();
 
@@ -637,7 +637,7 @@ Sequence< UserRecord > 
PasswordContainer::CopyToUserRecordSequence( const std::v
 
 void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& 
UserName, const Sequence< OUString >& Passwords, const Reference< 
XInteractionHandler >& aHandler )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 PrivateAdd( Url, UserName, Passwords, MEMORY_RECORD, aHandler );
 }
@@ -645,7 +645,7 @@ void SAL_CALL PasswordContainer::add( const OUString& Url, 
const OUString& UserN
 
 void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const 
OUString& UserName, const Sequence< OUString >& Passwords, const Reference< 
XInteractionHandler >& aHandler  )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 PrivateAdd( Url, UserName, Passwords, PERSISTENT_RECORD, aHandler );
 }
@@ -766,7 +766,7 @@ UrlRecord PasswordContainer::find(
 bool bName, // only needed to support empty user names
 const Reference< XInteractionHandler >& aHandler  )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 if( !m_aContainer.empty() && !aURL.isEmpty() )
 {
@@ -922,7 +922,7 @@ OUString const & PasswordContainer::GetMasterPassword( 
const Reference< XInterac
 
 void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& 
aName )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 OUString aUrl( aURL );
 if( m_aContainer.empty() )
@@ -962,7 +962,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& 
aURL, const OUString& a
 
 void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const 
OUString& aName )
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 OUString aUrl( aURL );
 if( m_aContainer.empty() )
@@ -1007,8 +1007,12 @@ void SAL_CALL PasswordContainer::removePersistent( const 
OUString& aURL, const O
 
 void SAL_CALL PasswordContainer::removeAllPersistent()
 {
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard(mMutex);
+removeAllPersistent(aGuard);
+}
 
+void PasswordContainer::removeAllPersistent(std::unique_lock& 
/*rGuard*/)
+{
 if( m_xStorageFile )
 m_xStorageFile->clear();
 
@@ -1046,7 +1050,7 @@ Sequence< UrlRecord > SAL_CALL 
PasswordContainer::getAllPersistent( const Refere
 {
 Sequence< UrlRecord > aResult;
 
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 for( const auto& rEntry : m_aContainer )
 {
 Sequence< UserRecord > aUsers;
@@ -1075,7 +1079,7 @@ sal_Bool SAL_CALL 
PasswordContainer::authorizateWithMasterPassword( const uno::R
 bool bResult = false;
 OUString aEncodedMP, aEncodedMPIV;
 uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
-::osl::MutexGuard aGuard( mMutex );
+std::unique_lock aGuard( mMutex );
 
 // the method should fail if there is no master password
 if( m_xStorageFile && m_xStorageFile->useStorage() && 
m_xStorageFile->getEncodedMasterPassword( aEncodedMP, aEncodedMPIV ) )
@@ -1133,7 +1137,7 @@ sal_Bool SAL_CALL 
PasswordContainer::changeMasterPassword( cons

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

[Xisco Fauli (via logerrit)]

 sw/source/ui/config/optload.cxx |9 +++---
 sw/source/ui/fldui/flddb.cxx|   25 +--
 sw/source/ui/fldui/fldfunc.cxx  |2 -
 sw/source/ui/fldui/fldref.cxx   |   17 ++---
 sw/source/ui/fmtui/tmpdlg.cxx   |   34 +++---
 sw/source/ui/frmdlg/frmpage.cxx |   30 --
 sw/source/ui/frmdlg/wrap.cxx|4 +--
 sw/source/uibase/app/appopt.cxx |   47 +++-
 sw/source/uibase/utlui/content.cxx  |   11 +---
 sw/source/uibase/utlui/glbltree.cxx |   17 +++--
 10 files changed, 112 insertions(+), 84 deletions(-)

New commits:
commit 25b38765d6e500af196ce312a3e1d819c6a7d09c
Author: Xisco Fauli 
AuthorDate: Thu Feb 16 12:38:55 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 16:03:11 2023 +

check GetActiveWrtShell() and CheckAndGetWrtShell()

See 
https://crashreport.libreoffice.org/stats/signature/SwModule::ApplyItemSet(unsigned%20short,SfxItemSet%20const%20&)
Change-Id: I7c719c5fe4cda9f6571592c30f39bd440053dbe9

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

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 93d6b7e4dabe..2c3ef5adbe4e 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -464,10 +464,11 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* 
pPage, weld::DialogControlle
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
 
-SwWrtShell* pSh = ::GetActiveWrtShell();
 
 // m_xFormatBox
 sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
+SwWrtShell* pSh = ::GetActiveWrtShell();
+
 if (pSh)
 {
 for ( auto i = m_pMgr->GetFieldTypeCount(); i; )
@@ -663,13 +664,12 @@ void SwCaptionOptPage::UpdateEntry(int nSelEntry)
 m_xCategory->set_sensitive(bChecked);
 m_xPreview->set_sensitive(bChecked);
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
 
 InsCaptionOpt* pOpt = 
weld::fromId(m_xCheckLB->get_id(nSelEntry));
 
 m_xCategoryBox->clear();
 m_xCategoryBox->append_text(m_sNone);
-if (pSh)
+if (::GetActiveWrtShell())
 {
 const size_t nCount = m_pMgr->GetFieldTypeCount();
 
@@ -867,8 +867,7 @@ void SwCaptionOptPage::InvalidatePreview()
 aStr += m_xCategoryBox->get_active_text() + " ";
 }
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
-if (pSh)
+if (SwWrtShell *pSh = ::GetActiveWrtShell())
 {
 SwSetExpFieldType* pFieldType = 
static_cast(m_pMgr->GetFieldType(
 SwFieldIds::SetExp, 
m_xCategoryBox->get_active_text() ));
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 3293a6bc670d..62dd538f01e0 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -73,7 +73,7 @@ SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, 
weld::DialogController* pCo
 SwFieldDBPage::~SwFieldDBPage()
 {
 // If we have no stored SwWrtShell, it means we didn't do anything useful 
- no need to revoke.
-if (SwWrtShell* pSh = GetWrtShell())
+if (SwWrtShell* pSh = CheckAndGetWrtShell())
 {
 // This would cleanup in the case of cancelled dialog
 SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
@@ -140,8 +140,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
 }
 else
 {
-SwWrtShell *pSh = CheckAndGetWrtShell();
-if(pSh)
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
 {
 SwDBData aTmp(pSh->GetDBData());
 m_xDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, u"");
@@ -197,15 +196,16 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
 aData.sDataSource = m_xDatabaseTLB->GetDBName(sTableName, sColumnName, 
&bIsTable);
 aData.sCommand = sTableName;
 aData.nCommandType = bIsTable ? 0 : 1;
-SwWrtShell *pSh = CheckAndGetWrtShell();
-assert(pSh);
 
-SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
-if (pDbManager)
-pDbManager->CommitLastRegistrations();
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
+{
+SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
+if (pDbManager)
+pDbManager->CommitLastRegistrations();
 
-if (aData.sDataSource.isEmpty())
-aData = pSh->GetDBData();
+if (aData.sDataSource.isEmpty())
+aData = pSh->GetDBData();
+}
 
 if(!aData.sDataSource.isEmpty())   // without database no new field 
command
 {
@@ -292,8 +292,6 @@ void SwFieldDBPage::TypeHdl(const weld::TreeView* pBox)
 if (nOld == GetTypeSel())
 

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

[Michael Stahl (via logerrit)]

 sw/source/filter/html/css1atr.cxx |6 --
 sw/source/filter/html/htmlatr.cxx |8 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 08b0443e0f50f79ee26fad4eada0190623b9b30a
Author: Michael Stahl 
AuthorDate: Thu Feb 16 20:12:46 2023 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 17 16:01:48 2023 +

sw: adapt aCSS1AttrFnTab to hintids.hxx

static_assert there is worthless because SwAttrFnTab is fixed size.

Change-Id: I9781027081c28a1c725bed510a768103dc53ccc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147208
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 28c5cc5dea8f..4180e94702d8 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3563,6 +3563,7 @@ SwAttrFnTab const aCSS1AttrFnTab = {
 /* RES_FRAMEDIR */  OutCSS1_SvxFrameDirection,
 /* RES_HEADER_FOOTER_EAT_SPACING */ nullptr,
 /* RES_ROW_SPLIT */ nullptr,
+/* RES_FLY_SPLIT */ nullptr,
 /* RES_FOLLOW_TEXT_FLOW */  nullptr,
 /* RES_COLLAPSING_BORDERS */nullptr,
 /* RES_WRAP_INFLUENCE_ON_OBJPOS */  nullptr,
@@ -3571,6 +3572,9 @@ SwAttrFnTab const aCSS1AttrFnTab = {
 /* RES_FRMATR_CONDITIONAL_STYLE_NAME */ nullptr,
 /* RES_FRMATR_GRABBAG */nullptr,
 /* RES_TEXT_VERT_ADJUST */  nullptr,
+/* RES_BACKGROUND_FULL_SIZE */  nullptr,
+/* RES_RTL_GUTTER */nullptr,
+/* RES_DECORATIVE */nullptr,
 
 /* RES_GRFATR_MIRRORGRF */  nullptr,
 /* RES_GRFATR_CROPGRF   */  nullptr,
@@ -3584,8 +3588,6 @@ SwAttrFnTab const aCSS1AttrFnTab = {
 /* RES_GRFATR_INVERT */ nullptr,
 /* RES_GRFATR_TRANSPARENCY */   nullptr,
 /* RES_GRFATR_DRWAMODE */   nullptr,
-/* RES_GRFATR_DUMMY1 */ nullptr,
-/* RES_GRFATR_DUMMY2 */ nullptr,
 /* RES_GRFATR_DUMMY3 */ nullptr,
 /* RES_GRFATR_DUMMY4 */ nullptr,
 /* RES_GRFATR_DUMMY5 */ nullptr,
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 6584e8a0e279..3b05399e2bea 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3285,8 +3285,8 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_PARATR_LINESPACING   */  nullptr,
 /* RES_PARATR_ADJUST*/  OutHTML_SvxAdjust,
 /* RES_PARATR_SPLIT */  nullptr,
-/* RES_PARATR_WIDOWS*/  nullptr,
 /* RES_PARATR_ORPHANS   */  nullptr,
+/* RES_PARATR_WIDOWS*/  nullptr,
 /* RES_PARATR_TABSTOP   */  nullptr,
 /* RES_PARATR_HYPHENZONE*/  nullptr,
 /* RES_PARATR_DROP */   OutHTML_CSS1Attr,
@@ -3343,6 +3343,7 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_FRAMEDIR */  nullptr,
 /* RES_HEADER_FOOTER_EAT_SPACING */ nullptr,
 /* RES_ROW_SPLIT */ nullptr,
+/* RES_FLY_SPLIT */ nullptr,
 /* RES_FOLLOW_TEXT_FLOW */  nullptr,
 /* RES_COLLAPSING_BORDERS */nullptr,
 /* RES_WRAP_INFLUENCE_ON_OBJPOS */  nullptr,
@@ -3351,6 +3352,9 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_FRMATR_CONDITIONAL_STYLE_NAME */ nullptr,
 /* RES_FRMATR_GRABBAG */nullptr,
 /* RES_TEXT_VERT_ADJUST */  nullptr,
+/* RES_BACKGROUND_FULL_SIZE */  nullptr,
+/* RES_RTL_GUTTER */nullptr,
+/* RES_DECORATIVE */nullptr,
 
 /* RES_GRFATR_MIRRORGRF */  nullptr,
 /* RES_GRFATR_CROPGRF   */  nullptr,
@@ -3364,8 +3368,6 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_GRFATR_INVERT */ nullptr,
 /* RES_GRFATR_TRANSPARENCY */   nullptr,
 /* RES_GRFATR_DRWAMODE */   nullptr,
-/* RES_GRFATR_DUMMY1 */ nullptr,
-/* RES_GRFATR_DUMMY2 */ nullptr,
 /* RES_GRFATR_DUMMY3 */ nullptr,
 /* RES_GRFATR_DUMMY4 */ nullptr,
 /* RES_GRFATR_DUMMY5 */ nullptr,

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

[Alain Romedenne (via logerrit)]

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

New commits:
commit ff28b2273c769b7085c031f135131724af25d2c7
Author: Alain Romedenne 
AuthorDate: Fri Feb 17 15:41:06 2023 +
Commit: Alain Romedenne 
CommitDate: Fri Feb 17 15:43:21 2023 +

typo

Change-Id: I67540e5f1feec3baa6d585a508fc5b270c0981ae
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147241
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/source/text/sbasic/shared/03170020.xhp 
b/source/text/sbasic/shared/03170020.xhp
index ea5d3972e5..567b9fb5bc 100644
--- a/source/text/sbasic/shared/03170020.xhp
+++ b/source/text/sbasic/shared/03170020.xhp
@@ -41,7 +41,7 @@
 
  
 MsgBox FormatPercent("-,2", 2, IncludeLeadingDigit:=vbTrue) ' -20,00% if 
french user interface
 
-  
MsgBox FormatPercent("-0.2", 2) ' -20.00% for en-US, -0.00 for fr-CA, de-AT or 
pt-BR
+  
MsgBox FormatPercent("-0.2", 2) ' -20.00% for en-US, -0,00 for fr-CA, de-AT or 
pt-BR
 
  
 MsgBox FormatPercent(-0.2, UseComputerRegionalSettings, 
UseParensForNegativeNumbers:=vbTrue) ' (20,00)% if pt-BR
 

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

[Alain Romedenne (via logerrit)]

 helpcontent2|2 +-
 sw/inc/swabstdlg.hxx|2 +-
 sw/source/ui/dialog/swdlgfact.cxx   |4 ++--
 sw/source/ui/dialog/swdlgfact.hxx   |2 +-
 sw/source/ui/misc/glossary.cxx  |4 ++--
 sw/source/uibase/dochdl/gloshdl.cxx |6 +++---
 sw/source/uibase/inc/gloshdl.hxx|4 ++--
 sw/source/uibase/inc/glossary.hxx   |2 +-
 sw/source/uibase/uiview/view.cxx|2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 0ffa1607c57600930fb6494ab6642f5da0d5447e
Author: Alain Romedenne 
AuthorDate: Fri Feb 17 15:43:21 2023 +
Commit: Gerrit Code Review 
CommitDate: Fri Feb 17 15:43:21 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to ff28b2273c769b7085c031f135131724af25d2c7
  - typo

Change-Id: I67540e5f1feec3baa6d585a508fc5b270c0981ae
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147241
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index aeb4e62cc9ff..ff28b2273c76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba
+Subproject commit ff28b2273c769b7085c031f135131724af25d2c7
commit 2d3b13d6b803f4a58c0302f7d9b58ba9766836d8
Author: Caolán McNamara 
AuthorDate: Fri Feb 17 12:38:49 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 15:43:16 2023 +

use a reference here to flag its never null

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

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index da48badefdd8..9c27f098eb29 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -502,7 +502,7 @@ public:
 const OString&  sPage,
 SwWrtShell* pActShell,
 boolbNew) = 0;
-virtual VclPtrCreateGlossaryDlg(SfxViewFrame* 
pViewFrame,
+virtual VclPtrCreateGlossaryDlg(SfxViewFrame& 
rViewFrame,
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) = 0;
 virtual VclPtr
CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 9bcae1e2ef33..ecf45ec06109 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1130,10 +1130,10 @@ VclPtr 
SwAbstractDialogFactory_Impl::CreateTemplateDi

  sPage, pActShell, bNew));
 }
 
-VclPtr 
SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame, 
SwGlossaryHdl* pGlosHdl,
+VclPtr 
SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame& rViewFrame, 
SwGlossaryHdl* pGlosHdl,
 
SwWrtShell *pWrtShell)
 {
-return 
VclPtr::Create(std::make_unique(pViewFrame,
 pGlosHdl, pWrtShell));
+return 
VclPtr::Create(std::make_unique(rViewFrame,
 pGlosHdl, pWrtShell));
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 7ee78f4a5c05..d31e212accf4 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -794,7 +794,7 @@ public:
 const OString&  sPage,
 SwWrtShell* pActShell,
 boolbNew) 
override;
-virtual VclPtrCreateGlossaryDlg(SfxViewFrame* 
pViewFrame,
+virtual VclPtrCreateGlossaryDlg(SfxViewFrame& 
rViewFrame,
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) 
override;
 virtual VclPtr
CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 33aefaa2ce39..a1b328e6a20e 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -288,9 +288,9 @@ public:
 }
 };
 
-SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame,
+SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame,
  SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell)
-: SfxDialogController(pViewFrame->GetFrameWeld(), 
"modules/swriter/ui/autotext.ui", "AutoTextDialog")
+: SfxDialogController(rViewFrame.GetFrameWeld(), 
"modules/swriter/ui/autotext.ui", "AutoTextDialog")
 , m_sReadonlyPat

[Libreoffice-commits] core.git: helpcontent2

[Sophia Schroeder (via logerrit)]

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

New commits:
commit 8bc365b8dd33feefd33fe4d64a80b9753401cba1
Author: Sophia Schroeder 
AuthorDate: Fri Feb 17 15:32:06 2023 +
Commit: Gerrit Code Review 
CommitDate: Fri Feb 17 15:32:06 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba
  - Minor: Fix for small whitespace issue

Change-Id: Icc5bd2dc4323da23867b4cfdce8284a936ee8e7b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147066
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fbc1e41ad496..aeb4e62cc9ff 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fbc1e41ad4961b502ca658e2f19e74450c93c76c
+Subproject commit aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba

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

[Sophia Schroeder (via logerrit)]

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

New commits:
commit aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba
Author: Sophia Schroeder 
AuthorDate: Wed Feb 15 13:59:35 2023 +
Commit: Olivier Hallot 
CommitDate: Fri Feb 17 15:32:06 2023 +

Minor: Fix for small whitespace issue

Change-Id: Icc5bd2dc4323da23867b4cfdce8284a936ee8e7b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147066
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/0707.xhp 
b/source/text/shared/02/0707.xhp
index 2aedcbf4c2..c06bf58530 100644
--- a/source/text/shared/02/0707.xhp
+++ b/source/text/shared/02/0707.xhp
@@ -39,15 +39,15 @@
 mw inserted "Edit File icon" entry
 
 Edit Mode
-Enables you to edit a read-only document 
or database table. Use the Edit Mode option to activate 
the edit mode.
+Enables you to edit a read-only document 
or database table. Use the Edit Mode option to activate 
the edit mode.
 
 
 
   
-
-  Edit Mode Icon
+
+  Edit Mode Icon
 
-
+
   Edit 
Mode
 
   

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 2c0d444f4ec8729a14a68a4441bcd74a22cf7f59
Author: Seth Chaiklin 
AuthorDate: Fri Feb 17 15:26:09 2023 +
Commit: Gerrit Code Review 
CommitDate: Fri Feb 17 15:26:09 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to fbc1e41ad4961b502ca658e2f19e74450c93c76c
  - tdf#153547 (related: tdf#137281) add "heading" to General Glossary

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

diff --git a/helpcontent2 b/helpcontent2
index 180d21fe3e76..fbc1e41ad496 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 180d21fe3e76731303703a5885f5ee99591f8d7b
+Subproject commit fbc1e41ad4961b502ca658e2f19e74450c93c76c

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/00/0005.xhp |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit fbc1e41ad4961b502ca658e2f19e74450c93c76c
Author: Seth Chaiklin 
AuthorDate: Sat Feb 11 21:38:30 2023 +
Commit: Seth Chaiklin 
CommitDate: Fri Feb 17 15:26:08 2023 +

tdf#153547 (related: tdf#137281) add "heading" to General Glossary

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

diff --git a/source/text/shared/00/0005.xhp 
b/source/text/shared/00/0005.xhp
index 30acb1f047..2fec9e35c3 100644
--- a/source/text/shared/00/0005.xhp
+++ b/source/text/shared/00/0005.xhp
@@ -50,6 +50,19 @@
Bézier Object
Developed 
by the French mathematician Pierre Bézier, a Bézier curve is a mathematically 
defined curve used in two-dimensional graphic applications. The curve is 
defined by four points: the initial position and the terminating position, and 
two separate middle points. Bézier objects can be modified by moving these 
points with the mouse.
   
+
+  
+
+
+  
+  chapter;definition
+  
+  Chapter
+  The word 
chapter in %PRODUCTNAME refers to any paragraph or paragraph style 
with its outline level set to 1. The outline level is set in the Outline & List tab of the 
Paragraph dialog. A chapter is also a heading, because its outline 
level is not Text Body.
+
+
+  
+
   
 
 CTL;definition
@@ -134,6 +147,19 @@
 For historical reasons, a set of square-shaped Latin 
letters, digits, and punctuation marks are also defined and used in CJK 
typography, in addition to or in place of their half-width counterparts. They 
are called full-width forms. Similarly, there are also half-width forms of the 
usually full-width Katakanas and Hangul Jamos, and they have narrower shapes 
instead of square ones. A character's half-width and full-width forms are 
essentially two ways of writing the same character, just like uppercase and 
lowercase forms of Latin alphabet. $[officename] supports conversion between 
half-width and full-width, as well as ignoring width difference when matching 
text strings.
   
 
+  
+  
+  
+
+heading;definition
+
+Heading
+Any paragraph with 
an outline level different than Text Body is a heading.
+The paragraph 
styles named “Heading N” (where N is a number from 1 to 10) have their outline 
level set by default to the number that corresponds to the number in the 
paragraph style name. For example, the paragraph style “Heading 2” has outline 
level 2. Each of the “Heading N” paragraph styles is a heading because they 
have an outline level different than Text Body. If the outline level of a 
paragraph or its paragraph style (e.g., “Heading 2”) is changed to Text Body, 
then the paragraph is no longer a heading. The name of the paragraph style has 
no consequence for whether a paragraph is a heading or not; only the outline 
level is relevant.
+  
+  
+  
+
   
 
 IME; definition

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - formula/source sc/source

[Eike Rathke (via logerrit)]

 formula/source/core/api/token.cxx |   13 +
 sc/source/core/tool/interpr4.cxx  |   10 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 306dfe210814e538be803ff241fb6130e35a7554
Author: Eike Rathke 
AuthorDate: Thu Feb 16 20:20:31 2023 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 17 15:19:09 2023 +

Obtain actual 0-parameter count for OR(), AND() and 1-parameter functions

OR and AND for legacy infix notation are classified as binary
operators but in fact are functions with parameter count. In case
no argument is supplied, GetByte() returns 0 and for that case the
implicit binary operator 2 parameters were wrongly assumed.
Similar for functions expecting 1 parameter, without argument 1
was assumed. For "real" unary and binary operators the compiler
already checks parameters. Omit OR and AND and 1-parameter
functions from this implicit assumption and return the actual 0
count.

Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129
Reviewed-by: Caolán McNamara 
(cherry picked from commit d6599a2af131994487d2d9223a4fd32a8c3ddc49)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147235
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index a7d44f897a24..6e50ca011983 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -93,17 +93,14 @@ sal_uInt8 FormulaToken::GetParamCount() const
 return 0;   // parameters and specials
 // ocIf... jump commands not for FAP, have cByte then
 //2do: bool parameter whether FAP or not?
-else if ( GetByte() )
+else if (GetByte())
 return GetByte();   // all functions, also ocExternal and ocMacro
-else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
-return 2;   // binary
-else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP)
-|| eOp == ocPercentSign)
-return 1;   // unary
+else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP && 
eOp != ocAnd && eOp != ocOr)
+return 2;   // binary operators, compiler checked; OR and AND 
legacy but are functions
+else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP) || 
eOp == ocPercentSign)
+return 1;   // unary operators, compiler checked
 else if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
 return 0;   // no parameter
-else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
-return 1;   // one parameter
 else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 return 1;   // only the condition counts as parameter
 else
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 8094d506c9c0..8345f4e1049a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4014,7 +4014,15 @@ StackVar ScInterpreter::Interpret()
 else if (sp >= pCur->GetParamCount())
 nStackBase = sp - pCur->GetParamCount();
 else
-nStackBase = sp;// underflow?!?
+{
+SAL_WARN("sc.core", "Stack anomaly at " << aPos.Format(
+ScRefFlags::VALID | ScRefFlags::FORCE_DOC | 
ScRefFlags::TAB_3D, &mrDoc)
+<< "  eOp: " << static_cast(eOp)
+<< "  params: " << 
static_cast(pCur->GetParamCount())
+<< "  nStackBase: " << nStackBase << "  sp: " << 
sp);
+nStackBase = sp;
+assert(!"underflow");
+}
 }
 
 switch( eOp )

[Libreoffice-commits] core.git: odk/config

[Stephan Bergmann (via logerrit)]

 odk/config/cfgWin.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2a5105cd0f4025b8ee4cecbd8cef864f72b0f659
Author: Stephan Bergmann 
AuthorDate: Fri Feb 17 13:27:05 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 17 15:18:07 2023 +

Quote some Windows shell settings

...or else, at least with the Windows 11 cmd.exe, when 
setsdkenv_windows.bat has
already been run before (and generated the
%APPDATA%\libreofficeX.Y_sdk\setsdkenv_windows.bat script), and is run again
(and thus reads that generated script), it failed with something like
"\Microsoft was unexpected at this time."

Change-Id: I1bfaf375e52a3ee2debe48a7dd736808790346ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147217
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index f112e231b193..6cfdce68f36a 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -928,9 +928,9 @@ function writeBatFile(fdir, file)
 " )\n" +
 "\n" +
 "REM Set library path. \n" +
-"set LIB=%OO_SDK_HOME%\\lib;%LIB%\n" +
+"set \"LIB=%OO_SDK_HOME%\\lib;%LIB%\"\n" +
 "if defined CPP_WINDOWS_SDK (\n" +
-"   set LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\n" +
+"   set \"LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\"\n" +
 " )\n" +
 "\n" +
 "REM Set office program path.\n" +

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 83ca2ace843eda40fc83270c7b068e68e2a0519c
Author: Olivier Hallot 
AuthorDate: Fri Feb 17 12:13:29 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Feb 17 15:13:29 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 180d21fe3e76731303703a5885f5ee99591f8d7b
  - tdf#149056 Bad Help link for Address book wizard

Change-Id: I3093fb88733b444b9a074d43d9971ad92ce384e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147086
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index eb05d16166e7..180d21fe3e76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eb05d16166e7bdaf119b434c9d613d3d88676762
+Subproject commit 180d21fe3e76731303703a5885f5ee99591f8d7b

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

[Olivier Hallot (via logerrit)]

 source/text/shared/autopi/0117.xhp |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 180d21fe3e76731303703a5885f5ee99591f8d7b
Author: Olivier Hallot 
AuthorDate: Wed Feb 15 10:18:25 2023 -0300
Commit: Olivier Hallot 
CommitDate: Fri Feb 17 15:13:29 2023 +

tdf#149056 Bad Help link for Address book wizard

Change-Id: I3093fb88733b444b9a074d43d9971ad92ce384e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147086
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/autopi/0117.xhp 
b/source/text/shared/autopi/0117.xhp
index 78e8d8f3a2..c98ee6e2ab 100644
--- a/source/text/shared/autopi/0117.xhp
+++ b/source/text/shared/autopi/0117.xhp
@@ -30,6 +30,7 @@
 
 
 
+
 
 Address Data Source
 This wizard registers an existing address book as a data source in 
$[officename].
@@ -42,25 +43,25 @@
 Please select the type of your external 
address book
 Not all types 
are available on all systems.
 
-Thunderbird
+Thunderbird
 Select this option if you already use an address book in Thunderbird or 
Icedove.
 
-KDE 
Address book
+KDE Address book
 Select this option if you already use an address book in KDE Address 
book.
 
-macOS 
Address book
+macOS Address book
 Select this option if you already use an address book in macOS Address 
book.
 
-Evolution
+Evolution
 Select this option if you already use an address book in 
Evolution.
 
-Evolution LDAP
+Evolution LDAP
 Select this option if you already use an address book in Evolution 
LDAP.
 
-Groupwise
+Groupwise
 Select this option if you already use an address book in 
Groupwise.
 
-Other 
external data source
+Other external data source
 Select this option if you want 
to register another data source as address book in 
$[officename].
 
 Cancel
@@ -70,7 +71,7 @@
 
 Go to next step.
 
-Create
+Create
 Establishes the connection to the data source and 
closes the dialog.
 
 

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

[Stephan Bergmann (via logerrit)]

 odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile |2 +-
 odk/examples/cpp/complextoolbarcontrols/Makefile  |2 +-
 odk/examples/cpp/custompanel/Makefile |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6c08211a2a37c6b1841a78d5a99d720ec385cb6b
Author: Stephan Bergmann 
AuthorDate: Fri Feb 17 13:41:54 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 17 14:29:42 2023 +

Remove remaining STL_INCLUDES

...that 1628005298923ad15cc78dbad63669b701f5fd04 "Trying to remove the 
stlport
mention from the code" didn't catch

Change-Id: I271d7760d2b2dd25c0fa27489a8ddf455963d970
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147213
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index 567ba11490d2..06afac5fbf5d 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -75,7 +75,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
-   $(CC) $(CC_FLAGS) $(CC_INCLUDES) $(STL_INCLUDES) -I$(OUT_COMP_INC) 
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+   $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) 
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
 ifeq "$(OS)" "WIN"
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile 
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index ad75987cfab0..0defc6176479 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -76,7 +76,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
-   $(CC) $(CC_FLAGS) $(STL_INCLUDES) $(CC_INCLUDES) -I$(OUT_COMP_INC) 
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+   $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) 
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
 
 ifeq "$(OS)" "WIN"
diff --git a/odk/examples/cpp/custompanel/Makefile 
b/odk/examples/cpp/custompanel/Makefile
index fcbcd20dcedf..b19c5a1721b6 100644
--- a/odk/examples/cpp/custompanel/Makefile
+++ b/odk/examples/cpp/custompanel/Makefile
@@ -71,7 +71,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
-   $(CC) $(CC_FLAGS) $(STL_INCLUDES) $(CC_INCLUDES) -I$(OUT_COMP_INC) 
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+   $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) 
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
 
 #$(COMP_MAPFILE) : $(SLOFILES)

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

[Caolán McNamara (via logerrit)]

 sw/inc/swabstdlg.hxx   |2 +-
 sw/source/ui/dialog/swdlgfact.cxx  |4 ++--
 sw/source/ui/dialog/swdlgfact.hxx  |2 +-
 sw/source/ui/frmdlg/frmdlg.cxx |6 +++---
 sw/source/uibase/inc/frmdlg.hxx|2 +-
 sw/source/uibase/shells/frmsh.cxx  |2 +-
 sw/source/uibase/shells/grfsh.cxx  |2 +-
 sw/source/uibase/shells/textsh.cxx |2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6ef32deaff0d5cc271098aebf89b82be72420d9b
Author: Caolán McNamara 
AuthorDate: Fri Feb 17 12:32:19 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 14:23:08 2023 +

use a reference here to flag its always dereferenced

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

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 534d422cb781..da48badefdd8 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -489,7 +489,7 @@ public:
 
 virtual VclPtr  
CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) = 0;
 virtual VclPtr   CreateFrameTabDialog(const 
OUString &rDialogType,
-SfxViewFrame *pFrame, 
weld::Window *pParent,
+SfxViewFrame& rFrame, 
weld::Window *pParent,
 const SfxItemSet& rCoreSet,
 bool bNewFrame = true,
 const OString& sDefPage = 
OString()) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index ae224d00f78c..9bcae1e2ef33 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1110,12 +1110,12 @@ VclPtr 
SwAbstractDialogFactory_Impl::CreateTableMergeDialog(w
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const OUString &rDialogType,
-SfxViewFrame *pFrame, 
weld::Window *pParent,
+SfxViewFrame& rFrame, 
weld::Window *pParent,
 const SfxItemSet& rCoreSet,
 boolbNewFrame,
 const OString&  sDefPage )
 {
-return 
VclPtr::Create(std::make_shared(pFrame, 
pParent, rCoreSet, bNewFrame, rDialogType, false/*bFormat*/, sDefPage, 
nullptr));
+return 
VclPtr::Create(std::make_shared(rFrame, 
pParent, rCoreSet, bNewFrame, rDialogType, false/*bFormat*/, sDefPage, 
nullptr));
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateTemplateDialog(
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 55aac3c8c858..7ee78f4a5c05 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -783,7 +783,7 @@ public:
 
 virtual VclPtr  
CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) override;
 virtual VclPtr   CreateFrameTabDialog( const 
OUString &rDialogType,
-SfxViewFrame *pFrame, 
weld::Window *pParent,
+SfxViewFrame& rFrame, 
weld::Window *pParent,
 const SfxItemSet& rCoreSet,
 bool bNewFrame  = true,
 const OString& sDefPage = 
OString()) override;
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 2a958bcf3853..b7124046d617 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -41,8 +41,8 @@
 #include 
 
 // the dialog's carrier
-SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
-   weld::Window*pParent,
+SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
+   weld::Window*   pParent,
const SfxItemSet&   rCoreSet,
boolbNewFrame,
const OUString& sResType,
@@ -56,7 +56,7 @@ SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
 , m_bNew(bNewFrame)
 , m_rSet(rCoreSet)
 , m_sDlgType(sResType)
-, 
m_pWrtShell(static_cast(pViewFrame->GetViewShell())->GetWrtShellPtr())
+, 
m_pWrtShell(static_cast(rViewFrame.GetViewShell())->GetWrtShellPtr())
 {
 sal_uInt16 nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell());
 bool bHTMLMode = (nHtmlMode & HTMLMODE_ON) != 0;
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index 87f03d8cc97a..438279a2a2da 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -37,7 +37,7 @@ class SwFrameDlg final : public SfxTabDialogController

[Libreoffice-commits] core.git: configmgr/qa test/user-template

[Stephan Bergmann (via logerrit)]

 configmgr/qa/unit/test.cxx   |9 +
 test/user-template/registry-common/modifications.xcd |1 +
 2 files changed, 10 insertions(+)

New commits:
commit c5d11033044cb7418ba3f8a78d5598721bb2a6c1
Author: Stephan Bergmann 
AuthorDate: Fri Feb 17 12:47:34 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 17 13:51:00 2023 +

Verify that es-419 locale works in configmgr as intended

...after a9b97301ba75a74e6671a6b9829f7044e85db6af "Do not add empty 
language tag
to fallback strings"

Change-Id: Ie42929c2ce6331012358f72026ae774b9dd0e369
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147207
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 217f386456ee..03d44a9947ee 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -324,6 +324,15 @@ void Test::testLocalizedProperty() {
 
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*pt") >>= v);
 CPPUNIT_ASSERT_EQUAL(OUString("pt-PT"), v);
 }
+{
+// See  "configmgr: 
fix no longer found
+// es-419 -> es fallback", which wants to retrieve the xml:lang="es" 
value for the passed-in
+// "es-419" locale:
+OUString v;
+CPPUNIT_ASSERT(
+
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*es-419") 
>>= v);
+CPPUNIT_ASSERT_EQUAL(OUString("es"), v);
+}
 {
 // Make sure a degenerate passed-in "-" locale is handled gracefully:
 OUString v;
diff --git a/test/user-template/registry-common/modifications.xcd 
b/test/user-template/registry-common/modifications.xcd
index f4698116b932..fff0045b08ee 100644
--- a/test/user-template/registry-common/modifications.xcd
+++ b/test/user-template/registry-common/modifications.xcd
@@ -20,6 +20,7 @@
   
 default
 en-US
+es
 pt-PT
   
   

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

[Xisco Fauli (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6d9091197b311321543ea0f0dac30825bf8cc2b8
Author: Xisco Fauli 
AuthorDate: Fri Feb 17 12:44:03 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 13:05:58 2023 +

sc: fix divide by zero in ScGridWindow::DrawPagePreview

Seen in 
https://crashreport.libreoffice.org/stats/signature/ScGridWindow::DrawPagePreview(short,long,short,long,OutputDevice%20&)

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

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 6c9c2a7b1819..c30052237646 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2039,13 +2039,16 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW 
nY1, SCCOL nX2, SCROW nY2,
 //  find right font size for DrawText
 aFont.SetFontSize( Size( 0,100 ) );
 rRenderContext.SetFont( aFont );
-Size aSize100(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );
 
-//  40% of width or 60% of height
-tools::Long nSizeX = 40 * ( aPageEnd.X() - 
aPageStart.X() ) / aSize100.Width();
-tools::Long nSizeY = 60 * ( aPageEnd.Y() - 
aPageStart.Y() ) / aSize100.Height();
-aFont.SetFontSize( Size( 
0,std::min(nSizeX,nSizeY) ) );
-rRenderContext.SetFont( aFont );
+Size aSize100(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );
+if (aSize100.Width() && aSize100.Height())
+{
+//  40% of width or 60% of height
+tools::Long nSizeX = 40 * ( aPageEnd.X() - 
aPageStart.X() ) / aSize100.Width();
+tools::Long nSizeY = 60 * ( aPageEnd.Y() - 
aPageStart.Y() ) / aSize100.Height();
+aFont.SetFontSize( Size( 
0,std::min(nSizeX,nSizeY) ) );
+rRenderContext.SetFont( aFont );
+}
 
 //  centered output with DrawText
 Size aTextSize(rRenderContext.GetTextWidth( 
aThisPageStr ), rRenderContext.GetTextHeight() );

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

[Noel Grandin (via logerrit)]

 sw/inc/accmap.hxx|   13 +++--
 sw/source/core/access/accmap.cxx |   17 -
 2 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit 2442fc19400e0e82b0375d3772a2e0b34a511600
Author: Noel Grandin 
AuthorDate: Thu Feb 16 19:39:17 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 17 12:59:41 2023 +

osl::Mutex->std::mutex in SwAccessibleMap

Change-Id: If7499b3fb165c904d32c9404161a7cdb2e29e5d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147187
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 0090d7837876..df5f697841e2 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -20,17 +20,17 @@
 #define INCLUDED_SW_INC_ACCMAP_HXX
 
 #include 
-#include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
-
 #include 
-#include 
 
-#include 
 #include 
-#include 
+#include 
+#include 
 
 class SwAccessibleParagraph;
 class SwViewShell;
@@ -90,7 +90,7 @@ class SwAccessibleMap final : public 
::accessibility::IAccessibleViewForwarder,
 , public std::enable_shared_from_this
 {
 mutable ::osl::Mutex maMutex;
-::osl::Mutex maEventMutex;
+std::mutex maEventMutex;
 std::unique_ptr mpFrameMap;
 std::unique_ptr mpShapeMap;
 SwShapeList_Impl mvShapes;
@@ -115,6 +115,7 @@ class SwAccessibleMap final : public 
::accessibility::IAccessibleViewForwarder,
 
 void FireEvent( const SwAccessibleEvent_Impl& rEvent );
 
+void AppendEvent( std::unique_lock& rGuard, const 
SwAccessibleEvent_Impl& rEvent );
 void AppendEvent( const SwAccessibleEvent_Impl& rEvent );
 
 void InvalidateCursorPosition( const 
css::uno::Reference& rAcc );
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 46c0dbaf0714..a22a0219bd81 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -977,7 +977,14 @@ void SwAccessibleMap::FireEvent( const 
SwAccessibleEvent_Impl& rEvent )
 
 void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
 {
-osl::MutexGuard aGuard( maEventMutex );
+std::unique_lock aGuard(maEventMutex);
+AppendEvent(aGuard, rEvent);
+}
+
+void SwAccessibleMap::AppendEvent( std::unique_lock& rGuard, const 
SwAccessibleEvent_Impl& rEvent )
+{
+assert(rGuard.mutex() == &maEventMutex);
+(void)rGuard;
 
 if( !mpEvents )
 mpEvents.reset(new SwAccessibleEventList_Impl);
@@ -1702,7 +1709,7 @@ SwAccessibleMap::~SwAccessibleMap()
 mpPreview.reset();
 
 {
-osl::MutexGuard aGuard( maEventMutex );
+std::unique_lock aGuard( maEventMutex );
 assert(!mpEvents);
 assert(!mpEventMap);
 mpEventMap.reset();
@@ -2247,7 +2254,7 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
 
 // remove events stored for the frame
 {
-osl::MutexGuard aGuard( maEventMutex );
+std::unique_lock aGuard( maEventMutex );
 if( mpEvents )
 {
 SwAccessibleEventMap_Impl::iterator aIter =
@@ -2256,7 +2263,7 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
 {
 SwAccessibleEvent_Impl aEvent(
 SwAccessibleEvent_Impl::DISPOSE, aFrameOrObj );
-AppendEvent( aEvent );
+AppendEvent( aGuard, aEvent );
 }
 }
 }
@@ -2998,7 +3005,7 @@ bool SwAccessibleMap::IsPageSelected( const SwPageFrame 
*pPageFrame ) const
 void SwAccessibleMap::FireEvents()
 {
 {
-osl::MutexGuard aGuard( maEventMutex );
+std::unique_lock aGuard( maEventMutex );
 if( mpEvents )
 {
 if (mpEvents->IsFiring())

Re: ESC meeting minutes: 2023-02-16

[Stephan Bergmann]

On 16/02/2023 16:34, Miklos Vajna wrote:

   + Q: Does LO SDK configuration work on Windows?
     + not working for Hossein locally
     + should work, worked in the past (Stephan)
   + can look into this with a new setup


See  "Quote some Windows 
shell settings".  (That hopefully doesn't break things on Windows 10. 
Somebody more at home with the Windows command shell disaster might want 
to take a look at this...)

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/functions/mathematical/fods/aggregate.fods |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit d07796880aa1ac7dcd90df54c8bb4f57d2d4a612
Author: Xisco Fauli 
AuthorDate: Fri Feb 17 11:37:41 2023 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 17 12:56:10 2023 +

CppunitTest_sc_mathematical_functions_test: Add unittest

it would have crashed without the fix in place

Change-Id: I4b7e2c7b72ff0d2a6532b4b7945fb9a0dabe28a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147202
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/data/functions/mathematical/fods/aggregate.fods 
b/sc/qa/unit/data/functions/mathematical/fods/aggregate.fods
index 19b91451330c..e6722a7f70ee 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/aggregate.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/aggregate.fods
@@ -2565,6 +2565,23 @@
  
  
 
+
+ 
+  3
+ 
+ 
+  3
+ 
+ 
+  TRUE
+ 
+ 
+  =AGGREGATE(1;2;3;OR())
+ 
+ 
+ 
+ 
+
 
  
  

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

[Seth Chaiklin (via logerrit)]

 filter/uiconfig/ui/pdfgeneralpage.ui |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 44c803f1481a31f54771fc681b0772a613e0bf83
Author: Seth Chaiklin 
AuthorDate: Thu Feb 16 17:40:38 2023 +
Commit: Seth Chaiklin 
CommitDate: Fri Feb 17 12:43:11 2023 +

tdf#153549 update extended tip because of command name change

Change-Id: I469b3852b406f209ed70e19a75f64cd67583c643
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147123
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui 
b/filter/uiconfig/ui/pdfgeneralpage.ui
index f39034a9b184..15f257c6e855 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -806,9 +806,10 @@
 start
 True
 True
+Export headings along with 
hyperlinked entries in Table of Contents as PDF bookmarks.
 
   
-Select to 
export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created 
for all outline paragraphs (Tools - Chapter Numbering) and for all table of 
contents entries for which you did assign hyperlinks in the source 
document.
+PDF 
bookmarks are created for all paragraphs with outline level 1 or greater and 
for all “Table of Contents” entries with hyperlinks.
   
 
   

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xeformula.cxx |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit f205403ff4efae613e87b07e7345ec20e96f68f1
Author: Caolán McNamara 
AuthorDate: Fri Feb 17 11:00:52 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 12:30:39 2023 +

crashtesting: crash on export of forum-mso-en4-568138.xlsx to xls

recurses to death

warn:legacy.osl:186588:186588:sc/source/filter/excel/xeformula.cxx:518:
XclExpFmlaCompImpl::CreateFormula - unknown garbage behind formula
warn:legacy.osl:186588:186588:sc/source/filter/excel/xeformula.cxx:518:
XclExpFmlaCompImpl::CreateFormula - unknown garbage behind formula
warn:legacy.osl:186588:186588:sc/source/filter/excel/xeformula.cxx:2235:
XclExpFmlaCompImpl::PopOperandPos - token stack broken
Segmentation fault (core dumped)

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

diff --git a/sc/source/filter/excel/xeformula.cxx 
b/sc/source/filter/excel/xeformula.cxx
index d44e13c41935..71f5056beb93 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -325,7 +325,8 @@ private:
 const ScAddress* pScBasePos, XclExpRefLog* pRefLog 
);
 
 voidRecalcTokenClasses();
-voidRecalcTokenClass( const XclExpTokenConvInfo& 
rConvInfo, XclFuncParamConv ePrevConv, XclExpClassConv ePrevClassConv, bool 
bWasRefClass );
+voidRecalcTokenClass( const XclExpTokenConvInfo& 
rConvInfo, XclFuncParamConv ePrevConv, XclExpClassConv ePrevClassConv, bool 
bWasRefClass,
+  o3tl::sorted_vector& rSeenTokens );
 
 voidFinalizeFormula();
 XclTokenArrayRefCreateTokenArray();
@@ -634,7 +635,8 @@ void XclExpFmlaCompImpl::RecalcTokenClasses()
 XclFuncParamConv eParamConv = bNameFmla ? EXC_PARAMCONV_ARR : 
EXC_PARAMCONV_VAL;
 XclExpClassConv eClassConv = bNameFmla ? EXC_CLASSCONV_ARR : 
EXC_CLASSCONV_VAL;
 XclExpTokenConvInfo aConvInfo = { PopOperandPos(), eParamConv, 
!bNameFmla };
-RecalcTokenClass( aConvInfo, eParamConv, eClassConv, bNameFmla );
+o3tl::sorted_vector aSeenTokens;
+RecalcTokenClass(aConvInfo, eParamConv, eClassConv, bNameFmla, 
aSeenTokens);
 }
 
 // clear operand vectors (calls to the expensive InsertZeros() may follow)
@@ -643,9 +645,19 @@ void XclExpFmlaCompImpl::RecalcTokenClasses()
 }
 
 void XclExpFmlaCompImpl::RecalcTokenClass( const XclExpTokenConvInfo& 
rConvInfo,
-XclFuncParamConv ePrevConv, XclExpClassConv ePrevClassConv, bool 
bWasRefClass )
+XclFuncParamConv ePrevConv, XclExpClassConv ePrevClassConv, bool 
bWasRefClass,
+o3tl::sorted_vector& rSeenTokens )
 {
 OSL_ENSURE( rConvInfo.mnTokPos < GetSize(), 
"XclExpFmlaCompImpl::RecalcTokenClass - invalid token position" );
+
+const bool bAlreadySeen = !rSeenTokens.insert(&rConvInfo).second;
+if (bAlreadySeen)
+{
+SAL_WARN("sc.filter", "XclExpFmlaCompImpl::RecalcTokenClass: loop in 
nested operands");
+return;
+}
+rSeenTokens.insert(&rConvInfo);
+
 sal_uInt8& rnTokenId = mxData->maTokVec[ rConvInfo.mnTokPos ];
 sal_uInt8 nTokClass = GetTokenClass( rnTokenId );
 
@@ -752,7 +764,7 @@ void XclExpFmlaCompImpl::RecalcTokenClass( const 
XclExpTokenConvInfo& rConvInfo,
 if( rConvInfo.mnTokPos < mxData->maOpListVec.size() )
 if( const XclExpOperandList* pOperands = mxData->maOpListVec[ 
rConvInfo.mnTokPos ].get() )
 for( const auto& rOperand : *pOperands )
-RecalcTokenClass( rOperand, eConv, eClassConv, nTokClass == 
EXC_TOKCLASS_REF );
+RecalcTokenClass( rOperand, eConv, eClassConv, nTokClass == 
EXC_TOKCLASS_REF, rSeenTokens );
 }
 
 void XclExpFmlaCompImpl::FinalizeFormula()

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Xisco Fauli (via logerrit)]

 sw/source/ui/config/optload.cxx |9 -
 sw/source/ui/fldui/flddb.cxx|   25 -
 sw/source/ui/fldui/fldfunc.cxx  |2 +-
 sw/source/ui/fldui/fldref.cxx   |   17 +
 sw/source/ui/fmtui/tmpdlg.cxx   |   34 --
 sw/source/ui/frmdlg/frmpage.cxx |   30 +-
 sw/source/ui/frmdlg/wrap.cxx|4 ++--
 sw/source/uibase/app/appopt.cxx |   25 +++--
 sw/source/uibase/utlui/content.cxx  |   11 +++
 sw/source/uibase/utlui/glbltree.cxx |   17 ++---
 10 files changed, 101 insertions(+), 73 deletions(-)

New commits:
commit e790bcace8109cbcce618f92e12afcb7dbc629f9
Author: Xisco Fauli 
AuthorDate: Thu Feb 16 12:38:55 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 12:10:21 2023 +

check GetActiveWrtShell() and CheckAndGetWrtShell()

See 
https://crashreport.libreoffice.org/stats/signature/SwModule::ApplyItemSet(unsigned%20short,SfxItemSet%20const%20&)
Change-Id: I7c719c5fe4cda9f6571592c30f39bd440053dbe9

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

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 1885c06ecf9d..af62e10f7fdf 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -464,10 +464,11 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* 
pPage, weld::DialogControlle
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
 
-SwWrtShell* pSh = ::GetActiveWrtShell();
 
 // m_xFormatBox
 sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
+SwWrtShell* pSh = ::GetActiveWrtShell();
+
 if (pSh)
 {
 for ( auto i = pMgr->GetFieldTypeCount(); i; )
@@ -663,13 +664,12 @@ void SwCaptionOptPage::UpdateEntry(int nSelEntry)
 m_xCategory->set_sensitive(bChecked);
 m_xPreview->set_sensitive(bChecked);
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
 
 InsCaptionOpt* pOpt = 
weld::fromId(m_xCheckLB->get_id(nSelEntry));
 
 m_xCategoryBox->clear();
 m_xCategoryBox->append_text(m_sNone);
-if (pSh)
+if (::GetActiveWrtShell())
 {
 const size_t nCount = pMgr->GetFieldTypeCount();
 
@@ -867,8 +867,7 @@ void SwCaptionOptPage::InvalidatePreview()
 aStr += m_xCategoryBox->get_active_text() + " ";
 }
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
-if (pSh)
+if (SwWrtShell *pSh = ::GetActiveWrtShell())
 {
 SwSetExpFieldType* pFieldType = 
static_cast(pMgr->GetFieldType(
 SwFieldIds::SetExp, 
m_xCategoryBox->get_active_text() ));
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 3293a6bc670d..62dd538f01e0 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -73,7 +73,7 @@ SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, 
weld::DialogController* pCo
 SwFieldDBPage::~SwFieldDBPage()
 {
 // If we have no stored SwWrtShell, it means we didn't do anything useful 
- no need to revoke.
-if (SwWrtShell* pSh = GetWrtShell())
+if (SwWrtShell* pSh = CheckAndGetWrtShell())
 {
 // This would cleanup in the case of cancelled dialog
 SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
@@ -140,8 +140,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
 }
 else
 {
-SwWrtShell *pSh = CheckAndGetWrtShell();
-if(pSh)
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
 {
 SwDBData aTmp(pSh->GetDBData());
 m_xDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, u"");
@@ -197,15 +196,16 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
 aData.sDataSource = m_xDatabaseTLB->GetDBName(sTableName, sColumnName, 
&bIsTable);
 aData.sCommand = sTableName;
 aData.nCommandType = bIsTable ? 0 : 1;
-SwWrtShell *pSh = CheckAndGetWrtShell();
-assert(pSh);
 
-SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
-if (pDbManager)
-pDbManager->CommitLastRegistrations();
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
+{
+SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
+if (pDbManager)
+pDbManager->CommitLastRegistrations();
 
-if (aData.sDataSource.isEmpty())
-aData = pSh->GetDBData();
+if (aData.sDataSource.isEmpty())
+aData = pSh->GetDBData();
+}
 
 if(!aData.sDataSource.isEmpty())   // without database no new field 
command
 {
@@ -292,8 +292,6 @@ void SwFieldDBPage::TypeHdl(const weld::TreeView* pBox)
 if (nOld == Ge

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/swriter/ui/outlinenumbering.ui |2 +-
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a07de1a335f1a25f13c992c937d21c2f16fba496
Author: Seth Chaiklin 
AuthorDate: Fri Feb 17 00:01:59 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 12:09:53 2023 +

tdf#153549 update extended tips in Chapter Numbering dialog

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

diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui 
b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 82689e1813e1..99df7dcaaeef 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -331,7 +331,7 @@
 
 
   
-Specifies the 
numbering scheme and the hierarchy for chapter numbering in the current 
document.
+Use this dialog 
to specify the numbering scheme for headings in the current document. For each 
outline level, you can assign a paragraph style and a numbering scheme. Use 
“1-10” to apply the same setting for all outline levels.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui 
b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 80f6ee298c67..68af7bf1383d 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -67,7 +67,7 @@
 
 
   
-Click the 
chapter and outline level that you want to modify, and then specify the 
numbering options for the level.
+Click the 
outline level that you want to modify, then specify the numbering options for 
that level. Use “1-10” to apply the same setting for all outline 
levels.
   
 
   
@@ -182,7 +182,7 @@
 True
 
   
-Select the 
paragraph style that you want to assign to the selected chapter and outline 
level.
+Select the 
paragraph style to assign to the selected outline level.
   
 
   
@@ -277,7 +277,7 @@
 1
 
   
-Select the number of 
outline levels to include in the chapter numbering. For example, select "3" to 
display three levels of chapter numbering: 1.1.1
+Select the number of 
outline levels to display in the heading number, where 1 starts at the current 
level, and increasing the value shows additional previous levels. For example, 
select “3” to display the current level and the two previous levels in the 
heading number.
   
 
   
@@ -310,7 +310,7 @@
 adjustment1
 
   
-Enter 
the number that you want to restart the chapter numbering at.
+Enter 
the number at which to start the numbering for the selected outline 
level.
   
 
   
@@ -361,7 +361,7 @@
 True
 
   
-Enter the 
text that you want to display before the chapter number.
+Enter the 
text that you want to display before the heading number.
   
 
   
@@ -379,7 +379,7 @@
 True
 
   
-Enter the 
text that you want to display after the chapter number.
+Enter the 
text that you want to display after the heading number.
   
 
   

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

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fe3b3b09002188be4691e11eaa36113be0d80c1
Author: Michael Weghorn 
AuthorDate: Fri Feb 17 10:27:12 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Feb 17 12:06:49 2023 +

android: Update com.google.android.material to 1.8.0

Change-Id: I2e2049c5d832aa9ea82feaabf3a86fd8c87a9668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147197
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 38a7cc801467..13bf0381d416 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 "libreoffice.jar",
 "unoloader.jar"
 ])
-implementation 'com.google.android.material:material:1.7.0'
+implementation 'com.google.android.material:material:1.8.0'
 implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 implementation "androidx.multidex:multidex:2.0.1"
 }

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

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/mozilla/gecko/gfx/LayerView.java |   71 ---
 1 file changed, 5 insertions(+), 66 deletions(-)

New commits:
commit 60e804f31cf2a9a3a36a4eb6551b7924253c479a
Author: Michael Weghorn 
AuthorDate: Fri Feb 17 08:59:13 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Feb 17 12:06:41 2023 +

android: Drop unused TextureView

It's unused since

commit 3860bff1013f9608b934c4cdb9ddb8d2dbbc3e52
Date:   Fri Dec 19 16:25:23 2014 +0900

android: never use TextureView for now (for performance reasons)

Get align with latest Fennec code which also has this disabled.

Change-Id: Ie4c27935bacd29218207e47593f073bdce0cf7e3

Change-Id: I808ce73928120c10f4e3721a11b1e74bac3a413c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147196
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java 
b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
index 9d3502528670..c3f639ddf7d1 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -11,14 +11,12 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.PixelFormat;
-import android.graphics.SurfaceTexture;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
-import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -54,7 +52,6 @@ public class LayerView extends FrameLayout {
 private boolean mFullScreen = false;
 
 private SurfaceView mSurfaceView;
-private TextureView mTextureView;
 
 private Listener mListener;
 private OnInterceptTouchListener mTouchIntercepter;
@@ -67,41 +64,16 @@ public class LayerView extends FrameLayout {
 public static final int PAINT_BEFORE_FIRST = 1;
 public static final int PAINT_AFTER_FIRST = 2;
 
-boolean shouldUseTextureView() {
-// we can only use TextureView on ICS or higher
-/*if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-Log.i(LOGTAG, "Not using TextureView: not on ICS+");
-return false;
-}
-
-try {
-// and then we can only use it if we have a hardware accelerated 
window
-Method m = View.class.getMethod("isHardwareAccelerated", new 
Class[0]);
-return (Boolean) m.invoke(this);
-} catch (Exception e) {
-Log.i(LOGTAG, "Not using TextureView: caught exception checking 
for hw accel: " + e.toString());
-return false;
-}*/
-return false;
-}
-
 public LayerView(Context context, AttributeSet attrs) {
 super(context, attrs);
 mContext = (LibreOfficeMainActivity) context;
 
-if (shouldUseTextureView()) {
-mTextureView = new TextureView(context);
-mTextureView.setSurfaceTextureListener(new 
SurfaceTextureListener());
+mSurfaceView = new SurfaceView(context);
+addView(mSurfaceView, ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT);
 
-addView(mTextureView, ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT);
-} else {
-mSurfaceView = new SurfaceView(context);
-addView(mSurfaceView, ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT);
-
-SurfaceHolder holder = mSurfaceView.getHolder();
-holder.addCallback(new SurfaceListener());
+SurfaceHolder holder = mSurfaceView.getHolder();
+holder.addCallback(new SurfaceListener());
 holder.setFormat(PixelFormat.RGB_565);
-}
 
 mGLController = new GLController(this);
 }
@@ -313,10 +285,7 @@ public class LayerView extends FrameLayout {
 }
 
 public Object getNativeWindow() {
-if (mSurfaceView != null)
-return mSurfaceView.getHolder();
-
-return mTextureView.getSurfaceTexture();
+return mSurfaceView.getHolder();
 }
 
 /** This function is invoked by Gecko (compositor thread) via JNI; be 
careful when modifying signature. */
@@ -364,29 +333,6 @@ public class LayerView extends FrameLayout {
 }
 }
 
-private class SurfaceTextureListener implements 
TextureView.SurfaceTextureListener {
-public void onSurfaceTextureAvailable(SurfaceTexture surface, int 
width, int height) {
-// We don't do this for surfaceCreated above because it is always 
followed by a surfaceChanged,
-// but that is not the case here.
-if (mRenderControllerThread != null) {
-  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source

[Xisco Fauli (via logerrit)]

 sw/source/ui/config/optload.cxx |9 +++---
 sw/source/ui/fldui/flddb.cxx|   25 +--
 sw/source/ui/fldui/fldfunc.cxx  |2 -
 sw/source/ui/fldui/fldref.cxx   |   17 ++---
 sw/source/ui/fmtui/tmpdlg.cxx   |   34 +++---
 sw/source/ui/frmdlg/frmpage.cxx |   30 --
 sw/source/ui/frmdlg/wrap.cxx|4 +--
 sw/source/uibase/app/appopt.cxx |   47 +++-
 sw/source/uibase/utlui/content.cxx  |   11 +---
 sw/source/uibase/utlui/glbltree.cxx |   17 +++--
 10 files changed, 112 insertions(+), 84 deletions(-)

New commits:
commit a7f4de4573082e9455542a961ab610cd09f01b34
Author: Xisco Fauli 
AuthorDate: Thu Feb 16 12:38:55 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 11:49:20 2023 +

check GetActiveWrtShell() and CheckAndGetWrtShell()

See 
https://crashreport.libreoffice.org/stats/signature/SwModule::ApplyItemSet(unsigned%20short,SfxItemSet%20const%20&)
Change-Id: I7c719c5fe4cda9f6571592c30f39bd440053dbe9

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

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 93d6b7e4dabe..2c3ef5adbe4e 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -464,10 +464,11 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* 
pPage, weld::DialogControlle
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
 SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
 
-SwWrtShell* pSh = ::GetActiveWrtShell();
 
 // m_xFormatBox
 sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
+SwWrtShell* pSh = ::GetActiveWrtShell();
+
 if (pSh)
 {
 for ( auto i = m_pMgr->GetFieldTypeCount(); i; )
@@ -663,13 +664,12 @@ void SwCaptionOptPage::UpdateEntry(int nSelEntry)
 m_xCategory->set_sensitive(bChecked);
 m_xPreview->set_sensitive(bChecked);
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
 
 InsCaptionOpt* pOpt = 
weld::fromId(m_xCheckLB->get_id(nSelEntry));
 
 m_xCategoryBox->clear();
 m_xCategoryBox->append_text(m_sNone);
-if (pSh)
+if (::GetActiveWrtShell())
 {
 const size_t nCount = m_pMgr->GetFieldTypeCount();
 
@@ -867,8 +867,7 @@ void SwCaptionOptPage::InvalidatePreview()
 aStr += m_xCategoryBox->get_active_text() + " ";
 }
 
-SwWrtShell *pSh = ::GetActiveWrtShell();
-if (pSh)
+if (SwWrtShell *pSh = ::GetActiveWrtShell())
 {
 SwSetExpFieldType* pFieldType = 
static_cast(m_pMgr->GetFieldType(
 SwFieldIds::SetExp, 
m_xCategoryBox->get_active_text() ));
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 3293a6bc670d..62dd538f01e0 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -73,7 +73,7 @@ SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, 
weld::DialogController* pCo
 SwFieldDBPage::~SwFieldDBPage()
 {
 // If we have no stored SwWrtShell, it means we didn't do anything useful 
- no need to revoke.
-if (SwWrtShell* pSh = GetWrtShell())
+if (SwWrtShell* pSh = CheckAndGetWrtShell())
 {
 // This would cleanup in the case of cancelled dialog
 SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
@@ -140,8 +140,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
 }
 else
 {
-SwWrtShell *pSh = CheckAndGetWrtShell();
-if(pSh)
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
 {
 SwDBData aTmp(pSh->GetDBData());
 m_xDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, u"");
@@ -197,15 +196,16 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
 aData.sDataSource = m_xDatabaseTLB->GetDBName(sTableName, sColumnName, 
&bIsTable);
 aData.sCommand = sTableName;
 aData.nCommandType = bIsTable ? 0 : 1;
-SwWrtShell *pSh = CheckAndGetWrtShell();
-assert(pSh);
 
-SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
-if (pDbManager)
-pDbManager->CommitLastRegistrations();
+if (SwWrtShell *pSh = CheckAndGetWrtShell())
+{
+SwDBManager* pDbManager = pSh->GetDoc()->GetDBManager();
+if (pDbManager)
+pDbManager->CommitLastRegistrations();
 
-if (aData.sDataSource.isEmpty())
-aData = pSh->GetDBData();
+if (aData.sDataSource.isEmpty())
+aData = pSh->GetDBData();
+}
 
 if(!aData.sDataSource.isEmpty())   // without database no new field 
command
 {
@@ -292,8 +292,6 @@ void SwFieldDBPage::TypeHdl(const weld::TreeView* pBox)
 if (nOld == GetTypeSel())
 

Re: Crash test update

[Caolán McNamara]

On Thu, 2023-02-16 at 07:57 +, crashtest wrote:
> Hi,
> 
> New crashtest update available at
>  fe3cc634c3573f778/>.
> 
> 141 files have crashed during import.
> 
> 4 files have crashed during export.

I've categorized these here again. The jump is from the "new" section,
mostly asserts to find documents that have a specific feature or
unexpected use of properties. Though the bisect from
DocumentFieldsManager::UpdateTableFields puzzle me, perhaps just
different font metrics triggers a bug we always had rather than a
true root cause.

new
---

writerfilter::dmapper::IsFieldNestingAllowed
 -> temp from https://gerrit.libreoffice.org/c/core/+/145931 assert to
find examples
# 8122 cloudon/File_258.docx
# 7708 bugtrackers/docx/tdf91384-1.docx
# 7685 bugtrackers/docx/tdf64372-3.docx
# 7666 bugtrackers/docx/tdf111341-6.docx
# 727 forums/docx/forum-mso-en-3703.docx
# 723 forums/docx/forum-mso-en-18492.docx
# 722 forums/docx/forum-mso-en-9978.docx
# 718 forums/docx/forum-mso-en-11813.docx
# 716 forums/docx/forum-mso-en-6863.docx"
# 715 forums/docx/forum-mso-en-6864.docx
# 702 forums/docx/forum-mso-en-18495.docx
# 701 forums/docx/forum-mso-en4-547666.docx
# 697 forums/docx/forum-mso-en-11731.docx
# 695 forums/docx/forum-mso-en-4096.docx
# 691 forums/docx/forum-mso-en-14436.docx
# 677 forums/docx/forum-mso-en-18503.docx
# 675 forums/docx/forum-mso-en-18154.docx
# 673 forums/docx/forum-mso-en-5.docx
# 671 forums/docx/forum-mso-en-15858.docx
# 667 forums/docx/forum-mso-en-15991.docx
# 662 forums/docx/forum-mso-en-18132.docx
# 659 forums/docx/forum-mso-de-106340.docx
# 658 forums/docx/forum-mso-en-12814.docx
# 656 forums/docx/forum-mso-en-15841.docx
# 655 forums/docx/forum-mso-en4-547665.docx
# 650 forums/docx/forum-mso-en-3205.docx
# 648 forums/docx/forum-mso-en-4306.docx
# 646 forums/docx/forum-mso-en-16545.docx
# 644 forums/docx/forum-mso-en-11777.docx
# 643 forums/docx/forum-mso-de-86461.docx
# 639 forums/docx/forum-mso-de-136366.docx
# 636 forums/docx/forum-mso-de-92780.docx
# 632 forums/docx/forum-mso-de-136389.docx
# 631 forums/docx/forum-mso-en4-547498.docx
# 625 forums/docx/forum-mso-de-112327.docx
# 616 forums/docx/forum-mso-en-18606.docx

SvxLRSpaceItem::SetLeft
 -> assert added in https://gerrit.libreoffice.org/c/core/+/146643
(noted there)
# 7991 bugtrackers/doc/fdo42762-1.doc
# 7329 bugtrackers/sxw/ooo30127-1.sxw
# 7309 bugtrackers/sxw/ooo49088-1.sxw
# 7203 bugtrackers/ott/tdf93421-1.ott
# 7192 bugtrackers/odt/fdo43370-1.odt
# 7178 bugtrackers/odt/tdf94897-3.odt
# 7172 bugtrackers/odt/tdf93946-1.odt
# 7169 bugtrackers/odt/tdf95222-2.odt
# 7143 bugtrackers/odt/tdf128828-1.odt
# 7127 bugtrackers/odt/tdf95840-1.odt
# 7119 bugtrackers/odt/tdf137241-1.odt
# 7115 bugtrackers/odt/tdf123042-1.odt
# 7114 bugtrackers/odt/tdf94897-2.odt
# 7112 bugtrackers/odt/tdf125373-3.odt
# 7111 bugtrackers/odt/tdf137402-1.odt
# 7108 bugtrackers/odt/tdf93009-1.odt
# 7100 bugtrackers/odt/tdf97806-2.odt
# 7094 bugtrackers/odt/fdo74389-1.odt
# 7075 bugtrackers/odt/fdo77308-1.odt
# 7074 bugtrackers/odt/tdf97491-2.odt
# 7071 bugtrackers/odt/tdf128906-2.odt
# 7039 bugtrackers/odt/tdf128906-1.odt
# 7036 bugtrackers/odt/tdf95648-4.odt
# 7007 bugtrackers/fodt/tdf125373-1.fodt
# 55 forums/odt/forum-it-770.odt
# 15 forums/odt/forum-en-3216.odt
# 120 forums/ott/forum-en-43800.ott
# 110 forums/odt/forum-pl-2563.odt
# 106 forums/odt/forum-en-11103.odt

DocumentFieldsManager::UpdateTableFields
 -> bisect to https://gerrit.libreoffice.org/c/core/+/146611 (which is
a weird outcome)
# 696 forums/docx/forum-mso-en-8069.docx
# 663 forums/docx/forum-mso-en-8072.docx

old
---

ScQueryCellIterator< FindEqualOrSortedLastInRange
 -> assert(!"FindEqualOrSortedLastInRange: rEntry.nField -= nColDiff <
0")
# 796 forums/xls/forum-mso-en4-144513.xls
# 901 forums/xls/forum-mso-en4-433310.xls
# 1034 forums/xls/forum-mso-en4-130543.xls
# 1132 forums/xls/forum-mso-en4-433308.xls
# 1461 forums/xls/forum-mso-en4-433031.xls
# 1601 forums/xls/forum-mso-en4-156881.xls
# 2074 forums/xlsx/forum-mso-en4-491002.xlsx
# 2504 forums/xlsx/forum-mso-en4-527778.xlsx
# 2564 forums/xlsx/forum-mso-en4-606273.xlsx
# 2945 forums/xlsx/forum-mso-en4-643938.xlsx
# 3016 forums/xlsx/forum-mso-en4-544867.xlsx
# 3111 forums/xlsx/forum-mso-en4-629391.xlsx
# 3928 forums/xlsx/forum-mso-en4-353197.xlsx
# 4501 forums/xlsx/forum-mso-en4-544866.xlsx
# 4801 forums/xlsx/forum-mso-en4-606285.xlsx
# 6552 forums/xlsx/forum-mso-en4-606274.xlsx
# 6119 forums/xlsx/forum-mso-en4-70163.xlsx
# 6101 forums/xlsx/forum-mso-en4-183459.xlsx
# 5500 forums/xlsx/forum-mso-en4-112469.xlsx
# 5253 forums/xlsx/forum-mso-en4-606289.xlsx
# 5176 forums/xlsx/forum-mso-de-62049.xlsx
# 5379 forums/xlsx/forum-mso-de-62049.xlsx

ScFormulaCell::MaybeInterpret()
# 891 forums/xls/forum-mso-de-48401.xls
# 2679 forums/xlsx/forum-mso-en4-237685.xlsx
# 2735 forums/xlsx/forum-mso-en4-271721.xlsx
# 3354 forums/xlsx/forum-mso-en4-237668.xlsx
# 3748 forums/xlsx/

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/menu.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a1ef5ac4008b0b2625aed9641f0047b84921af7a
Author: Caolán McNamara 
AuthorDate: Fri Feb 17 09:46:07 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 11:07:11 2023 +

use accessibility description in menus for extended tips

like we do for generic widgets

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

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index bf02fab4c698..656fba5320e9 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1091,6 +1091,9 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const
 }
 }
 
+//Fallback to Menu::GetAccessibleDescription without reentry to 
GetHelpText()
+if (pData->aHelpText.isEmpty())
+return pData->aAccessibleDescription;
 return pData->aHelpText;
 }
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/itiff/itiff.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 07858f9fb48776ca4d5e380490d008640185db47
Author: Caolán McNamara 
AuthorDate: Thu Feb 16 16:24:58 2023 +
Commit: Michael Stahl 
CommitDate: Fri Feb 17 10:12:41 2023 +

Resolves: tdf#151395 need to track tiff offset from start of stream

when importing them from EPS

Change-Id: Ia3ba2aa188f8dcee0ede6d43311c5dcdccb1eb25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147124
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/filter/itiff/itiff.cxx 
b/vcl/source/filter/itiff/itiff.cxx
index a611810a9aec..0251f0bcd9c1 100644
--- a/vcl/source/filter/itiff/itiff.cxx
+++ b/vcl/source/filter/itiff/itiff.cxx
@@ -38,11 +38,13 @@ namespace
 struct Context
 {
 SvStream& rStream;
+tsize_t nStart;
 tsize_t nSize;
 bool bAllowOneShortRead;
-Context(SvStream& rInStream, tsize_t nInSize)
+Context(SvStream& rInStream)
 : rStream(rInStream)
-, nSize(nInSize)
+, nStart(rInStream.Tell())
+, nSize(rInStream.remainingSize())
 , bAllowOneShortRead(false)
 {
 }
@@ -76,9 +78,10 @@ static toff_t tiff_seek(thandle_t handle, toff_t offset, int 
whence)
 switch (whence)
 {
 case SEEK_SET:
+offset = pContext->nStart + offset;
 break;
 case SEEK_CUR:
-offset = pContext->rStream.Tell() + offset;;
+offset = pContext->rStream.Tell() + offset;
 break;
 case SEEK_END:
 offset = pContext->rStream.TellEnd() + offset;
@@ -90,7 +93,7 @@ static toff_t tiff_seek(thandle_t handle, toff_t offset, int 
whence)
 
 pContext->rStream.Seek(offset);
 
-return offset;
+return offset - pContext->nStart;
 }
 
 static int tiff_close(thandle_t)
@@ -113,7 +116,7 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic& 
rGraphic)
 TIFFSetWarningHandler(origWarningHandler);
 });
 
-Context aContext(rTIFF, rTIFF.remainingSize());
+Context aContext(rTIFF);
 TIFF* tif = TIFFClientOpen("libtiff-svstream", "r", &aContext,
tiff_read, tiff_write,
tiff_seek, tiff_close,

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - formula/source sc/source

[Eike Rathke (via logerrit)]

 formula/source/core/api/token.cxx |   13 +
 sc/source/core/tool/interpr4.cxx  |   10 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit d6599a2af131994487d2d9223a4fd32a8c3ddc49
Author: Eike Rathke 
AuthorDate: Thu Feb 16 20:20:31 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 10:12:02 2023 +

Obtain actual 0-parameter count for OR(), AND() and 1-parameter functions

OR and AND for legacy infix notation are classified as binary
operators but in fact are functions with parameter count. In case
no argument is supplied, GetByte() returns 0 and for that case the
implicit binary operator 2 parameters were wrongly assumed.
Similar for functions expecting 1 parameter, without argument 1
was assumed. For "real" unary and binary operators the compiler
already checks parameters. Omit OR and AND and 1-parameter
functions from this implicit assumption and return the actual 0
count.

Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129
Reviewed-by: Caolán McNamara 

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 9a22d9cd2205..f194a4f74926 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -93,17 +93,14 @@ sal_uInt8 FormulaToken::GetParamCount() const
 return 0;   // parameters and specials
 // ocIf... jump commands not for FAP, have cByte then
 //2do: bool parameter whether FAP or not?
-else if ( GetByte() )
+else if (GetByte())
 return GetByte();   // all functions, also ocExternal and ocMacro
-else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
-return 2;   // binary
-else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP)
-|| eOp == ocPercentSign)
-return 1;   // unary
+else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP && 
eOp != ocAnd && eOp != ocOr)
+return 2;   // binary operators, compiler checked; OR and AND 
legacy but are functions
+else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP) || 
eOp == ocPercentSign)
+return 1;   // unary operators, compiler checked
 else if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
 return 0;   // no parameter
-else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
-return 1;   // one parameter
 else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 return 1;   // only the condition counts as parameter
 else
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 0895c75b5cc9..120aea5d3e97 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4034,7 +4034,15 @@ StackVar ScInterpreter::Interpret()
 else if (sp >= pCur->GetParamCount())
 nStackBase = sp - pCur->GetParamCount();
 else
-nStackBase = sp;// underflow?!?
+{
+SAL_WARN("sc.core", "Stack anomaly at " << aPos.Format(
+ScRefFlags::VALID | ScRefFlags::FORCE_DOC | 
ScRefFlags::TAB_3D, &mrDoc)
+<< "  eOp: " << static_cast(eOp)
+<< "  params: " << 
static_cast(pCur->GetParamCount())
+<< "  nStackBase: " << nStackBase << "  sp: " << 
sp);
+nStackBase = sp;
+assert(!"underflow");
+}
 }
 
 switch( eOp )

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

[Miklos Vajna (via logerrit)]

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

New commits:
commit e11e1d48abedf17db40c069d9f37b4edcbcc09c4
Author: Miklos Vajna 
AuthorDate: Fri Feb 17 10:14:31 2023 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 17 10:07:48 2023 +

sw floattable: it's fine to recalc the table in SwTabFrame::MakeAll()

Avoids this warning:

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

I assume that the intention is that flys first format their content and
then grow as necessary, so there is no risk to call lcl_RecalcTable() in
the floattable case. (Parent will grow, then split if necessary.)

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

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index b95f8ca45b25..177bfa947fb2 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2736,7 +2736,13 @@ void SwTabFrame::MakeAll(vcl::RenderContext* 
pRenderContext)
 // allowed to split.
 SwTwips nDistToUpperPrtBottom =
 aRectFnSet.BottomDist( getFrameArea(), 
aRectFnSet.GetPrtBottom(*GetUpper()));
-if ( nDistToUpperPrtBottom >= 0 || bTryToSplit )
+bool bFlySplit = false;
+if (GetUpper()->IsFlyFrame())
+{
+auto pUpperFly = static_cast(GetUpper());
+bFlySplit = pUpperFly->IsFlySplitAllowed();
+}
+if ( nDistToUpperPrtBottom >= 0 || bTryToSplit || bFlySplit )
 {
 lcl_RecalcTable( *this, nullptr, aNotify );
 m_bLowersFormatted = true;

Re: 7.5.0.3 crashes

[Xisco Fauli]

Hi Caolán,

On 16/2/23 21:51, Caolán McNamara wrote:

On Thu, 2023-02-16 at 15:44 +0100, Xisco Fauli wrote:

Hello,

Attached you can find the list of LibreOffice 7.5.0.3 crashes
reported to https://crashreport.libreoffice.org/stats/version/7.5.0.3


When it lists the "Last 4 UNO Commands", e.g. beside that most common
crasher of sw/source/uibase/utlui/content.cxx:4002, does it mean that
in all reported cases those were the last 4 commands recorded?

The last "Last 4 UNO Commands" listed there are for that specific ID 



Checking other IDs from the same signature 
 
it seems each ID has different last 4 UNO commands.


--
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0

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

[Noel Grandin (via logerrit)]

 svx/source/form/fmscriptingenv.cxx |8 
 svx/source/inc/fmscriptingenv.hxx  |3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 1c749fb1766263638a7a87575b84ab31ebdd5cde
Author: Noel Grandin 
AuthorDate: Thu Feb 16 09:14:04 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 17 09:28:44 2023 +

osl::Mutex->std::mutex in FormScriptingEnvironment

Change-Id: I6c6fbe6126d9431f4a252aadf31c9733a41a73b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147193
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svx/source/form/fmscriptingenv.cxx 
b/svx/source/form/fmscriptingenv.cxx
index 948fdb182efe..db7904174b0a 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -760,7 +760,7 @@ namespace svxform
 
 void FormScriptingEnvironment::impl_registerOrRevoke_throw( const 
Reference< XEventAttacherManager >& _rxManager, bool _bRegister )
 {
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 
 if ( !_rxManager.is() )
 throw IllegalArgumentException();
@@ -841,7 +841,7 @@ namespace svxform
 (void) m_rFormModel;
 #else
 SolarMutexClearableGuard aSolarGuard;
-::osl::ClearableMutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 
 if ( m_bDisposed )
 return;
@@ -898,7 +898,7 @@ namespace svxform
 
 assert(pScript && "FormScriptingEnvironment::doFireScriptEvent: no 
script to execute!");
 
-aGuard.clear();
+aGuard.unlock();
 aSolarGuard.clear();
 
 Any aIgnoreResult;
@@ -916,7 +916,7 @@ namespace svxform
 
 void FormScriptingEnvironment::dispose()
 {
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
 m_bDisposed = true;
 m_pScriptListener->dispose();
 m_pScriptListener.clear();
diff --git a/svx/source/inc/fmscriptingenv.hxx 
b/svx/source/inc/fmscriptingenv.hxx
index 18d8a5e44ad5..0fdbcbc251d5 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class FmFormModel;
 
@@ -78,7 +79,7 @@ namespace svxform
 void dispose();
 
 private:
-::osl::Mutexm_aMutex;
+std::mutex  m_aMutex;
 rtl::Reference m_pScriptListener;
 FmFormModel&m_rFormModel;
 boolm_bDisposed;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/png/PngImageWriter.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit bc4080c7fdb81eff5cc71d88ba1d7c5714047490
Author: Caolán McNamara 
AuthorDate: Thu Feb 16 20:36:57 2023 +
Commit: Xisco Fauli 
CommitDate: Fri Feb 17 09:15:12 2023 +

crashreporting: divide by zero, aPrefSize.Width() must have been 0 here

Change-Id: I5ee2c1f4386c95c12fb821a3514cb732b220bb86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147125
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/filter/png/PngImageWriter.cxx 
b/vcl/source/filter/png/PngImageWriter.cxx
index fd5ba3c84e8e..f550d9951e64 100644
--- a/vcl/source/filter/png/PngImageWriter.cxx
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -170,9 +170,12 @@ static bool pngWrite(SvStream& rStream, const BitmapEx& 
rBitmapEx, int nCompress
 if (aBitmapEx.GetPrefMapMode().GetMapUnit() == MapUnit::Map100thMM)
 {
 Size aPrefSize(aBitmapEx.GetPrefSize());
-sal_uInt32 nPrefSizeX = o3tl::convert(aSize.Width(), 10, 
aPrefSize.Width());
-sal_uInt32 nPrefSizeY = o3tl::convert(aSize.Height(), 10, 
aPrefSize.Height());
-png_set_pHYs(pPng, pInfo, nPrefSizeX, nPrefSizeY, 1);
+if (aPrefSize.Width() && aPrefSize.Height())
+{
+sal_uInt32 nPrefSizeX = o3tl::convert(aSize.Width(), 10, 
aPrefSize.Width());
+sal_uInt32 nPrefSizeY = o3tl::convert(aSize.Height(), 10, 
aPrefSize.Height());
+png_set_pHYs(pPng, pInfo, nPrefSizeX, nPrefSizeY, 1);
+}
 }
 
 png_set_compression_level(pPng, nCompressionLevel);

[Libreoffice-commits] core.git: officecfg/registry sw/CppunitTest_sw_core_layout_flycnt.mk sw/CppunitTest_sw_core_layout.mk sw/inc sw/Module_sw.mk sw/qa sw/source writerfilter/source

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |7 +
 sw/CppunitTest_sw_core_layout.mk   |1 
 sw/CppunitTest_sw_core_layout_flycnt.mk|   82 -
 sw/Module_sw.mk|1 
 sw/inc/formatflysplit.hxx  |4 
 sw/qa/core/layout/flycnt.cxx   |   28 +++-
 sw/source/core/attr/formatflysplit.cxx |   28 +---
 sw/source/core/unocore/unoframe.cxx|   10 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx   |   11 +
 9 files changed, 59 insertions(+), 113 deletions(-)

New commits:
commit 3282508f8deeafd50f5af45ca0adf760efb114a3
Author: Miklos Vajna 
AuthorDate: Fri Feb 17 08:49:59 2023 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 17 09:12:28 2023 +

sw floattable: add ImportFloatingTableAsSplitFly expert setting

Mapping DOCX floating tables to Writer split flys is still disabled by
default, but now the environment variable affects the DOCX import
instead of affecting the Writer item pool's default.

This allows mixing ImportFloatingTableAsSplitFly=true and =false tests
in the same suite, so the sw/CppunitTest_sw_core_layout_flycnt.mk
boilerplate can be dropped.

It also allows overwriting this default from an xcu file (expert config,
or the XCU file in online.git) for testing / demo purposes.

Also extend the layout representation comment / doc a bit.

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 99c3e8e0f606..07fcc54d10d4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5670,6 +5670,13 @@
 
 true
   
+  
+
+  Specifies whether a floating table should be imported as a 
split text frame.
+  Import floating table as split frame.
+
+false
+  
 
   
 
diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 9a7a4710dfb7..1a7aeb649887 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_core_layout))
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_layout))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout, \
+sw/qa/core/layout/flycnt \
 sw/qa/core/layout/layout \
 ))
 
diff --git a/sw/CppunitTest_sw_core_layout_flycnt.mk 
b/sw/CppunitTest_sw_core_layout_flycnt.mk
deleted file mode 100644
index c9668afbc9b8..
--- a/sw/CppunitTest_sw_core_layout_flycnt.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#*
-
-$(eval $(call gb_CppunitTest_CppunitTest,sw_core_layout_flycnt))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sw_core_layout_flycnt))
-
-# TODO merge this with sw_core_layout once SwFormatFlySplit::SetForce() is 
gone.
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout_flycnt, \
-sw/qa/core/layout/flycnt \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_core_layout_flycnt, \
-editeng \
-comphelper \
-cppu \
-cppuhelper \
-sal \
-sfx \
-subsequenttest \
-sw \
-   swqahelper \
-test \
-unotest \
-utl \
-vcl \
-svt \
-tl \
-svl \
-svxcore \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_core_layout_flycnt,\
-boost_headers \
-libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_core_layout_flycnt,\
--I$(SRCDIR)/sw/inc \
--I$(SRCDIR)/sw/source/core/inc \
--I$(SRCDIR)/sw/source/uibase/inc \
--I$(SRCDIR)/sw/qa/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_core_layout_flycnt,\
-   udkapi \
-   offapi \
-   oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_core_layout_flycnt))
-$(eval $(call gb_CppunitTest_use_vcl,sw_core_layout_flycnt))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_core_layout_flycnt,services))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_layout_flycnt,\
-officecfg/registry \
-))
-
-$(eval $(call gb_

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

[Andrea Gelmini (via logerrit)]

 svx/source/form/navigatortree.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb3a4468ab7ce0409d4cd5a7e263fa4c0c3eac38
Author: Andrea Gelmini 
AuthorDate: Thu Feb 16 18:12:43 2023 +0100
Commit: Julien Nabet 
CommitDate: Fri Feb 17 09:06:59 2023 +

Fix typo

Change-Id: I5d71f98cafd644dc79df06e67fc400aa8ea4d8b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147164
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index 88245f7fc15c..b42210122010 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1676,7 +1676,7 @@ namespace svxform
 if ( pCurrent->GetChildList()->size() )
 continue;
 
-// one remaining subtile problem, before deleting it : if it's a 
form and the shell
+// one remaining subtle problem, before deleting it : if it's a 
form and the shell
 // knows it as CurrentObject, I have to tell it something else
 if (auto pFormData = dynamic_cast( pCurrent))
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/inc sw/source

[Tomaž Vajngerl (via logerrit)]

 sw/inc/OnlineAccessibilityCheck.hxx |8 
 sw/source/core/txtnode/OnlineAccessibilityCheck.cxx |   10 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0f2e76b726672fcd4af1ebba5d70b44b9bc99a9f
Author: Tomaž Vajngerl 
AuthorDate: Wed Nov 16 18:04:34 2022 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 17 08:59:10 2023 +

sw: rename WeakContentNodeContainer to WeakNodeContainer

Change-Id: Ic80c0753b600ff6e846f2f38a1c46cb67763e2fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142820
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit bada1fc45d6ec65c12cf9ed36e15927b27d6d49c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144500
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/inc/OnlineAccessibilityCheck.hxx 
b/sw/inc/OnlineAccessibilityCheck.hxx
index e87f24d61d44..8f52b73f35bd 100644
--- a/sw/inc/OnlineAccessibilityCheck.hxx
+++ b/sw/inc/OnlineAccessibilityCheck.hxx
@@ -24,14 +24,14 @@ namespace sw
 {
 /// Contains the node and tracks if the node gets deleted.
 /// Note: the node needs to extend sw::BroadcastingModify.
-class WeakContentNodeContainer : public SvtListener
+class WeakNodeContainer : public SvtListener
 {
 private:
 SwNode* m_pNode;
 
 public:
-WeakContentNodeContainer(SwNode* pNode);
-~WeakContentNodeContainer();
+WeakNodeContainer(SwNode* pNode);
+~WeakNodeContainer();
 
 /// Is the node still alive or it was deleted?
 bool isAlive();
@@ -44,7 +44,7 @@ public:
 class OnlineAccessibilityCheck : public SvtListener
 {
 private:
-std::map> m_aNodes;
+std::map> m_aNodes;
 
 SwDoc& m_rDocument;
 sw::AccessibilityCheck m_aAccessibilityCheck;
diff --git a/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx 
b/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
index 97f63c7276ab..682fde13cceb 100644
--- a/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
+++ b/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
@@ -29,7 +29,7 @@
 
 namespace sw
 {
-WeakContentNodeContainer::WeakContentNodeContainer(SwNode* pNode)
+WeakNodeContainer::WeakNodeContainer(SwNode* pNode)
 : m_pNode(pNode)
 {
 if (m_pNode)
@@ -43,16 +43,16 @@ WeakContentNodeContainer::WeakContentNodeContainer(SwNode* 
pNode)
 }
 }
 
-WeakContentNodeContainer::~WeakContentNodeContainer() { EndListeningAll(); }
+WeakNodeContainer::~WeakNodeContainer() { EndListeningAll(); }
 
-bool WeakContentNodeContainer::isAlive()
+bool WeakNodeContainer::isAlive()
 {
 if (!HasBroadcaster())
 m_pNode = nullptr;
 return m_pNode;
 }
 
-SwNode* WeakContentNodeContainer::getNode()
+SwNode* WeakNodeContainer::getNode()
 {
 if (isAlive())
 return m_pNode;
@@ -81,7 +81,7 @@ void OnlineAccessibilityCheck::updateNodeStatus(SwNode* pNode)
 auto it = m_aNodes.find(pNode);
 if (it == m_aNodes.end())
 {
-m_aNodes.emplace(pNode, 
std::make_unique(pNode));
+m_aNodes.emplace(pNode, std::make_unique(pNode));
 }
 
 for (auto iterator = m_aNodes.begin(); iterator != m_aNodes.end();)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - formula/source sc/source

[Eike Rathke (via logerrit)]

 formula/source/core/api/token.cxx |   13 +
 sc/source/core/tool/interpr4.cxx  |   10 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit dfffc53dc7fbf9ddfd3bc3b871a7cbc5a135dabb
Author: Eike Rathke 
AuthorDate: Thu Feb 16 20:20:31 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 08:54:16 2023 +

Obtain actual 0-parameter count for OR(), AND() and 1-parameter functions

OR and AND for legacy infix notation are classified as binary
operators but in fact are functions with parameter count. In case
no argument is supplied, GetByte() returns 0 and for that case the
implicit binary operator 2 parameters were wrongly assumed.
Similar for functions expecting 1 parameter, without argument 1
was assumed. For "real" unary and binary operators the compiler
already checks parameters. Omit OR and AND and 1-parameter
functions from this implicit assumption and return the actual 0
count.

Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147128
Reviewed-by: Caolán McNamara 

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index ca7b7bab3d58..74a212937bb0 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -94,17 +94,14 @@ sal_uInt8 FormulaToken::GetParamCount() const
 return 0;   // parameters and specials
 // ocIf... jump commands not for FAP, have cByte then
 //2do: bool parameter whether FAP or not?
-else if ( GetByte() )
+else if (GetByte())
 return GetByte();   // all functions, also ocExternal and ocMacro
-else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
-return 2;   // binary
-else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP)
-|| eOp == ocPercentSign)
-return 1;   // unary
+else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP && 
eOp != ocAnd && eOp != ocOr)
+return 2;   // binary operators, compiler checked; OR and AND 
legacy but are functions
+else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP) || 
eOp == ocPercentSign)
+return 1;   // unary operators, compiler checked
 else if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
 return 0;   // no parameter
-else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
-return 1;   // one parameter
 else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 return 1;   // only the condition counts as parameter
 else
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b122a836d654..1f14981ebadc 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4034,7 +4034,15 @@ StackVar ScInterpreter::Interpret()
 else if (sp >= pCur->GetParamCount())
 nStackBase = sp - pCur->GetParamCount();
 else
-nStackBase = sp;// underflow?!?
+{
+SAL_WARN("sc.core", "Stack anomaly at " << aPos.Format(
+ScRefFlags::VALID | ScRefFlags::FORCE_DOC | 
ScRefFlags::TAB_3D, &mrDoc)
+<< "  eOp: " << static_cast(eOp)
+<< "  params: " << 
static_cast(pCur->GetParamCount())
+<< "  nStackBase: " << nStackBase << "  sp: " << 
sp);
+nStackBase = sp;
+assert(!"underflow");
+}
 }
 
 switch( eOp )

[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/qa sc/source sd/qa sd/source sfx2/source starmath/source svx/qa sw/source vcl/source

[Caolán McNamara (via logerrit)]

 include/sfx2/request.hxx  |2 +-
 sc/qa/unit/scshapetest.cxx|6 +++---
 sc/source/ui/view/cellsh1.cxx |4 ++--
 sc/source/ui/view/cellsh2.cxx |2 +-
 sc/source/ui/view/cellsh3.cxx |8 
 sc/source/ui/view/prevwsh.cxx |   12 ++--
 sd/qa/unit/misc-tests.cxx |8 
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |2 +-
 sd/qa/unit/uiimpress.cxx  |4 ++--
 sd/source/ui/sidebar/LayoutMenu.cxx   |4 ++--
 sd/source/ui/view/ViewShellImplementation.cxx |2 +-
 sfx2/source/control/request.cxx   |   20 +++-
 sfx2/source/view/lokhelper.cxx|4 ++--
 sfx2/source/view/viewprn.cxx  |2 +-
 starmath/source/view.cxx  |4 ++--
 svx/qa/unit/customshapes.cxx  |2 +-
 sw/source/ui/dialog/uiregionsw.cxx|2 +-
 sw/source/ui/fldui/fldpage.cxx|4 ++--
 sw/source/ui/misc/bookmark.cxx|2 +-
 sw/source/ui/misc/glossary.cxx|6 +++---
 sw/source/uibase/docvw/PostItMgr.cxx  |4 ++--
 sw/source/uibase/docvw/edtwin.cxx |8 
 sw/source/uibase/lingu/olmenu.cxx |2 +-
 sw/source/uibase/misc/swruler.cxx |2 +-
 sw/source/uibase/ribbar/drawbase.cxx  |2 +-
 sw/source/uibase/shells/basesh.cxx|8 
 sw/source/uibase/shells/textsh1.cxx   |   10 +-
 sw/source/uibase/shells/textsh2.cxx   |2 +-
 sw/source/uibase/shells/txtnum.cxx|2 +-
 sw/source/uibase/uiview/view2.cxx |2 +-
 vcl/source/filter/png/PngImageWriter.cxx  |9 ++---
 31 files changed, 74 insertions(+), 77 deletions(-)

New commits:
commit 72cf5b4b8c99e969eb36b0910e2954d220b8850c
Author: Caolán McNamara 
AuthorDate: Thu Feb 16 20:36:57 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 08:49:23 2023 +

crashreporting: divide by zero, aPrefSize.Width() must have been 0 here

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

diff --git a/vcl/source/filter/png/PngImageWriter.cxx 
b/vcl/source/filter/png/PngImageWriter.cxx
index 0438ea7645a2..35ccefaec2c7 100644
--- a/vcl/source/filter/png/PngImageWriter.cxx
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -170,9 +170,12 @@ static bool pngWrite(SvStream& rStream, const BitmapEx& 
rBitmapEx, int nCompress
 if (aBitmapEx.GetPrefMapMode().GetMapUnit() == MapUnit::Map100thMM)
 {
 Size aPrefSize(aBitmapEx.GetPrefSize());
-sal_uInt32 nPrefSizeX = o3tl::convert(aSize.Width(), 10, 
aPrefSize.Width());
-sal_uInt32 nPrefSizeY = o3tl::convert(aSize.Height(), 10, 
aPrefSize.Height());
-png_set_pHYs(pPng, pInfo, nPrefSizeX, nPrefSizeY, 1);
+if (aPrefSize.Width() && aPrefSize.Height())
+{
+sal_uInt32 nPrefSizeX = o3tl::convert(aSize.Width(), 10, 
aPrefSize.Width());
+sal_uInt32 nPrefSizeY = o3tl::convert(aSize.Height(), 10, 
aPrefSize.Height());
+png_set_pHYs(pPng, pInfo, nPrefSizeX, nPrefSizeY, 1);
+}
 }
 
 png_set_compression_level(pPng, nCompressionLevel);
commit 7183d259d0d8bf8020da1aa06c963581d2bf779f
Author: Caolán McNamara 
AuthorDate: Thu Feb 16 15:45:59 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 17 08:49:11 2023 +

SfxViewFrame* arg of SfxRequest ctor always dereferenced

change it to take a reference

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

diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 966974498065..908f98b55379 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -56,7 +56,7 @@ private:
 SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet );
 
 public:
-SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId );
+SfxRequest( SfxViewFrame&, sal_uInt16 nSlotId );
 SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, 
SfxItemPool &rPool );
 SfxRequest( const SfxSlot* pSlot, const 
css::uno::Sequence < css::beans::PropertyValue >& rArgs,
 SfxCallMode nCallMode, SfxItemPool 
&rPool );
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index df6fb030d691..dc60439a536f 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -135,7 +135,7 @@ void ScShapeTest::testTdf144242_OpenBezier_noSwapWH(

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

[Noel Grandin (via logerrit)]

 ucb/source/sorter/sortdynres.cxx |6 +++---
 ucb/source/sorter/sortdynres.hxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eefa8e8110c432be36e1cd5d166b5f5676a7e5ca
Author: Noel Grandin 
AuthorDate: Thu Feb 16 19:50:32 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 17 08:19:52 2023 +

osl::Mutex->std::mutex in SortedDynamicResultSetListener

Change-Id: I70b20a616cb84c5c066431be50359def5d041b3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147188
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index fe142c2b53f4..a3bf493a2ba0 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -474,7 +474,7 @@ 
SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
 void SAL_CALL
 SortedDynamicResultSetListener::disposing( const EventObject& /*Source*/ )
 {
-osl::Guard< osl::Mutex > aGuard( maMutex );
+std::unique_lock aGuard( maMutex );
 
 if ( mpOwner )
 mpOwner->impl_disposing();
@@ -486,7 +486,7 @@ SortedDynamicResultSetListener::disposing( const 
EventObject& /*Source*/ )
 void SAL_CALL
 SortedDynamicResultSetListener::notify( const ListEvent& Changes )
 {
-osl::Guard< osl::Mutex > aGuard( maMutex );
+std::unique_lock aGuard( maMutex );
 
 if ( mpOwner )
 mpOwner->impl_notify( Changes );
@@ -497,7 +497,7 @@ SortedDynamicResultSetListener::notify( const ListEvent& 
Changes )
 void
 SortedDynamicResultSetListener::impl_OwnerDies()
 {
-osl::Guard< osl::Mutex > aGuard( maMutex );
+std::unique_lock aGuard( maMutex );
 mpOwner = nullptr;
 }
 
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 320e4d9ddb8e..2bb8f24aa8c2 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -113,7 +113,7 @@ class SortedDynamicResultSetListener: public 
cppu::WeakImplHelper <
 css::ucb::XDynamicResultSetListener >
 {
 SortedDynamicResultSet  *mpOwner;
-osl::Mutex  maMutex;
+std::mutex   maMutex;
 
 public:
  SortedDynamicResultSetListener( SortedDynamicResultSet *mOwner );