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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter4.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit a92965d51887b552d912304fbf9efd6d5015a82a
Author: Miklos Vajna 
AuthorDate: Wed May 24 08:14:26 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 24 09:02:12 2023 +0200

CppunitTest_sw_uiwriter4: disable testTdf107975 on Windows

E.g.  failed 3 times in
a row, always on this test, always on Windows.

Also  failed 2 times in
a row, again only on this test, only on Windows.

At the same time, it doesn't fail reliably locally, so hard to debug the
root cause.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index b692becbfcf3..f1b3336a8f6b 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2345,6 +2345,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, 
testTdf113877_blank_bold_on)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
 {
+// Disable on Windows: fails quite a lot on multiple Jenkins slaves, but 
entirely reliably,
+// with:
+// sw/qa/extras/uiwriter/uiwriter4.cxx(2407) : error : Assertion
+// - Expected: 2
+// - Actual  : 1
+// i.e. the xIndexAccess->getCount() line.
+#if !defined(_WIN32)
 // This test also covers tdf#117185 tdf#110442
 
 createSwDoc("tdf107975.odt");
@@ -2416,6 +2423,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
 dispatchCommand(mxComponent, ".uno:Undo", {});
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+#endif
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf113877_blank_bold_off)

[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/source sd/uiconfig

[Baole Fang (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 -
 sd/inc/strings.hrc   |
8 -
 sd/source/ui/dlg/sdpreslt.cxx|   
16 +-
 sd/source/ui/inc/sdpreslt.hxx|
1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
16 +++---
 sd/uiconfig/sdraw/popupmenu/page.xml |
2 -
 sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml   |
2 -
 sd/uiconfig/sdraw/ui/notebookbar.ui  |
4 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui  |
4 +-
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui   |
2 -
 10 files changed, 43 insertions(+), 14 deletions(-)

New commits:
commit 0a90b90048313fb43f8c5d7461f58dafec276600
Author: Baole Fang 
AuthorDate: Sun May 7 22:35:34 2023 -0400
Commit: Heiko Tietze 
CommitDate: Wed May 24 09:22:48 2023 +0200

tdf#148088: Fix master related UI in Draw

Page/Master Page... -> Page/Change Master Page... (corresponds to Impress)
In the above dialog:
Available Master Slides -> Available Master Pages
Select a Slide Design -> Select a Page Design
After clickling load:
Load Master Slide -> Load Master Page
In Master mode, right click/Rename Master:
Rename Master Slide -> Rename Master Page

Change-Id: I6a8e987d6f3eaf91289ec061ec87cd76b3f90ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151489
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 716d496161e6..cca1b2ec38ae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1103,7 +1103,7 @@
   
   
 
-  Master Page...
+  Change Master Page...
 
 
   .uno:PresentationLayout
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index bf5372b2ad33..3e1ddd1542e7 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -159,7 +159,12 @@
 
 // Strings for animation effects
 #define STR_INSERT_TEXT NC_("STR_INSERT_TEXT", 
"Insert Text")
+#define STR_AVAILABLE_MASTERSLIDE   
NC_("STR_AVAILABLE_MASTERSLIDE", "Available Master Slides")
+#define STR_AVAILABLE_MASTERPAGE
NC_("STR_AVAILABLE_MASTERPAGE", "Available Master Pages")
+#define STR_SELECT_SLIDE
NC_("STR_SELECT_SLIDE", "Select a Slide Design")
+#define STR_SELECT_PAGE NC_("STR_SELECT_PAGE", 
"Select a Page Design")
 #define STR_LOAD_PRESENTATION_LAYOUT
NC_("STR_LOAD_PRESENTATION_LAYOUT", "Load Master Slide")
+#define STR_LOAD_DRAWING_LAYOUT 
NC_("STR_LOAD_DRAWING_LAYOUT", "Load Master Page")
 #define STR_GLUE_ESCDIR_SMART   
NC_("STR_GLUE_ESCDIR_SMART", "Smart")
 #define STR_GLUE_ESCDIR_LEFT
NC_("STR_GLUE_ESCDIR_LEFT", "Left")
 #define STR_GLUE_ESCDIR_RIGHT   
NC_("STR_GLUE_ESCDIR_RIGHT", "Right")
@@ -238,7 +243,8 @@
 #define STR_TITLE_RENAMEPAGE
NC_("STR_TITLE_RENAMEPAGE", "Rename Page")
 #define STR_TOOLTIP_RENAME  
NC_("STR_TOOLTIP_RENAME", "Duplicate or empty names are not possible")
 #define STR_DESC_RENAMESLIDE
NC_("STR_DESC_RENAMESLIDE", "Name")
-#define STR_TITLE_RENAMEMASTER  
NC_("STR_TITLE_RENAMEMASTER", "Rename Master Slide")
+#define STR_TITLE_RENAMEMASTERSLIDE 
NC_("STR_TITLE_RENAMEMASTERSLIDE", "Rename Master Slide")
+#define STR_TITLE_RENAMEMASTERPAGE  
NC_("STR_TITLE_RENAMEMASTERPAGE", "Rename Master Page")
 #define STR_PLACEHOLDER_DESCRIPTION_TITLE   
NC_("STR_PLACEHOLDER_DESCRIPTION_TITLE", "Title Area for AutoLayouts" )
 #define STR_PLACEHOLDER_DESCRIPTION_OUTLINE 
NC_("STR_PLACEHOLDER_DESCRIPTION_OUTLINE", "Object Area for AutoLayouts" )
 #define STR_PLACEHOLDER_DESCRIPTION_FOOTER  
NC_("STR_PLACEHOLDER_DESCRIPTION_FOOTER", "Footer Area" )
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index dd54611e28d9..d0d0839bbb41 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -47,7 +47,18 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* 
pDocShell,
 , m_xBtnLoad(m_xBuilder->weld_button("load"))
 , m_xVS(new ValueSet(m_xBuilder->weld_scrolled_window("selectwin", true)))
 , m

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - officecfg/registry

[Julien Nabet (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|
8 +
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
14 --
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   
14 ++
 4 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit 68427cc4964716c89c6e97943bd3f0d309e231c2
Author: Julien Nabet 
AuthorDate: Tue May 23 19:27:01 2023 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 24 09:25:54 2023 +0200

Revert "Related tdf#114286: put duplicates commands in GenericCommands..."

This reverts commit 52a695d2ceb4231a9fcc419959e29023ecef037b.

Reason: cause of tdf#155442
Accelerator to delete row(s) conflicts with the one for adding row(s)

Change-Id: If19d67a080e85d2a2716e4004db3335f0619c73f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152169
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 791bc23d88dacf5e7d2ebcb6781a4c43187cbc0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152106
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index d79914600953..ccf99067b033 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1167,6 +1167,14 @@
   Data ~Validation...
 
   
+  
+
+  Delete Rows
+
+
+  1
+
+  
   
 
   Insert
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 8f8dba845c1a..256a4f90f860 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2018,6 +2018,14 @@
   1
 
   
+  
+
+  Delete Row
+
+
+  1
+
+  
   
 
   Delete Table
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c355eb776ad3..f1ce0d323c10 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -7074,20 +7074,6 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   1
 
   
-  
-
-  Delete Rows
-
-
-  Delete ~Rows
-
-
-  Delete selected rows
-
-
-  1
-
-  
   
 
   Manage Language
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2236ab475ffc..ec2125c35d90 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1730,6 +1730,20 @@
   1
 
   
+  
+
+  Delete Rows
+
+
+  ~Rows
+
+
+  Delete selected rows
+
+
+  1
+
+  
   
 
   Delete Table

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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/impedit2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1e206d5b53ed1e11f2bab2437dd6fccdab4586ce
Author: Caolán McNamara 
AuthorDate: Tue May 23 19:58:39 2023 +0100
Commit: Xisco Fauli 
CommitDate: Wed May 24 09:27:04 2023 +0200

tdf#155350 Do AutoCorrect of Input Method text

for all of SvxAutoCorrect::IsAutoCorrectChar() chars not just
quotes

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 4e87e36af5d3..7e830da175b0 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -371,8 +371,9 @@ bool ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 // #102812# convert quotes in IME text
 // works on the last input character, this is especially in 
Korean text often done
 // quotes that are inside of the string are not replaced!
+// See also tdf#155350
 const sal_Unicode nCharCode = aSel.Min().GetNode()->GetChar( 
aSel.Min().GetIndex() );
-if ( ( GetStatus().DoAutoCorrect() ) && ( ( nCharCode == '\"' 
) || ( nCharCode == '\'' ) ) )
+if ( ( GetStatus().DoAutoCorrect() ) && 
SvxAutoCorrect::IsAutoCorrectChar(nCharCode) )
 {
 aSel = DeleteSelected( aSel );
 aSel = AutoCorrect( aSel, nCharCode, 
mpIMEInfos->bWasCursorOverwrite );

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/htmlexport/htmlexport.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 50ab65a84ade5a14c2e48667ff6629e4907de35f
Author: Miklos Vajna 
AuthorDate: Tue May 23 20:17:09 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 24 09:48:02 2023 +0200

CppunitTest_sw_htmlexport: avoid reqif magic in testReqIfList

Set the filter options explicitly, rather than inferring it from the
test name.

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

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 7121b9f7021f..18bfa2ea6496 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -917,8 +917,14 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testXHTMLUseCSS)
 CPPUNIT_ASSERT(aStream.indexOf("TellEnd();

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

[Noel Grandin (via logerrit)]

 vcl/inc/unx/gtk/gtkgdi.hxx|1 +
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |   16 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 55cca83ca3544d3ae82d978b017899ced9833cc5
Author: Noel Grandin 
AuthorDate: Tue May 23 15:06:07 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed May 24 10:17:03 2023 +0200

speedup drawing toolbars, cache min-width

doing the style lookup for the minWidth is really very slow in gtk

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

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index c0a032863ea4..2fc66ace5ece 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -201,6 +201,7 @@ private:
 static GtkStyleContext *mpRadioMenuItemRadioStyle;
 static GtkStyleContext *mpSeparatorMenuItemStyle;
 static GtkStyleContext *mpSeparatorMenuItemSeparatorStyle;
+static gint mnVerticalSeparatorMinWidth;
 
 #if !GTK_CHECK_VERSION(4, 0, 0)
 static tools::Rectangle NWGetScrollButtonRect( ControlPart nPart, 
tools::Rectangle aAreaRect );
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 425c642d45fd..a531a59527db 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -91,6 +91,7 @@ GtkStyleContext* GtkSalGraphics::mpRadioMenuItemStyle = 
nullptr;
 GtkStyleContext* GtkSalGraphics::mpRadioMenuItemRadioStyle = nullptr;
 GtkStyleContext* GtkSalGraphics::mpSeparatorMenuItemStyle = nullptr;
 GtkStyleContext* GtkSalGraphics::mpSeparatorMenuItemSeparatorStyle = nullptr;
+gint GtkSalGraphics::mnVerticalSeparatorMinWidth = 0;
 
 #if !GTK_CHECK_VERSION(4, 0, 0)
 static void style_context_get_margin(GtkStyleContext *pContext, GtkBorder 
*pMargin)
@@ -1531,17 +1532,11 @@ static gfloat getArrowSize(GtkStyleContext* context)
 
 namespace
 {
-void draw_vertical_separator(GtkStyleContext *context, cairo_t *cr, const 
tools::Rectangle& rControlRegion)
+void draw_vertical_separator(GtkStyleContext *context, cairo_t *cr, const 
tools::Rectangle& rControlRegion, gint nSeparatorWidth)
 {
 tools::Long nX = 0;
 tools::Long nY = 0;
 
-gint nSeparatorWidth = 1;
-
-gtk_style_context_get(context,
-gtk_style_context_get_state(context),
-"min-width", &nSeparatorWidth, nullptr);
-
 gint nHalfSeparatorWidth = nSeparatorWidth / 2;
 gint nHalfRegionWidth = rControlRegion.GetWidth() / 2;
 
@@ -1854,14 +1849,14 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 break;
 case RenderType::ToolbarSeparator:
 {
-draw_vertical_separator(context, cr, rControlRegion);
+draw_vertical_separator(context, cr, rControlRegion, 
mnVerticalSeparatorMinWidth);
 break;
 }
 case RenderType::Separator:
 if (nPart == ControlPart::SeparatorHorz)
 draw_horizontal_separator(context, cr, rControlRegion);
 else
-draw_vertical_separator(context, cr, rControlRegion);
+draw_vertical_separator(context, cr, rControlRegion, 
mnVerticalSeparatorMinWidth);
 break;
 case RenderType::Arrow:
 gtk_render_arrow(context, cr,
@@ -2920,6 +2915,9 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, 
GtkWidget *pWindow )
 GtkToolItem *item = gtk_separator_tool_item_new();
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1);
 mpToolbarSeparatorStyle = gtk_widget_get_style_context(GTK_WIDGET(item));
+gtk_style_context_get(mpToolbarSeparatorStyle,
+gtk_style_context_get_state(mpToolbarSeparatorStyle),
+"min-width", &mnVerticalSeparatorMinWidth, nullptr);
 
 GtkWidget *pButton = gtk_button_new();
 item = gtk_tool_button_new(pButton, nullptr);

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter4.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2c43b3f88d71e9bcf73d2b3ac52bad55aa5b9a7a
Author: Miklos Vajna 
AuthorDate: Wed May 24 09:24:18 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 24 10:17:57 2023 +0200

CppunitTest_sw_uiwriter4: restore part of testTdf107975 on Windows

Just disable the part that in fact fails, as requested at

.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index f1b3336a8f6b..029c62191373 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2345,13 +2345,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, 
testTdf113877_blank_bold_on)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
 {
-// Disable on Windows: fails quite a lot on multiple Jenkins slaves, but 
entirely reliably,
-// with:
-// sw/qa/extras/uiwriter/uiwriter4.cxx(2407) : error : Assertion
-// - Expected: 2
-// - Actual  : 1
-// i.e. the xIndexAccess->getCount() line.
-#if !defined(_WIN32)
 // This test also covers tdf#117185 tdf#110442
 
 createSwDoc("tdf107975.odt");
@@ -2410,6 +2403,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
 dispatchCommand(mxComponent, ".uno:GoRight", {});
 dispatchCommand(mxComponent, ".uno:Paste", {});
 
+// Disable on Windows: fails quite a lot on multiple Jenkins slaves, but 
entirely reliably,
+// with:
+// sw/qa/extras/uiwriter/uiwriter4.cxx(2407) : error : Assertion
+// - Expected: 2
+// - Actual  : 1
+// i.e. the xIndexAccess->getCount() line.
+#if !defined(_WIN32)
 // without the fix, it crashes
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
 CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());

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

[Caolán McNamara (via logerrit)]

 sw/inc/viewsh.hxx|   41 +
 sw/source/core/frmedt/feshview.cxx   |2 -
 sw/source/core/layout/layact.cxx |2 -
 sw/source/core/view/viewsh.cxx   |   56 ---
 sw/source/uibase/docvw/edtdd.cxx |2 -
 sw/source/uibase/docvw/edtwin3.cxx   |4 +-
 sw/source/uibase/inc/wrtsh.hxx   |2 -
 sw/source/uibase/shells/basesh.cxx   |4 +-
 sw/source/uibase/shells/textsh.cxx   |6 +--
 sw/source/uibase/uiview/view2.cxx|4 +-
 sw/source/uibase/uiview/viewmdi.cxx  |4 +-
 sw/source/uibase/uiview/viewport.cxx |2 -
 sw/source/uibase/utlui/unotools.cxx  |2 -
 sw/source/uibase/wrtsh/wrtsh1.cxx|2 -
 14 files changed, 105 insertions(+), 28 deletions(-)

New commits:
commit 21298817ad59e34baf85f22403e4fd8b774183c7
Author: Caolán McNamara 
AuthorDate: Tue May 23 13:10:22 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 10:33:08 2023 +0200

categorize the reasons writer calls "LockPaint"

and bubble to a new InvalidateAll the collected
reasons for that whole document Invalidate

https: //github.com/CollaboraOnline/online/issues/6379
Change-Id: Id71c59f9cafebe42085337ee1e9591eb9f1162d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152162
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152174
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1114478ed395..5d2e57952f4f 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -66,6 +66,25 @@ class SdrPaintWindow;
 class SwAccessibleMap;
 enum class Orientation;
 
+enum class LockPaintReason
+{
+ViewLayout = 1,
+OuterResize,
+Undo,
+Redo,
+OutlineFolding,
+EndSdrCreate,
+SwLayIdle,
+InvalidateLayout,
+StartDrag,
+DataChanged,
+InsertFrame,
+GotoPage,
+InsertGraphic,
+SetZoom,
+ExampleFrame
+};
+
 namespace vcl
 {
 typedef OutputDevice RenderContext;
@@ -170,6 +189,8 @@ class SW_DLLPUBLIC SwViewShell : public 
sw::Ring
 
 SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
 
+SAL_DLLPRIVATE void InvalidateAll(const std::vector& 
rReasons);
+
 protected:
 static ShellResource*  spShellRes;  ///< Resources for the Shell.
 static vcl::DeleteOnDeinit< std::shared_ptr > spCareDialog;  
  ///< Avoid this window.
@@ -180,6 +201,7 @@ protected:
 
 sal_uInt16 mnStartAction; ///< != 0 if at least one Action is active.
 sal_uInt16 mnLockPaint;   ///< != 0 if Paint is locked.
+std::vector maLockPaintReasons;
 bool  mbSelectAll; ///< Special select all mode: whole document 
selected, even if doc starts with table.
 
 /// The virtual device we paint to will end up on the screen.
@@ -471,10 +493,10 @@ public:
 bool IsViewLocked() const { return mbViewLocked; }
 void LockView( bool b )   { mbViewLocked = b;}
 
-inline void LockPaint();
+inline void LockPaint(LockPaintReason eReason);
void ImplLockPaint();
-inline void UnlockPaint( bool bVirDev = false );
-   void ImplUnlockPaint( bool bVirDev );
+inline void UnlockPaint(bool bVirDev = false );
+   void ImplUnlockPaint( const std::vector& rReasons, 
bool bVirDev );
bool IsPaintLocked() const { return mnLockPaint != 0; }
 
 // Get/set DrawView and PageView.
@@ -604,6 +626,7 @@ inline void SwViewShell::StartAction()
 if ( !mnStartAction++ )
 ImplStartAction();
 }
+
 inline void SwViewShell::EndAction( const bool bIdleEnd )
 {
 if( 0 == (mnStartAction - 1) )
@@ -611,16 +634,22 @@ inline void SwViewShell::EndAction( const bool bIdleEnd )
 --mnStartAction;
 }
 
-inline void SwViewShell::LockPaint()
+inline void SwViewShell::LockPaint(LockPaintReason eReason)
 {
+maLockPaintReasons.push_back(eReason);
 if ( !mnLockPaint++ )
 ImplLockPaint();
 }
-inline void SwViewShell::UnlockPaint( bool bVirDev )
+
+inline void SwViewShell::UnlockPaint(bool bVirDev )
 {
 if ( 0 == --mnLockPaint )
-ImplUnlockPaint( bVirDev );
+{
+ImplUnlockPaint(maLockPaintReasons, bVirDev);
+maLockPaintReasons.clear();
+}
 }
+
 inline const SfxItemPool& SwViewShell::GetAttrPool() const
 {
 return const_cast(this)->GetAttrPool();
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 14b97a620cca..61f2a8ae30eb 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1928,7 +1928,7 @@ bool SwFEShell::ImpEndCreate()
 return true;
 }
 
-LockPaint();
+LockPaint(LockPaintReason::EndSdrCreate);
 StartAllAction();
 
 Imp()->GetDrawView()->UnmarkAll();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index be803a3b00c1..f0ac091d16ea 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/s

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

[Stephan Bergmann (via logerrit)]

 comphelper/qa/string/test_string.cxx |   20 
 comphelper/source/misc/string.cxx|8 
 include/comphelper/string.hxx|   13 -
 3 files changed, 41 deletions(-)

New commits:
commit 4f3a5acac5c1810d845e850f5199d9292c7fe1b6
Author: Stephan Bergmann 
AuthorDate: Wed May 24 09:35:10 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 24 11:05:47 2023 +0200

Remove unused comphelper::adjustIndexToStartOfSurrogate

...introduced in 28cc0bff10f5dcec0c7b698ae7ba275845b2cad1 "Break
comphelper::adjustIndexToStartOfSurrogate out of o3tl::iterateCodePoints" in
preparation for bd5c3582581f37513f45b518e348f443d5d57334 "a11y: Fix 
returning
unpaired surrogates when retrieving characters", but which never picked it 
up

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

diff --git a/comphelper/qa/string/test_string.cxx 
b/comphelper/qa/string/test_string.cxx
index 974673ca2940..58f9c3f63c16 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -50,7 +50,6 @@ public:
 void testReverseCodePoints();
 void testSplit();
 void testRemoveAny();
-void testAdjustIndexToStartOfSurrogate();
 
 CPPUNIT_TEST_SUITE(TestString);
 CPPUNIT_TEST(testStripStart);
@@ -64,7 +63,6 @@ public:
 CPPUNIT_TEST(testReverseCodePoints);
 CPPUNIT_TEST(testSplit);
 CPPUNIT_TEST(testRemoveAny);
-CPPUNIT_TEST(testAdjustIndexToStartOfSurrogate);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -239,24 +237,6 @@ void TestString::testRemoveAny()
 CPPUNIT_ASSERT_EQUAL(OUString(), removeAny(in, test7));
 }
 
-void TestString::testAdjustIndexToStartOfSurrogate() {
-CPPUNIT_ASSERT_EQUAL(
-sal_Int32(0),
-comphelper::string::adjustIndexToStartOfSurrogate("", 0));
-CPPUNIT_ASSERT_EQUAL(
-sal_Int32(0),
-comphelper::string::adjustIndexToStartOfSurrogate(u"\U0001", 0));
-CPPUNIT_ASSERT_EQUAL(
-sal_Int32(0),
-comphelper::string::adjustIndexToStartOfSurrogate(u"\U0001", 1));
-CPPUNIT_ASSERT_EQUAL(
-sal_Int32(2),
-comphelper::string::adjustIndexToStartOfSurrogate(u"\U0001", 2));
-CPPUNIT_ASSERT_EQUAL(
-sal_Int32(1),
-comphelper::string::adjustIndexToStartOfSurrogate(u"\xD800", 1));
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
 
 }
diff --git a/comphelper/source/misc/string.cxx 
b/comphelper/source/misc/string.cxx
index d5653522a229..e17951fc43be 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -673,14 +673,6 @@ OUString sanitizeStringSurrogates(const OUString& rString)
 return rString;
 }
 
-sal_Int32 adjustIndexToStartOfSurrogate(OUString const & string, sal_Int32 
index) {
-assert(index >= 0 && index <= string.getLength());
-return
-(index > 0 && rtl::isHighSurrogate(string[index - 1])
- && index < string.getLength() && rtl::isLowSurrogate(string[index]))
-? index - 1 : index;
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index 2763ded2e9fd..bab63f06f034 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -384,19 +384,6 @@ COMPHELPER_DLLPUBLIC bool 
isdigitAsciiString(std::u16string_view rString);
  */
 COMPHELPER_DLLPUBLIC OUString sanitizeStringSurrogates(const OUString& 
rString);
 
-/** Adjust an index in case it points into the middle of a surrogate pair.
-
-@param string  An OUString
-
-@param index  A valid index into the string or to its end (i.e., must be 
in the range from zero
-to the length of string, inclusive)
-
-@return index - 1 if the original index pointed into the middle of a 
surrogate pair; otherwise
-the unchanged index
- */
-COMPHELPER_DLLPUBLIC sal_Int32 adjustIndexToStartOfSurrogate(
-OUString const & string, sal_Int32 index);
-
 } // namespace comphelper::string
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Xisco Fauli (via logerrit)]

 sw/source/core/docnode/node.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e518624da1bdad5fcb24feb41349efa4301329e3
Author: Xisco Fauli 
AuthorDate: Tue May 23 12:39:50 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed May 24 11:09:02 2023 +0200

sw: fix crash in SwNode::GetFlyFormat()

FindFlyFrame() might return nullptr
See 
https://crashreport.libreoffice.org/stats/signature/SwNode::GetFlyFormat()

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

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b69dec062a1f..64a9e86137c5 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -744,7 +744,7 @@ SwFrameFormat* SwNode::GetFlyFormat() const
 if( IsContentNode() )
 {
 SwContentFrame* pFrame = SwIterator(*static_cast(this)).First();
-if( pFrame )
+if( pFrame && pFrame->FindFlyFrame())
 pRet = pFrame->FindFlyFrame()->GetFormat();
 }
 if( !pRet )

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

[Xisco Fauli (via logerrit)]

 sw/source/core/doc/DocumentLayoutManager.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 05d8be5c4a13be63cfbea58954f1b0c4d8a9837f
Author: Xisco Fauli 
AuthorDate: Fri May 19 16:12:18 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed May 24 11:10:00 2023 +0200

sw: fix crash in DocumentLayoutManager::CopyLayoutFormat

See 
https://crashreport.libreoffice.org/stats/signature/sw::DocumentLayoutManager::CopyLayoutFormat(SwFrameFormat%20const%20&,SwFormatAnchor%20const%20&,bool,bool)

Change-Id: I1680bb79be4c1eb2ff18ed46dfa286da5e729e63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152015
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit 77bc0d1d7c0b895d089fa7ac2f7ca5221345b71a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152102

diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx 
b/sw/source/core/doc/DocumentLayoutManager.cxx
index e0366bdd3a0b..75c8e86acdb2 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -454,8 +454,9 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
 {
 SwNode* pAnchorNode = rNewAnchor.GetAnchorNode();
 SwFormatFlyCnt aFormat( pDest );
-pAnchorNode->GetTextNode()->InsertItem(
-aFormat, rNewAnchor.GetAnchorContentOffset(), 0 );
+assert(pAnchorNode->GetTextNode() && "sw.core: text node expected");
+if (SwTextNode *pTextNd = pAnchorNode->GetTextNode())
+pTextNd->InsertItem( aFormat, rNewAnchor.GetAnchorContentOffset(), 
0 );
 }
 
 if( bMakeFrames )

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/python/scriptforge.py |3 
 wizards/source/sfdialogs/SF_Dialog.xba   |   87 ++-
 wizards/source/sfdialogs/SF_DialogControl.xba|3 
 wizards/source/sfdialogs/SF_Register.xba |2 
 4 files changed, 91 insertions(+), 4 deletions(-)

New commits:
commit e7c4a883624745ef858d0e281e87c0483a66b791
Author: Jean-Pierre Ledure 
AuthorDate: Tue May 23 16:19:50 2023 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Wed May 24 11:20:48 2023 +0200

ScripForge (SF_Dialog) new OrderTabs() method

Set the tabulation index f a series of controls.
The sequence of controls are given as an array
of control names from the first to the last.

Next controls will not be accessible (anymore ?)
via the TAB key if >=1 of next conditions is met:
   - if they are not in the given list
   - if their type is FixedLine, GroupBox or ProgressBar
   - if the control is disabled

Args:
   TabsList: an array of valid control names in the order of tabulation.
   Start: the tab index to be assigned to the 1st control in the list. 
Default = 1.
   Increment: the difference between 2 successive tab indexes. Default = 1.
Returns:
   True when successful.

The method is available from Basic and Python user scripts

This change will require an update of the SF_Dialog help page.

Change-Id: Ie854227691c4e182b49a521b1285deaa4de3d1ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152166
Reviewed-by: Jean-Pierre Ledure 
Tested-by: Jenkins

diff --git a/wizards/source/scriptforge/python/scriptforge.py 
b/wizards/source/scriptforge/python/scriptforge.py
index 66d69238a16c..76845c71e75d 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -1977,6 +1977,9 @@ class SFDialogs:
 l10nobj = l10n.objectreference if isinstance(l10n, 
SFScriptForge.SF_L10N) else l10n
 return self.ExecMethod(self.vbMethod + self.flgObject, 
'GetTextsFromL10N', l10nobj)
 
+def OrderTabs(self, tabslist, start = 1, increment = 1):
+return self.ExecMethod(self.vbMethod, 'OrderTabs', tabslist, 
start, increment)
+
 def Resize(self, left = -9, top = -9, width = -1, height = -1):
 return self.ExecMethod(self.vbMethod + self.flgHardCode, 'Resize', 
left, top, width, height)
 
diff --git a/wizards/source/sfdialogs/SF_Dialog.xba 
b/wizards/source/sfdialogs/SF_Dialog.xba
index 9eb72d1a2d94..cf32bf92629b 100644
--- a/wizards/source/sfdialogs/SF_Dialog.xba
+++ b/wizards/source/sfdialogs/SF_Dialog.xba
@@ -2095,6 +2095,7 @@ Public Function Methods() As Variant
, "EndExecute" _
, "Execute" _
, "GetTextsFromL10N" _
+   , "OrderTabs" _
, "Resize" _
, "SetPageManager" _
, "Terminate" _
@@ -2102,6 +2103,90 @@ Public Function Methods() As Variant
 
 End Function   '  SFDialogs.SF_Dialog.Methods
 
+REM 
-
+Public Function OrderTabs(ByRef Optional TabsList As Variant _
+   , ByVal Optional Start 
As Variant _
+   , ByVal Optional 
Increment As Variant _
+   ) As Boolean
+''' Set the tabulation index f a series of controls.
+''' The sequence of controls are given as an array of 
control names from the first to the last.
+''' Next controls will not be accessible (anymore ?) via 
the TAB key if >=1 of next conditions is met:
+''' - if they are not in the given list
+''' - if their type is FixedLine, GroupBox or 
ProgressBar
+''' - if the control is disabled
+''' Args:
+''' TabsList: an array of valid control names in 
the order of tabulation
+''' Start: the tab index to be assigned to the 1st 
control in the list. Default = 1
+''' Increment: the difference between 2 successive 
tab indexes. Default = 1
+''' Returns:
+''' True when successful
+''' Example:
+''' dialog.OredrTabs(Array("myListBox", 
"myTextField", "myNumericField"), Start := 10)
+
+Dim bOrder As Boolean  '  Return value
+Dim vControlNames As Variant   '  List of control names in the dialog
+Dim oControl As Object '  A SF_DialogControl instance
+Dim bValid As Boolean  '  When True, the considered 
control deserves a tab stop
+Dim iTabIndex As Integer   '  The tab index to be set
+Dim vWrongTypes As Variant '  List of rejected control

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/iframe.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit ad8ccdad7f77b91c2b39b567b43da7dfc5947a02
Author: Caolán McNamara 
AuthorDate: Tue Apr 11 10:13:37 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 11:39:42 2023 +0200

set Referer on loading IFrames

so tools, options, security, options,
"block any links from document not..."
applies to their contents.

Change-Id: I04839aea6b07a4a76ac147a85045939ccd9c3c79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150221
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150751
Reviewed-by: Stephan Bergmann 
(cherry picked from commit acff9ca0579333b45d10ae5f8cd48172f563)
(cherry picked from commit 04c8176fb40d2eb983aa0bd0a6ce65804d3f6ecd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152110
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 96502ce60726..b9495b8fd311 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -33,10 +33,12 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -164,14 +166,19 @@ sal_Bool SAL_CALL IFrameObject::load(
 uno::Reference < util::XURLTransformer > xTrans( 
util::URLTransformer::create( mxContext ) );
 xTrans->parseStrict( aTargetURL );
 
+uno::Reference xParentFrame = 
xFrame->getCreator();
+SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
+
 if (INetURLObject(aTargetURL.Complete).GetProtocol() == 
INetProtocol::Macro)
 {
-uno::Reference xParentFrame = 
xFrame->getCreator();
-SfxObjectShell* pDoc = 
SfxMacroLoader::GetObjectShell(xParentFrame);
 if (pDoc && !pDoc->AdjustMacroMode())
 return false;
 }
 
+OUString sReferer;
+if (pDoc && pDoc->HasName())
+sReferer = pDoc->GetMedium()->GetName();
+
 DBG_ASSERT( !mxFrame.is(), "Frame already existing!" );
 VclPtr pParent = VCLUnoHelper::GetWindow( 
xFrame->getContainerWindow() );
 VclPtr pWin = VclPtr::Create( 
pParent, maFrmDescr.IsFrameBorderOn() );
@@ -194,11 +201,11 @@ sal_Bool SAL_CALL IFrameObject::load(
 if ( xFramesSupplier.is() )
 mxFrame->setCreator( xFramesSupplier );
 
-uno::Sequence < beans::PropertyValue > aProps(2);
-aProps[0].Name = "PluginMode";
-aProps[0].Value <<= sal_Int16(2);
-aProps[1].Name = "ReadOnly";
-aProps[1].Value <<= true;
+uno::Sequence < beans::PropertyValue > aProps{
+comphelper::makePropertyValue("PluginMode", sal_Int16(2)),
+comphelper::makePropertyValue("ReadOnly", true),
+comphelper::makePropertyValue("Referer", sReferer)
+};
 uno::Reference < frame::XDispatch > xDisp = mxFrame->queryDispatch( 
aTargetURL, "_self", 0 );
 if ( xDisp.is() )
 xDisp->dispatch( aTargetURL, aProps );

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - embeddedobj/source include/svx sc/source sfx2/source svx/source sw/inc sw/source xmloff/source

[Caolán McNamara (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx  |   60 +-
 embeddedobj/source/commonembedding/specialobject.cxx |9 +
 embeddedobj/source/inc/commonembobj.hxx  |3 
 embeddedobj/source/inc/specialobject.hxx |6 +
 include/svx/svdoole2.hxx |   17 ++-
 include/svx/unoshape.hxx |2 
 sc/source/ui/docshell/documentlinkmgr.cxx|9 +
 sfx2/source/doc/iframe.cxx   |   57 ++
 svx/source/svdraw/svdoole2.cxx   |  104 +++
 svx/source/unodraw/shapeimpl.hxx |5 
 svx/source/unodraw/unoshap4.cxx  |   23 +++-
 sw/inc/ndole.hxx |4 
 sw/source/core/ole/ndole.cxx |   89 ++--
 xmloff/source/draw/ximpshap.cxx  |   29 -
 xmloff/source/draw/ximpshap.hxx  |2 
 15 files changed, 330 insertions(+), 89 deletions(-)

New commits:
commit 96b3bee1d13236cfe5132e3decf5dd1e8986251a
Author: Caolán McNamara 
AuthorDate: Thu Apr 20 20:58:21 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 11:40:12 2023 +0200

assume IFrame script/macro support isn't needed

seems undocumented at least

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

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 73030f151359..e73fb1f1f2d1 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -166,20 +166,16 @@ sal_Bool SAL_CALL IFrameObject::load(
 uno::Reference < util::XURLTransformer > xTrans( 
util::URLTransformer::create( mxContext ) );
 xTrans->parseStrict( aTargetURL );
 
+INetURLObject aURLObject(aTargetURL.Complete);
+if (aURLObject.GetProtocol() == INetProtocol::Macro || 
aURLObject.isSchemeEqualTo(u"vnd.sun.star.script"))
+return false;
+
 uno::Reference xParentFrame = 
xFrame->getCreator();
 SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
 
-if (INetURLObject(aTargetURL.Complete).GetProtocol() == 
INetProtocol::Macro)
-{
-if (pDoc && !pDoc->AdjustMacroMode())
-return false;
-}
-
 bool bUpdateAllowed(true);
 if (pDoc)
 {
-// perhaps should only check for file targets, but lets default to 
making it strong
-// unless there is a known need to distinguish
 comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
pDoc->getEmbeddedObjectContainer();
 bUpdateAllowed = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
 }
commit d503a8c9880b92a026081cc84d4e5bca7248c787
Author: Caolán McNamara 
AuthorDate: Thu Apr 13 11:31:17 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 11:39:58 2023 +0200

put floating frames under managed links control

like we do for sections and ole objects that link to their content

individual commits in trunk are:

extract a OCommonEmbeddedObject::SetInplaceActiveState for reuse

no behaviour change intended

Change-Id: Ia1d12aa5c9afdc1347f6d4364bc6a0b7f41ee168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150341
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 183e34a3f8c429c0698951e24c17844e416a3825)

use parent window as dialog parent

it makes no odds, but is more convenient for upcoming modification

Change-Id: Ibc5333b137d2da089b3b701ff615c6ddf43063d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150342
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit f93edf343658abd489bde3639d2ffaefd50c0f99)

adjust IFrameObject so it could reuse mxFrame for a reload of content

Change-Id: I7eec3132a23faafd9a2878215a0a117a67bc9bf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150343
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 3a727d26fd9eb6fa140bc3f5cadf3db079d42206)

query getUserAllowsLinkUpdate for the case of content in a floating frame

similarly to how it works for the more common "normal" embedded objects

Change-Id: I83e38dfa2f84907c2de9680e91f779d34864a9ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149971
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 52aa46468531918eabfa2031dedf50377ae72cf7)

add a route to get writer Floating Frame links under 'manage links'

Change-Id:

[Libreoffice-commits] dictionaries.git: Module_dictionaries.mk

[Andras Timar (via logerrit)]

 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2404521a6c320ae5e307c6c0fed31d81de751a88
Author: Andras Timar 
AuthorDate: Wed May 24 08:15:10 2023 +0200
Commit: Andras Timar 
CommitDate: Wed May 24 12:37:22 2023 +0200

On Linux dictionaries are packaged separately

Change-Id: I604a0f12bdbedc0f35a27ead0f995e9dd3a27d8b
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/152191
Reviewed-by: Gabor Kelemen 
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk
index 1115c52..eaa02d3 100644
--- a/Module_dictionaries.mk
+++ b/Module_dictionaries.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_ckb \
Dictionary_cs \
Dictionary_da \
-   $(if $(MPL_SUBSET),,Dictionary_de) \
+   $(if $(and $(MPL_SUBSET), $(filter-out LINUX,$(OS))),,Dictionary_de) \
Dictionary_el \
-   $(if $(MPL_SUBSET),,Dictionary_en) \
+   $(if $(and $(MPL_SUBSET), $(filter-out LINUX,$(OS))),,Dictionary_en) \
Dictionary_eo \
Dictionary_es \
Dictionary_et \
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_hu \
Dictionary_id \
Dictionary_is \
-   $(if $(MPL_SUBSET),,Dictionary_it) \
+   $(if $(and $(MPL_SUBSET), $(filter-out LINUX,$(OS))),,Dictionary_it) \
Dictionary_kmr-Latn \
Dictionary_ko-KR \
Dictionary_lo \

[Libreoffice-commits] core.git: dictionaries

[Andras Timar (via logerrit)]

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

New commits:
commit 0ce9c61f35151f115b42e24fabe6f7bae5ee8783
Author: Andras Timar 
AuthorDate: Wed May 24 12:37:23 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Wed May 24 12:37:23 2023 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 2404521a6c320ae5e307c6c0fed31d81de751a88
  - On Linux dictionaries are packaged separately

Change-Id: I604a0f12bdbedc0f35a27ead0f995e9dd3a27d8b
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/152191
Reviewed-by: Gabor Kelemen 
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index e868c6a2b117..2404521a6c32 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e868c6a2b11784ff728588ef15f310737dce2747
+Subproject commit 2404521a6c320ae5e307c6c0fed31d81de751a88

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

[Miklos Vajna (via logerrit)]

 include/xmloff/xmluconv.hxx   |3 ++-
 sw/inc/IDocumentSettingAccess.hxx |1 +
 sw/qa/uibase/uno/uno.cxx  |   24 
 sw/source/core/doc/DocumentSettingManager.cxx |   13 +
 sw/source/core/inc/DocumentSettingManager.hxx |1 +
 sw/source/core/layout/fly.cxx |6 ++
 sw/source/filter/xml/xmlexp.cxx   |5 -
 sw/source/filter/xml/xmlimp.cxx   |   10 ++
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   18 ++
 xmloff/source/core/xmluconv.cxx   |   25 +++--
 10 files changed, 98 insertions(+), 8 deletions(-)

New commits:
commit 08fa2903df1a7cf9a1647fcf967e4c8b57dad793
Author: Miklos Vajna 
AuthorDate: Wed May 24 11:00:11 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed May 24 12:38:09 2023 +0200

sw floattable: add a DoNotBreakWrappedTables compat flag

RTF doesn't break floating table across pages, and there is a matching
DOCX compat flag to handle such documents.

We can ignore floating table info on the model as a workaround, but that
would mean the info is lost on save, so that's not ideal.

Instead add a new compat flag that disables fly split at a layout level,
which allows both not splitting tables & retaining the model-level info.
This commit does the doc model, UNO API, layout & ODT filter, the Word
filters are not yet updated.

This compat flag is probably quite rare, so introduce a mechanism to
only write the compat flag when it's true: this way the majority of the
documents don't need to say anything about it and we can assume "false"
for them. Also fix two missing xmlTextWriterEndElement() calls in the
xml dumper.

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

diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 9af40034400a..c9e1bea3c9ec 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -288,7 +288,8 @@ public:
   sal_Int16 nType );
 
 static void 
convertPropertySet(css::uno::Sequence& rProps,
-const css::uno::Reference& 
aProperties);
+const css::uno::Reference& 
aProperties,
+const std::initializer_list* 
pOmitFalseValues = nullptr);
 static void 
convertPropertySet(css::uno::Reference const & 
rProperties,
 const css::uno::Sequence& 
aProps);
 
diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index c05e5d54df4b..f8d9bfa2ab59 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -92,6 +92,7 @@ enum class DocumentSettingId
 // tdf#129448: Auto first-line indent should not be effected by line space
 AUTO_FIRST_LINE_INDENT_DISREGARD_LINE_SPACE,
 HYPHENATE_URLS, ///< tdf#152952
+DO_NOT_BREAK_WRAPPED_TABLES,
 // COMPATIBILITY FLAGS END
 BROWSE_MODE,
 HTML_MODE,
diff --git a/sw/qa/uibase/uno/uno.cxx b/sw/qa/uibase/uno/uno.cxx
index 6ad35e07466a..dd74cd716ea3 100644
--- a/sw/qa/uibase/uno/uno.cxx
+++ b/sw/qa/uibase/uno/uno.cxx
@@ -510,6 +510,30 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUnoTest, testGetField)
  aBookmark.get("name"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUibaseUnoTest, testDoNotBreakWrappedTables)
+{
+// Given an empty document:
+createSwDoc();
+
+// When checking the state of the DoNotBreakWrappedTables compat flag:
+uno::Reference xDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xSettings(
+xDocument->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+bool bDoNotBreakWrappedTables{};
+// Without the accompanying fix in place, this test would have failed with:
+// An uncaught exception of type 
com.sun.star.beans.UnknownPropertyException
+// i.e. the compat flag was not recognized.
+xSettings->getPropertyValue("DoNotBreakWrappedTables") >>= 
bDoNotBreakWrappedTables;
+// Then make sure it's false by default:
+CPPUNIT_ASSERT(!bDoNotBreakWrappedTables);
+
+// And when setting DoNotBreakWrappedTables=true:
+xSettings->setPropertyValue("DoNotBreakWrappedTables", uno::Any(true));
+// Then make sure it gets enabled:
+xSettings->getPropertyValue("DoNotBreakWrappedTables") >>= 
bDoNotBreakWrappedTables;
+CPPUNIT_ASSERT(bDoNotBreakWrappedTables);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 412d1a56b686..7eb4f9de5f20 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -252,6 +252,8 @@

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

[Noel Grandin (via logerrit)]

 include/svx/unomod.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3fbaef1db1f63485f4cabe843c08ccf6f5ca92fd
Author: Noel Grandin 
AuthorDate: Wed May 24 10:40:06 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed May 24 12:57:39 2023 +0200

remove obsolete comment

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

diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index d786824ebbab..ff346e3bd416 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -42,7 +42,7 @@ protected:
 // not too hard to asl a UnoModel to hand back a DrawingLayer Model in the
 // form of an SdrModel. Thus, returning a reference and make usages
 // safer and easier is justified.
-virtual SdrModel& getSdrModelFromUnoModel() const = 0; // make 
reference return
+virtual SdrModel& getSdrModelFromUnoModel() const = 0;
 
 public:
 SvxUnoDrawMSFactory() noexcept {};

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

[Rafael Lima (via logerrit)]

 basctl/uiconfig/basicide/toolbar/standardbar.xml |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6c48e0b8e15c46b4c56a772065f3671d6bdba8e8
Author: Rafael Lima 
AuthorDate: Wed May 17 15:27:49 2023 +0200
Commit: Rafael Lima 
CommitDate: Wed May 24 13:55:26 2023 +0200

Related tdf#146518 Add Watch/Stack window commands to toolbar

This patch adds the new commands WatchWindow and StackWindow to the Basic 
toolbar, together with the related ObjectCatalog command.

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

diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml 
b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 41541aa91898..f41df28ab649 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -35,6 +35,9 @@
  
  
  
+ 
+ 
+ 
  
  
  

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

[Caolán McNamara (via logerrit)]

 sw/inc/viewsh.hxx  |4 ++--
 sw/source/core/view/viewsh.cxx |   18 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 6e0c522de3faf55f3a069b1648cc283a3813ff6d
Author: Caolán McNamara 
AuthorDate: Tue May 23 14:19:34 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 14:36:49 2023 +0200

don't InvalidateAll in online for a OuterResize case

which is triggered on a new joiner to a shared document
but doesn't seem useful in the online case at least

https: //github.com/CollaboraOnline/online/issues/6379
Change-Id: Ic5034658d9e8a7ca1dfab44ce3905b95a5705eb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152164
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152175
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 5d2e57952f4f..cc327e3c75f2 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -189,7 +189,7 @@ class SW_DLLPUBLIC SwViewShell : public 
sw::Ring
 
 SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
 
-SAL_DLLPRIVATE void InvalidateAll(const std::vector& 
rReasons);
+SAL_DLLPRIVATE void InvalidateAll(std::vector& rReasons);
 
 protected:
 static ShellResource*  spShellRes;  ///< Resources for the Shell.
@@ -496,7 +496,7 @@ public:
 inline void LockPaint(LockPaintReason eReason);
void ImplLockPaint();
 inline void UnlockPaint(bool bVirDev = false );
-   void ImplUnlockPaint( const std::vector& rReasons, 
bool bVirDev );
+   void ImplUnlockPaint( std::vector& rReasons, bool 
bVirDev );
bool IsPaintLocked() const { return mnLockPaint != 0; }
 
 // Get/set DrawView and PageView.
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c4c410efe02d..9c80d43f36a6 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -480,7 +480,7 @@ void SwViewShell::ImplLockPaint()
 Imp()->LockPaint();
 }
 
-void SwViewShell::ImplUnlockPaint(const std::vector& 
rReasons, bool bVirDev)
+void SwViewShell::ImplUnlockPaint(std::vector& rReasons, bool 
bVirDev)
 {
 CurrShell aCurr( this );
 if ( GetWin() && GetWin()->IsVisible() )
@@ -578,11 +578,23 @@ namespace
 };
 }
 
-void SwViewShell::InvalidateAll(const std::vector& rReasons)
+void SwViewShell::InvalidateAll(std::vector& rReasons)
 {
+assert(!rReasons.empty() && "there must be a reason to InvalidateAll");
+
 for (const auto& reason : rReasons)
 SAL_INFO("sw.core", "InvalidateAll because of: " << to_string(reason));
-GetWin()->Invalidate(InvalidateFlags::Children);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// https://github.com/CollaboraOnline/online/issues/6379
+// ditch OuterResize as a reason to invalidate all in the online case
+rReasons.erase(std::remove(rReasons.begin(), rReasons.end(), 
LockPaintReason::OuterResize), rReasons.end());
+}
+
+if (!rReasons.empty())
+GetWin()->Invalidate(InvalidateFlags::Children);
+rReasons.clear();
 }
 
 bool SwViewShell::AddPaintRect( const SwRect & rRect )

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

[Andrea Gelmini (via logerrit)]

 sc/source/core/data/queryiter.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bcad9f53c8b421590beacbe1e65cb065db67d1a9
Author: Andrea Gelmini 
AuthorDate: Wed May 24 13:56:29 2023 +0200
Commit: Julien Nabet 
CommitDate: Wed May 24 14:47:46 2023 +0200

Remove duplicated include

Change-Id: I01ff5b522433826f560c9adbe606393e449434ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152198
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/core/data/queryiter.cxx 
b/sc/source/core/data/queryiter.cxx
index 58709957157a..d3ed109b8661 100644
--- a/sc/source/core/data/queryiter.cxx
+++ b/sc/source/core/data/queryiter.cxx
@@ -47,7 +47,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 

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

[Stephan Bergmann (via logerrit)]

 configmgr/qa/unit/test.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 72b869d1c006f61bf78d8af4ce76b14489f477d4
Author: Stephan Bergmann 
AuthorDate: Wed May 24 09:56:42 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 24 14:53:26 2023 +0200

Fix CppunitTest_configmgr_unit for --disable-report-builder

...after abd630e81bc150d05e4129cc22752ecf461777c7 "Allow all hierarchical 
path
segments to be ['...'] quoted", which failed as the checked
MimeTypeClassIDRelations group is conditional on 
install:module="reportbuilder".
(See the comments at


"Allow all hierarchical path segments to be ['...'] quoted".)

It looks like there is no other, non-conditional property with a slash in 
its
name, so the test now just tests the ['...'] syntax on an otherwise
unproblematic property name.  (Alternatively, we could have extended the
configuration data used by unit tests with such a problematicaly named
property.)

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

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index aa5b137413d3..d6213692405d 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -214,13 +215,8 @@ void Test::testKeyFetch()
 s);
 }
 {
-auto const v = getKey(
-"/org.openoffice.Office.Embedding",
-
"MimeTypeClassIDRelations/['application/vnd.sun.xml.report.chart']");
-OUString s;
-CPPUNIT_ASSERT(v >>= s);
-CPPUNIT_ASSERT_EQUAL(OUString("80243D39-6741-46C5-926E-069164FF87BB"), 
s);
-// cf. officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+auto const v = getKey("/org.openoffice.System", "L10N/['Locale']");
+CPPUNIT_ASSERT_EQUAL(cppu::UnoType::get(), v.getValueType());
 }
 }
 

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

[Andrea Gelmini (via logerrit)]

 basctl/source/basicide/baside2b.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f128fc5dbb34c75cbd5fca326e1ad7cce1f485bd
Author: Andrea Gelmini 
AuthorDate: Wed May 24 13:52:58 2023 +0200
Commit: Julien Nabet 
CommitDate: Wed May 24 15:02:38 2023 +0200

Remove triplicated include

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index cf7e7388dd52..f1c1a7303878 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -63,12 +63,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include "textwindowpeer.hxx"
 #include "uiobject.hxx"
 #include 

[Libreoffice-commits] core.git: download.lst external/libxml2 external/redland

[Caolán McNamara (via logerrit)]

 download.lst  |4 ++--
 external/libxml2/ExternalPackage_libxml2.mk   |2 +-
 external/libxml2/ExternalProject_libxml2.mk   |4 ++--
 external/libxml2/UnpackedTarball_libxml2.mk   |1 +
 external/libxml2/libxml2-XMLCALL-redefine.patch.0 |   11 +++
 external/libxml2/libxml2-icu-sym.patch.0  |2 +-
 external/libxml2/libxml2-icu.patch.0  |2 +-
 external/redland/UnpackedTarball_raptor.mk|1 +
 external/redland/raptor/raptor-libxml2-11.patch.1 |   15 +++
 9 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7
Author: Caolán McNamara 
AuthorDate: Tue May 23 21:15:52 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 15:52:03 2023 +0200

upgrade to libxml2-2.11.4

'checked' field removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55

win32 'run_debug' removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b

add libxml2-XMLCALL-redefine.patch.0 to avoid:
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the 
following warning is treated as an error
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 
'XMLCALL': macro redefinition
UnpackedTarball\expat\lib\expat_external.h(69): note: see previous 
definition of 'XMLCALL'

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

diff --git a/download.lst b/download.lst
index 9615e2dac051..f05ff4539cb5 100644
--- a/download.lst
+++ b/download.lst
@@ -339,9 +339,9 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+LIBXML_SHA256SUM := 
737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
 LIBXML_VERSION_MICRO := 4
-LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_TARBALL := libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index 6338fb20b9df..3c399970cd5b 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.10.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.11.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/ExternalProject_libxml2.mk 
b/external/libxml2/ExternalProject_libxml2.mk
index 979a07728966..7b334fa8ab2a 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_Trace_StartRange,libxml2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
-   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
+   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& nmake \
,win32)
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
$(call 
gb_ExternalProject_get_build_flags,libxml2)" \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-   && $(MAKE) \
+   && $(MAKE) libxml2.la \
)
$(call gb_Trace_EndRange,libxml2,EXTERNAL)
 endif
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 8c81c3d26e4c..d50d52cbeef8 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libxml2))
 $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
+   external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
 

ESC meeting agenda: 2023-05-25 16:00 CEST

[Miklos Vajna]

Hi,

The prototype agenda is below. Extra items are appreciated either in
this document or as a reply to this mail:

https://pad.documentfoundation.org/p/esc

You can join using Jitsi here:

https://jitsi.documentfoundation.org/esc

Regards,

Miklos

---

* Present:
+

* Completed Action Items:

* Pending Action Items:

* Release Engineering update (Cloph)
+ 7.6 status: feature freeze in 2 weeks?
  + bring up late features if they won't make that date!
+ 7.5 status: 7.5.4 rc2 in 1 week?

* Documentation (Olivier)
+ Bugzilla Documentation statistics
262(262) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 2(-14)   36(-4)108(-18)311(0)
 commented 6(-18)   77(6) 300(-44)   1109(-22)
  resolved 1(-5)15(0)  48(-13)179(1)
+ top 10 contributors:
  Olivier Hallot made 66 changes in 1 month, and 502 changes in 1 year
  Stéphane Guillou made 29 changes in 1 month, and 219 changes in 1 year
  Heiko Tietze made 22 changes in 1 month, and 134 changes in 1 year
  Roman Kuznetsov made 19 changes in 1 month, and 77 changes in 1 year
  Ilmari Lauhakangas made 6 changes in 1 month, and 112 changes in 1 
year
  ady made 3 changes in 1 month, and 8 changes in 1 year
  Rathke, Eike made 3 changes in 1 month, and 18 changes in 1 year
  Bogdan B made 2 changes in 1 month, and 222 changes in 1 year
  Cip made 2 changes in 1 month, and 2 changes in 1 year
  gabriel made 2 changes in 1 month, and 2 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
274(274) (topicUI) bugs open, 69(69) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  5(-1) 20(0)  35(-1)  56(0)
 commented 61(-30)   371(-33)   922(7) 2432(14)
   removed  0(-2)  4(0)  12(0)   26(-1)
  resolved  5(-21)54(-12)   110(-6) 312(-8)
+ top 10 contributors:
  Heiko Tietze made 243 changes in 1 month, and 1467 changes in 1 year
  Stéphane Guillou made 86 changes in 1 month, and 316 changes in 1 year
  Vernon, Stuart Foote made 61 changes in 1 month, and 382 changes in 1 
year
  Roman Kuznetsov made 43 changes in 1 month, and 199 changes in 1 year
  Bogdan B made 40 changes in 1 month, and 84 changes in 1 year
  Dieter made 38 changes in 1 month, and 235 changes in 1 year
  Kaganski, Mike made 26 changes in 1 month, and 135 changes in 1 year
  ady made 23 changes in 1 month, and 49 changes in 1 year
  Justin Luth made 23 changes in 1 month, and 49 changes in 1 year
  Ilmari Lauhakangas made 21 changes in 1 month, and 206 changes in 1 
year

* Crash Testing (Caolan)
+ 28(-12) import failure, 2(-12) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
+ 7.5.0.332113(+1230)
+ 7.5.1.218368(+1056)
+ 7.5.2.211147(+1218)
+ 7.5.3.23316(+1678)

* Mentoring (Hossein)
  committer...   1 week1 month 3 months12 months
  open  69(17)115(-33)174(15)  184(16)
   reviews 294(34)   1248(-30)   3114(-50)   10790(30)
merged 270(61)   1089(-11)   3351(-57)   12563(8)
 abandoned  11(0)  47(-12)179(-5)  663(-1)
   own commits 179(10)859(-15)   2627(-89)   10413(-70)
review commits  58(-8)293(6)  898(-20)3026(16)
contributor...   1 week 1 month  3 months 12 months
  open  16(-13)209(-11) 227(-5)   234(-5)
   reviews 700(32)3124(-180)   8638(-170)   31982(-162)
merged  14(-18)160(-44) 568(-35) 2740(-54)
 abandoned   4(2)   24(-7)   90(-3)   521(-7)
   own commits  16(-6)  89(-8)  354(-4)  1016(4)
review commits   0(0)0(0) 0(0)  0(0)
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 1(1)   cleanup_comments 324(324)
   total 393(393)   assigned 28(28)   open 339(339)
+ top 10 contributors:
  Sophia Schroeder made 10 patches in 1 month, and 46 patches in 1 year
  Armin Le Grand (allotropia) made 6 patches in 1 month, and 66 patches 
in 1 year
  Vojtěch Doležal made 4 patches in 1 month, and 13 patches in 1 year
  Czeber László made 4 patches in 1 month, and 9 patches in 1 year
  Svante Schubert made 4 patches in 1 month, and 4 patches in 1 year
  Colomban Wendling made 3 patches in 1 month, and 22 patches in 1 year
  Baole Fang made 3 patches in 1 month, and 15 patches in 1 year

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 720aeaea11fea5a57d2a09d662742f03c4fbb9cb
Author: Andras Timar 
AuthorDate: Wed May 24 17:28:41 2023 +0200
Commit: Andras Timar 
CommitDate: Wed May 24 17:28:41 2023 +0200

Bump version to 7.0.7.0.M13

Change-Id: I007eb67802b639de42572ce9ea2faf3644127d65

diff --git a/configure.ac b/configure.ac
index 3202010e738e..2b7cdabb2c49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M12],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M13],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/UITest_sfx2_doc.mk

[Caolán McNamara (via logerrit)]

 sfx2/UITest_sfx2_doc.mk |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d3f662245ba81a0d775aab670c0d920cf347aa48
Author: Caolán McNamara 
AuthorDate: Tue May 23 21:22:42 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 17:28:40 2023 +0200

revert apparent overwrite of UITest_sfx2_doc.mk with 
ExternalPackage_libffi.mk

sfx2/UITest_sfx2_doc.mk:12: *** gb_ExternalPackage_use_external_project: 
only one project allowed.  Stop.

in:

commit d2715de5b0a3bd4b5eabe99d8cf1edf52ca5b65f
Date:   Tue Jul 14 23:35:57 2020 +0200

python3: update to 3.8.4

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

diff --git a/sfx2/UITest_sfx2_doc.mk b/sfx2/UITest_sfx2_doc.mk
index 61b0a1ca460c..b5e3ef8cebde 100644
--- a/sfx2/UITest_sfx2_doc.mk
+++ b/sfx2/UITest_sfx2_doc.mk
@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libffi,libffi))
+$(eval $(call gb_UITest_UITest,sfx2_doc))
 
-$(eval $(call gb_ExternalPackage_use_external_project,libffi,libffi))
+$(eval $(call gb_UITest_add_modules,sfx2_doc,$(SRCDIR)/sfx2/qa/uitest,\
+   doc/ \
+))
 
-ifeq ($(COM),MSC)
-$(eval $(call 
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
 \
-$(HOST_PLATFORM)/.libs/libffi-7.dll \
+$(eval $(call gb_UITest_set_defs,sfx2_doc, \
+TDOC="$(SRCDIR)/sfx2/qa/uitest/doc/data" \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/iframe.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 789155b523b384df020d86228ac200a63a68b154
Author: Caolán McNamara 
AuthorDate: Tue Apr 11 10:13:37 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 17:28:58 2023 +0200

set Referer on loading IFrames

so tools, options, security, options,
"block any links from document not..."
applies to their contents.

Change-Id: I04839aea6b07a4a76ac147a85045939ccd9c3c79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150221
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150751
Reviewed-by: Stephan Bergmann 
(cherry picked from commit acff9ca0579333b45d10ae5f8cd48172f563)
(cherry picked from commit 04c8176fb40d2eb983aa0bd0a6ce65804d3f6ecd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152094
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index aea851894286..5a0ea96a234d 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -32,12 +32,14 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -166,14 +168,19 @@ sal_Bool SAL_CALL IFrameObject::load(
 uno::Reference < util::XURLTransformer > xTrans( 
util::URLTransformer::create( mxContext ) );
 xTrans->parseStrict( aTargetURL );
 
+uno::Reference xParentFrame = 
xFrame->getCreator();
+SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
+
 if (INetURLObject(aTargetURL.Complete).GetProtocol() == 
INetProtocol::Macro)
 {
-uno::Reference xParentFrame = 
xFrame->getCreator();
-SfxObjectShell* pDoc = 
SfxMacroLoader::GetObjectShell(xParentFrame);
 if (pDoc && !pDoc->AdjustMacroMode())
 return false;
 }
 
+OUString sReferer;
+if (pDoc && pDoc->HasName())
+sReferer = pDoc->GetMedium()->GetName();
+
 DBG_ASSERT( !mxFrame.is(), "Frame already existing!" );
 VclPtr pParent = VCLUnoHelper::GetWindow( 
xFrame->getContainerWindow() );
 VclPtr pWin = VclPtr::Create( 
pParent, maFrmDescr.IsFrameBorderOn() );
@@ -196,11 +203,11 @@ sal_Bool SAL_CALL IFrameObject::load(
 if ( xFramesSupplier.is() )
 mxFrame->setCreator( xFramesSupplier );
 
-uno::Sequence < beans::PropertyValue > aProps(2);
-aProps[0].Name = "PluginMode";
-aProps[0].Value <<= sal_Int16(2);
-aProps[1].Name = "ReadOnly";
-aProps[1].Value <<= true;
+uno::Sequence < beans::PropertyValue > aProps{
+comphelper::makePropertyValue("PluginMode", sal_Int16(2)),
+comphelper::makePropertyValue("ReadOnly", true),
+comphelper::makePropertyValue("Referer", sReferer)
+};
 uno::Reference < frame::XDispatch > xDisp = mxFrame->queryDispatch( 
aTargetURL, "_self", 0 );
 if ( xDisp.is() )
 xDisp->dispatch( aTargetURL, aProps );

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - embeddedobj/source include/svx sc/source sfx2/source svx/source sw/inc sw/source xmloff/source

[Caolán McNamara (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx  |   60 +-
 embeddedobj/source/commonembedding/specialobject.cxx |9 +
 embeddedobj/source/inc/commonembobj.hxx  |3 
 embeddedobj/source/inc/specialobject.hxx |6 +
 include/svx/svdoole2.hxx |   17 ++-
 include/svx/unoshape.hxx |2 
 sc/source/ui/docshell/documentlinkmgr.cxx|9 +
 sfx2/source/doc/iframe.cxx   |   57 ++
 svx/source/svdraw/svdoole2.cxx   |  104 +++
 svx/source/unodraw/shapeimpl.hxx |5 
 svx/source/unodraw/unoshap4.cxx  |   23 +++-
 sw/inc/ndole.hxx |4 
 sw/source/core/ole/ndole.cxx |   89 ++--
 xmloff/source/draw/ximpshap.cxx  |   29 -
 xmloff/source/draw/ximpshap.hxx  |2 
 15 files changed, 330 insertions(+), 89 deletions(-)

New commits:
commit 4b679f8e16bc050bc0cc9fa9294413c8115ed239
Author: Caolán McNamara 
AuthorDate: Thu Apr 20 20:58:21 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 17:29:26 2023 +0200

assume IFrame script/macro support isn't needed

seems undocumented at least

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

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index fce6cb48ea08..84d724f7c58f 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -168,20 +168,16 @@ sal_Bool SAL_CALL IFrameObject::load(
 uno::Reference < util::XURLTransformer > xTrans( 
util::URLTransformer::create( mxContext ) );
 xTrans->parseStrict( aTargetURL );
 
+INetURLObject aURLObject(aTargetURL.Complete);
+if (aURLObject.GetProtocol() == INetProtocol::Macro || 
aURLObject.isSchemeEqualTo(u"vnd.sun.star.script"))
+return false;
+
 uno::Reference xParentFrame = 
xFrame->getCreator();
 SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
 
-if (INetURLObject(aTargetURL.Complete).GetProtocol() == 
INetProtocol::Macro)
-{
-if (pDoc && !pDoc->AdjustMacroMode())
-return false;
-}
-
 bool bUpdateAllowed(true);
 if (pDoc)
 {
-// perhaps should only check for file targets, but lets default to 
making it strong
-// unless there is a known need to distinguish
 comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
pDoc->getEmbeddedObjectContainer();
 bUpdateAllowed = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
 }
commit 0f52104f5f6f2d5a1a08d1a1c3a00fd06ee9501f
Author: Caolán McNamara 
AuthorDate: Thu Apr 13 11:31:17 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 17:29:14 2023 +0200

put floating frames under managed links control

like we do for sections and ole objects that link to their content

individual commits in trunk are:

extract a OCommonEmbeddedObject::SetInplaceActiveState for reuse

no behaviour change intended

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150341
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 183e34a3f8c429c0698951e24c17844e416a3825)

use parent window as dialog parent

it makes no odds, but is more convenient for upcoming modification

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150342
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit f93edf343658abd489bde3639d2ffaefd50c0f99)

adjust IFrameObject so it could reuse mxFrame for a reload of content

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150343
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 3a727d26fd9eb6fa140bc3f5cadf3db079d42206)

query getUserAllowsLinkUpdate for the case of content in a floating frame

similarly to how it works for the more common "normal" embedded objects

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149971
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 52aa46468531918eabfa2031dedf50377ae72cf7)

add a route to get writer Floating Frame links under 'manage links'

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150349
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8b8a2844addbd262befb1a2d193dfb590dfa20be)

allow SvxOle2Shape::resetModifiedState 

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

[Andras Timar (via logerrit)]

 desktop/source/lib/init.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 2145ecd4aeeb363449b9c776972e950c4a3461bb
Author: Andras Timar 
AuthorDate: Sun May 14 18:19:18 2023 +0200
Commit: Andras Timar 
CommitDate: Wed May 24 17:52:47 2023 +0200

lok: set help root URL

Change-Id: Id4089027f095daebb69942eb3315d516cfb14779

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9dc5b6bf66f2..b437735ed71b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7206,6 +7206,25 @@ static void activateNotebookbar(std::u16string_view rApp)
 }
 }
 
+void setHelpRootURL()
+{
+const char* pHelpRootURL = ::getenv("LOK_HELP_URL");
+if (pHelpRootURL)
+{
+OUString aHelpRootURL = OStringToOUString(pHelpRootURL, 
RTL_TEXTENCODING_UTF8);
+try
+{
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+officecfg::Office::Common::Help::HelpRootURL::set(aHelpRootURL, 
batch);
+batch->commit();
+}
+catch (uno::Exception const& rException)
+{
+SAL_WARN("lok", "Failed to set the help root URL: " << 
rException.Message);
+}
+}
+}
+
 void setCertificateDir()
 {
 const char* pEnvVarString = ::getenv("LO_CERTIFICATE_DATABASE_PATH");
@@ -7633,6 +7652,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 }
 #endif
 
+
+setHelpRootURL();
 setCertificateDir();
 setDeeplConfig();
 

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

[Andras Timar (via logerrit)]

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

New commits:
commit a3908f47f58f0eeb1bb788f7501ee8d6bac11ae3
Author: Andras Timar 
AuthorDate: Wed May 24 18:24:22 2023 +0200
Commit: Andras Timar 
CommitDate: Wed May 24 18:24:22 2023 +0200

Bump version to 22.05.15.2

Change-Id: I89ba521234c721e2278b32dafc5899afa4c32ecf

diff --git a/configure.ac b/configure.ac
index ebf1c706cb7b..40987b268ba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[22.05.15.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.15.2],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

[Aron Budea (via logerrit)]

Tag 'cp-22.05.15-2' created by Andras Timar  at 
2023-05-24 16:24 +

cp-22.05.15-2

Changes since cp-22.05.5-2:
Aron Budea (1):
  Add Persian (fa-IR) dictionary

---
 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)
---

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

[Olivier Hallot (via logerrit)]

Tag 'cp-22.05.15-2' created by Andras Timar  at 
2023-05-24 16:24 +

cp-22.05.15-2

Changes since cp-22.05.6-1-1:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-22.05.15-2' created by Andras Timar  at 
2023-05-24 16:24 +

cp-22.05.15-2

Changes since cp-22.05.10-1-1:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-22.05.15-2' created by Andras Timar  at 
2023-05-24 16:24 +

cp-22.05.15-2

Changes since cp-22.05.15-1-1:
---
 0 files changed
---

GSoC'23 - Select tests to run on gerrit patches based on machine learning

[Baole Fang]

Hi,

I'm Baole Fang, currently pursuing a master degree in the school of
computer science at Carnegie Mellon University. I'm looking forward to
working with LibreOffice in the project Select tests to run on gerrit
patches based on machine learning
 with
C++ and Python.

The project aims to reduce the number of unit tests run by gerrit using
machine learning. Most patches only change a small portion of the code, so
only a few tests are enough. Currently, all tests are run during the build,
which is a waste of resources. As mentioned in Mozilla's work
,
machine learning can be used to select unit tests. Therefore, I intend to
use machine learning to select unit tests on gerrit patches.

Once again, it's my great pleasure to work with you on this project. I want
to thank all the mentors and admins at LibreOffice to give me this amazing
opportunity.

Feel free to contact me if you have any questions. Looking forward to
working with you!

Best,
Baole Fang

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

[Justin Luth (via logerrit)]

 vcl/source/control/PriorityMergedHBox.cxx |   28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 2cdb48eee93a3a93074184c5c8a82e571fb0bd04
Author: Justin Luth 
AuthorDate: Mon May 22 13:53:25 2023 -0400
Commit: Justin Luth 
CommitDate: Wed May 24 19:50:44 2023 +0200

tdf#141684 tdf#147740 notebookbar: fix disappearing icons in groupbar #2

AFAICS, the code was non-sensical before.
Hopefully now it is logical.

Apparently returning the correct width doesn't mean much,
but that is the only thing that should be changing in this patch.
I would assume that returning an accurate width
is the proper thing to do for this function...

Change-Id: Iab26ac7fd8cd00127d2646f792fa552ec148dc74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152126
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/control/PriorityMergedHBox.cxx 
b/vcl/source/control/PriorityMergedHBox.cxx
index 3e67a13a8f4a..fd5aa5814dac 100644
--- a/vcl/source/control/PriorityMergedHBox.cxx
+++ b/vcl/source/control/PriorityMergedHBox.cxx
@@ -144,31 +144,23 @@ Size PriorityMergedHBox::calculateRequisition() const
 sal_uInt16 nVisibleChildren = 0;
 
 Size aSize;
-for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
-{
-if (!pChild->IsVisible())
-continue;
-++nVisibleChildren;
-Size aChildSize = getLayoutRequisition(*pChild);
-
-tools::Long nPrimaryDimension = getPrimaryDimension(aChildSize);
-nPrimaryDimension += pChild->get_padding() * 2;
-setPrimaryDimension(aChildSize, nPrimaryDimension);
-
-accumulateMaxes(aChildSize, aSize);
-}
-
-// find max height
+// find max height and total width
 for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild;
  pChild = pChild->GetWindow(GetWindowType::Next))
 {
 Size aChildSize = getLayoutRequisition(*pChild);
-setPrimaryDimension(aChildSize, getPrimaryDimension(aSize));
+if (!pChild->IsVisible())
+setPrimaryDimension(aChildSize, 0);
+else
+{
+++nVisibleChildren;
+tools::Long nPrimaryDimension = getPrimaryDimension(aChildSize);
+nPrimaryDimension += pChild->get_padding() * 2;
+setPrimaryDimension(aChildSize, nPrimaryDimension);
+}
 accumulateMaxes(aChildSize, aSize);
 }
 
-setPrimaryDimension(aSize, 200);
 return finalizeMaxes(aSize, nVisibleChildren);
 }
 

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc |binary
 sw/qa/extras/ww8export/ww8export4.cxx  |   19 
++
 sw/source/filter/ww8/ww8atr.cxx|2 -
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 446f9d77af4fe0cedf50e9cbd792cf1aee105675
Author: Justin Luth 
AuthorDate: Wed May 24 08:52:20 2023 -0400
Commit: Justin Luth 
CommitDate: Wed May 24 19:52:14 2023 +0200

tdf#155465 doc export: handle para last line - justify

This was already OK for import in OOo 3.3,
but never exported. DOCX export landed in 2019 (no bug report).

No existing unit tests matched for DOC.

make CppunitTest_sw_ww8export4 \
CPPUNIT_TEST_NAME=testTdf155465_paraAdjustDistribute

Change-Id: Iaea149c21259fe2a9002c8ce7c023327bbd13746
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152199
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc 
b/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc
new file mode 100644
index ..5a661cd837ef
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx 
b/sw/qa/extras/ww8export/ww8export4.cxx
index 414d183ed6b0..9e4551fe872f 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,6 +102,24 @@ DECLARE_WW8EXPORT_TEST(testTdf90408B, "tdf90408B.doc")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("text is 10pt", 10.f, 
getProperty(xRun, "CharHeight"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf155465_paraAdjustDistribute, 
"tdf155465_paraAdjustDistribute.doc")
+{
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected: 2; Actual  : 0', i.e. the first paragraph's ParaAdjust was 
left, not block.
+const style::ParagraphAdjust eBlock = style::ParagraphAdjust_BLOCK;
+auto nAdjust = getProperty(getParagraph(1), "ParaAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(1), "ParaLastLineAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(2), "ParaAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(2), "ParaLastLineAdjust");
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_LEFT, 
static_cast(nAdjust));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 8d7603f2d9a7..041abc5c65c5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5087,7 +5087,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& 
rAdjust )
 break;
 case SvxAdjust::BlockLine:
 case SvxAdjust::Block:
-nAdj = nAdjBiDi = 3;
+nAdj = nAdjBiDi = rAdjust.GetLastBlock() == SvxAdjust::Block ? 4 : 
3;
 break;
 case SvxAdjust::Center:
 nAdj = nAdjBiDi = 1;

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

[Andrea Gelmini (via logerrit)]

 filter/source/pdf/pdfexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01c12264f1f6ec3b78cab0c6acb04a55b1a52903
Author: Andrea Gelmini 
AuthorDate: Wed May 24 14:01:02 2023 +0200
Commit: Julien Nabet 
CommitDate: Wed May 24 20:37:57 2023 +0200

Fix typo

Change-Id: I9478777b375b69794a3ae61ee35842ca94b6ba1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152202
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 54dd54f7590e..a29ff1afb777 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -883,7 +883,7 @@ bool PDFExport::Export( const OUString& rFile, const 
Sequence< PropertyValue >&
 aContext.BaseURL = xModel->getURL();
 // relative link option is private to PDF Export filter and 
limited to local filesystem only
 aContext.RelFsys = mbExportRelativeFsysLinks;
-// determine the default acton for PDF links
+// determine the default action for PDF links
 switch( mnDefaultLinkAction )
 {
 default:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/source

[Michael Meeks (via logerrit)]

 vcl/source/gdi/salgdilayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 127a7b263c4a45c1570f21080022f79099c5c3e6
Author: Michael Meeks 
AuthorDate: Tue May 23 18:19:18 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 20:38:54 2023 +0200

perf: surprising to see getenv on a profile.

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

diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 91419779d871..a219ce89e5c6 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -62,7 +62,7 @@ SalGraphics::SalGraphics()
 
 bool SalGraphics::initWidgetDrawBackends(bool bForce)
 {
-bool bFileDefinitionsWidgetDraw = !!getenv("VCL_DRAW_WIDGETS_FROM_FILE");
+static bool bFileDefinitionsWidgetDraw = 
!!getenv("VCL_DRAW_WIDGETS_FROM_FILE");
 
 if (bFileDefinitionsWidgetDraw || bForce)
 {

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - 3 commits - sc/inc sc/source

[Henry Castro (via logerrit)]

 sc/inc/colorscale.hxx  |3 +++
 sc/inc/conditio.hxx|5 +
 sc/source/core/data/colorscale.cxx |   21 +
 sc/source/core/data/conditio.cxx   |   20 
 sc/source/core/data/table2.cxx |3 +++
 sc/source/filter/html/htmlexp.cxx  |   23 ++-
 6 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit 3a8420ae420d475e4e8fbeecc6a8ac74b6bc5b33
Author: Henry Castro 
AuthorDate: Thu May 11 16:29:55 2023 -0400
Commit: Aron Budea 
CommitDate: Wed May 24 19:26:31 2023 +0200

sc: filter: html: fix missing color scale conditional format

When copying a range cell to an external application that request
html data, the color scale conditional format does not have an
associate a set attribute.

Signed-off-by: Henry Castro 
Change-Id: I82b466a2100abc5070e92f844dc706d9b015c2e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151687
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/source/filter/html/htmlexp.cxx 
b/sc/source/filter/html/htmlexp.cxx
index ef6392c02491..1446d5b8d23f 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -64,6 +64,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -881,10 +883,27 @@ void ScHTMLExport::WriteTables()
 
 void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, 
SCROW nRow, SCTAB nTab )
 {
+std::optional aColorScale;
 ScAddress aPos( nCol, nRow, nTab );
 ScRefCellValue aCell(*pDoc, aPos, rBlockPos);
 const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
 const SfxItemSet* pCondItemSet = pDoc->GetCondResult( nCol, nRow, nTab, 
&aCell );
+if (!pCondItemSet)
+{
+ScConditionalFormatList* pCondList = pDoc->GetCondFormList(nTab);
+const ScCondFormatItem& rCondItem = pAttr->GetItem(ATTR_CONDITIONAL);
+const ScCondFormatIndexes& rCondIndex = rCondItem.GetCondFormatData();
+if (rCondIndex.size() > 0)
+{
+ScConditionalFormat* pCondFmt = 
pCondList->GetFormat(rCondIndex[0]);
+if (pCondFmt)
+{
+const ScColorScaleFormat* pEntry = dynamic_cast(pCondFmt->GetEntry(0));
+if (pEntry)
+aColorScale = pEntry->GetColor(aPos);
+}
+}
+}
 
 const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG, 
pCondItemSet );
 if ( rMergeFlagAttr.IsOverlapped() )
@@ -1023,7 +1042,9 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& 
rBlockPos, SCCOL nCol, SC
 ATTR_BACKGROUND, pCondItemSet );
 
 Color aBgColor;
-if ( rBrushItem.GetColor().GetAlpha() == 0 )
+if ( aColorScale )
+aBgColor = *aColorScale;
+else if ( rBrushItem.GetColor().GetAlpha() == 0 )
 aBgColor = aHTMLStyle.aBackgroundColor; // No unwanted background color
 else
 aBgColor = rBrushItem.GetColor();
commit 8ac5e24a3575d140008a6b8d4c6414dc3ef1ef4b
Author: Henry Castro 
AuthorDate: Thu May 11 16:23:03 2023 -0400
Commit: Aron Budea 
CommitDate: Wed May 24 19:26:18 2023 +0200

sc: copy cache values when clone color conditional format

When clone a conditional format list, also copy the cache
values that hold the min and max values, otherwise if clone
occurs when copying to the clipboard the values have wrong
data due to limiting range cells copied.

Signed-off-by: Henry Castro 
Change-Id: Id9085a1488a3bde24842e0d2e062c9b425074157
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151686
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 9923eac4c572..fc5c34dda287 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -224,6 +224,8 @@ public:
 virtual ~ScColorFormat() override;
 
 const ScRangeList& GetRange() const;
+void SetCache(const std::vector& aValues);
+std::vector GetCache() const;
 
 virtual void SetParent(ScConditionalFormat* pParent) override;
 
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index a8d94440f237..10f2b05aa092 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -377,6 +377,9 @@ ScColorScaleFormat::ScColorScaleFormat(ScDocument* pDoc, 
const ScColorScaleForma
 {
 maColorScales.emplace_back(new ScColorScaleEntry(pDoc, *rxEntry));
 }
+
+auto aCache = rFormat.GetCache();
+SetCache(aCache);
 }
 
 ScColorFormat* ScColorScaleFormat::Clone(ScDocument* pDoc) const
@@ -438,6 +441,18 @@ const ScRangeList& ScColorFormat::GetRange() const
 return mpParent->GetRange();
 }
 
+std::vector ScColorFormat::GetCache() const
+{
+std::vector empty;
+return mpCache ? mpCache->maValues : empty;
+}
+
+void ScColorFormat::SetCache(const std::vector& aValues)
+{
+mpCache.reset(new ScC

Minutes from the UX/design meeting 2023-May-24

[Heiko Tietze]

Present: https://pad.documentfoundation.org/p/design#L39
Comments: Eike, Ady, Bogdan, Rafael, Tomaz, Timur, Roman, Stuart

Tickets/Topics

 * Find & Replace: Checkmark "Current selection only" automatically
   unset after repeating "find" (or "find/ replace") despite that area
   is still marked
   + https://bugs.documentfoundation.org/show_bug.cgi?id=141296
   + dialog should remember the option (Eike)
   + after f&r the dialog selection is lost (Ady) and searching
 again makes no sense (Heiko)
   + iterative operations are common (Bogdan)
   + only obvious issue is that replacing items may end in no selection
 and the fact that current selection depends on  whether more than
 one cell is selected (Heiko)
   + remembering the option is desirable (Hossein)
   + MSO has no option to _ignore_ the selection; replacement is always
 applied to the selection if more than one cell is selected (Hossein)
   + makes sense to drop the option (John); option is good (Shu)
   + MSO does not change the current selection on replacement (Heiko)
 + it's kind of a convenience feature to quickly see what has been
   changed (Heiko)
 + could be made dependent on whether a selection was active before the
   replacement (Hossein)
   => comment

 * Confusion between "bibliography entry" and "citation"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=155050
   + bibliographical entry is part of the toc - and citation a more
 common term for the functionality (Stuart)
   + alternatively use "reference"? (Heiko)
   + compare with well-known 3rd party tools Mendeley, Zotero,
 Endnote (John, Hossein)
   + Zotero uses "Citation" and Bibliography (John), MSO Word as
 well (Hossein)
   => do rename

 * Pasting a table cell, pastes the source cell in the upper/actual
   cell as an inner table cell
   + https://bugs.documentfoundation.org/show_bug.cgi?id=149625
   + different behavior depending on the selection; same behavior
 for MSO Word
   + inserting a table into a table cell is possible too (Heiko)
   + wondering if this has a real use case (John), apparently it is
 as questions on the web indicate (Hossein)
 + Search for "nested tables" in BZ
   => resolve NAB

 * Remove empty rows faster in Calc (add in LO instead of extension)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=151133
   + common use case, integration makes sense (Rafael, Tomaz, Timur)
   + does it exit in Excel? (John), unclear (Heiko)
   => do it (for both row and column)

 * rename “Modify” button into "Assign"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=155214
   + wouldn't change (Roman)
   + Assign fits better (Stuart, Heiko, John)
   => rename

 * Simplified options dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=90989
   + simplification means essentially to create new dialogs
 from scratch- with a lot of effort
   + searching for content simplifies the workflow
   + improve rather than start from scratch (Hossein, John)
   + still think it's beneficial (John)
   + MSO does a worse job by some simple tabs and one large
"Advanced" (Hossein)
   + small-size devices such as handhelds demand a smaller
 options dialog (John)
   => do it


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 3 commits - sc/inc sc/source

[Henry Castro (via logerrit)]

 sc/inc/colorscale.hxx  |3 +++
 sc/inc/conditio.hxx|5 +
 sc/source/core/data/colorscale.cxx |   21 +
 sc/source/core/data/conditio.cxx   |   20 
 sc/source/core/data/table2.cxx |3 +++
 sc/source/filter/html/htmlexp.cxx  |   23 ++-
 6 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit 6cedc29a03938784ea9d59626221fb17abfb7258
Author: Henry Castro 
AuthorDate: Thu May 11 16:29:55 2023 -0400
Commit: Aron Budea 
CommitDate: Wed May 24 21:11:54 2023 +0200

sc: filter: html: fix missing color scale conditional format

When copying a range cell to an external application that request
html data, the color scale conditional format does not have an
associate a set attribute.

Signed-off-by: Henry Castro 
Change-Id: I82b466a2100abc5070e92f844dc706d9b015c2e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151687
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 3a8420ae420d475e4e8fbeecc6a8ac74b6bc5b33)

diff --git a/sc/source/filter/html/htmlexp.cxx 
b/sc/source/filter/html/htmlexp.cxx
index 270312f594ce..d21fcf4d0035 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -64,6 +64,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -881,10 +883,27 @@ void ScHTMLExport::WriteTables()
 
 void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, 
SCROW nRow, SCTAB nTab )
 {
+std::optional aColorScale;
 ScAddress aPos( nCol, nRow, nTab );
 ScRefCellValue aCell(*pDoc, aPos, rBlockPos);
 const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
 const SfxItemSet* pCondItemSet = pDoc->GetCondResult( nCol, nRow, nTab, 
&aCell );
+if (!pCondItemSet)
+{
+ScConditionalFormatList* pCondList = pDoc->GetCondFormList(nTab);
+const ScCondFormatItem& rCondItem = pAttr->GetItem(ATTR_CONDITIONAL);
+const ScCondFormatIndexes& rCondIndex = rCondItem.GetCondFormatData();
+if (rCondIndex.size() > 0)
+{
+ScConditionalFormat* pCondFmt = 
pCondList->GetFormat(rCondIndex[0]);
+if (pCondFmt)
+{
+const ScColorScaleFormat* pEntry = dynamic_cast(pCondFmt->GetEntry(0));
+if (pEntry)
+aColorScale = pEntry->GetColor(aPos);
+}
+}
+}
 
 const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG, 
pCondItemSet );
 if ( rMergeFlagAttr.IsOverlapped() )
@@ -1023,7 +1042,9 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& 
rBlockPos, SCCOL nCol, SC
 ATTR_BACKGROUND, pCondItemSet );
 
 Color aBgColor;
-if ( rBrushItem.GetColor().GetAlpha() == 0 )
+if ( aColorScale )
+aBgColor = *aColorScale;
+else if ( rBrushItem.GetColor().GetAlpha() == 0 )
 aBgColor = aHTMLStyle.aBackgroundColor; // No unwanted background color
 else
 aBgColor = rBrushItem.GetColor();
commit 4e897dc555ad00e611b16cba7a7ae18bd2a745c2
Author: Henry Castro 
AuthorDate: Thu May 11 16:23:03 2023 -0400
Commit: Aron Budea 
CommitDate: Wed May 24 21:11:45 2023 +0200

sc: copy cache values when clone color conditional format

When clone a conditional format list, also copy the cache
values that hold the min and max values, otherwise if clone
occurs when copying to the clipboard the values have wrong
data due to limiting range cells copied.

Signed-off-by: Henry Castro 
Change-Id: Id9085a1488a3bde24842e0d2e062c9b425074157
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151686
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 8ac5e24a3575d140008a6b8d4c6414dc3ef1ef4b)

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 9923eac4c572..fc5c34dda287 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -224,6 +224,8 @@ public:
 virtual ~ScColorFormat() override;
 
 const ScRangeList& GetRange() const;
+void SetCache(const std::vector& aValues);
+std::vector GetCache() const;
 
 virtual void SetParent(ScConditionalFormat* pParent) override;
 
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index b84d6a063034..8b1a8987acbb 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -379,6 +379,9 @@ ScColorScaleFormat::ScColorScaleFormat(ScDocument* pDoc, 
const ScColorScaleForma
 {
 maColorScales.emplace_back(new ScColorScaleEntry(pDoc, *rxEntry));
 }
+
+auto aCache = rFormat.GetCache();
+SetCache(aCache);
 }
 
 ScColorFormat* ScColorScaleFormat::Clone(ScDocument* pDoc) const
@@ -440,6 +443,18 @@ const ScRangeList& ScColorFormat::GetRange() const
 return mpParent->GetRange();
 }
 
+std::vector ScColorFormat::GetCache() const
+{
+std::vector em

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

[Michael Stahl (via logerrit)]

 sw/inc/anchoredobject.hxx  |5 +
 sw/qa/extras/layout/data/tdf148897.odt |binary
 sw/qa/extras/layout/layout2.cxx|   82 +++
 sw/source/core/inc/txtfly.hxx  |4 +
 sw/source/core/inc/txtfrm.hxx  |3 
 sw/source/core/layout/flylay.cxx   |2 
 sw/source/core/layout/frmtool.cxx  |5 +
 sw/source/core/layout/layact.cxx   |6 +
 sw/source/core/text/frmform.cxx|  100 +++--
 sw/source/core/text/txtfly.cxx |   29 +
 sw/source/core/view/viewsh.cxx |3 
 11 files changed, 219 insertions(+), 20 deletions(-)

New commits:
commit b0e2b60fa45f236f6a993cc1295a7afddabb5098
Author: Michael Stahl 
AuthorDate: Wed May 24 20:16:49 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed May 24 22:29:15 2023 +0200

tdf#148897 tdf#143239 sw: move flys off the page in SwTextFrame::Format()

The bugfix regresses testTdf143239, so we add some scary additional hacks:

* testTdf143239: turns out that this was already moving back and forth
  many times but then ran into some loop control - now with the fix for
  tdf#148897 this still happens, but the result is now bad, where
  previously it was good (by accident?).

  Move the flys off the page also in SwTextFrame::Format() - there is
  already code there to detect that footnotes have been moved off by
  Format_() - this is similar, the formatting should be redone immediately
  if there is a fly that created SwFlyPortions in the current frame, but
  the fly was actually moved to the next page by the very same
  Format_() splitting the frame.

* testKeepWithNextPlusFlyFollowTextFlow: here the problem was that the
  para with the fly didn't move back to page 1; need to clear the
  SwLayouter when toggling FieldNames.

* testKeepwithnextFullheight: this test document will loop creating
  infinite pages if the newly add move code is run during
  SwObjectFormatterTextFrame - the latter must move the flys if it is
  active, not SwTextFrame::Format().

This is all a bit experimental but i failed to have a better idea...

(regression from previous commit)

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

diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 37d78e3c822f..95d70198f858 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -152,7 +152,9 @@ class SwTextFly
 
 SwAnchoredObjList* InitAnchoredObjList();
 
+public:
 SwAnchoredObjList* GetAnchoredObjList() const;
+private:
 
 /**
 Look for the first object which overlaps with the rectangle.
@@ -302,6 +304,8 @@ public:
 void SetIgnoreContour( bool bNew );
 
 void SetIgnoreObjsInHeaderFooter( const bool bNew );
+
+SwRect GetFrameArea() const;
 };
 
 inline SwAnchoredObjList* SwTextFly::GetAnchoredObjList() const
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 2376153b40d3..c4c51503ec98 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -268,7 +268,8 @@ class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame
 
 // In order to safe stack space, we split this method:
 // Format_ calls Format_ with parameters
-void Format_( vcl::RenderContext* pRenderContext, SwParaPortion *pPara );
+void FormatImpl( vcl::RenderContext* pRenderContext, SwParaPortion *pPara,
+::std::vector & rIntersectingObjs);
 void Format_( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
   const bool bAdjust = false );
 void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 912047487a64..5fdf320d4eee 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -50,6 +50,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 // Tolerance in formatting and text output
 #define SLOPPY_TWIPS5
@@ -1775,7 +1777,8 @@ void SwTextFrame::FormatOnceMore( SwTextFormatter &rLine, 
SwTextFormatInfo &rInf
 }
 }
 
-void SwTextFrame::Format_( vcl::RenderContext* pRenderContext, SwParaPortion 
*pPara )
+void SwTextFrame::FormatImpl(vcl::RenderContext* pRenderContext, SwParaPortion 
*pPara,
+std::vector & rIntersectingObjs)
 {
 const bool bIsEmpty = GetText().isEmpty();
 
@@ -1810,6 +1813,18 @@ void SwTextFrame::Format_( vcl::RenderContext* 
pRenderContext, SwParaPortion *pP
 if( aLine.IsOnceMore() )
 FormatOnceMore( aLine, aInf );
 
+if (aInf.GetTextFly().IsOn())
+{
+SwRect const aRect(aInf.GetTextFly().GetFrameArea());
+for (SwAnchoredObject *const pObj : 
*aInf.GetTextFly().GetAnchoredObjList())
+{

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sfx2/source starmath/qa

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/doc/objmisc.cxx |3 ++-
 starmath/qa/cppunit/test_cursor.cxx |1 +
 starmath/qa/cppunit/test_node.cxx   |1 +
 starmath/qa/cppunit/test_nodetotextvisitors.cxx |1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit cb46fe877fd000ad74eb167a3a6127e89c8990f9
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 8 15:41:27 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed May 24 22:28:04 2023 +0200

tdf#146547 Mark read-only docs as modified

when an editable section is changed.

Change-Id: I588b09f160974d3a3833bfa011fd07f2ee496616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151535
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit e7e9991fd06ba2e0484ae5e6b6acc323ab8bf66b)

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index ff31ce956bbc..50f92ee65ac6 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -262,7 +262,8 @@ void SfxObjectShell::EnableSetModified( bool bEnable )
 
 bool SfxObjectShell::IsEnableSetModified() const
 {
-return pImpl->m_bEnableSetModified && !IsReadOnly();
+// Don't allow when user explicitly requested read only (IsLoadReadonly() 
or IsOriginallyLoadedReadOnlyMedium())
+return pImpl->m_bEnableSetModified && ! (IsLoadReadonly() || 
IsOriginallyLoadedReadOnlyMedium());
 }
 
 
diff --git a/starmath/qa/cppunit/test_cursor.cxx 
b/starmath/qa/cppunit/test_cursor.cxx
index 080e7a274c4d..b85b5ceef37a 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -57,6 +57,7 @@ void Test::setUp()
 SmGlobals::ensure();
 
 xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
+xDocShRef->DoInitNew();
 }
 
 void Test::tearDown()
diff --git a/starmath/qa/cppunit/test_node.cxx 
b/starmath/qa/cppunit/test_node.cxx
index dba0b9ff3c40..570cab00d062 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -53,6 +53,7 @@ void NodeTest::setUp()
 mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT |
 SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
 SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+mxDocShell->DoInitNew();
 }
 
 void NodeTest::tearDown()
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx 
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index c3172ab60126..e738351a8d23 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -90,6 +90,7 @@ void Test::setUp()
 SmGlobals::ensure();
 
 xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
+xDocShRef->DoInitNew();
 }
 
 void Test::tearDown()

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc |binary
 sw/qa/extras/ww8export/ww8export4.cxx  |   19 
++
 sw/source/filter/ww8/ww8atr.cxx|2 -
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit dfe794ee03cab7906136c39ab2aa468c983af4cd
Author: Justin Luth 
AuthorDate: Wed May 24 08:52:20 2023 -0400
Commit: Justin Luth 
CommitDate: Wed May 24 23:24:01 2023 +0200

tdf#155465 doc export: handle para last line - justify

This was already OK for import in OOo 3.3,
but never exported. DOCX export landed in 2019 (no bug report).

No existing unit tests matched for DOC.

make CppunitTest_sw_ww8export4 \
CPPUNIT_TEST_NAME=testTdf155465_paraAdjustDistribute

Change-Id: Iaea149c21259fe2a9002c8ce7c023327bbd13746
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152199
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152243

diff --git a/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc 
b/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc
new file mode 100644
index ..5a661cd837ef
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx 
b/sw/qa/extras/ww8export/ww8export4.cxx
index 69596ded0303..cd4410e3cb2e 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -54,6 +55,24 @@ DECLARE_WW8EXPORT_TEST(testTdf117994_CRnumformatting, 
"tdf117994_CRnumformatting
 CPPUNIT_ASSERT_EQUAL(OUString("160"), 
parseDump("//body/txt[1]/SwParaPortion/SwLineLayout/child::*[@type='PortionType::Number']",
 "font-height"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf155465_paraAdjustDistribute, 
"tdf155465_paraAdjustDistribute.doc")
+{
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected: 2; Actual  : 0', i.e. the first paragraph's ParaAdjust was 
left, not block.
+const style::ParagraphAdjust eBlock = style::ParagraphAdjust_BLOCK;
+auto nAdjust = getProperty(getParagraph(1), "ParaAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(1), "ParaLastLineAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(2), "ParaAdjust");
+CPPUNIT_ASSERT_EQUAL(eBlock, static_cast(nAdjust));
+
+nAdjust = getProperty(getParagraph(2), "ParaLastLineAdjust");
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_LEFT, 
static_cast(nAdjust));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4a9779591d87..ff3d057d3042 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4988,7 +4988,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& 
rAdjust )
 break;
 case SvxAdjust::BlockLine:
 case SvxAdjust::Block:
-nAdj = nAdjBiDi = 3;
+nAdj = nAdjBiDi = rAdjust.GetLastBlock() == SvxAdjust::Block ? 4 : 
3;
 break;
 case SvxAdjust::Center:
 nAdj = nAdjBiDi = 1;

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

[Justin Luth (via logerrit)]

 chart2/source/controller/sidebar/ChartLinePanel.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 73a82b425b4dc02ef4ad3946b71c067a6411045c
Author: Justin Luth 
AuthorDate: Sat May 20 11:38:16 2023 -0400
Commit: Justin Luth 
CommitDate: Wed May 24 23:29:58 2023 +0200

tdf#138279 Revert "On double click on chart select the chart backgroud"

This reverts 7.1 commit 6a915073f8400fd34274cf311994bbc9bf498ab6.

The change was simply wrong. There is NOTHING about this context
that indicates that a double-click is happening.

So whatever this patch was trying to do,
it simply was made in a completely wrong way.

So best to just revert, and put the onus back on the interested
parties to redesign a fix for their double-click issue.

Change-Id: Ia209c0552839d6cce1b348432789f0f861ac5703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152023
Reviewed-by: Justin Luth 
Tested-by: Jenkins

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 9dbcc08ebc04..128718ff6694 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -55,10 +55,7 @@ OUString getCID(const rtl::Reference<::chart::ChartModel>& 
xModel)
 
 css::uno::Any aAny = xSelectionSupplier->getSelection();
 if (!aAny.hasValue())
-{
-xSelectionSupplier->select(css::uno::Any(OUString("CID/Page=")));
-aAny = xSelectionSupplier->getSelection();
-}
+return OUString();
 
 OUString aCID;
 aAny >>= aCID;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/editeng include/svx svx/source sw/source

[Tomaž Vajngerl (via logerrit)]

 include/editeng/unotext.hxx |3 ++-
 include/svx/unoshprp.hxx|4 ++--
 svx/source/unodraw/unoprov.cxx  |2 +-
 sw/source/core/unocore/unomap.cxx   |3 ++-
 sw/source/core/unocore/unomap1.cxx  |5 +++--
 sw/source/core/unocore/unomapproperties.hxx |6 +++---
 6 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 1f0a022bfe872192491400e8143c2756bd5acac5
Author: Tomaž Vajngerl 
AuthorDate: Sat Apr 29 23:04:27 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu May 25 02:17:15 2023 +0200

use XThemeColor instead of XInterface for *ThemeReference props

Change-Id: I23b6a7429bbcf7901f3d817c970ee7ef4a453197
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151184
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 0cda9cdba77bfe3c5f4b78f7538e2b6c96a01493)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152207
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 5231219b5a1a..8fb6710cb2e8 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -91,7 +92,7 @@ struct SfxItemPropertyMapEntry;
 { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE }, \
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_MOD }, \
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_OFF }, \
-{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, EE_CHAR_COLOR,
::cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE }, \
+{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, EE_CHAR_COLOR,
::cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE }, 
\
 { u"CharBackColor",EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
 { u"CharBackTransparent",  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index c385f0766358..828e02771e4b 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -237,7 +237,7 @@
 #define LINE_PROPERTIES_DEFAULTS\
 { UNO_NAME_LINECAP,   XATTR_LINECAP,  
::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_LINECOLOR, XATTR_LINECOLOR,
::cppu::UnoType::get() ,   0, 0}, \
-{ UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, 
::cppu::UnoType::get() ,   0, 
MID_COLOR_THEME_REFERENCE}, \
+{ UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, 
::cppu::UnoType::get() ,   0, 
MID_COLOR_THEME_REFERENCE}, \
 { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER,
cppu::UnoType::get() ,   0, 0}, \
 { UNO_NAME_LINEENDWIDTH,  XATTR_LINEENDWIDTH, 
::cppu::UnoType::get() ,   0, 0, 
PropertyMoreFlags::METRIC_ITEM}, \
 { UNO_NAME_LINEJOINT, XATTR_LINEJOINT,
::cppu::UnoType::get(), 0, 0}, \
@@ -294,7 +294,7 @@
 { UNO_NAME_FILLCOLOR_THEME,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_THEME_INDEX}, \
 { UNO_NAME_FILLCOLOR_LUM_MOD, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_MOD}, \
 { UNO_NAME_FILLCOLOR_LUM_OFF, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_OFF}, \
-{ UNO_NAME_FILLCOLOR_THEME_REFERENCE,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, 
MID_COLOR_THEME_REFERENCE}, \
+{ UNO_NAME_FILLCOLOR_THEME_REFERENCE,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, 
MID_COLOR_THEME_REFERENCE}, \
 { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP  , 
::cppu::UnoType::get(), 0, 0 }, \
 { UNO_NAME_FILLUSESLIDEBACKGROUND, XATTR_FILLUSESLIDEBACKGROUND, 
cppu::UnoType::get(), 0,   0},
 
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 139e9d3ac48e..00a48d272b22 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -566,7 +566,7 @@ static o3tl::span 
ImplGetSvxControlShapePropertyM
 { UNO_NAME_EDIT_CHAR_COLOR,   0,  
cppu::UnoType::get(),0, MID_COLOR_RGB },
 { UNO_NAME_EDIT_CHAR_COLOR_THEME, 0,  
cppu::UnoType::get(),0, MID_COLOR_THEME_INDEX },
 { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, 0, 
cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE },
-{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, 0,  
cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE },
+{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, 0,  
cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE },
 { u"CharB

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - include/docmodel include/oox oox/inc oox/source sw/qa

[Tomaž Vajngerl (via logerrit)]

 include/docmodel/color/ComplexColor.hxx  |  127 
 include/docmodel/color/Transformation.hxx|   72 +++
 include/docmodel/theme/FormatScheme.hxx  |  142 +++
 include/docmodel/theme/ThemeColor.hxx|   52 
 include/oox/export/ThemeExport.hxx   |   16 +-
 oox/inc/drawingml/colorchoicecontext.hxx |8 -
 oox/source/drawingml/colorchoicecontext.cxx  |   46 +++
 oox/source/drawingml/effectpropertiescontext.cxx |   10 -
 oox/source/drawingml/misccontexts.cxx|   28 ++--
 oox/source/export/ThemeExport.cxx|   64 +-
 sw/qa/core/theme/ThemeTest.cxx   |   16 +-
 11 files changed, 313 insertions(+), 268 deletions(-)

New commits:
commit fa81974797c66df101771ff4f62f642c8d261a3b
Author: Tomaž Vajngerl 
AuthorDate: Sun Apr 30 15:52:32 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu May 25 02:17:50 2023 +0200

docmodel: extract ColorDefinition into own file and rename

ColorDefinition is renamed into ComplexColor.

Change-Id: I81c2d97e6b7bf9de4ce703c02b6db40636b04961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151224
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 113c6d11afbfc97e17fe90d90dd55d149a33a191)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152209
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/docmodel/color/ComplexColor.hxx 
b/include/docmodel/color/ComplexColor.hxx
new file mode 100644
index ..228b32b16932
--- /dev/null
+++ b/include/docmodel/color/ComplexColor.hxx
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+#include 
+
+namespace model
+{
+enum class ColorType
+{
+Unused,
+RGB,
+CRGB,
+HSL,
+Scheme,
+Palette,
+System,
+Placeholder
+};
+
+enum class SystemColorType
+{
+Unused,
+DarkShadow3D,
+Light3D,
+ActiveBorder,
+ActiveCaption,
+AppWorkspace,
+Background,
+ButtonFace,
+ButtonHighlight,
+ButtonShadow,
+ButtonText,
+CaptionText,
+GradientActiveCaption,
+GradientInactiveCaption,
+GrayText,
+Highlight,
+HighlightText,
+HotLight,
+InactiveBorder,
+InactiveCaption,
+InactiveCaptionText,
+InfoBack,
+InfoText,
+Menu,
+MenuBar,
+MenuHighlight,
+MenuText,
+ScrollBar,
+Window,
+WindowFrame,
+WindowText
+};
+
+struct DOCMODEL_DLLPUBLIC ComplexColor
+{
+ColorType meType = ColorType::Unused;
+
+sal_Int32 mnComponent1 = 0; // Red, Hue
+sal_Int32 mnComponent2 = 0; // Green, Saturation
+sal_Int32 mnComponent3 = 0; // Blue, Luminance
+sal_Int32 mnAlpha = 0; // Percentage
+
+SystemColorType meSystemColorType = SystemColorType::Unused;
+::Color maLastColor;
+
+ThemeColorType meSchemeType = ThemeColorType::Unknown;
+std::vector maTransformations;
+
+Color getRGBColor() const { return Color(mnComponent1, mnComponent2, 
mnComponent3); }
+
+void setCRGB(sal_Int32 nR, sal_Int32 nG, sal_Int32 nB)
+{
+mnComponent1 = nR;
+mnComponent2 = nG;
+mnComponent3 = nB;
+meType = ColorType::CRGB;
+}
+
+void setRGB(sal_Int32 nRGB)
+{
+::Color aColor(ColorTransparency, nRGB);
+mnComponent1 = aColor.GetRed();
+mnComponent2 = aColor.GetGreen();
+mnComponent3 = aColor.GetBlue();
+meType = ColorType::RGB;
+}
+
+void setHSL(sal_Int32 nH, sal_Int32 nS, sal_Int32 nL)
+{
+mnComponent1 = nH;
+mnComponent2 = nS;
+mnComponent3 = nL;
+meType = ColorType::HSL;
+}
+
+void setSystemColor(SystemColorType eSystemColorType, sal_Int32 nRGB)
+{
+maLastColor = ::Color(ColorTransparency, nRGB);
+meSystemColorType = eSystemColorType;
+meType = ColorType::System;
+}
+
+void setSchemePlaceholder() { meType = ColorType::Placeholder; }
+
+void setSchemeColor(ThemeColorType eType)
+{
+meSchemeType = eType;
+meType = ColorType::Scheme;
+}
+};
+
+} // end of namespace svx
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/docmodel/theme/FormatScheme.hxx 
b/include/docmodel/theme/FormatScheme.hxx
index fb65d24d2ba8..6e20d88b51ca 100644
--- a/include/docmodel/theme/FormatScheme.hxx
+++ b/include/docmodel/theme/FormatScheme.hxx
@@ -13,115 +13,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace model
 {
-enum class ColorType
-{
-Unused,
-RGB,
-CRGB,
-HSL,
-Sch

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - cui/source docmodel/Library_docmodel.mk docmodel/source editeng/source include/docmodel include/editeng include/oox off

[Tomaž Vajngerl (via logerrit)]

 cui/source/tabpages/chardlg.cxx|9 +--
 docmodel/Library_docmodel.mk   |1 
 docmodel/source/theme/ColorSet.cxx |   12 
 docmodel/source/uno/UnoComplexColor.cxx|   37 
 editeng/source/items/textitem.cxx  |   58 +++
 editeng/source/uno/unotext.cxx |8 +-
 include/docmodel/color/ComplexColor.hxx|   87 -
 include/docmodel/theme/ColorSet.hxx|3 +
 include/docmodel/theme/ThemeColor.hxx  |5 +
 include/docmodel/uno/UnoComplexColor.hxx   |   50 
 include/editeng/colritem.hxx   |   16 +
 include/oox/export/ThemeExport.hxx |2 
 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/util/XComplexColor.idl |   26 
 sd/source/ui/view/drtxtob1.cxx |9 +--
 sw/source/core/model/ThemeColorChanger.cxx |   16 +++--
 sw/source/uibase/shells/textsh1.cxx|2 
 17 files changed, 284 insertions(+), 58 deletions(-)

New commits:
commit e21f2c8710b6116b9b17f065b1482d057e7842ff
Author: Tomaž Vajngerl 
AuthorDate: Mon May 1 10:19:06 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu May 25 02:18:16 2023 +0200

svx: use ComplexColor in SvxColorItem instead of the ThemeColor

ComplexColor includes everything a ThemeColor has and in addition
also can have various other representations that are supported by
OOXML. This is important for compatibility reasons to preserve the
color information.

Change-Id: I65a96511dc1742c75b1949e002eaa8c622e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151226
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 900c3a2a854436fdbacd488ef1da12ea99fbceb0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152231
Tested-by: Jenkins CollaboraOffice 

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 194dfd65f830..438a9ac37cbf 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1600,10 +1600,11 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( 
SfxItemSet& rSet )
 model::ThemeColorType eType = 
model::convertToThemeColorType(aSelectedColor.m_nThemeIndex);
 if (eType != model::ThemeColorType::Unknown)
 {
-aItem.GetThemeColor().setType(eType);
-aItem.GetThemeColor().clearTransformations();
-
aItem.GetThemeColor().addTransformation({model::TransformationType::LumMod, 
aSelectedColor.m_nLumMod});
-
aItem.GetThemeColor().addTransformation({model::TransformationType::LumOff, 
aSelectedColor.m_nLumOff});
+model::ComplexColor aComplexColor;
+aComplexColor.setSchemeColor(eType);
+
aComplexColor.addTransformation({model::TransformationType::LumMod, 
aSelectedColor.m_nLumMod});
+
aComplexColor.addTransformation({model::TransformationType::LumOff, 
aSelectedColor.m_nLumOff});
+aItem.setComplexColor(aComplexColor);
 }
 
 rSet.Put(aItem);
diff --git a/docmodel/source/theme/ColorSet.cxx 
b/docmodel/source/theme/ColorSet.cxx
index 55c03dadba8c..44cd5bdc6c4f 100644
--- a/docmodel/source/theme/ColorSet.cxx
+++ b/docmodel/source/theme/ColorSet.cxx
@@ -50,6 +50,18 @@ Color ColorSet::resolveColor(model::ThemeColor const& 
rThemeColor) const
 return rThemeColor.applyTransformations(aColor);
 }
 
+Color ColorSet::resolveColor(model::ComplexColor const& rComplexColor) const
+{
+auto eSchemeType = rComplexColor.meSchemeType;
+if (eSchemeType == model::ThemeColorType::Unknown)
+{
+SAL_WARN("svx", "ColorSet::resolveColor with ThemeColorType::Unknown");
+return COL_AUTO;
+}
+Color aColor = getColor(eSchemeType);
+return rComplexColor.applyTransformations(aColor);
+}
+
 void ColorSet::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
 (void)xmlTextWriterStartElement(pWriter, BAD_CAST("ColorSet"));
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index ece9a4a35237..153319ae8e75 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1368,10 +1368,10 @@ SvxColorItem::SvxColorItem( const Color& rCol, const 
sal_uInt16 nId ) :
 {
 }
 
-SvxColorItem::SvxColorItem(Color const& rColor, model::ThemeColor const& 
rThemeColor, const sal_uInt16 nId)
+SvxColorItem::SvxColorItem(Color const& rColor, model::ComplexColor const& 
rComplexColor, const sal_uInt16 nId)
 : SfxPoolItem(nId)
 , mColor(rColor)
-, maThemeColor(rThemeColor)
+, maComplexColor(rComplexColor)
 {
 }
 
@@ -1385,7 +1385,7 @@ bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) 
const
 const SvxColorItem& rColorItem = static_cast(rAttr);
 
 return mColor == rColorItem.mColor &&
-   maThemeColor == rColorItem.maThemeColor;
+   maComplexColor == rColorItem.maComplexColor;
 }
 
 boo

[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source include/svx include/xmloff oox/qa reportdesign/source schema/libreoffice sd/source svx/source xmloff/qa xmloff/source

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |2 
 cui/source/tabpages/tphatch.cxx  |2 
 cui/source/tabpages/tpline.cxx   |4 -
 include/svx/Palette.hxx  |   14 
 include/xmloff/xmltoken.hxx  |1 
 oox/qa/unit/data/ReferenceShapeFill.fodp |   18 ++---
 oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt   |   10 +--
 oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt|   12 +--
 oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt |   12 +--
 oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt   |8 +-
 reportdesign/source/ui/dlg/Condition.cxx |2 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng  |   20 +++---
 sd/source/ui/dlg/copydlg.cxx |4 -
 svx/source/engine3d/float3d.cxx  |2 
 svx/source/tbxctrls/Palette.cxx  |8 +-
 svx/source/tbxctrls/PaletteManager.cxx   |   14 ++--
 svx/source/tbxctrls/tbcontrl.cxx |   34 +--
 svx/source/tbxctrls/tbxcolorupdate.cxx   |4 -
 xmloff/qa/unit/draw.cxx  |   24 +++
 xmloff/source/core/xmltoken.cxx  |5 -
 xmloff/source/text/XMLComplexColorContext.cxx|2 
 xmloff/source/text/XMLComplexColorExport.cxx |2 
 xmloff/source/token/tokens.txt   |5 -
 23 files changed, 113 insertions(+), 96 deletions(-)

New commits:
commit 8e87f1f2ff4df763e29bdc097786230c6293744b
Author: Tomaž Vajngerl 
AuthorDate: Mon May 22 14:16:01 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu May 25 03:58:52 2023 +0200

svx: change NamedColor be a struct instead of std::pair

Change-Id: Ice1625e8cae8da859ea8a940b3f8e40f6f9d7037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152235
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx 
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 11fc0c88adb5..2020365fd12f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -101,7 +101,7 @@ namespace
 void lcl_selectColor(ColorListBox& rListBox, const Color& rColor)
 {
 rListBox.SetNoSelection();
-rListBox.SelectEntry(std::make_pair(rColor, 
lcl_makeColorName(rColor)));
+rListBox.SelectEntry({rColor, lcl_makeColorName(rColor)});
 }
 
 ::chart::LightSource lcl_getLightSourceFromProperties(
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 1a35114739fc..879e68a0462c 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -245,7 +245,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
 if (m_xCbBackgroundColor->get_active())
 {
 NamedColor aColor = m_xLbBackgroundColor->GetSelectedEntry();
-rSet->Put(XFillColorItem(aColor.second, aColor.first));
+rSet->Put(XFillColorItem(aColor.m_aName, aColor.m_aColor));
 }
 return true;
 }
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 06e95d3fdcaf..d150767daf37 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -457,7 +457,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
 if (m_xLbColor->IsValueChangedFromSaved())
 {
 NamedColor aColor = m_xLbColor->GetSelectedEntry();
-XLineColorItem aItem(aColor.second, aColor.first);
+XLineColorItem aItem(aColor.m_aName, aColor.m_aColor);
 pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR );
 if ( !pOld || !( *static_cast(pOld) == aItem ) )
 {
@@ -759,7 +759,7 @@ void SvxLineTabPage::FillXLSet_Impl()
 
 m_rXLSet.Put( XLineWidthItem( GetCoreValue( *m_xMtrLineWidth, m_ePoolUnit 
) ) );
 NamedColor aColor = m_xLbColor->GetSelectedEntry();
-m_rXLSet.Put(XLineColorItem(aColor.second, aColor.first));
+m_rXLSet.Put(XLineColorItem(aColor.m_aName, aColor.m_aColor));
 
 // Centered line end
 if( m_xTsbCenterStart->get_state() == TRISTATE_TRUE )
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index b24825be3d3c..8965138c7831 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -29,10 +29,22 @@
 
 class SvxColorValueSet;
 
-typedef std::pair NamedColor;
+struct SVXCORE_DLLPUBLIC NamedColor
+{
+Color m_aColor;
+OUString m_aName;
+
+NamedColor() = default;
+
+NamedColor(Color const& rColor, OUString const& rName)
+: m_aColor(rColor)
+, m_aName(rName)
+{}
+};
 
 namespace svx
 {
+
 /// A color with an optional name and o

[Libreoffice-commits] core.git: chart2/source cui/source include/svx reportdesign/source svx/source

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |2 
 chart2/source/controller/sidebar/ChartColorWrapper.hxx |2 
 cui/source/inc/cuitabarea.hxx  |4 -
 cui/source/tabpages/chardlg.cxx|2 
 cui/source/tabpages/tpcolor.cxx|   22 +-
 include/svx/Palette.hxx|   23 +--
 include/svx/PaletteManager.hxx |2 
 include/svx/colorbox.hxx   |   10 ++--
 include/svx/tbcontrl.hxx   |2 
 reportdesign/source/ui/dlg/Condition.cxx   |4 -
 reportdesign/source/ui/dlg/Condition.hxx   |2 
 svx/source/tbxctrls/Palette.cxx|   13 --
 svx/source/tbxctrls/PaletteManager.cxx |4 -
 svx/source/tbxctrls/tbcontrl.cxx   |   35 -
 14 files changed, 49 insertions(+), 78 deletions(-)

New commits:
commit 9a4b768b0a22bd3ae627c7355bbd223b9cf65015
Author: Tomaž Vajngerl 
AuthorDate: Mon May 22 14:35:19 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu May 25 03:59:01 2023 +0200

svx: combine svx::NamedThemedColor into NamedColor

Change-Id: I9a9656ddce9c12564411cfcb3e8e8714ae74a418
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152236
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 7376f37070ff..e1011a684787 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -87,7 +87,7 @@ ChartColorWrapper::ChartColorWrapper(
 {
 }
 
-void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const 
svx::NamedThemedColor& rColor)
+void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const 
NamedColor& rColor)
 {
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
 
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
index c4d30a8a314c..6894726768d0 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
@@ -28,7 +28,7 @@ public:
 SvxColorToolBoxControl* pControl,
 OUString  rPropertyName);
 
-void operator()(const OUString& rCommand, const svx::NamedThemedColor& 
rColor);
+void operator()(const OUString& rCommand, const NamedColor& rColor);
 // ColorSelectFunction signature
 
 void updateModel(const rtl::Reference<::chart::ChartModel>& xModel);
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 64ec01ef5abf..7399f03eb0be 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -658,7 +658,7 @@ private:
 ColorModel  eCM;
 
 Color   aPreviousColor;
-svx::NamedThemedColor aCurrentColor;
+NamedColor aCurrentColor;
 
 PaletteManager maPaletteManager;
 SvxXRectPreview m_aCtlPreviewOld;
@@ -714,7 +714,7 @@ private:
 DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void);
 DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void );
 DECL_LINK( SelectColorModeHdl_Impl, weld::Toggleable&, void );
-void ChangeColor(const svx::NamedThemedColor &rNewColor, bool 
bUpdatePreset = true);
+void ChangeColor(const NamedColor &rNewColor, bool bUpdatePreset = true);
 void SetColorModel(ColorModel eModel);
 void ChangeColorModel();
 void UpdateColorValues( bool bUpdatePreset = true );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 601dae8dce0e..87984d573281 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1572,7 +1572,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( 
SfxItemSet& rSet )
 sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR );
 const SfxItemSet& rOldSet = GetItemSet();
 
-svx::NamedThemedColor aSelectedColor;
+NamedColor aSelectedColor;
 bool bChanged = m_bNewFontColor;
 
 if (bChanged)
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 799f53957678..470b1c13a866 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -209,9 +209,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 ChangeColorModel();
 
 const Color aColor = pFillColorItem->GetColorValue();
-svx::NamedThemedColor aThemedColor;
-aThemedColor.m_aColor = aColor;
-ChangeColor( aThemedColor );
+NamedColor aNamedColor;
+aNamedColor.m_aColor = aColor;
+ChangeColor(aNamedColor);
 sal_Int32 nPos = FindInPalette( aColor );
 
 if ( nPos != -1 )
@@ -288,9 +288,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
 SetColorModel( e

[Libreoffice-commits] core.git: cui/source editeng/source forms/source include/editeng sd/source svx/source sw/source

[Noel Grandin (via logerrit)]

 cui/source/tabpages/page.cxx |   20 ++--
 cui/source/tabpages/paragrph.cxx |3 
 editeng/source/rtf/rtfitem.cxx   |  133 +--
 editeng/source/rtf/svxrtf.cxx|   10 +-
 forms/source/richtext/rtattributehandler.cxx |6 -
 forms/source/richtext/specialdispatchers.cxx |2 
 include/editeng/editids.hrc  |  111 ++
 include/editeng/svxrtf.hxx   |   15 ++-
 sd/source/ui/func/bulmaper.cxx   |   20 +---
 svx/source/dialog/hdft.cxx   |   18 +--
 sw/source/filter/ww8/rtfsdrexport.cxx|3 
 sw/source/uibase/frmdlg/colex.cxx|   12 --
 sw/source/uibase/uiview/viewtab.cxx  |6 -
 13 files changed, 192 insertions(+), 167 deletions(-)

New commits:
commit 839c5010241842835a1c066be0838df4a8a53dc7
Author: Noel Grandin 
AuthorDate: Wed May 24 16:40:59 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu May 25 07:52:21 2023 +0200

use more TypedWhichId in editeng

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

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 662ec9dd59ce..d939f0949018 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1249,13 +1249,13 @@ void SvxPageDescPage::InitHeadFoot_Impl( const 
SfxItemSet& rSet )
 {
 const SvxSizeItem& rSize =
 rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) );
-const SvxULSpaceItem& rUL = static_cast(
-rHeaderSet.Get( GetWhich( SID_ATTR_ULSPACE ) ));
+const SvxULSpaceItem& rUL =
+rHeaderSet.Get( GetWhich( SID_ATTR_ULSPACE ) );
 tools::Long nDist = rUL.GetLower();
 m_aBspWin.SetHdHeight( rSize.GetSize().Height() - nDist );
 m_aBspWin.SetHdDist( nDist );
-const SvxLRSpaceItem& rLR = static_cast(
-rHeaderSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
+const SvxLRSpaceItem& rLR =
+rHeaderSet.Get( GetWhich( SID_ATTR_LRSPACE ) );
 m_aBspWin.SetHdLeft( rLR.GetLeft() );
 m_aBspWin.SetHdRight( rLR.GetRight() );
 m_aBspWin.SetHeader( true );
@@ -1304,13 +1304,13 @@ void SvxPageDescPage::InitHeadFoot_Impl( const 
SfxItemSet& rSet )
 {
 const SvxSizeItem& rSize =
 rFooterSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) );
-const SvxULSpaceItem& rUL = static_cast(
-rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) ));
+const SvxULSpaceItem& rUL =
+rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) );
 tools::Long nDist = rUL.GetUpper();
 m_aBspWin.SetFtHeight( rSize.GetSize().Height() - nDist );
 m_aBspWin.SetFtDist( nDist );
-const SvxLRSpaceItem& rLR = static_cast(
-rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
+const SvxLRSpaceItem& rLR =
+rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) );
 m_aBspWin.SetFtLeft( rLR.GetLeft() );
 m_aBspWin.SetFtRight( rLR.GetRight() );
 m_aBspWin.SetFooter( true );
@@ -1435,8 +1435,8 @@ void SvxPageDescPage::RangeHdl_Impl()
 SfxItemState::DEFAULT )
 {
 aBorder = GetMinBorderSpace_Impl(
-static_cast(_pSet->Get(GetWhich(SID_ATTR_BORDER_SHADOW))),
-static_cast(_pSet->Get(GetWhich(SID_ATTR_BORDER_OUTER;
+_pSet->Get(GetWhich(SID_ATTR_BORDER_SHADOW)),
+_pSet->Get(GetWhich(SID_ATTR_BORDER_OUTER)));
 }
 
 // limits paper
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 8a3b443cae42..483c41e6f9e2 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -45,6 +45,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index b74b118791d1..7abfccbd452b 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -77,37 +77,39 @@ using namespace editeng;
 void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
 SfxPoolItem& rItem )
 {
-const sal_uInt16 *pNormal = nullptr, *pCJK = nullptr, *pCTL = nullptr;
+std::optional pNormal;
+std::optional pCJK;
+std::optional pCTL;
 switch( rItem.Which() )
 {
 case SID_ATTR_CHAR_FONT:
-pNormal = &aPlainMap[SID_ATTR_CHAR_FONT];
-pCJK = &aPlainMap[SID_ATTR_CHAR_CJK_FONT];
-pCTL = &aPlainMap[SID_ATTR_CHAR_CTL_FONT];
+pNormal = aPlainMap[SID_ATTR_CHAR_FONT];
+pCJK = aPlainMap[SID_ATTR_CHAR_CJK_FONT];
+pCTL = aPlainMap[SID_ATTR_CHAR_CTL_FONT];
 break;
 
 case SID_ATTR_CHAR_

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   42 +
 sw/source/core/undo/docundo.cxx|2 -
 2 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit f0a9d4d4eea6562e98fd92a2797d16504e1d4db5
Author: Miklos Vajna 
AuthorDate: Wed May 24 15:40:35 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 25 08:05:18 2023 +0200

sw: fix wrong downcast in UndoManager::IsViewUndoActionIndependent()

In case a user types in one view, an other user types in an other view,
finally the first user deletes, then getting the undo state resulted in
a memory corruption.

This went wrong in commit 2875c65946e59f5dd7968155463bf00bd71d440b (sw,
out of order undo: allow a subset of a non-empty redo list, 2021-11-11),
the intention was to check if we have a redo item and it has the
expected type, but we checked the type of an earlier undo action that
belongs to the view.

Fix the problem by checking the type of the correct undo action, this
was probably a copy&paste error of mine.

Resolves .

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

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 2fbe09c0a90b..a0345e712714 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1300,6 +1300,48 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 
testUndoReorderingRedo)
 SfxViewShell::Current()->setLibreOfficeKitViewCallback(nullptr);
 }
 
+CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingRedo2)
+{
+// Create two views.
+SwXTextDocument* pXTextDocument = createDoc();
+SwWrtShell* pWrtShell1 = pXTextDocument->GetDocShell()->GetWrtShell();
+int nView1 = SfxLokHelper::getView();
+int nView2 = SfxLokHelper::createView();
+
pXTextDocument->initializeForTiledRendering(uno::Sequence());
+SwWrtShell* pWrtShell2 = pXTextDocument->GetDocShell()->GetWrtShell();
+
+// Type in the first view.
+SfxLokHelper::setView(nView1);
+pWrtShell1->SttEndDoc(/*bStt=*/true);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'f', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'f', 0);
+Scheduler::ProcessEventsToIdle();
+
+// Type to the same paragraph in the second view.
+SfxLokHelper::setView(nView2);
+pWrtShell2->SttEndDoc(/*bStt=*/true);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 's', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 's', 0);
+Scheduler::ProcessEventsToIdle();
+
+// Delete in the first view and undo.
+SfxLokHelper::setView(nView1);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, 
awt::Key::BACKSPACE);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::BACKSPACE);
+Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+// Query the undo state, now that a "delete" is on the redo stack and an 
"insert" belongs to the
+// view on the undo stack, so the types are different.
+SwUndoId nUndoId(SwUndoId::EMPTY);
+// Without the accompanying fix in place, this test would have failed with:
+// runtime error: downcast which does not point to an object of type 
'const SwUndoInsert'
+// note: object is of type 'SwUndoDelete'
+// in an UBSan build.
+pWrtShell1->GetLastUndoInfo(nullptr, &nUndoId, &pWrtShell1->GetView());
+}
+
 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingMulti)
 {
 // Create two views and a document of 2 paragraphs.
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 84fcd4fe5bb6..a9efc248259a 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -416,7 +416,7 @@ bool UndoManager::IsViewUndoActionIndependent(const SwView* 
pView, sal_uInt16& r
 for (size_t i = 0; i < GetRedoActionCount(); ++i)
 {
 auto pRedoAction = dynamic_cast(GetRedoAction(i));
-if (!pRedoAction || pViewSwAction->GetId() != SwUndoId::TYPING)
+if (!pRedoAction || pRedoAction->GetId() != SwUndoId::TYPING)
 {
 return false;
 }

[Libreoffice-commits] core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst  |4 
 external/pdfium/Library_pdfium.mk |1 
 external/pdfium/UnpackedTarball_pdfium.mk |8 -
 external/pdfium/abseil-trivial.patch  |   31 -
 external/pdfium/build.patch.1 |  170 +++---
 external/pdfium/include.patch |   11 -
 6 files changed, 89 insertions(+), 136 deletions(-)

New commits:
commit dc69e7c52f12f57197f26b56c968139186d4ed5b
Author: Miklos Vajna 
AuthorDate: Wed May 24 20:13:48 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 25 08:12:41 2023 +0200

Update pdfium to 5778

- external/pdfium/abseil-trivial.patch is no longer needed, upstream
  does what we did previously

- external/pdfium/build.patch.1: re-generate with 'patch -p1' + 'git
  diff'

- external/pdfium/include.patch is no longer needed, upstream does what
  we did previously

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

diff --git a/download.lst b/download.lst
index f05ff4539cb5..9a0ac67b1bff 100644
--- a/download.lst
+++ b/download.lst
@@ -433,8 +433,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
1a625b25562fb4c25c8bf4660c704111cdd306b8934b94dcd9b89329909ede55
-PDFIUM_TARBALL := pdfium-5636.tar.bz2
+PDFIUM_SHA256SUM := 
b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06
+PDFIUM_TARBALL := pdfium-5778.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index f137f851a0b2..bdab04c6861d 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -293,6 +293,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfunc \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_basedcs \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_indexedcs \
+UnpackedTarball/pdfium/core/fpdfapi/parser/object_tree_traversal_util \
 ))
 
 # fpdfdoc
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 46c7a45ee798..79e93d24d439 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -14,14 +14,6 @@ pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
 pdfium_patches += windows7.patch.1
 pdfium_patches += c++20-comparison.patch
-# Use CoreGraphics.h instead of Carbon.h -- 
https://pdfium-review.googlesource.com/c/pdfium/+/99753
-# pdfium_patches += cg-instead-of-carbon.patch.1
-# Android NDK 19 - that is known to work well - does not have 2 defines -- 
https://pdfium-review.googlesource.com/c/pdfium/+/96530
-# pdfium_patches += AndroidNDK19.patch.1
-
-pdfium_patches += include.patch
-
-pdfium_patches += abseil-trivial.patch
 
 pdfium_patches += constexpr-template.patch
 
diff --git a/external/pdfium/abseil-trivial.patch 
b/external/pdfium/abseil-trivial.patch
deleted file mode 100644
index fa91fa6bbba9..
--- a/external/pdfium/abseil-trivial.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 third_party/abseil-cpp/absl/meta/type_traits.h
-+++ third_party/abseil-cpp/absl/meta/type_traits.h
-@@ -501,27 +501,7 @@ struct is_trivially_move_assignable
- // operation that is not trivial. `is_trivially_copy_assignable` is simply
- // `is_trivially_assignable`.
- template 
--struct is_trivially_copy_assignable
--#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
--: std::is_trivially_copy_assignable {
--#else
--: std::integral_constant<
--  bool, __has_trivial_assign(typename std::remove_reference::type) 
&&
--absl::is_copy_assignable::value> {
--#endif
--#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-- private:
--  static constexpr bool compliant =
--  std::is_trivially_copy_assignable::value ==
--  is_trivially_copy_assignable::value;
--  static_assert(compliant || std::is_trivially_copy_assignable::value,
--"Not compliant with std::is_trivially_copy_assignable; "
--"Standard: false, Implementation: true");
--  static_assert(compliant || !std::is_trivially_copy_assignable::value,
--"Not compliant with std::is_trivially_copy_assignable; "
--"Standard: true, Implementation: false");
--#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
--};
-+using is_trivially_copy_assignable = std::is_trivially_copy_assignable;
- 
- #if defined(__cpp_lib_remove_cvref) && __cpp_lib_remove_cvref >= 201711L
- template 
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 6f6a53a44ef3..2c177b3b61a4 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -1,9 +1,66 @@
 -*-

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_table.cxx |9 -
 connectivity/source/drivers/mysqlc/mysqlc_table.hxx |4 
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c557b30df03cb09ca7133d6921ece09a2a10eb3c
Author: Julien Nabet 
AuthorDate: Wed May 24 22:15:26 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu May 25 08:28:25 2023 +0200

tdf#155443: MySQL/MariaDB direct connect: pb to change fieldname in table

Copy and simplify "getAlterTableColumnPart" from Mysql JDBC part which seems
to do the right job with table name.

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_table.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
index 13d7480998c3..aa2bd528e93e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
@@ -135,7 +135,7 @@ void SAL_CALL 
connectivity::mysqlc::Table::alterColumnByName(
 {
 OUString sNewColName;
 rDescriptor->getPropertyValue("Name") >>= sNewColName;
-OUString sSql("ALTER TABLE `" + getName() + "` RENAME COLUMN `" + 
rColName + "` TO `"
+OUString sSql(getAlterTableColumnPart() + " RENAME COLUMN `" + 
rColName + "` TO `"
   + sNewColName + "`");
 
 getConnection()->createStatement()->execute(sSql);
@@ -155,6 +155,13 @@ void SAL_CALL 
connectivity::mysqlc::Table::alterColumnByIndex(
   descriptor);
 }
 
+OUString connectivity::mysqlc::Table::getAlterTableColumnPart() const
+{
+return "ALTER TABLE "
+   + ::dbtools::composeTableName(getMetaData(), m_CatalogName, 
m_SchemaName, m_Name, true,
+ 
::dbtools::EComposeRule::InTableDefinitions);
+}
+
 OUString connectivity::mysqlc::Table::getRenameStart() const { return "RENAME 
TABLE "; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_table.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
index f17a326878f9..7487f1bc7b34 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
@@ -58,6 +58,10 @@ public:
 
 virtual void SAL_CALL alterColumnByIndex(
 sal_Int32 index, const css::uno::Reference& 
descriptor) override;
+
+/** returns the ALTER TABLE XXX statement
+*/
+OUString getAlterTableColumnPart() const;
 };
 
 } // namespace connectivity::mysqlc