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

[Paris Oplopoios (via logerrit)]

 emfio/qa/cppunit/emf/EmfImportTest.cxx |   15 ++-
 emfio/source/reader/mtftools.cxx   |1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 75093a9f7fbde760a3034f41694739c7454cb7eb
Author: Paris Oplopoios 
AuthorDate: Mon Dec 12 11:30:27 2022 +
Commit: Miklos Vajna 
CommitDate: Tue Dec 13 06:59:06 2022 +

tdf#152435 Revert "Make EMR_SAVEDC not UpdateClipRegion"

This reverts commit 1230b88055c7389d2c376c316f91549e4aaef8aa.

Reason for revert:
The reverted commit breaks the files documented in tdf#152435 (some
text is not shown in those .EMF files). The reverted commit would solve
an issue where some text was not clipped correctly, albeit in a naive
way. As it is more important that text is shown rather than some text
having correct clipping, that patch is reverted and I will look for one
that fixes both cases.

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

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 3d77dd95e5a0..75f2b9001a08 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -1019,19 +1019,16 @@ void Test::TestEmfPlusSave()
 
 assertXPath(pDocument, aXPathPrefix + "mask/polypolygon", "path", "m0 
0h33544v21311h-33544z");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polypolygoncolor[1]/polypolygon", "path",
+assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polypolygoncolor/polypolygon", "path",
 "m327.4583 
638.h437007.1875v29.6h-437007.1875z");
-assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polypolygoncolor[1]", "color",
-"#ff0cad");
+assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor", 
"color", "#ff0cad");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polypolygoncolor[2]/polypolygon", "path",
+assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor/polypolygon", 
"path",
 "m10853.4145539602 
7321.41354709201h41952690v29630720h-41952690z");
-assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polypolygoncolor[2]", "color",
-"#00ffad");
+assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor", "color", 
"#00ffad");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/group/mask/polygonstrokearrow/line", "color",
-"#00");
-assertXPathContent(pDocument, aXPathPrefix + 
"mask/group/mask/polygonstrokearrow/polygon",
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstrokearrow/line", 
"color", "#00");
+assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstrokearrow/polygon",
"10853.4145539602,7321.41354709201 
10853.4145539602,4907.54325697157 "
"12832.6557236512,4907.54325697157");
 }
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 2683151166b2..7f067e4fcd15 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -2365,6 +2365,7 @@ namespace emfio
 
 void MtfTools::Push()   // !! to be able to access the 
original ClipRegion it
 {   // is not allowed to use 
the MetaPushAction()
+UpdateClipRegion(); // (the original clip 
region is on top of the stack) (SJ)
 auto pSave = std::make_shared();
 
 pSave->aLineStyle = maLineStyle;

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

[Miklos Vajna (via logerrit)]

 sw/inc/dpage.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit dabb07a77df33cc1b9732f7276f3d29b8e7e7810
Author: Miklos Vajna 
AuthorDate: Mon Dec 12 20:16:13 2022 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 13 06:57:58 2022 +

sw: document SwDPage

That shared draw page means explicit clipping is needed at many places,
e.g. this is the reason SdrPageView::DrawLayer() has a page frame
parameter.

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

diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index c5a5c45a9813..16d5b4650169 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -27,6 +27,9 @@ class SdrPageGridFrameList;
 class SwDrawModel;
 class SwDoc;
 
+/// SwDPage is Writer's draw page: derives from SdrPage, but has a reference 
to the Writer document
+/// via SwDrawModel. One Writer document has 1 draw page, i.e. all Writer 
pages share the same draw
+/// page.
 class SwDPage final : public FmFormPage, public SdrObjUserCall
 {
 SwDPage &operator=(const SwDPage&) = delete;

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

[offtkp (via logerrit)]

 sw/qa/uibase/wrtsh/wrtsh.cxx  |7 +++
 sw/source/core/txtnode/attrcontentcontrol.cxx |1 -
 sw/source/uibase/wrtsh/wrtsh1.cxx |   14 ++
 sw/source/uibase/wrtsh/wrtsh3.cxx |4 
 4 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 618cef756b87f9816d0dcbe04af163ccd06a986e
Author: offtkp 
AuthorDate: Mon Dec 12 13:03:43 2022 +0200
Commit: Miklos Vajna 
CommitDate: Tue Dec 13 06:44:03 2022 +

docx: Do not remove showingPlcHdr until edit

When a placeholder has the showingPlcHdr attribute, the entire text is
selected upon click. This is no longer removed by selecting it once but
once the text has been edited.

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

diff --git a/sw/qa/uibase/wrtsh/wrtsh.cxx b/sw/qa/uibase/wrtsh/wrtsh.cxx
index d2adde32a179..a2d9fdc37514 100644
--- a/sw/qa/uibase/wrtsh/wrtsh.cxx
+++ b/sw/qa/uibase/wrtsh/wrtsh.cxx
@@ -399,6 +399,13 @@ CPPUNIT_TEST_FIXTURE(Test, 
testInsertPlainTextContentControl)
 // Without the accompanying fix in place, this test would have failed, 
there was no special
 // handling for plain text content controls.
 CPPUNIT_ASSERT(pContentControl->GetPlainText());
+
+CPPUNIT_ASSERT(pContentControl->GetShowingPlaceHolder());
+pWrtShell->GotoContentControl(rFormatContentControl);
+CPPUNIT_ASSERT(pContentControl->GetShowingPlaceHolder());
+pWrtShell->Insert("Foo");
+// No longer showing placeholder text, as it has been changed
+CPPUNIT_ASSERT(!pContentControl->GetShowingPlaceHolder());
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testInsertComboBoxContentControl)
diff --git a/sw/source/core/txtnode/attrcontentcontrol.cxx 
b/sw/source/core/txtnode/attrcontentcontrol.cxx
index 890bf20c1376..1db39849fbe6 100644
--- a/sw/source/core/txtnode/attrcontentcontrol.cxx
+++ b/sw/source/core/txtnode/attrcontentcontrol.cxx
@@ -720,7 +720,6 @@ void SwTextContentControl::Invalidate()
 pDocShell->GetWrtShell()->Push();
 
 // visit the control in the text (which makes any necessary visual changes)
-// NOTE: simply going to a control indicates cancelling 
ShowingPlaceHolder, unless bOnlyRefresh
 // NOTE: simply going to a checkbox causes a toggle, unless bOnlyRefresh
 auto& rFormatContentControl = 
static_cast(GetAttr());
 pDocShell->GetWrtShell()->GotoContentControl(rFormatContentControl, 
/*bOnlyRefresh=*/true);
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index adf96052e8fa..b989343266cb 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -117,6 +117,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace sw::mark;
 using namespace com::sun::star;
@@ -262,6 +263,19 @@ void SwWrtShell::Insert( const OUString &rStr )
 bCallIns ?
 SwEditShell::Insert2( rStr, bDeleted ) : SwEditShell::Overwrite( rStr 
);
 
+// Check whether node is content control
+SwTextContentControl* pTextContentControl = CursorInsideContentControl();
+if (pTextContentControl)
+{
+std::shared_ptr pContentControl =
+pTextContentControl->GetContentControl().GetContentControl();
+if (pContentControl)
+{
+// Set showingPlcHdr to false as node has been edited
+pContentControl->SetShowingPlaceHolder(false);
+}
+}
+
 if( bStarted )
 {
 EndUndo();
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx 
b/sw/source/uibase/wrtsh/wrtsh3.cxx
index aa170d1374a4..4e80bfc1e3d1 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -125,10 +125,6 @@ bool SwWrtShell::GotoContentControl(const 
SwFormatContentControl& rContentContro
 (this->*m_fnKillSel)(nullptr, false);
 
 bool bRet = SwCursorShell::GotoFormatContentControl(rContentControl);
-// Assume that once the placeholder is selected, the content is no longer 
the placeholder.
-if (!bOnlyRefresh && pContentControl)
-pContentControl->SetShowingPlaceHolder(false);
-
 
 if (bRet && pContentControl && pContentControl->GetCheckbox())
 {

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

[Patrick Luby (via logerrit)]

 sw/source/core/layout/layact.cxx |   12 ++
 vcl/osx/salinst.cxx  |   44 ---
 vcl/source/gdi/print3.cxx|   10 
 3 files changed, 63 insertions(+), 3 deletions(-)

New commits:
commit 229b0ce8d8453960c213da59770b8bb7b6dca895
Author: Patrick Luby 
AuthorDate: Wed Dec 7 11:40:18 2022 -0500
Commit: Noel Grandin 
CommitDate: Tue Dec 13 06:08:54 2022 +

tdf#151700 Display native print panel even if there are no printers

Prevent the non-native LibreOffice PrintDialog from displaying by creating 
a fake printer if there are no printers. This will allow the LibreOffice 
printing code to proceed with native NSPrintOperation which will display the 
native print panel.

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

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 22a024bc265d..e8a4a94efc08 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -60,6 +60,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -125,6 +126,20 @@ public:
 
 }
 
+static OUString& getFallbackPrinterName()
+{
+static OUString aFallbackPrinter;
+
+if ( aFallbackPrinter.isEmpty() )
+{
+aFallbackPrinter = VclResId( SV_PRINT_DEFPRT_TXT );
+if ( aFallbackPrinter.isEmpty() )
+aFallbackPrinter = "Printer";
+}
+
+return aFallbackPrinter;
+}
+
 void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
 {
 osl::Guard< comphelper::SolarMutex > aGuard( *GetYieldMutex() );
@@ -765,6 +780,20 @@ void AquaSalInstance::GetPrinterQueueInfo( 
ImplPrnQueueList* pList )
 pList->Add( std::move(pInfo) );
 }
 }
+
+// tdf#151700 Prevent the non-native LibreOffice PrintDialog from
+// displaying by creating a fake printer if there are no printers. This
+// will allow the LibreOffice printing code to proceed with native
+// NSPrintOperation which will display the native print panel.
+if ( !nNameCount )
+{
+std::unique_ptr pInfo(new SalPrinterQueueInfo);
+pInfo->maPrinterName= getFallbackPrinterName();
+pInfo->mnStatus = PrintQueueFlags::NONE;
+pInfo->mnJobs   = 0;
+
+pList->Add( std::move(pInfo) );
+}
 }
 
 void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
@@ -776,7 +805,9 @@ OUString AquaSalInstance::GetDefaultPrinter()
 // #i113170# may not be the main thread if called from UNO API
 SalData::ensureThreadAutoreleasePool();
 
-if( maDefaultPrinter.isEmpty() )
+// WinSalInstance::GetDefaultPrinter() fetches current default printer
+// on every call so do the same here
+OUString aDefaultPrinter;
 {
 NSPrintInfo* pPI = [NSPrintInfo sharedPrintInfo];
 SAL_WARN_IF( !pPI, "vcl", "no print info" );
@@ -786,13 +817,20 @@ OUString AquaSalInstance::GetDefaultPrinter()
 SAL_WARN_IF( !pPr, "vcl", "no printer in default info" );
 if( pPr )
 {
+// Related: tdf#151700 Return the name of the fake printer if
+// there are no printers so that the LibreOffice printing code
+// will be able to find the the fake printer returned by
+// AquaSalInstance::GetPrinterQueueInfo()
 NSString* pDefName = [pPr name];
 SAL_WARN_IF( !pDefName, "vcl", "printer has no name" );
-maDefaultPrinter = GetOUString( pDefName );
+if ( pDefName && [pDefName length])
+aDefaultPrinter = GetOUString( pDefName );
+else
+aDefaultPrinter = getFallbackPrinterName();
 }
 }
 }
-return maDefaultPrinter;
+return aDefaultPrinter;
 }
 
 SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* 
pQueueInfo,
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index e8acbcd38297..dc2fc5e74d35 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -538,6 +538,16 @@ bool 
Printer::PreparePrintJob(std::shared_ptr xController,
 {
 }
 }
+#ifdef MACOSX
+else
+{
+// The PrintDialog updates the printer list in its constructor so do
+// the same for printers that bring up their own dialog since. Not
+// sure if this is needed or not on Windows or X11, so limit only to
+// macOS for now.
+Printer::updatePrinters();
+}
+#endif
 
 xController->pushPropertiesToPrinter();
 return true;
commit d491791dad8c3a946dac8c4dfd28ef0c4cb65ce5
Author: Patrick Luby 
AuthorDate: Sun Dec 11 14:41:15 2022 -0500
Commit: Noel Grandin 
CommitDate: Tue Dec 13 06:08:40 2022 +

Fix infinite loop in sw_ooxmlexport17 unit test on macOS Intel

When running the sw_ooxmlexport17 unit test on sl

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sysui/desktop

[galjit (via logerrit)]

 dev/null|binary
 sysui/desktop/icons/base_app.ico|binary
 sysui/desktop/icons/calc_app.ico|binary
 sysui/desktop/icons/database.ico|binary
 sysui/desktop/icons/draw_app.ico|binary
 sysui/desktop/icons/drawing-template.ico|binary
 sysui/desktop/icons/drawing.ico |binary
 sysui/desktop/icons/formula.ico |binary
 sysui/desktop/icons/impress_app.ico |binary
 sysui/desktop/icons/master-document.ico |binary
 sysui/desktop/icons/math_app.ico|binary
 sysui/desktop/icons/oasis-database.ico  |binary
 sysui/desktop/icons/oasis-drawing-template.ico  |binary
 sysui/desktop/icons/oasis-drawing.ico   |binary
 sysui/desktop/icons/oasis-formula.ico   |binary
 sysui/desktop/icons/oasis-master-document.ico   |binary
 sysui/desktop/icons/oasis-presentation-template.ico |binary
 sysui/desktop/icons/oasis-presentation.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet-template.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet.ico   |binary
 sysui/desktop/icons/oasis-text-template.ico |binary
 sysui/desktop/icons/oasis-text.ico  |binary
 sysui/desktop/icons/oasis-web-template.ico  |binary
 sysui/desktop/icons/oxt-extension.ico   |binary
 sysui/desktop/icons/presentation-template.ico   |binary
 sysui/desktop/icons/presentation.ico|binary
 sysui/desktop/icons/soffice.ico |binary
 sysui/desktop/icons/spreadsheet-template.ico|binary
 sysui/desktop/icons/spreadsheet.ico |binary
 sysui/desktop/icons/text-template.ico   |binary
 sysui/desktop/icons/text.ico|binary
 sysui/desktop/icons/writer_app.ico  |binary
 32 files changed

New commits:
commit 2ee9bb7ce0dde890cac9971d88788c596de550cf
Author: galjit 
AuthorDate: Fri Dec 9 20:38:21 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Dec 13 03:05:01 2022 +

Related tdf#132398 - Update .ico files - Dec 2022

Updated .ico files based on the new hicolor icons
Also deleted those that were not listed in any WinResTarget file

Change-Id: If536ea51518d531918b4dda2d2330d7cc7487c93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143885
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 31a953c7edb22f5fac1e81d92db24e1915b9b317)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144022
Tested-by: Jenkins

diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico
index 5b4bdb30ec72..be8501076a89 100644
Binary files a/sysui/desktop/icons/base_app.ico and 
b/sysui/desktop/icons/base_app.ico differ
diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico
index 14a8b39dd2b2..03a709f3ec20 100644
Binary files a/sysui/desktop/icons/calc_app.ico and 
b/sysui/desktop/icons/calc_app.ico differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index 5b7e091543a0..1700eab51d1b 100644
Binary files a/sysui/desktop/icons/database.ico and 
b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico
index 52cdfe4dc92b..bde547b8e507 100644
Binary files a/sysui/desktop/icons/draw_app.ico and 
b/sysui/desktop/icons/draw_app.ico differ
diff --git a/sysui/desktop/icons/drawing-template.ico 
b/sysui/desktop/icons/drawing-template.ico
index b7f50e2b829b..d04c3cee7467 100644
Binary files a/sysui/desktop/icons/drawing-template.ico and 
b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 67a22ca6bce7..d04c3cee7467 100644
Binary files a/sysui/desktop/icons/drawing.ico and 
b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.ico 
b/sysui/desktop/icons/empty-document.ico
deleted file mode 100644
index 56e1e4e00c99..
Binary files a/sysui/desktop/icons/empty-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/empty-template.ico 
b/sysui/desktop/icons/empty-template.ico
deleted file mode 100644
index 56e1e4e00c99..
Binary files a/sysui/desktop/icons/empty-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index eac96dcbe5c0..faf46fd1b607 100644
Binary files a/sysui/desktop/icons/formula.ico and 
b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/impress_app.ico 
b/sysui/desktop/icons/impress_app.ico
index 235d7cf91945..dda40831ed5e 100644
Binary files a/sysui/desktop/icons/impress_app.ico and 
b/sysui/desktop/icons/impress_app.ico differ
diff --git a/sysui/desktop/icons/master-document.ico 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 7c09d780f9d0803935f939a489ca371318056fdc
Author: Thorsten Behrens 
AuthorDate: Sun Dec 11 23:06:34 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 12 23:09:17 2022 +

Add oox to build side, for cross compilation

With ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058, cui now depends on oox
generated headers, so we need to build oox too, for cross builds.

Change-Id: I1af3116ab35c5094c23db3ed3dccd90c80080cef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 599f9836a674ec525e56fa787a800d7ed4be3383)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143963

diff --git a/configure.ac b/configure.ac
index 9e92838241e2..93e02435e639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5797,6 +5797,7 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
+OOX
 OPENSSL
 ORCUS
 PYTHON

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac

[Thorsten Behrens (via logerrit)]

 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e2af567b99d61a209da21657ec6e0cf641034e86
Author: Thorsten Behrens 
AuthorDate: Sun Dec 11 00:19:53 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 12 23:07:50 2022 +

Replace backslashes in config params before usage in cxx files

With cbfac11330882c7d0a817b6c37a08b2ace2b66f4, LOKit tries to pass
full configure line on via JSON - which, on Windows, might contain
backslashes and other nasties, so we better try to clean that up here.

Change-Id: I8314783fc6f49e9b2b374d94448ed735de39bf81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143940
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit b60dfc2928ef9763452c57f06073185456310609)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143964

diff --git a/configure.ac b/configure.ac
index c2a7159ea9e5..9e92838241e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,7 +522,9 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 LIBO_THIS_YEAR=`date +%Y`
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
-AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$ac_configure_args"]],[Options passed to 
configure script])
+# replace backslashes, to get a valid c++ string
+config_args=$(echo $ac_configure_args | tr '\\' '/')
+AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$config_args"]],[Options passed to 
configure script])
 
 dnl ===
 dnl Product version

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

[Miklos Vajna (via logerrit)]

 framework/inc/dispatch/dispatchprovider.hxx   |2 ++
 framework/inc/dispatch/interceptionhelper.hxx |2 ++
 framework/source/services/frame.cxx   |   11 +++
 3 files changed, 15 insertions(+)

New commits:
commit 4bcf6d9c905e7b5558ee8d9f7f616ce61eadb8f8
Author: Miklos Vajna 
AuthorDate: Mon Dec 12 16:10:05 2022 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 12 22:45:11 2022 +

tdf#151376 framework: fix calling in-document macros with reused frames

The bugdoc has a macro in it, and after closing the document -> start
center -> opening it again, you could no longer trigger the macro by
clicking on the URL field in the Calc cell.

The problem is that we cache protocol handler instances since
3f768cddd28a2f04eb1ffa30bed4474deb6fbfc4 (framework: avoid re-creating
protocol handler instances all the time, 2022-05-02) in frames, but we
failed to invalidate this cache when the component of the frame changes.

Fix the problem by clearing the cache in XFrameImpl::setComponent(),
which gets called in this somewhat rare case when a frame gets reused to
host a different component.

[ No testcase, I'm not sure how to close a document without disposing
its XFrame from code. ]

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

diff --git a/framework/inc/dispatch/dispatchprovider.hxx 
b/framework/inc/dispatch/dispatchprovider.hxx
index 3b544807337c..c6656948ebee 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -88,6 +88,8 @@ class DispatchProvider final : public ::cppu::WeakImplHelper< 
css::frame::XDispa

sal_Int32   
  nSearchFlags ) override;
 virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch 
> > SAL_CALL queryDispatches( const css::uno::Sequence< 
css::frame::DispatchDescriptor >& lDescriptions) override;
 
+void ClearProtocolHandlers() { m_aProtocolHandlers.clear(); }
+
 /* helper */
 private:
 // Let him protected! So nobody can use us as base ...
diff --git a/framework/inc/dispatch/interceptionhelper.hxx 
b/framework/inc/dispatch/interceptionhelper.hxx
index 391986ff549f..681f69c6d013 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -244,6 +244,8 @@ class InterceptionHelper final : public  
::cppu::WeakImplHelper<
  */
 virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) 
override;
 
+css::uno::Reference GetSlave() const { 
return m_xSlave; }
+
 }; // class InterceptionHelper
 
 } // namespace framework
diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 7e8ea9b8823b..b658874b865f 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1473,6 +1473,17 @@ sal_Bool SAL_CALL XFrameImpl::setComponent(const 
css::uno::Reference< css::awt::
 {
 SolarMutexGuard aWriteLock;
 m_xController = nullptr;
+
+auto pInterceptionHelper = 
dynamic_cast(m_xDispatchHelper.get());
+if (pInterceptionHelper)
+{
+css::uno::Reference 
xDispatchProvider = pInterceptionHelper->GetSlave();
+auto pDispatchProvider = 
dynamic_cast(xDispatchProvider.get());
+if (pDispatchProvider)
+{
+pDispatchProvider->ClearProtocolHandlers();
+}
+}
 }
 /* } SAFE */
 

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

[Xisco Fauli (via logerrit)]

 sd/qa/unit/sdmodeltestbase.hxx |   19 ---
 1 file changed, 19 deletions(-)

New commits:
commit 2ef1439ae90b3621198728b4e1e67b2e72fc376c
Author: Xisco Fauli 
AuthorDate: Mon Dec 12 18:08:44 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 21:54:46 2022 +

SdModelTestBase: remove duplicated template

this is already defined in include/tools/gen.hxx

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

diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 08e3a8e7fbc3..f651419c776b 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -172,23 +172,4 @@ public:
 }
 };
 
-CPPUNIT_NS_BEGIN
-
-template <> struct assertion_traits
-{
-static bool equal(const tools::Rectangle& r1, const tools::Rectangle& r2) 
{ return r1 == r2; }
-
-static std::string toString(const tools::Rectangle& r)
-{
-OStringStream ost;
-ost << "Rect P: [" << r.Top() << ", " << r.Left()
-<< "] "
-   "S: ["
-<< r.GetWidth() << ", " << r.GetHeight() << "]";
-return ost.str();
-}
-};
-
-CPPUNIT_NS_END
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Xisco Fauli (via logerrit)]

 chart2/qa/extras/uichart.cxx   |   38 +
 sc/qa/uitest/chart/tdf98690.py |   42 -
 2 files changed, 38 insertions(+), 42 deletions(-)

New commits:
commit 0e5d89a149e86975e103270a0ff4e65776ff8f85
Author: Xisco Fauli 
AuthorDate: Mon Dec 12 17:27:12 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 21:54:27 2022 +

tdf#98690: move UItest to CppUnittest

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

diff --git a/sc/qa/uitest/data/tdf98690.xlsx 
b/chart2/qa/extras/data/xlsx/tdf98690.xlsx
similarity index 100%
rename from sc/qa/uitest/data/tdf98690.xlsx
rename to chart2/qa/extras/data/xlsx/tdf98690.xlsx
diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx
index ec250f80bb27..877ea0ffac1e 100644
--- a/chart2/qa/extras/uichart.cxx
+++ b/chart2/qa/extras/uichart.cxx
@@ -201,6 +201,44 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057)
 testCopyPasteToNewSheet(xChartDoc, "Object 1", 2, 6);
 }
 
+CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690)
+{
+loadFromURL(u"xlsx/tdf98690.xlsx");
+uno::Reference xChartDoc(getChartCompFromSheet(0, 
0, mxComponent),
+uno::UNO_QUERY_THROW);
+
+CPPUNIT_ASSERT(xChartDoc.is());
+uno::Reference xChartData(xChartDoc->getData(), 
uno::UNO_QUERY_THROW);
+uno::Sequence aSeriesList = xChartData->getColumnDescriptions();
+CPPUNIT_ASSERT_EQUAL(static_cast(6), aSeriesList.getLength());
+
+uno::Sequence aPropertyValues = {
+comphelper::makePropertyValue("ToObject", OUString("Chart 2")),
+};
+dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:Copy", {});
+Scheduler::ProcessEventsToIdle();
+
+// create a new document
+load("private:factory/scalc");
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+
+uno::Reference xChartDoc2(getChartCompFromSheet(0, 
0, mxComponent),
+ uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xChartDoc2.is());
+uno::Reference xChartData2(xChartDoc2->getData(), 
uno::UNO_QUERY_THROW);
+uno::Sequence aSeriesList2 = 
xChartData2->getColumnDescriptions();
+
+// Without the fix in place, this test would have failed with
+// - Expected: 12
+// - Actual  : 0
+CPPUNIT_ASSERT_EQUAL(static_cast(12), aSeriesList2.getLength());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/uitest/chart/tdf98690.py b/sc/qa/uitest/chart/tdf98690.py
deleted file mode 100644
index 8cd6b82c0359..
--- a/sc/qa/uitest/chart/tdf98690.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
-#
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_url_for_data_file
-
-class tdf98690(UITestCase):
-
-  def test_tdf98690(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf98690.xlsx")):
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-
-gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Chart 
2"}))
-
-self.xUITest.executeCommand(".uno:Copy")
-
-with self.ui_test.load_empty_file("calc") as calc_document:
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-
-self.xUITest.executeCommand(".uno:Paste")
-
-xData = calc_document.Sheets[0].Charts[0].getEmbeddedObject().Data
-
-aExpectedRowDescriptions = tuple(str(i) for i in range(1, 14))
-aExpectedColumnDescriptions = ('Column D Column D', 'cc_girder2', 
'Column S Column S',
-'Column S Column S', 'Column D Column D', 'clexrfdon', 'Column 
S Column S',
-'Column S Column S', 'Column D', 'clexrfdoff', 'Column S 
Column S', 'Column S Column S')
-
-# Without the fix in place, this test would have failed here,
-# since the pasted chart wouldn't have had any data
-self.assertEqual(aExpectedRowDescriptions, xData.RowDescriptions)
-self.assertEqual(aExpectedColumnDescriptions, xData.ColumnDescriptions)
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/thesaurus.ui |  145 +--
 1 file changed, 71 insertions(+), 74 deletions(-)

New commits:
commit 5b2aa621ec501f580c359a79bfcb8893594ef288
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 16:56:34 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 21:29:53 2022 +

resave with latest glade

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

diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui
index fbd890635d70..ea8a8ab0450e 100644
--- a/cui/uiconfig/ui/thesaurus.ui
+++ b/cui/uiconfig/ui/thesaurus.ui
@@ -1,10 +1,10 @@
 
-
+
 
   
   
 True
-False
+False
 go-previous
   
   
@@ -18,29 +18,29 @@
 
   
   
-False
-6
+False
+6
 Thesaurus
 False
 True
-0
-0
-dialog
+0
+0
+dialog
 
   
-False
+False
 vertical
 12
 
   
-False
-end
+False
+end
 
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -54,11 +54,11 @@
   
 _Replace
 True
-True
-True
-True
-True
-True
+True
+True
+True
+True
+True
   
   
 False
@@ -70,9 +70,9 @@
   
 _Cancel
 True
-True
-True
-True
+True
+True
+True
 True
   
   
@@ -85,67 +85,67 @@
   
 False
 True
-end
+end
 0
   
 
 
-  
+  
   
 True
-False
-6
-12
+False
+6
+12
 
   
 True
-False
+False
 Current word:
-True
-wordcb
+True
+wordcb
 0
   
   
-1
-0
+1
+0
 2
   
 
 
   
 True
-False
+False
 Alternatives:
-True
-alternatives
+True
+alternatives
 0
   
   
-0
-2
+0
+2
 3
   
 
 
   
 True
-False
+False
 Replace with:
-True
-replaceed
+True
+replaceed
 0
   
   
-0
-4
+0
+4
 3
   
 
 
   
 True
-True
-True
+True
+True
 True
 
   
@@ -154,16 +154,16 @@
 
   
   
-0
-5
+0
+5
 3
   
 
 
   
 True
-True
-True
+True
+True
 start
 center
 image1
@@ -175,14 +175,14 @@
 
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 center
 
   
@@ -191,23 +191,23 @@
 
   
   
-2
-1
+2
+1
   
 
 
   
 True
-False
+False
 center
 True
-True
+True
 
   
 True
-True
+True
+True
 True
-  

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

[galjit (via logerrit)]

 dev/null|binary
 sysui/desktop/icons/base_app.ico|binary
 sysui/desktop/icons/calc_app.ico|binary
 sysui/desktop/icons/database.ico|binary
 sysui/desktop/icons/draw_app.ico|binary
 sysui/desktop/icons/drawing-template.ico|binary
 sysui/desktop/icons/drawing.ico |binary
 sysui/desktop/icons/formula.ico |binary
 sysui/desktop/icons/impress_app.ico |binary
 sysui/desktop/icons/master-document.ico |binary
 sysui/desktop/icons/math_app.ico|binary
 sysui/desktop/icons/oasis-database.ico  |binary
 sysui/desktop/icons/oasis-drawing-template.ico  |binary
 sysui/desktop/icons/oasis-drawing.ico   |binary
 sysui/desktop/icons/oasis-formula.ico   |binary
 sysui/desktop/icons/oasis-master-document.ico   |binary
 sysui/desktop/icons/oasis-presentation-template.ico |binary
 sysui/desktop/icons/oasis-presentation.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet-template.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet.ico   |binary
 sysui/desktop/icons/oasis-text-template.ico |binary
 sysui/desktop/icons/oasis-text.ico  |binary
 sysui/desktop/icons/oasis-web-template.ico  |binary
 sysui/desktop/icons/oxt-extension.ico   |binary
 sysui/desktop/icons/presentation-template.ico   |binary
 sysui/desktop/icons/presentation.ico|binary
 sysui/desktop/icons/soffice.ico |binary
 sysui/desktop/icons/spreadsheet-template.ico|binary
 sysui/desktop/icons/spreadsheet.ico |binary
 sysui/desktop/icons/text-template.ico   |binary
 sysui/desktop/icons/text.ico|binary
 sysui/desktop/icons/writer_app.ico  |binary
 32 files changed

New commits:
commit 31a953c7edb22f5fac1e81d92db24e1915b9b317
Author: galjit 
AuthorDate: Fri Dec 9 20:38:21 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 21:28:56 2022 +

Related tdf#132398 - Update .ico files - Dec 2022

Updated .ico files based on the new hicolor icons
Also deleted those that were not listed in any WinResTarget file

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

diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico
index 5b4bdb30ec72..be8501076a89 100644
Binary files a/sysui/desktop/icons/base_app.ico and 
b/sysui/desktop/icons/base_app.ico differ
diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico
index 14a8b39dd2b2..03a709f3ec20 100644
Binary files a/sysui/desktop/icons/calc_app.ico and 
b/sysui/desktop/icons/calc_app.ico differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index 5b7e091543a0..1700eab51d1b 100644
Binary files a/sysui/desktop/icons/database.ico and 
b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico
index 52cdfe4dc92b..bde547b8e507 100644
Binary files a/sysui/desktop/icons/draw_app.ico and 
b/sysui/desktop/icons/draw_app.ico differ
diff --git a/sysui/desktop/icons/drawing-template.ico 
b/sysui/desktop/icons/drawing-template.ico
index b7f50e2b829b..d04c3cee7467 100644
Binary files a/sysui/desktop/icons/drawing-template.ico and 
b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 67a22ca6bce7..d04c3cee7467 100644
Binary files a/sysui/desktop/icons/drawing.ico and 
b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.ico 
b/sysui/desktop/icons/empty-document.ico
deleted file mode 100644
index 56e1e4e00c99..
Binary files a/sysui/desktop/icons/empty-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/empty-template.ico 
b/sysui/desktop/icons/empty-template.ico
deleted file mode 100644
index 56e1e4e00c99..
Binary files a/sysui/desktop/icons/empty-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index eac96dcbe5c0..faf46fd1b607 100644
Binary files a/sysui/desktop/icons/formula.ico and 
b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/impress_app.ico 
b/sysui/desktop/icons/impress_app.ico
index 235d7cf91945..dda40831ed5e 100644
Binary files a/sysui/desktop/icons/impress_app.ico and 
b/sysui/desktop/icons/impress_app.ico differ
diff --git a/sysui/desktop/icons/master-document.ico 
b/sysui/desktop/icons/master-document.ico
index 7ac50c138182..07a828095ac0 100644
Binary files a/sysui/desktop/icons/master-document.ico and 
b/sysui/desktop/i

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

[Olivier Hallot (via logerrit)]

 sc/uiconfig/scalc/ui/solverdlg.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e11a61b5630396f0b6d8312fbc7e12337e1f645e
Author: Olivier Hallot 
AuthorDate: Sat Dec 10 11:02:18 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 21:26:19 2022 +

Make extended tip more precise (after translator review)

Thanks to Tuomas Hietala.

Change-Id: I99d630d7e7086270ca76173c254cd282cbe81a5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143915
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit cb415ed64a647fe736599bb6c4f2136aa5ec5d1b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144021

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui 
b/sc/uiconfig/scalc/ui/solverdlg.ui
index 18bbb5868caa..458a205ba5d4 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -57,7 +57,7 @@
 True
 
   
-Opens the Solver 
Options dialog.
+Opens the solver’s 
Options dialog.
   
 
   

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

[Olivier Hallot (via logerrit)]

 sc/uiconfig/scalc/ui/solverdlg.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb415ed64a647fe736599bb6c4f2136aa5ec5d1b
Author: Olivier Hallot 
AuthorDate: Sat Dec 10 11:02:18 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 21:25:56 2022 +

Make extended tip more precise (after translator review)

Thanks to Tuomas Hietala.

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

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui 
b/sc/uiconfig/scalc/ui/solverdlg.ui
index 18bbb5868caa..458a205ba5d4 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -57,7 +57,7 @@
 True
 
   
-Opens the Solver 
Options dialog.
+Opens the solver’s 
Options dialog.
   
 
   

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/thesdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 36651d2b51f7db243d975cc2bf3bb8975b2faa10
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 16:58:46 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 21:16:45 2022 +

Resolves: tdf#139749 set initial focus to combobox

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

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 1d98480973ee..ea98a44a3c9e 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -315,6 +315,8 @@ SvxThesaurusDialog::SvxThesaurusDialog(
 // disable controls if service is missing
 if (!xThesaurus.is())
 m_xDialog->set_sensitive(false);
+else
+m_xWordCB->grab_focus();
 }
 
 SvxThesaurusDialog::~SvxThesaurusDialog()

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/thesdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d4a1d4b266a74a9adeaa84a8caab9b8b33dbb302
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 16:58:46 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 20:57:58 2022 +

Resolves: tdf#139749 set initial focus to combobox

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

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 1d98480973ee..ea98a44a3c9e 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -315,6 +315,8 @@ SvxThesaurusDialog::SvxThesaurusDialog(
 // disable controls if service is missing
 if (!xThesaurus.is())
 m_xDialog->set_sensitive(false);
+else
+m_xWordCB->grab_focus();
 }
 
 SvxThesaurusDialog::~SvxThesaurusDialog()

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/thesdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2390c63e311497892f56e7e16a213195098c87b4
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 16:58:46 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 20:58:08 2022 +

Resolves: tdf#139749 set initial focus to combobox

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

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 1d98480973ee..ea98a44a3c9e 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -315,6 +315,8 @@ SvxThesaurusDialog::SvxThesaurusDialog(
 // disable controls if service is missing
 if (!xThesaurus.is())
 m_xDialog->set_sensitive(false);
+else
+m_xWordCB->grab_focus();
 }
 
 SvxThesaurusDialog::~SvxThesaurusDialog()

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

[Caolán McNamara (via logerrit)]

 oox/source/helper/attributelist.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 76b923ebf17eba7d2ec13b66bf03f3ac4ea347c3
Author: Caolán McNamara 
AuthorDate: Sun Dec 11 16:42:37 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 20:14:17 2022 +

crashtesting: accept timestamp with Z suffix as valid

seen with forum-mso-en4-652977.xlsx

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

diff --git a/oox/source/helper/attributelist.cxx 
b/oox/source/helper/attributelist.cxx
index e0bea17c22e6..c247fdb43e8d 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -250,8 +250,9 @@ OptValue< util::DateTime > AttributeList::getDateTime( 
sal_Int32 nAttrToken ) co
 {
 OUString aValue = mxAttribs->getOptionalValue( nAttrToken );
 util::DateTime aDateTime;
-bool bValid = (aValue.getLength() == 19) && (aValue[ 4 ] == '-') && 
(aValue[ 7 ] == '-') &&
-(aValue[ 10 ] == 'T') && (aValue[ 13 ] == ':') && (aValue[ 16 ] == 
':');
+bool bValid = (aValue.getLength() == 19 || (aValue.getLength() == 20 && 
aValue[19] == 'Z')) &&
+(aValue[ 4 ] == '-') && (aValue[ 7 ] == '-') && (aValue[ 10 ] == 'T') 
&&
+(aValue[ 13 ] == ':') && (aValue[ 16 ] == ':');
 if( bValid )
 {
 aDateTime.Year= static_cast< sal_uInt16 >( 
o3tl::toInt32(aValue.subView( 0, 4 )) );

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/address.cxx  |2 +-
 sc/source/filter/oox/worksheethelper.cxx |   13 -
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit b7fbb1ee9eddd4ec6099bd3677068185e5e96473
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 10:19:36 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 20:13:42 2022 +

crashtesting: assert seen on loading forum-mso-en4-497867.xlsx

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

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index f704290e340d..7bd66f6402e4 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2094,7 +2094,7 @@ static void lcl_Split_DocTab( const ScDocument& rDoc,  
SCTAB nTab,
 rDoc.GetName(nTab, rTabName);
 rDocName.clear();
 // External reference, same as in ScCompiler::MakeTabStr()
-if ( rTabName[0] == '\'' )
+if (!rTabName.isEmpty() && rTabName[0] == '\'')
 {   // "'Doc'#Tab"
 sal_Int32 nPos = ScCompiler::GetDocTabPos( rTabName);
 if (nPos != -1)
commit f3fb7ade7fba0c2c4c56f155c3e048d5bcc4c3e1
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 09:48:39 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 20:13:30 2022 +

crashtesting: assert see on loading forum-mso-en4-489894.xlsx

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

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 010a4189cf7f..2c409e0d7b14 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1378,7 +1378,18 @@ void WorksheetGlobals::finalizeDrawings()
 Needed if the imported document is inserted as "OLE object from file"
 and thus does not provide an OLE size property by itself. */
 if( (maShapeBoundingBox.Width > 0) || (maShapeBoundingBox.Height > 0) )
-extendUsedArea( getCellRangeFromRectangle( maShapeBoundingBox ) );
+{
+ScRange aRange(getCellRangeFromRectangle(maShapeBoundingBox));
+if (aRange.aStart.Col() < 0)
+aRange.aStart.SetCol(0);
+if (aRange.aStart.Row() < 0)
+aRange.aStart.SetRow(0);
+if (aRange.aEnd.Col() < 0)
+aRange.aEnd.SetCol(0);
+if (aRange.aEnd.Row() < 0)
+aRange.aEnd.SetRow(0);
+extendUsedArea(aRange);
+}
 
 // if no used area is set, default to A1
 if( maUsedArea.aStart.Col() > maUsedArea.aEnd.Col() )

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit c6956491f4938a80754dda6e4218ad84ffcc837b
Author: Olivier Hallot 
AuthorDate: Mon Dec 12 19:23:18 2022 +
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 19:23:18 2022 +

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-5'
  to e5e867d40a4a958627db0ed1595d3987e4224a30
  - Mute L10n in code instructions

Change-Id: I92f719fbd4b646809fb385360541b285a41fd3d9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143919
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 3f394267138498a70430a44dcbc4cff8727ce367)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144019
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index b145c182c198..e5e867d40a4a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b145c182c198f2039da951f96931f7181f2db4be
+Subproject commit e5e867d40a4a958627db0ed1595d3987e4224a30

[Libreoffice-commits] help.git: Branch 'libreoffice-7-5' - source/text

[Olivier Hallot (via logerrit)]

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

New commits:
commit e5e867d40a4a958627db0ed1595d3987e4224a30
Author: Olivier Hallot 
AuthorDate: Sat Dec 10 12:55:23 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 19:23:18 2022 +

Mute L10n in code instructions

Change-Id: I92f719fbd4b646809fb385360541b285a41fd3d9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143919
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 3f394267138498a70430a44dcbc4cff8727ce367)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144019
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/shared/03103600.xhp 
b/source/text/sbasic/shared/03103600.xhp
index 1a33a15ed0..5cf06080d7 100644
--- a/source/text/sbasic/shared/03103600.xhp
+++ b/source/text/sbasic/shared/03103600.xhp
@@ -38,17 +38,17 @@
 
 
 
-  TypeName 
(Varname As Variant) As String
-  VarType 
(Varname As Variant) As Integer
+  TypeName (Varname As Variant) As String
+  VarType (Varname As Variant) As Integer
 
 
 
 
 
-Text for 
TypeName suffixed with '()' for arrays.
+A text for 
TypeName suffixed with '()' for arrays.
 
 
-Integer for 
VarType. 8192 is added to the returned 
value for arrays.
+An integer for 
VarType. The number 8192 is added to the returned value for 
arrays of type VarType.
 
 
 

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4' - source/an source/ast source/bg source/bn source/bn-IN source/bo source/bs source/ca source/cs source/cy source/da source/de source/ds

[Christian Lohmaier (via logerrit)]

 source/an/officecfg/registry/data/org/openoffice/Office/UI.po   |  
  3 
 source/ast/chart2/messages.po   |  
 10 
 source/ast/cui/messages.po  |  
 24 
 source/ast/filter/source/config/fragments/filters.po|  
  8 
 source/ast/helpcontent2/source/text/sbasic/shared/02.po |  
 10 
 source/ast/helpcontent2/source/text/scalc.po|  
  8 
 source/ast/helpcontent2/source/text/scalc/01.po |  
 18 
 source/ast/helpcontent2/source/text/scalc/02.po |  
 16 
 source/ast/helpcontent2/source/text/sdatabase.po|  
  6 
 source/ast/helpcontent2/source/text/shared/01.po|  
 10 
 source/ast/helpcontent2/source/text/shared/guide.po |  
  8 
 source/ast/helpcontent2/source/text/shared/optionen.po  |  
 12 
 source/ast/helpcontent2/source/text/simpress.po |  
  8 
 source/ast/helpcontent2/source/text/simpress/01.po  |  
  8 
 source/ast/helpcontent2/source/text/simpress/02.po  |  
  8 
 source/ast/helpcontent2/source/text/simpress/guide.po   |  
  4 
 source/ast/helpcontent2/source/text/smath/00.po |  
 18 
 source/ast/helpcontent2/source/text/smath/01.po |  
  8 
 source/ast/helpcontent2/source/text/swriter/01.po   |  
 16 
 source/ast/helpcontent2/source/text/swriter/02.po   |  
 22 
 source/ast/officecfg/registry/data/org/openoffice/Office.po |  
  4 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po  |  
 18 
 source/ast/sc/messages.po   |  
 22 
 source/ast/scaddins/messages.po |  
 12 
 source/ast/scp2/source/writer.po|  
 10 
 source/ast/sd/messages.po   |  
 13 
 source/ast/sfx2/messages.po |  
  6 
 source/ast/svtools/messages.po  |  
  6 
 source/ast/svx/messages.po  |  
 13 
 source/ast/sw/messages.po   |  
 10 
 source/ast/wizards/source/resources.po  |  
  7 
 source/bg/dbaccess/messages.po  |  
  6 
 source/bg/helpcontent2/source/text/shared/guide.po  |  
  8 
 source/bg/officecfg/registry/data/org/openoffice/Office.po  |  
  6 
 source/bg/sc/messages.po|  
  8 
 source/bg/svtools/messages.po   |  
  8 
 source/bn-IN/helpcontent2/source/text/shared/guide.po   |  
 10 
 source/bn-IN/readlicense_oo/docs.po |  
 10 
 source/bn/helpcontent2/source/text/shared/guide.po  |  
  8 
 source/bo/readlicense_oo/docs.po|  
 10 
 source/bs/helpcontent2/source/text/shared/00.po |  
 10 
 source/ca/filter/messages.po|  
  4 
 source/ca/filter/source/config/fragments/filters.po |  
  8 
 source/ca/filter/source/config/fragments/internalgraphicfilters.po  |  
 16 
 source/ca/framework/messages.po |  
 10 
 source/ca/helpcontent2/source/text/sbasic/guide.po  |  
  8 
 source/ca/helpcontent2/source/text/sbasic/python.po |  
 12 
 source/ca/helpcontent2/source/text/sbasic/shared.po |  
 29 
 source/ca/helpcontent2/source/text/sbasic/shared/02.po  |  
  4 
 source/ca/helpcontent2/source/text/scalc/01.po  |  
 16 
 source/ca/helpcontent2/source/text/sdatabase.po |  
 14 
 source/ca/helpcontent2/source/text/sdraw/01.po  |  
  8 
 source/ca/helpcontent2/source/text/shared/01.po |  
 13 
 source/ca/helpcontent2/source/text/shared/02.po |  
108 
 source/ca/helpcontent2/source/text/shared/guide.po  |  
110 
 source/ca/helpcontent2/source/text/shared/optionen.po   |  
370 
 source/ca/helpcontent2/source/text/simpress/02.po   |  
  6 
 source/ca/helpcontent2/source/text/simpress/guide.po|  
 57 
 source/ca/

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit bc2d59641c38b237eecef464a1c725da6592f55c
Author: Christian Lohmaier 
AuthorDate: Mon Dec 12 18:59:21 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 17:59:21 2022 +

Update git submodules

* Update translations from branch 'libreoffice-7-4'
  to b6b1cf01ee6b3ff3435e22dc96f5f3a1be2f1f9c
  - update translations for 7.4

and force-fix errors using pocheck

Change-Id: I7ca894b7250666bcffbd136ba5ceff45f2122e2c

diff --git a/translations b/translations
index 866c614e3b64..b6b1cf01ee6b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 866c614e3b6401538fc951583e8bbb11874da097
+Subproject commit b6b1cf01ee6b3ff3435e22dc96f5f3a1be2f1f9c

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - helpcontent2

[Bogdan B (via logerrit)]

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

New commits:
commit c27e04e7abce2486273bd3b1888e9c9afe01d139
Author: Bogdan B 
AuthorDate: Mon Dec 12 17:38:01 2022 +
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 17:38:01 2022 +

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-5'
  to b145c182c198f2039da951f96931f7181f2db4be
  - tdf#152022 Improve Select Text and Edit Mode

Select Text was wrongly linking to Edit mode page. The hyperlink is now 
removed. Also is impossible to be in Edit mode and active Edit mode, so it 
can't be activate or deactivate edit mode.

Change-Id: I1d759b3962692c2dcec181267045d15f934325ec
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143728
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 0743da9a51f1d7733f436d0144e35e8536e56583)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144017

diff --git a/helpcontent2 b/helpcontent2
index 79a1aad15a90..b145c182c198 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 79a1aad15a9024a25e83b9ceb47455f63434e4bd
+Subproject commit b145c182c198f2039da951f96931f7181f2db4be

[Libreoffice-commits] help.git: Branch 'libreoffice-7-5' - source/text

[Bogdan B (via logerrit)]

 source/text/shared/02/0707.xhp |2 +-
 source/text/swriter/main0102.xhp   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b145c182c198f2039da951f96931f7181f2db4be
Author: Bogdan B 
AuthorDate: Thu Dec 8 20:12:05 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 17:38:01 2022 +

tdf#152022 Improve Select Text and Edit Mode

Select Text was wrongly linking to Edit mode page. The hyperlink is now 
removed. Also is impossible to be in Edit mode and active Edit mode, so it 
can't be activate or deactivate edit mode.

Change-Id: I1d759b3962692c2dcec181267045d15f934325ec
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143728
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 0743da9a51f1d7733f436d0144e35e8536e56583)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144017

diff --git a/source/text/shared/02/0707.xhp 
b/source/text/shared/02/0707.xhp
index f325143be0..2aedcbf4c2 100644
--- a/source/text/shared/02/0707.xhp
+++ b/source/text/shared/02/0707.xhp
@@ -39,7 +39,7 @@
 mw inserted "Edit File icon" entry
 
 Edit Mode
-Enables you to edit a read-only document 
or database table. Use the Edit Mode icon to activate or 
deactivate the edit mode.
+Enables you to edit a read-only document 
or database table. Use the Edit Mode option to activate 
the edit mode.
 
 
 
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index 8235b287e5..abc67966b2 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -43,7 +43,7 @@
 
 
 
-Select Text
+Select Text
 
 
 

[Libreoffice-commits] core.git: helpcontent2

[Bogdan B (via logerrit)]

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

New commits:
commit 8f2e33c1e57aec67fbab456cd3aeeaa7ed60f67e
Author: Bogdan B 
AuthorDate: Mon Dec 12 17:36:08 2022 +
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 17:36:08 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0743da9a51f1d7733f436d0144e35e8536e56583
  - tdf#152022 Improve Select Text and Edit Mode

Select Text was wrongly linking to Edit mode page. The hyperlink is now 
removed. Also is impossible to be in Edit mode and active Edit mode, so it 
can't be activate or deactivate edit mode.

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

diff --git a/helpcontent2 b/helpcontent2
index 3f3942671384..0743da9a51f1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f394267138498a70430a44dcbc4cff8727ce367
+Subproject commit 0743da9a51f1d7733f436d0144e35e8536e56583

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

[Bogdan B (via logerrit)]

 source/text/shared/02/0707.xhp |2 +-
 source/text/swriter/main0102.xhp   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0743da9a51f1d7733f436d0144e35e8536e56583
Author: Bogdan B 
AuthorDate: Thu Dec 8 20:12:05 2022 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 12 17:36:07 2022 +

tdf#152022 Improve Select Text and Edit Mode

Select Text was wrongly linking to Edit mode page. The hyperlink is now 
removed. Also is impossible to be in Edit mode and active Edit mode, so it 
can't be activate or deactivate edit mode.

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

diff --git a/source/text/shared/02/0707.xhp 
b/source/text/shared/02/0707.xhp
index f325143be0..2aedcbf4c2 100644
--- a/source/text/shared/02/0707.xhp
+++ b/source/text/shared/02/0707.xhp
@@ -39,7 +39,7 @@
 mw inserted "Edit File icon" entry
 
 Edit Mode
-Enables you to edit a read-only document 
or database table. Use the Edit Mode icon to activate or 
deactivate the edit mode.
+Enables you to edit a read-only document 
or database table. Use the Edit Mode option to activate 
the edit mode.
 
 
 
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index 8235b287e5..abc67966b2 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -43,7 +43,7 @@
 
 
 
-Select Text
+Select Text
 
 
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sw/inc sw/Library_vbaswobj.mk sw/qa sw/source

[Justin Luth (via logerrit)]

 oovbaapi/UnoApi_oovbaapi.mk  |2 
 oovbaapi/ooo/vba/word/XContentControlListEntries.idl |   30 +++
 oovbaapi/ooo/vba/word/XContentControlListEntry.idl   |   43 
 sw/Library_vbaswobj.mk   |2 
 sw/inc/formatcontentcontrol.hxx  |4 
 sw/qa/core/data/docm/testModernVBA.docm  |binary
 sw/source/core/txtnode/attrcontentcontrol.cxx|   66 +++
 sw/source/ui/vba/vbacontentcontrol.cxx   |   12 -
 sw/source/ui/vba/vbacontentcontrollistentries.cxx|  176 +++
 sw/source/ui/vba/vbacontentcontrollistentries.hxx|   51 +
 sw/source/ui/vba/vbacontentcontrollistentry.cxx  |  161 +
 sw/source/ui/vba/vbacontentcontrollistentry.hxx  |   54 +
 12 files changed, 595 insertions(+), 6 deletions(-)

New commits:
commit 0632c2df0f0b6524bd5c4bb8e7e62a3996359a2e
Author: Justin Luth 
AuthorDate: Mon Nov 21 19:57:15 2022 -0500
Commit: Justin Luth 
CommitDate: Mon Dec 12 17:34:18 2022 +

tdf#151548 vba ContentControls: Add word::XContentControlListEntry

make CppunitTest_sw_macros_test CPPUNIT_TEST_NAME=testVba

Squashed commit containing various cleanups.

This now allows MS Word's modern content control list boxes
(combobox and dropbox) to be controlled by VBA basic.
-allows getting and setting the selected list entry
-allows adding/deleting/renaming/moving list entries

  If .DropdownListEntries.Count <> 3 Then GoTo errorhandler:
  .DropdownListEntries.Item(2).Select
  .DropdownListEntries.Item(2).Delete

  If .DropdownListEntries.Item(2).Text <> "infinity"
  If .DropdownListEntries.Item(2).Value <> "infinity and beyond"

  'With .DropdownListEntries.Add("third", "3rd", 2)
  Dim LE As ContentControlListEntry
  Set LE = .DropdownListEntries.Add("third", "3rd", 2)
  With LE
If LE.Index <> 2 Then GoTo errorhandler:
If LE.Value <> "3rd" Then GoTo errorhandler:
.MoveUp
.MoveUp
.MoveUp
If .Index <> 1 Then GoTo errorhandler:
.MoveDown
.MoveDown
If .Index <> 3 Then GoTo errorhandler:
End With 'LE
  If .DropdownListEntries.Item(3).Text <> "third" Then GoTo errorhandler:
  End With 'Item 1
runOnceDropDown:

With ActiveDocument.ContentControls.Item(4)
  If .Type <> wdContentControlComboBox Then GoTo errorhandler:
  .DropdownListEntries.Clear
End With

Change-Id: Iffebb2bd69abec1cbcfaed05b58f940664852eae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143082
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

Fix typo

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

Fix typo

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

tdf#151548 ContentControls: improve ListEntry::setValue

The LO implementation pulls the display text from the value
in case there is no display text provided.

This is the opposite from VBA. So when we set the Value,
make sure that we aren't unintentionally
changing the display as well.

Change-Id: I699bfc1c2e9fbab6574a3c1363fe1dc21c7354e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143416
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143421
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 063700762e46..dcd514f7ea3e 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -1060,6 +1060,8 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/word,\
XFont \
XContentControl \
XContentControls \
+   XContentControlListEntry \
+   XContentControlListEntries \
XFormField \
XFormFields \
XFrame \
diff --git a/oovbaapi/ooo/vba/word/XContentControlListEntries.idl 
b/oovbaapi/ooo/vba/word/XContentControlListEntries.idl
new file mode 100644
index ..fddf2318afe0
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XContentControlListEntries.idl
@@ -0,0 +1,30 @@
+/* -*- 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/.
+ */
+
+module ooo {  module vba {  module word {
+
+interface XContentControlListEntry;
+interface XContentControlListEntries
+{
+   

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

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/fillproperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ebce5bb1b741c50926407d7ee036827f0ad8aa6
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 11:23:51 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 16:18:45 2022 +

crashtesting: relax assert seen on loading forum-mso-en4-151836.xlsx

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

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 329d5d3bb4b1..c68568096fd8 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -616,7 +616,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 }
 ++aIt;
 }
-assert( nWidestWidth > 0 );
+assert( nWidestWidth >= 0 );
 
 double nBorder = 0;
 bool bSwap(false);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 32eae3840ce9d765856d63be8c0c7a2a42511003
Author: Christian Lohmaier 
AuthorDate: Mon Dec 12 17:17:26 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 16:17:26 2022 +

Update git submodules

* Update translations from branch 'libreoffice-7-5'
  to 3e575719f7f7e3c10f4c1ca39e1b10a746fe6adb
  - update translations for master/7.5

and force-fix errors using pocheck

Change-Id: I8fdffa156100c7583eec271a33632534cb8629b3
(cherry picked from commit 0c9f3d0b57a3ced617fca89de6a87b38efdf8d94)

diff --git a/translations b/translations
index 53ac2ecc1165..3e575719f7f7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 53ac2ecc116572789505a5fe304b1c962d01ed26
+Subproject commit 3e575719f7f7e3c10f4c1ca39e1b10a746fe6adb

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 2958e1686452764e58e8e7257eccb4b633094b4b
Author: Christian Lohmaier 
AuthorDate: Mon Dec 12 17:13:04 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 12 16:13:04 2022 +

Update git submodules

* Update translations from branch 'master'
  to 0c9f3d0b57a3ced617fca89de6a87b38efdf8d94
  - update translations for master/7.5

and force-fix errors using pocheck

Change-Id: I8fdffa156100c7583eec271a33632534cb8629b3

diff --git a/translations b/translations
index f201069fb109..0c9f3d0b57a3 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f201069fb109d5c24dd18d03f393de1169056956
+Subproject commit 0c9f3d0b57a3ced617fca89de6a87b38efdf8d94

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/pivottablebuffer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 92e7bc1769c0cf0a0bca4e68a17cd52211e07414
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 10:34:49 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 16:00:44 2022 +

crashtesting: null deref see on loading forum-mso-en4-531817.xlsx

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

diff --git a/sc/source/filter/oox/pivottablebuffer.cxx 
b/sc/source/filter/oox/pivottablebuffer.cxx
index 3425c4a6c0c5..d57c17571282 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -755,8 +755,9 @@ Reference< XDataPilotField > 
PivotTableField::convertRowColPageField( sal_Int32
 {
 ScDPSaveData* pSaveData = pDPObj->GetSaveData();
 ScDPSaveDimension* pDim = 
pSaveData->GetDimensionByName(pCacheField->getName());
+SAL_WARN_IF(!pDim, "sc.filter", 
"PivotTableField::convertRowColPageField - no Dimension found for: " << 
pCacheField->getName());
 
-try
+if (pDim) try
 {
 for( const auto& rItem : maItems )
 {

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - basctl/source include/sfx2 sfx2/sdi sfx2/source

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/basides1.cxx |4 -
 basctl/source/basicide/basobj2.cxx  |9 ++--
 basctl/source/basicide/macrodlg.cxx |2 
 basctl/source/basicide/moduldlg.cxx |   21 -
 basctl/source/basicide/moduldlg.hxx |6 ++
 basctl/source/inc/basobj.hxx|3 -
 include/sfx2/app.hxx|5 +-
 include/sfx2/strings.hrc|5 +-
 include/sfx2/viewfrm.hxx|3 +
 sfx2/sdi/sfx.sdi|2 
 sfx2/source/appl/app.cxx|   10 ++--
 sfx2/source/appl/appserv.cxx|   17 +--
 sfx2/source/view/viewfrm.cxx|   81 +++-
 13 files changed, 143 insertions(+), 25 deletions(-)

New commits:
commit 72136773c452513e49358c8b27866cb4169f86cf
Author: Caolán McNamara 
AuthorDate: Fri Dec 9 17:12:47 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 16:00:14 2022 +

tdf#152266 add an infobar with indicators for macro-like content in doc

Show "macros" and "events" for now if we know that are present so
they can be investigated by the user. There are other things which
could potentially be added in the future.

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

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index fd0fb7acccff..430b795e162d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -340,10 +340,10 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 if ( rReq.GetArgs() )
 {
 const SfxUInt16Item &rTabId = 
rReq.GetArgs()->Get(SID_BASICIDE_ARG_TABID );
-Organize(rReq.GetFrameWeld(), rTabId.GetValue());
+Organize(rReq.GetFrameWeld(), nullptr, rTabId.GetValue());
 }
 else
-Organize(rReq.GetFrameWeld(), 0);
+Organize(rReq.GetFrameWeld(), nullptr, 0);
 }
 break;
 case SID_BASICIDE_CHOOSEMACRO:
diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index d145d14fb634..708b1ce035d2 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -62,18 +62,19 @@ extern "C" {
 
 return pScriptURL;
 }
-SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer(void *pParent, 
sal_Int16 nTabId)
+SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer(void *pParent, void* 
pDocFrame_AsXFrame, sal_Int16 nTabId)
 {
 SAL_INFO("basctl.basicide","in basicide_macro_organizer");
-basctl::Organize(static_cast(pParent), nTabId);
+Reference< frame::XFrame > aDocFrame( static_cast< frame::XFrame* >( 
pDocFrame_AsXFrame ) );
+basctl::Organize(static_cast(pParent), aDocFrame, 
nTabId);
 }
 }
 
-void Organize(weld::Window* pParent, sal_Int16 tabId)
+void Organize(weld::Window* pParent, const 
css::uno::Reference& xDocFrame, sal_Int16 tabId)
 {
 EnsureIde();
 
-auto xDlg(std::make_shared(pParent, tabId));
+auto xDlg(std::make_shared(pParent, xDocFrame, tabId));
 weld::DialogController::runAsync(xDlg, [](int) {});
 }
 
diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index db424becb2e9..b1097b9ad8c8 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -742,7 +742,7 @@ IMPL_LINK(MacroChooser, ButtonHdl, weld::Button&, rButton, 
void)
 StoreMacroDescription();
 
 m_xBasicBox->get_selected(m_xBasicBoxIter.get());
-auto xDlg(std::make_shared(m_xDialog.get(), 0));
+auto xDlg(std::make_shared(m_xDialog.get(), nullptr, 
0));
 weld::DialogController::runAsync(xDlg, [this](sal_Int32 nRet) {
 if (nRet == RET_OK) // not only closed
 {
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 25250526d285..617d80e7f033 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -182,8 +183,24 @@ void Shell::CopyDialogResources(
 io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, 
rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
 }
 
+void OrganizeDialog::SetCurrentEntry(const 
css::uno::Reference& xDocFrame)
+{
+if (!xDocFrame)
+return;
+Reference xController(xDocFrame->getController());
+if (!xController)
+return;
+Reference xModel(xController->getModel());
+if (!xModel)
+return;
+ScriptDocument aScriptDocument(xModel);
+EntryDescriptor aDesc(aScriptDocument, LIBRARY_LOCATION_DOCUMENT, 
OUString(), OUString(), OUString(), OBJ_TYPE_DOCUMENT);
+m_xModulePage->SetCurrentEntry(aDesc);
+m_xDialogPage

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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/basides1.cxx |4 -
 basctl/source/basicide/basobj2.cxx  |9 ++--
 basctl/source/basicide/macrodlg.cxx |2 
 basctl/source/basicide/moduldlg.cxx |   21 -
 basctl/source/basicide/moduldlg.hxx |6 ++
 basctl/source/inc/basobj.hxx|3 -
 include/sfx2/app.hxx|5 +-
 include/sfx2/strings.hrc|5 +-
 include/sfx2/viewfrm.hxx|3 +
 sfx2/sdi/sfx.sdi|2 
 sfx2/source/appl/app.cxx|   10 ++--
 sfx2/source/appl/appserv.cxx|   17 +--
 sfx2/source/view/viewfrm.cxx|   81 +++-
 13 files changed, 143 insertions(+), 25 deletions(-)

New commits:
commit 6691816fe86ef7d193fee3632c2d56debfff3fa9
Author: Caolán McNamara 
AuthorDate: Fri Dec 9 17:12:47 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 16:00:04 2022 +

tdf#152266 add an infobar with indicators for macro-like content in doc

Show "macros" and "events" for now if we know that are present so
they can be investigated by the user. There are other things which
could potentially be added in the future.

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

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index fd0fb7acccff..430b795e162d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -340,10 +340,10 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 if ( rReq.GetArgs() )
 {
 const SfxUInt16Item &rTabId = 
rReq.GetArgs()->Get(SID_BASICIDE_ARG_TABID );
-Organize(rReq.GetFrameWeld(), rTabId.GetValue());
+Organize(rReq.GetFrameWeld(), nullptr, rTabId.GetValue());
 }
 else
-Organize(rReq.GetFrameWeld(), 0);
+Organize(rReq.GetFrameWeld(), nullptr, 0);
 }
 break;
 case SID_BASICIDE_CHOOSEMACRO:
diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index d145d14fb634..708b1ce035d2 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -62,18 +62,19 @@ extern "C" {
 
 return pScriptURL;
 }
-SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer(void *pParent, 
sal_Int16 nTabId)
+SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer(void *pParent, void* 
pDocFrame_AsXFrame, sal_Int16 nTabId)
 {
 SAL_INFO("basctl.basicide","in basicide_macro_organizer");
-basctl::Organize(static_cast(pParent), nTabId);
+Reference< frame::XFrame > aDocFrame( static_cast< frame::XFrame* >( 
pDocFrame_AsXFrame ) );
+basctl::Organize(static_cast(pParent), aDocFrame, 
nTabId);
 }
 }
 
-void Organize(weld::Window* pParent, sal_Int16 tabId)
+void Organize(weld::Window* pParent, const 
css::uno::Reference& xDocFrame, sal_Int16 tabId)
 {
 EnsureIde();
 
-auto xDlg(std::make_shared(pParent, tabId));
+auto xDlg(std::make_shared(pParent, xDocFrame, tabId));
 weld::DialogController::runAsync(xDlg, [](int) {});
 }
 
diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index db424becb2e9..b1097b9ad8c8 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -742,7 +742,7 @@ IMPL_LINK(MacroChooser, ButtonHdl, weld::Button&, rButton, 
void)
 StoreMacroDescription();
 
 m_xBasicBox->get_selected(m_xBasicBoxIter.get());
-auto xDlg(std::make_shared(m_xDialog.get(), 0));
+auto xDlg(std::make_shared(m_xDialog.get(), nullptr, 
0));
 weld::DialogController::runAsync(xDlg, [this](sal_Int32 nRet) {
 if (nRet == RET_OK) // not only closed
 {
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 25250526d285..617d80e7f033 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -182,8 +183,24 @@ void Shell::CopyDialogResources(
 io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, 
rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
 }
 
+void OrganizeDialog::SetCurrentEntry(const 
css::uno::Reference& xDocFrame)
+{
+if (!xDocFrame)
+return;
+Reference xController(xDocFrame->getController());
+if (!xController)
+return;
+Reference xModel(xController->getModel());
+if (!xModel)
+return;
+ScriptDocument aScriptDocument(xModel);
+EntryDescriptor aDesc(aScriptDocument, LIBRARY_LOCATION_DOCUMENT, 
OUString(), OUString(), OUString(), OBJ_TYPE_DOCUMENT);
+m_xModulePage->SetCurrentEntry(aDesc);
+m_xDialogPage

[Libreoffice-commits] core.git: config.guess config.sub

[Thorsten Behrens (via logerrit)]

 config.guess | 1211 +++
 config.sub   |  124 --
 2 files changed, 739 insertions(+), 596 deletions(-)

New commits:
commit 4ea9061d54ee6d2c1ce2460162a1ea5f32de1ae7
Author: Thorsten Behrens 
AuthorDate: Mon Dec 12 13:17:09 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 12 15:46:46 2022 +

Update config.guess & .sub to latest

General updates & streamlining, plus addition of loongarch32 and
managarm as probably most relevant additions here.

Change-Id: Iff94f05c5e9240204eb3f844a05a7cad519522a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143988
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/config.guess b/config.guess
index 76b022d3d066..980b02083815 100644
--- a/config.guess
+++ b/config.guess
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2020 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2020-08-06'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-09-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -27,11 +29,19 @@ timestamp='2020-08-06'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to .
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -50,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2020 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,6 +94,9 @@ if test $# != 0; then
   exit 1
 fi
 
+# Just in case it came from the environment.
+GUESS=
+
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -102,7 +115,7 @@ set_cc_for_build() {
 # prevent multiple calls if $tmp is already set
 test "$tmp" && return 0
 : "${TMPDIR=/tmp}"
-# shellcheck disable=SC2039
+# shellcheck disable=SC2039,SC3028
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir 
"$tmp" 2>/dev/null) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo 
"Warning: creating insecure temp directory" >&2 ; } ||
@@ -112,7 +125,7 @@ set_cc_for_build() {
,,)echo "int x;" > "$dummy.c"
   for driver in cc gcc c89 c99 ; do
   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; 
then
-  CC_FOR_BUILD="$driver"
+  CC_FOR_BUILD=$driver
   break
   fi
   done
@@ -133,14 +146,12 @@ fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "$UNAME_SYSTEM" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-   # If the system lacks a compiler, then just pick glibc.
-   # We could probably try harder.
-   LIBC=gnu
+   LIBC=unknown
 
set_cc_for_build
cat <<-EOF > "$dummy.c"
@@ -149,24 +160,37 @@ Linux|GNU|GNU/*)
LIBC=uclibc
#elif defined(__dietlibc__)
LIBC=dietlibc
-   #else
+   #elif defined(__GLIBC__)
LIBC=gnu
+   #else
+   #include 
+   /* First heuristic to detect musl libc.  */
+   #ifdef __DEFINED_va_list
+   LIBC=musl
+   #endif
#endif
EOF
-   eval "`$CC_FOR_BUILD -E "$dummy.c

Re: unoidl-write usage help

[Stephan Bergmann]

On 12/12/2022 14:04, Scott Robinson wrote:

unoidl-write $unoTypes $offTypes com/sun/star/test/XSomethinA.idl

I get nothing; no output, no error message. Please advise.


The usage of unoidl-write is


Usage:

  unoidl-write [] [@] 

where each  is either a new- or legacy-format .rdb file, a single .idl
file, or a root directory of an .idl file tree; and the UTF-8 encoded  contains zero or more space-separated names of (non-module) entities to
include in the output, and, if omitted, defaults to the complete content of the
last , if any.


so what your invocation does is (successfully, hence no stderr output) 
export the complete content (as there is no @ given) of 
$offTypes (which is the last  given) into a new-format .rdb 
file (misleadingly) named com/sun/star/test/XSomethinA.idl (the file> given).


Maybe you wanted something like


unoidl-write $unoTypes $offTypes com/sun/star/test/XSomethingA.idl 
XSomething.rdb


instead, to write the definition of XSomething to XSomething.rdb?

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/pivottablebuffer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit afa81be4b2bf36193b338979b6707e5eb48892c8
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 10:34:49 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 14:57:27 2022 +

crashtesting: null deref see on loading forum-mso-en4-531817.xlsx

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

diff --git a/sc/source/filter/oox/pivottablebuffer.cxx 
b/sc/source/filter/oox/pivottablebuffer.cxx
index 3425c4a6c0c5..d57c17571282 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -755,8 +755,9 @@ Reference< XDataPilotField > 
PivotTableField::convertRowColPageField( sal_Int32
 {
 ScDPSaveData* pSaveData = pDPObj->GetSaveData();
 ScDPSaveDimension* pDim = 
pSaveData->GetDimensionByName(pCacheField->getName());
+SAL_WARN_IF(!pDim, "sc.filter", 
"PivotTableField::convertRowColPageField - no Dimension found for: " << 
pCacheField->getName());
 
-try
+if (pDim) try
 {
 for( const auto& rItem : maItems )
 {

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/address.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19b7008d14ca106fdddcefaa1c43ac05ba49fd2c
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 10:19:36 2022 +
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 14:53:09 2022 +

crashtesting: assert seen on loading forum-mso-en4-497867.xlsx

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

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index ca1010a393bd..a1e93472f2c4 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2094,7 +2094,7 @@ static void lcl_Split_DocTab( const ScDocument& rDoc,  
SCTAB nTab,
 rDoc.GetName(nTab, rTabName);
 rDocName.clear();
 // External reference, same as in ScCompiler::MakeTabStr()
-if ( rTabName[0] == '\'' )
+if (!rTabName.isEmpty() && rTabName[0] == '\'')
 {   // "'Doc'#Tab"
 sal_Int32 nPos = ScCompiler::GetDocTabPos( rTabName);
 if (nPos != -1)

unoidl-write usage help

[Scott Robinson]

Using Fedora 37, LibreOffice 7.4.3.2
Using $sdk/examples/DevelopersGuide/Components/JavaComponent

Steps I take:

Copy JavaComponet to home directory
cd ~/JavaComponent
export 
PATH=/usr/lib64/libreoffice/sdk/bin:/usr/lib64/libreoffice/program:/usr/bin
export LD_LIBRARY_PATH=/usr/lib64/libreoffice/program:/usr/bin
export unoTypes=/usr/lib64/libreoffice/program/types.rdb
export offTypes=/usr/lib64/libreoffice/program/types/offapi.rdb
unoidl-write $unoTypes $offTypes com/sun/star/test/XSomethinA.idl

I get nothing; no output, no error message. Please advise.

Thanks

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

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/browser/unodatbr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c98abd873124b5cc883b3755f45b91fc238dc90
Author: Julien Nabet 
AuthorDate: Fri Dec 9 20:42:26 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 14:35:46 2022 +

Related tdf#152381: fix "lengths do not match"

On console, I noticed these:
warn:dbaccess:111457:111457:dbaccess/source/ui/browser/unodatbr.cxx:754: 
DBG_UNHANDLED_EXCEPTION in InitializeGridModel exception: 
com.sun.star.lang.IllegalArgumentException message: "lengths do not match at 
/home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:872" 
ArgumentPosition: -1

0  
cppu::OPropertySetHelper::setPropertyValues(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Sequence const&)
(this=0x55eca23d3b90, rPropertyNames=uno::Sequence of length 6 = {...}, 
rValues=uno::Sequence of length 7 = {...}) at cppuhelper/source/propshlp.cxx:872
1  0x7f39c7a7ecb6 in 
comphelper::OPropertySetAggregationHelper::setPropertyValues(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Sequence const&)
(this=0x55eca23d3b90, _rPropertyNames=uno::Sequence of length 6 = 
{...}, _rValues=uno::Sequence of length 7 = {...}) at 
comphelper/source/property/propagg.cxx:589
2  0x7f39ac81f057 in 
dbaui::SbaTableQueryBrowser::InitializeGridModel(com::sun::star::uno::Reference
 const&)
 (this=0x55eca23b1960, xGrid=uno::Reference to (frm::OGridControlModel 
*) 0x55eca23d3c30) at dbaccess/source/ui/browser/unodatbr.cxx:594
3  0x7f39ac834d46 in 
dbaui::SbaTableQueryBrowser::implLoadAnything(rtl::OUString const&, 
rtl::OUString const&, int, bool, 
utl::SharedUNOComponent const&) (this=0x55eca23b1960, 
_rDataSourceName="file:///tmp/Table_Default_Firebird.odb", _rCommand="Table2", 
nCommandType=0, _bEscapeProcessing=true, _rxConnection=...)
at dbaccess/source/ui/browser/unodatbr.cxx:2384
4  0x7f39ac8312ee in 
dbaui::SbaTableQueryBrowser::implSelect(weld::TreeIter const*) 
(this=0x55eca23b1960, pEntry=0x55eca243bd90) at 
dbaccess/source/ui/browser/unodatbr.cxx:2678
5  0x7f39ac8343e2 in 
dbaui::SbaTableQueryBrowser::implSelect(rtl::OUString const&, rtl::OUString 
const&, int, bool, utl::SharedUNOComponent const&, bool) (this=0x55eca23b1960, 
_rDataSourceName="file:///tmp/Table_Default_Firebird.odb", _rCommand="Table2", 
nCommandType=0, _bEscapeProcessing=true, _rxConnection=..., _bSelectDirect=true)
at dbaccess/source/ui/browser/unodatbr.cxx:2445
6  0x7f39ac8398c5 in dbaui::SbaTableQueryBrowser::impl_initialize() 
(this=0x55eca23b1960) at dbaccess/source/ui/browser/unodatbr.cxx:3251
7  0x7f39ac7a3eee in 
dbaui::OGenericUnoController::initialize(com::sun::star::uno::Sequence
 const&) (this=0x55eca23b1960, aArguments=uno::Sequence of length 17 = {...})
at dbaccess/source/ui/browser/genericcontroller.cxx:259
8  0x7f39ac718dd7 in (anonymous 
namespace)::DBContentLoader::load(com::sun::star::uno::Reference
 const&, rtl::OUString const&, 
com::sun::star::uno::Sequence const&, 
com::sun::star::uno::Reference 
const&)
 (this=0x55eca23aacf0, rFrame=uno::Reference to ((anonymous 
namespace)::XFrameImpl *) 0x55eca1f13750, 
rURL=".component:DB/DataSourceBrowser", rArgs=uno::Sequence of length 16 = 
{...}, rListener=uno::Reference to (framework::(anonymous 
namespace)::LoadEnvListener *) 0x55eca23b0828) at 
dbaccess/source/ui/browser/dbloader.cxx:230
9  0x7f39c65f5f13 in framework::LoadEnv::impl_loadContent() 
(this=0x7fff7788a6e8) at framework/source/loadenv/loadenv.cxx:1154

At least from 59bc10eb4609c "INTEGRATION: CWS insight01 (1.152.38); FILE 
MERGED" (2004-08-02)
this part seems the root pb:
-Sequence< ::rtl::OUString> aProperties(6);
-Sequence< Any> aValues(6);
+Sequence< ::rtl::OUString> aProperties(6 + ( m_bPreview ? 
5 : 0 ));
+Sequence< Any> aValues(7 + ( m_bPreview ? 5 : 0 ));
if m_bPreview is false, there are only 6 attributes:
- PROPERTY_FONT
- PROPERTY_TEXTEMPHASIS
- PROPERTY_TEXTRELIEF
- PROPERTY_ROW_HEIGHT
- PROPERTY_TEXTCOLOR
- PROPERTY_TEXTLINECOLOR

Change-Id: I91cd81f87ae0685123e273fa6d106fdd22003147
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143889
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Lionel Mamane 
(cherry picked from commit 0390479ccf454cd87997fe97d640caf9f8c45a13)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143960
Reviewed-by: Xisco Fauli 

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index ee300a8862ed..0a54ccb4051d 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -547,7 +547,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const 
Reference< css::form::XForm
 if 

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   39 +
 1 file changed, 39 insertions(+)

New commits:
commit b7a51a7cd46e155ad78ac0f9301863d5a1eabd52
Author: Jim Raykowski 
AuthorDate: Thu Dec 8 22:48:09 2022 -0900
Commit: Noel Grandin 
CommitDate: Mon Dec 12 14:20:46 2022 +

tdf#152029 Bring sections to attention in the document view

when mouse pointer is over section content type and content entries in
the Navigator content tree

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index e8eb722c1338..a7c74261c4f8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1213,6 +1213,27 @@ IMPL_LINK(SwContentTree, MouseMoveHdl, const 
MouseEvent&, rMEvt, bool)
 {
 BringBookmarksToAttention(std::vector 
{pCnt->GetName()});
 }
+else if (nType == ContentTypeId::REGION)
+{
+const SwSectionFormats& rFormats = 
m_pActiveShell->GetDoc()->GetSections();
+if (const size_t nSize = rFormats.size())
+{
+auto aEntryName = pCnt->GetName();
+for (SwSectionFormats::size_type n = nSize; n;)
+{
+if (const SwSectionFormat* pFormat = rFormats[--n])
+{
+const SwSection* pSect = pFormat->GetSection();
+if (pSect && !pSect->IsHiddenFlag() &&
+pSect->GetSectionName() == aEntryName)
+{
+BringFramesToAttention(std::vector {pFormat});
+break;
+}
+}
+}
+}
+}
 else if (nType == ContentTypeId::URLFIELD)
 {
 BringURLFieldsToAttention(SwGetINetAttrs 
{SwGetINetAttr(pCnt->GetName(),
@@ -1302,6 +1323,24 @@ IMPL_LINK(SwContentTree, MouseMoveHdl, const 
MouseEvent&, rMEvt, bool)
 BringBookmarksToAttention(aNames);
 }
 }
+else if (nType == ContentTypeId::REGION)
+{
+const SwSectionFormats& rFormats = 
m_pActiveShell->GetDoc()->GetSections();
+if (const size_t nSize = rFormats.size())
+{
+std::vector aSectionsFormatsArr;
+for (SwSectionFormats::size_type n = nSize; n;)
+{
+if (const SwSectionFormat* pFormat = rFormats[--n])
+{
+const SwSection* pSect = pFormat->GetSection();
+if (pSect && !pSect->IsHiddenFlag())
+aSectionsFormatsArr.push_back(pFormat);
+}
+}
+BringFramesToAttention(aSectionsFormatsArr);
+}
+}
 else if (nType == ContentTypeId::URLFIELD)
 {
 SwGetINetAttrs aINetAttrsArr;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - sw/inc sw/Library_sw.mk sw/sdi sw/source sw/uiconfig

[Tomaž Vajngerl (via logerrit)]

 sw/Library_sw.mk |1 
 sw/inc/OnlineAccessibilityCheck.hxx  |6 
 sw/inc/cmdid.h   |1 
 sw/inc/ndtxt.hxx |   13 --
 sw/inc/node.hxx  |   21 +++
 sw/sdi/_viewsh.sdi   |6 
 sw/sdi/swriter.sdi   |   17 ++
 sw/sdi/viewsh.sdi|6 
 sw/source/core/txtnode/OnlineAccessibilityCheck.cxx  |   95 +--
 sw/source/uibase/app/swmodule.cxx|2 
 sw/source/uibase/inc/AccessibilityStatusBarControl.hxx   |   30 
 sw/source/uibase/uiview/view2.cxx|   19 +++
 sw/source/uibase/utlui/AccessibilityStatusBarControl.cxx |   46 +++
 sw/uiconfig/sglobal/statusbar/statusbar.xml  |1 
 sw/uiconfig/swriter/statusbar/statusbar.xml  |1 
 15 files changed, 209 insertions(+), 56 deletions(-)

New commits:
commit 160381ff036585b7f57c4f01ba482f1d2e128d33
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 24 09:46:43 2022 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Dec 12 14:15:51 2022 +

sw: Run a11y check for all content nodes

Change-Id: Icc3ff1be31a01b22242c48dec6d830e645ecb310
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141784
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit fad326833699293e5f4e3254881cb56889a220c0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143703
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/inc/OnlineAccessibilityCheck.hxx 
b/sw/inc/OnlineAccessibilityCheck.hxx
index f27f867ce96b..48a639b9d656 100644
--- a/sw/inc/OnlineAccessibilityCheck.hxx
+++ b/sw/inc/OnlineAccessibilityCheck.hxx
@@ -26,11 +26,11 @@ class OnlineAccessibilityCheck : public SvtListener
 private:
 SwDoc& m_rDocument;
 sw::AccessibilityCheck m_aAccessibilityCheck;
-SwTextNode* m_pCurrentTextNode;
-SwNodeOffset m_aCurrentNodeIndex;
+SwContentNode* m_pPreviousNode;
+SwNodeOffset m_nPreviousNodeIndex;
 sal_Int32 m_nAccessibilityIssues;
 
-void runCheck(SwTextNode* pTextNode);
+void runCheck(SwContentNode* pNode);
 
 public:
 OnlineAccessibilityCheck(SwDoc& rDocument);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 22c84d38c641..1ed4cff26f7c 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class SfxHint;
 class SwNumRule;
@@ -96,12 +95,6 @@ struct ParagraphIdleData
 bool bAutoComplDirty = true;   ///< auto complete list dirty
 };
 
-struct AccessibilityCheckStatus
-{
-std::unique_ptr pCollection;
-bool bDirty = true;
-};
-
 } // end namespace sw
 
 /// SwTextNode is a paragraph in the document model.
@@ -127,7 +120,6 @@ class SW_DLLPUBLIC SwTextNode final
 OUString m_Text;
 
 mutable sw::ParagraphIdleData m_aParagraphIdleData;
-mutable sw::AccessibilityCheckStatus m_aAccessibilityCheckStatus;
 
 /** Some of the chars this para are hidden. Paragraph has to be reformatted
on changing the view to print preview. */
@@ -233,11 +225,6 @@ public:
 
 /// End: Data collected during idle time
 
-sw::AccessibilityCheckStatus& getAccessibilityCheckStatus()
-{
-return m_aAccessibilityCheckStatus;
-}
-
 public:
 using SwContentNode::GetAttr;
 /// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index bdcc9c801a49..eae16fe70550 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -30,6 +30,8 @@
 #include "fmtcol.hxx"
 #include "nodeoffset.hxx"
 
+#include 
+
 #include 
 #include 
 
@@ -355,6 +357,18 @@ class SwEndNode final : public SwNode
 SwEndNode & operator= ( const SwEndNode & rNode ) = delete;
 };
 
+// Accessibiity check
+
+namespace sw
+{
+struct AccessibilityCheckStatus
+{
+std::unique_ptr pCollection;
+bool bDirty = true;
+};
+
+}
+
 // SwContentNode
 
 class SW_DLLPUBLIC SwContentNode: public sw::BroadcastingModify, public 
SwNode, public SwIndexReg
@@ -364,6 +378,8 @@ class SW_DLLPUBLIC SwContentNode: public 
sw::BroadcastingModify, public SwNode,
 SwFormatColl* m_pCondColl;
 mutable bool mbSetModifyAtAttr;
 
+mutable sw::AccessibilityCheckStatus m_aAccessibilityCheckStatus;
+
 protected:
 SwContentNode( const SwNodeIndex &rWhere, const SwNodeType nNodeType,
 SwFormatColl *pFormatColl );
@@ -480,6 +496,11 @@ public:
 
 void UpdateAttr(const SwUpdateAttr&);
 
+sw::AccessibilityCheckStatus& getAccessibilityCheckStatus()
+{
+return m_aAccessibilityCheckStatus;
+}
+
 private:
 SwContentNode( const SwContentNode & rNode ) = delete;
 SwContentNode & operator= ( const SwContentNode & rNode ) = delete;
diff --git a/sw/source/core/txt

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - include/sfx2 officecfg/registry sfx2/source sw/inc sw/Library_sw.mk sw/source

[Tomaž Vajngerl (via logerrit)]

 include/sfx2/AccessibilityIssue.hxx|2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 +
 sfx2/source/accessibility/AccessibilityIssue.cxx   |2 
 sw/Library_sw.mk   |1 
 sw/inc/OnlineAccessibilityCheck.hxx|   43 
 sw/inc/doc.hxx |6 
 sw/inc/ndtxt.hxx   |   12 +
 sw/inc/pam.hxx |3 
 sw/source/core/crsr/crsrsh.cxx |4 
 sw/source/core/doc/docnew.cxx  |4 
 sw/source/core/txtnode/OnlineAccessibilityCheck.cxx|  124 +
 11 files changed, 210 insertions(+), 1 deletion(-)

New commits:
commit 9bcaf349091e4d97e7c6ca183c13736636d25612
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 20 22:33:22 2022 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Dec 12 14:15:05 2022 +

sw: add online accessibility check implementation

Change-Id: Ic68aa91b1cbf23ac305ad4e361c56b91556757ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141604
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 0b96a1747fc3f96ca70fd159594fe1a478369da0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143701
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/sfx2/AccessibilityIssue.hxx 
b/include/sfx2/AccessibilityIssue.hxx
index 82e6c49f2941..8cc2839229cb 100644
--- a/include/sfx2/AccessibilityIssue.hxx
+++ b/include/sfx2/AccessibilityIssue.hxx
@@ -60,6 +60,8 @@ public:
 AccessibilityIssueCollection() = default;
 
 std::vector>& getIssues();
+
+void clear();
 };
 
 } // end sfx namespace
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 4f615a4ef69b..24bcdefda38f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6535,6 +6535,16 @@
  
  false

+   
+
+  
+Enables online accessibility check, which checks for accessibility 
issues inside the document structure
+while the user edits the document.
+  
+  Enable/Disable online accessibility check.
+ 
+ false
+   
 
 
   
diff --git a/sfx2/source/accessibility/AccessibilityIssue.cxx 
b/sfx2/source/accessibility/AccessibilityIssue.cxx
index b276faf54c3f..aa58c3924476 100644
--- a/sfx2/source/accessibility/AccessibilityIssue.cxx
+++ b/sfx2/source/accessibility/AccessibilityIssue.cxx
@@ -24,6 +24,8 @@ std::vector>& 
AccessibilityIssueCollection::
 return m_aIssues;
 }
 
+void AccessibilityIssueCollection::clear() { m_aIssues.clear(); }
+
 } // end sfx namespace
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 6e00b2e9a500..b0f11424f422 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -423,6 +423,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/tox/ToxTextGenerator \
 sw/source/core/tox/ToxWhitespaceStripper \
 sw/source/core/txtnode/GrammarContact \
+sw/source/core/txtnode/OnlineAccessibilityCheck \
 sw/source/core/txtnode/attrcontentcontrol \
 sw/source/core/txtnode/atrfld \
 sw/source/core/txtnode/atrflyin \
diff --git a/sw/inc/OnlineAccessibilityCheck.hxx 
b/sw/inc/OnlineAccessibilityCheck.hxx
new file mode 100644
index ..f27f867ce96b
--- /dev/null
+++ b/sw/inc/OnlineAccessibilityCheck.hxx
@@ -0,0 +1,43 @@
+/* -*- 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 "ndindex.hxx"
+#include "ndtxt.hxx"
+#include 
+#include 
+#include 
+
+struct SwPosition;
+class SwTextNode;
+
+namespace sw
+{
+class OnlineAccessibilityCheck : public SvtListener
+{
+private:
+SwDoc& m_rDocument;
+sw::AccessibilityCheck m_aAccessibilityCheck;
+SwTextNode* m_pCurrentTextNode;
+SwNodeOffset m_aCurrentNodeIndex;
+sal_Int32 m_nAccessibilityIssues;
+
+void runCheck(SwTextNode* pTextNode);
+
+public:
+OnlineAccessibilityCheck(SwDoc& rDocument);
+void update(const SwPosition& rNewPos);
+sal_Int32 getNumberOfAccessibilityIssues() { return 
m_nAccessibilityIssues; }
+};
+
+} // end sw
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a1d466214b58..72025d5160e1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -164,6 +164,7 @@ namespace sw {
 class DocumentSty

Infinite loop in sw_ooxmlexport17 unit test on macOS x86_64

[Patrick Luby]

Hi all,

I don't know if anyone is seeing their macOS Intel builds time out on 
Jenkins, but over the last week I have been seeing this happen 
frequently for my gerrit patch submissions.


I was able to track down the problem to an infinite loop that occurs in 
the sw_ooxmlexport17 unit test. This infinite loop is 100% reproducible 
when I run make check on master on my old Intel MacBook Pro despite 
rebasing to master and running a clean build each day.


I have not ever seen this infinite loop on my much faster macOS Silicon 
laptop so my guess is that this is a bug that only appears on slower 
machines.


I have submitted a patch that fixes this infinite loop, but IMHO it is 
just a quick hack and I know that my fix will terminate the layout loop 
early when opening, saving, printing, and exporting to PDF with a Writer 
document without huge text tables that span multiple pages:


https://gerrit.libreoffice.org/c/core/+/143947/4

Does anyone have any suggestions or idea for a better way to fix this 
bug other than my quick hack?


Patrick

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/karasa_jaga icon-themes/sifr icon-themes/sifr_dark icon-themes

[Christian Lohmaier (via logerrit)]

 dev/null  |binary
 icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very |2 -
 icon-themes/breeze_svg/svx/res/symphony/spacing_very  |2 -
 icon-themes/sifr_dark_svg/svx/res/symphony/spacing|1 
 icon-themes/sifr_dark_svg/svx/res/symphony/spacing_very   |4 ---
 icon-themes/sifr_svg/svx/res/symphony/spacing |1 
 icon-themes/sifr_svg/svx/res/symphony/spacing_very|4 ---
 icon-themes/sukapura_svg/svx/res/symphony/spacing_very|   16 --
 8 files changed, 30 deletions(-)

New commits:
commit d8db6a072968f58bd6178dbfd5ac695976171b6e
Author: Christian Lohmaier 
AuthorDate: Sat Dec 10 18:05:31 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Dec 12 13:42:40 2022 +

remove erroneously added icons with space in filename

Change-Id: I8e1a5ed47af74e8b26e542c7df7757368446f87a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143913
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/icon-themes/breeze/svx/res/symphony/spacing_very loose.png 
b/icon-themes/breeze/svx/res/symphony/spacing_very loose.png
deleted file mode 100644
index 6f7248dc72e4..
Binary files a/icon-themes/breeze/svx/res/symphony/spacing_very loose.png and 
/dev/null differ
diff --git a/icon-themes/breeze/svx/res/symphony/spacing_very tight.png 
b/icon-themes/breeze/svx/res/symphony/spacing_very tight.png
deleted file mode 100644
index f57b6e8870d3..
Binary files a/icon-themes/breeze/svx/res/symphony/spacing_very tight.png and 
/dev/null differ
diff --git a/icon-themes/breeze_dark/svx/res/symphony/spacing_very loose.png 
b/icon-themes/breeze_dark/svx/res/symphony/spacing_very loose.png
deleted file mode 100644
index c201d2e5e6e1..
Binary files a/icon-themes/breeze_dark/svx/res/symphony/spacing_very loose.png 
and /dev/null differ
diff --git a/icon-themes/breeze_dark/svx/res/symphony/spacing_very tight.png 
b/icon-themes/breeze_dark/svx/res/symphony/spacing_very tight.png
deleted file mode 100644
index 51daa3d2a730..
Binary files a/icon-themes/breeze_dark/svx/res/symphony/spacing_very tight.png 
and /dev/null differ
diff --git a/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very 
loose.svg b/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very loose.svg
deleted file mode 100644
index f2f80cccb40d..
--- a/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very loose.svg   
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
diff --git a/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very 
tight.svg b/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very tight.svg
deleted file mode 100644
index 2a3e3388ae77..
--- a/icon-themes/breeze_dark_svg/svx/res/symphony/spacing_very tight.svg   
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
diff --git a/icon-themes/breeze_svg/svx/res/symphony/spacing_very loose.svg 
b/icon-themes/breeze_svg/svx/res/symphony/spacing_very loose.svg
deleted file mode 100644
index 516d43e8da4c..
--- a/icon-themes/breeze_svg/svx/res/symphony/spacing_very loose.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
diff --git a/icon-themes/breeze_svg/svx/res/symphony/spacing_very tight.svg 
b/icon-themes/breeze_svg/svx/res/symphony/spacing_very tight.svg
deleted file mode 100644
index ef6009693fed..
--- a/icon-themes/breeze_svg/svx/res/symphony/spacing_very tight.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>/>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very loose.png 
b/icon-themes/karasa_jaga/svx/res/symphony/spacing_very loose.png
deleted file mode 100644
index 83fd100cf7b2..
Binary files a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very loose.png 
and /dev/null differ
diff --git a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very loose_s.png 
b/icon-themes/karasa_jaga/svx/res/symphony/spacing_very loose_s.png
deleted file mode 100644
index 14b0a6ec6cd1..
Binary files a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very 
loose_s.png and /dev/null differ
diff --git a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very tight.png 
b/icon-themes/karasa_jaga/svx/res/symphony/spacing_very tight.png
deleted file mode 100644
index 26beb1b7da51..
Binary files a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very tight.png 
and /dev/null differ
diff --git a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very tight_s.png 
b/icon-themes/karasa_jaga/svx/res/symphony/spacing_very tight_s.png
deleted file mode 100644
index a772b090268a..
Binary files a/icon-themes/karasa_jaga/svx/res/symphony/spacing_very 
tight_s.png and /dev/null differ
diff --git a/icon-themes/sifr/svx/res/symphony/

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf152203.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   18 
 writerfilter/inc/dmapper/resourcemodel.hxx|3 
 writerfilter/source/dmapper/DomainMapper.cxx  |   14 +++
 writerfilter/source/dmapper/DomainMapper.hxx  |1 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   71 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 
 writerfilter/source/dmapper/LoggedResources.cxx   |   14 +++
 writerfilter/source/dmapper/LoggedResources.hxx   |2 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |1 
 10 files changed, 119 insertions(+), 8 deletions(-)

New commits:
commit 78ae28707022a014baf8c477b6c3f8ff91052803
Author: László Németh 
AuthorDate: Thu Dec 8 11:41:00 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 13:27:47 2022 +

tdf#152203 DOCX import: fix mixed footnotes/endnotes

Footnotes (like endnotes) were imported in the order
of their w:footnote elements in footnotes.xml, resulting
mixed footnote text content during loading documents
exported from Google Docs. Import them in the order
of their w:id attributes.

Regression from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".

Change-Id: I7d9ed36fe96b2b90c4d62fb1ca7201318581775d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143824
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 09ae3c01940bbc25ffde51963683b04e3cb4bb6a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143959
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf152203.docx 
b/sw/qa/extras/ooxmlexport/data/tdf152203.docx
new file mode 100644
index ..f8ba96ea59fb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf152203.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 19cf5dee5e3f..9ce06be528e9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1272,6 +1273,23 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143583)
 assertXPath(pXml, "/w:footnotes/w:footnote[6]/w:p", 3);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf152203)
+{
+loadAndSave("tdf152203.docx");
+xmlDocUniquePtr pXml = parseExport("word/footnotes.xml");
+CPPUNIT_ASSERT(pXml);
+
+uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFootnotes = 
xFootnotesSupplier->getFootnotes();
+uno::Reference xLastFootnote(xFootnotes->getByIndex(5), 
uno::UNO_QUERY);
+// This was "Footnote for pg5" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg 6"), 
xLastFootnote->getString().trim() );
+
+uno::Reference xLastButOne(xFootnotes->getByIndex(4), 
uno::UNO_QUERY);
+// This was "Footnote for pg 6" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg5"), 
xLastButOne->getString().trim() );
+}
+
 // skip test for macOS (missing fonts?)
 #if !defined(MACOSX)
 DECLARE_OOXMLEXPORT_TEST(testTdf146346, "tdf146346.docx")
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx 
b/writerfilter/inc/dmapper/resourcemodel.hxx
index 91fda417c2d9..e277ed675fc1 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -313,6 +313,9 @@ public:
 /// Receives end mark for glossary document entry.
 virtual void endGlossaryEntry() = 0;
 
+/// Receives identifier for node entry.
+virtual void checkId(const sal_Int32 nId) = 0;
+
 virtual void commentProps(const OUString& /*sId*/, const 
CommentProperties& /*rProps*/) {}
 
 protected:
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index b2ca35e6da51..1e0f9597b3b4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -197,6 +197,9 @@ DomainMapper::~DomainMapper()
 {
 try
 {
+// Remove temporary footnotes and endnotes
+m_pImpl->RemoveTemporaryFootOrEndnotes();
+
 uno::Reference< text::XDocumentIndexesSupplier> xIndexesSupplier( 
m_pImpl->GetTextDocument(), uno::UNO_QUERY );
 sal_Int32 nIndexes = 0;
 if( xIndexesSupplier.is() )
@@ -3739,6 +3742,17 @@ void DomainMapper::lcl_positivePercentage(const 
OUString& rText)
 m_pImpl->m_aPositivePercentages.push(rText);
 }
 
+void DomainMapper::lcl_checkId(const sal_Int32 nId)
+{
+if (m_pImpl->IsInFootnote())
+{
+if (m_pImpl->GetFootnoteCount() > -1)
+m_pImpl->m_aFootnoteIds.push_back(nId);
+}
+else if (m_pImpl->GetEndnoteCount() > -1)
+m_pImpl->m_aEndnoteIds.push_back(nId);
+}
+
 void DomainMapper::lcl_utext(const sa

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

[Olivier Hallot (via logerrit)]

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

New commits:
commit 3a1e1636171d718b2b18afb87228a0606248db1a
Author: Olivier Hallot 
AuthorDate: Sat Dec 10 13:58:18 2022 +
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 13:26:32 2022 +

Fix English on extended tip

Change-Id: I3aad959d3d309b4ee4a1095edc16d68c86a3ed0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143921
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9b46020c262045aed0beace4708565235c2523cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143957
Reviewed-by: Xisco Fauli 

diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui 
b/sw/uiconfig/swriter/ui/cardmediumpage.ui
index 085a448a6eb4..1075e1b95e6b 100644
--- a/sw/uiconfig/swriter/ui/cardmediumpage.ui
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -445,7 +445,7 @@
 False
 
   
-Select the size 
format that you want to use. The available formats depend on the brand on what 
you selected in the Brand list. If you want to use a custom label format, 
select [User], and then click the Format tab to define the format.
+Select the size 
format that you want to use. The available formats depend on the brand you 
selected in the Brand list. If you want to use a custom label format, select 
[User], and then click the Format tab to define the format.
   
 
   

[Libreoffice-commits] core.git: bin/get-forum-attachments.py

[Xisco Fauli (via logerrit)]

 bin/get-forum-attachments.py |   90 ++-
 1 file changed, 64 insertions(+), 26 deletions(-)

New commits:
commit 7bd768846aa13dfa98fc0fb480d1818eacb47bf4
Author: Xisco Fauli 
AuthorDate: Mon Dec 12 11:39:46 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 13:08:48 2022 +

get-forum-attachment: Add optional get-file argument

to help to download a specific file
e.g: --get-file forum-mso-en4-93354.xls

Change-Id: Id6a2388a3388d7a332a0a7e1bd8042094d835ca7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143984
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/bin/get-forum-attachments.py b/bin/get-forum-attachments.py
index 4300778e4fda..74827fff929c 100755
--- a/bin/get-forum-attachments.py
+++ b/bin/get-forum-attachments.py
@@ -43,15 +43,23 @@ forums = {
 'mso-en2': ["https://www.excelguru.ca/forums";, False, 0],
 'mso-en3': ["http://www.vbaexpress.com/forum";, True, 5100],
 'mso-en4': ["https://www.excelforum.com";, True, 5100],
-# lang : [url, doLogin, startIndex]
+# forum : [url, doLogin, startIndex]
 }
 
-def get_attachment_query(lang):
-if lang.startswith("mso"):
+def get_attachment_query(forum):
+if forum.startswith("mso"):
 return "/attachment.php?attachmentid="
 else:
 return "/download/file.php?id="
 
+def createSession():
+session = requests.Session()
+retry = Retry(connect=3, backoff_factor=0.5)
+adapter = HTTPAdapter(max_retries=retry)
+session.mount('http://', adapter)
+session.mount('https://', adapter)
+return session
+
 def login(session, url, configFile):
 config = configparser.ConfigParser()
 
@@ -81,7 +89,7 @@ def login(session, url, configFile):
 
 return False
 
-def get_attachments_from_url(lang, config, pathes):
+def get_attachments_from_url(forum, config, args):
 url = config[0]
 doLogin = config[1]
 startIndex = config[2]
@@ -89,25 +97,21 @@ def get_attachments_from_url(lang, config, pathes):
 print("Checking " + url)
 
 # Keep the index and resume from there
-indexFile = os.path.join(pathes.outdir, lang + ".index")
+indexFile = os.path.join(args.outdir, forum + ".index")
 if os.path.isfile(indexFile):
 with open(indexFile) as f:
 startIndex = int(f.readline().rstrip()) + 1
 
-session = requests.Session()
-retry = Retry(connect=3, backoff_factor=0.5)
-adapter = HTTPAdapter(max_retries=retry)
-session.mount('http://', adapter)
-session.mount('https://', adapter)
+session = createSession()
 
 if doLogin:
-if not login(session, url, pathes.config):
+if not login(session, url, args.config):
 print("Can't log in to " + url)
 return
 
 invalidCount = 0
 for i in range(startIndex, 99):
-fileUrl = url + get_attachment_query(lang) + str(i)
+fileUrl = url + get_attachment_query(forum) + str(i)
 
 h = session.head(fileUrl)
 header = h.headers
@@ -129,14 +133,14 @@ def get_attachments_from_url(lang, config, pathes):
 mimetype = magic.from_file(tmp.name, mime=True)
 if mimetype in mimetypes:
 suffix = mimetypes[mimetype]
-suffixDir = os.path.join(pathes.outdir, suffix)
+suffixDir = os.path.join(args.outdir, suffix)
 try:
 os.mkdir(suffixDir)
 except:
 pass
 
 download = os.path.join(suffixDir,
-"forum-" + lang + '-' + str(i) + '.' + suffix)
+"forum-" + forum + '-' + str(i) + '.' + suffix)
 
 print("Downloading as " + download)
 shutil.copy(tmp.name, download)
@@ -150,23 +154,57 @@ if __name__ == '__main__':
 
 parser.add_argument('--outdir', action='store', dest="outdir", 
required=True)
 parser.add_argument('--config', action="store", dest="config", 
required=True)
+parser.add_argument('--get-file', action="store", dest="fileName", 
required=False)
 
-pathes = parser.parse_args()
+args = parser.parse_args()
 
-if not os.path.exists(pathes.outdir) or os.path.isfile(pathes.outdir):
+if not os.path.exists(args.outdir) or os.path.isfile(args.outdir):
 print("Outdir folder doesn't exists")
 sys.exit(1)
-elif not os.path.exists(pathes.config) or not 
os.path.isfile(pathes.config):
+elif not os.path.exists(args.config) or not os.path.isfile(args.config):
 print("Config file doesn't exists")
 sys.exit(1)
 
-processes = []
-# by default, 10 at a time seems to work fine
-with ThreadPoolExecutor(max_workers=int(os.environ.get('PARALLELISM', 
10))) as executor:
-for lang, config in forums.items():
-processes.append(executor.submit(get_attachments_from_url, lang, 
confi

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/address.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0f61ec33be9b76116495907e4874aaae5990088
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 10:19:36 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 12:51:29 2022 +

crashtesting: assert seen on loading forum-mso-en4-497867.xlsx

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

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index f704290e340d..7bd66f6402e4 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2094,7 +2094,7 @@ static void lcl_Split_DocTab( const ScDocument& rDoc,  
SCTAB nTab,
 rDoc.GetName(nTab, rTabName);
 rDocName.clear();
 // External reference, same as in ScCompiler::MakeTabStr()
-if ( rTabName[0] == '\'' )
+if (!rTabName.isEmpty() && rTabName[0] == '\'')
 {   // "'Doc'#Tab"
 sal_Int32 nPos = ScCompiler::GetDocTabPos( rTabName);
 if (nPos != -1)

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/linux.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit baddc742c3fe260d20d7924ab134f0fbf179fd85
Author: Stephan Bergmann 
AuthorDate: Mon Dec 12 11:04:44 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 12 12:28:32 2022 +

lld 16 trunk defaults to --no-undefined-version now

...since


"[ELF] Enable --no-undefined-version by default", causing e.g.

> ld.lld: error: version script assignment of 'PRIVATE_1.4' to symbol 
'_ZN3sal13backtrace_getEm' failed: symbol not defined
> ld.lld: error: version script assignment of 'GLIBCXX_3.4' to symbol 
'_ZNSs4_Rep20_S_empty_rep_storageE' failed: symbol not defined

while building Library_sal and

> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrBuildNodeList' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrEvalRangePredicate' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrFreeLocationSet' failed: symbol not defined
[...]

while building ExternalProject_libxml2 (and the latter is the reason to add 
to
USE_LD rather than gb_LinkTarget_LDFLAGS, so that this also goes into
gb_ExternalProject_get_link_flags).

This is only relevant for ELF targets, so at least for now add it to 
linux.mk
rather than the general com_GCC_defs.mk.

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

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 8fc7d38e3f23..127a5f7b372c 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -15,6 +15,10 @@ endif
 endif
 gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs)
 
+ifneq ($(findstring lld,$(USE_LD)),)
+USE_LD += -Wl,--undefined-version
+endif
+
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 ifneq ($(ATOMIC_LIB),)

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

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/chart/converterbase.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d4799f2a8cc077c118ac0fdcab4b88c3bdbf9be0
Author: Caolán McNamara 
AuthorDate: Sun Dec 11 16:30:33 2022 +
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 11:54:01 2022 +

crashtesting: null deref seen with forum-mso-en4-763051.xlsx

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

diff --git a/oox/source/drawingml/chart/converterbase.cxx 
b/oox/source/drawingml/chart/converterbase.cxx
index bf85b7c02360..d7130ec9795d 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -85,6 +86,11 @@ void TitleLayoutInfo::convertTitlePos( ConverterRoot const & 
rRoot, const Refere
 {
 // try to get the title shape
 Reference< XShape > xTitleShape = mpGetShape( rxChart1Doc );
+if (!xTitleShape)
+{
+SAL_WARN("oox", "failed to get a TitleShape");
+return;
+}
 // get title rotation angle, needed for correction of position of 
top-left edge
 double fAngle = 0.0;
 PropertySet aTitleProp( mxTitle );

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/excrecds.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 90dc1ce8a1976b3c2e26791bdbabb2651ba45224
Author: Caolán McNamara 
AuthorDate: Sun Dec 11 20:06:01 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 11:38:18 2022 +

crashtesting: assert on import of forum-mso-en4-85437.xls

aParam.nCol1 of 180
aParam.nRow1 of 0
aParam.nCol2 of 0
aParam.nRow2 of 0

so a negative nColCnt

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

diff --git a/sc/source/filter/excel/excrecds.cxx 
b/sc/source/filter/excel/excrecds.cxx
index 3feac86be5a2..f69a5ca431c8 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -946,7 +946,8 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& 
rRoot, SCTAB nTab, const
 
 ScRange aRange( aParam.nCol1, aParam.nRow1, aParam.nTab,
 aParam.nCol2, aParam.nRow2, aParam.nTab );
-SCCOL   nColCnt = aParam.nCol2 - aParam.nCol1 + 1;
+aRange.PutInOrder();
+SCCOL nColCnt = aRange.aEnd.Col() - aRange.aStart.Col() + 1;
 
 maRef = aRange;
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/inc vcl/osx vcl/quartz

[Patrick Luby (via logerrit)]

 vcl/inc/quartz/salbmp.h|6 +
 vcl/osx/salinst.cxx|6 +
 vcl/quartz/AquaGraphicsBackend.cxx |  139 +
 vcl/quartz/salbmp.cxx  |   60 +++
 4 files changed, 210 insertions(+), 1 deletion(-)

New commits:
commit e777e0860c7f5dfb7a5f71102a69636935a091ba
Author: Patrick Luby 
AuthorDate: Sat Dec 10 14:16:39 2022 -0500
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 11:38:01 2022 +

Related: tdf#146842 Convert SkiaSalBitmap to QuartzSalBitmap

Commit de3f13e2175564316eb5a62dee65e9ff8f31b460 disabled Skia for printing.
However, since all SalBitmaps created are either all QuartzSalBitmaps or all
SkiaSalBitmaps, a crash occurs whenever a SkiaSalBitmap is passed to a
printer's SalGraphics instance which is now always non-Skia.

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

diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 8a9e94d043cc..459a2b528f99 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -30,6 +30,9 @@
 #include 
 #include 
 #include 
+#if HAVE_FEATURE_SKIA
+#include 
+#endif
 
 #include 
 
@@ -61,6 +64,9 @@ public:
 boolCreate( const SalBitmap& rSalBmp ) override;
 boolCreate( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) 
override;
 boolCreate( const SalBitmap& rSalBmp, vcl::PixelFormat 
eNewPixelFormat) override;
+#if HAVE_FEATURE_SKIA
+boolCreate( const SkiaSalBitmap& rSkiaSalBmp, const 
SalTwoRect& rPosAry );
+#endif
 virtual boolCreate( const css::uno::Reference< 
css::rendering::XBitmapCanvas >& rBitmapCanvas,
 Size& rSize,
 bool bMask = false ) override;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 6ac198554fb0..c243a7a982c3 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -501,7 +501,11 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 bool AquaSalInstance::RunInMainYield( bool bHandleAllCurrentEvents )
 {
 OSX_SALDATA_RUNINMAIN_UNION( DoYield( false, bHandleAllCurrentEvents), 
boolean )
-assert( false && "Don't call this from the main thread!" );
+
+// PrinterController::removeTransparencies() calls this frequently on the
+// main thread so reduce the severity from an assert so that printing still
+// works in a debug builds
+SAL_WARN_IF( true, "vcl", "Don't call this from the main thread!" );
 return false;
 
 }
diff --git a/vcl/quartz/AquaGraphicsBackend.cxx 
b/vcl/quartz/AquaGraphicsBackend.cxx
index 383fdc0f7fd0..822c1820c95d 100644
--- a/vcl/quartz/AquaGraphicsBackend.cxx
+++ b/vcl/quartz/AquaGraphicsBackend.cxx
@@ -45,6 +45,11 @@
 #endif
 #include 
 
+#if HAVE_FEATURE_SKIA
+#include 
+#include 
+#endif
+
 using namespace vcl;
 
 namespace
@@ -188,6 +193,48 @@ void drawPattern50(void*, CGContextRef rContext)
 CGContextAddRects(rContext, aRects, 2);
 CGContextFillPath(rContext);
 }
+
+#if HAVE_FEATURE_SKIA
+
+// Related: tdf#146842 Convert SkiaSalBitmap to QuartzSalBitmap
+// Commit de3f13e2175564316eb5a62dee65e9ff8f31b460 disabled Skia for printing.
+// However, since all SalBitmaps created are either all QuartzSalBitmaps or all
+// SkiaSalBitmaps, a crash occurs whenever a SkiaSalBitmap is passed to a
+// printer's SalGraphics instance which is now always non-Skia.
+QuartzSalBitmap* checkAndConvertToQuartzSalBitmap(const SalTwoRect& rPosAry,
+  const SalBitmap& rSalBitmap,
+  SalTwoRect* 
pAdjustedSrcPosAry)
+{
+QuartzSalBitmap* pRet = nullptr;
+
+if (SkiaHelper::isVCLSkiaEnabled() && dynamic_cast(&rSalBitmap))
+{
+const SkiaSalBitmap& rSkiaBitmap = static_cast(rSalBitmap);
+
+SalTwoRect aSrcPosAry(rPosAry);
+aSrcPosAry.mnDestX = 0;
+aSrcPosAry.mnDestY = 0;
+
+pRet = new QuartzSalBitmap;
+if (pRet)
+{
+// Ignore any failures as returning a nullptr will lead to a crash
+pRet->Create(rSkiaBitmap, aSrcPosAry);
+
+if (pAdjustedSrcPosAry)
+{
+pAdjustedSrcPosAry->mnSrcX = 0;
+pAdjustedSrcPosAry->mnSrcY = 0;
+pAdjustedSrcPosAry->mnSrcWidth = aSrcPosAry.mnDestWidth;
+pAdjustedSrcPosAry->mnSrcHeight = aSrcPosAry.mnDestHeight;
+}
+}
+}
+
+return pRet;
+}
+
+#endif
 }
 
 AquaGraphicsBackend::AquaGraphicsBackend(AquaSharedAttributes& rShared)
@@ -905,6 +952,21 @@ void AquaGraphicsBackend::drawBitmap(const SalTwoRect& 
rPosAry, const SalBitmap&
 if (!mrShared.checkContext())
 return;
 
+#if HAVE_FEATURE_SKIA
+if (mrShared.mbPrinter)
+{
+SAL_INFO("vcl.print", "Printin

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/worksheethelper.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c9f84e636107b1fa29493b3841799d8d8f49fda1
Author: Caolán McNamara 
AuthorDate: Mon Dec 12 09:48:39 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 11:37:26 2022 +

crashtesting: assert see on loading forum-mso-en4-489894.xlsx

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

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 010a4189cf7f..2c409e0d7b14 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1378,7 +1378,18 @@ void WorksheetGlobals::finalizeDrawings()
 Needed if the imported document is inserted as "OLE object from file"
 and thus does not provide an OLE size property by itself. */
 if( (maShapeBoundingBox.Width > 0) || (maShapeBoundingBox.Height > 0) )
-extendUsedArea( getCellRangeFromRectangle( maShapeBoundingBox ) );
+{
+ScRange aRange(getCellRangeFromRectangle(maShapeBoundingBox));
+if (aRange.aStart.Col() < 0)
+aRange.aStart.SetCol(0);
+if (aRange.aStart.Row() < 0)
+aRange.aStart.SetRow(0);
+if (aRange.aEnd.Col() < 0)
+aRange.aEnd.SetCol(0);
+if (aRange.aEnd.Row() < 0)
+aRange.aEnd.SetRow(0);
+extendUsedArea(aRange);
+}
 
 // if no used area is set, default to A1
 if( maUsedArea.aStart.Col() > maUsedArea.aEnd.Col() )

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

[Julien Nabet (via logerrit)]

 wizards/com/sun/star/wizards/common/strings.hrc |   10 +-
 wizards/source/resources/resources_en_US.properties |   10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1f77a3c5d4d71d868cad47bf0d16d6177753b79e
Author: Julien Nabet 
AuthorDate: Fri Dec 9 13:12:11 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Dec 12 11:29:06 2022 +

PRODUCTNAME -> %PRODUCTNAME

Spotted thanks to:
grep -nR PRODUCTNAME *|grep -v \%PRODUCTNAME|grep -v '${PRODUCTNAME}'|grep 
-v '\[PRODUCTNAME\]'|grep -v '\[FULLPRODUCTNAME\]'
suggested in tdf#152265 UI: "tip of the day: placeholder "PRODUCTNAME" in 
text of the tip"

Change-Id: I5292eeb1767404f2aa31f4b51b410a29afafcd6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143851
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/wizards/com/sun/star/wizards/common/strings.hrc 
b/wizards/com/sun/star/wizards/common/strings.hrc
index bb3f07237961..d176df485b50 100644
--- a/wizards/com/sun/star/wizards/common/strings.hrc
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -30,11 +30,11 @@ def NC_(context, string):
 
 # common section
 RID_COMMON_START_0  = NC_("RID_COMMON_START_0", "The 
directory '%1' could not be created.There may not be enough space left on 
your hard disk.")
-RID_COMMON_START_1  = NC_("RID_COMMON_START_1", "The text 
document could not be created.Please check if the module 'PRODUCTNAME 
Writer' is installed.")
-RID_COMMON_START_2  = NC_("RID_COMMON_START_2", "The 
spreadsheet could not be created.Please check if the module 'PRODUCTNAME 
Calc' is installed.")
-RID_COMMON_START_3  = NC_("RID_COMMON_START_3", "The 
presentation could not be created.Please check if the module 'PRODUCTNAME 
Impress' is installed.")
-RID_COMMON_START_4  = NC_("RID_COMMON_START_4", "The 
drawing could not be created.Please check if the module 'PRODUCTNAME Draw' 
is installed.")
-RID_COMMON_START_5  = NC_("RID_COMMON_START_5", "The 
formula could not be created.Please check if the module 'PRODUCTNAME Math' 
is installed.")
+RID_COMMON_START_1  = NC_("RID_COMMON_START_1", "The text 
document could not be created.Please check if the module '%PRODUCTNAME 
Writer' is installed.")
+RID_COMMON_START_2  = NC_("RID_COMMON_START_2", "The 
spreadsheet could not be created.Please check if the module '%PRODUCTNAME 
Calc' is installed.")
+RID_COMMON_START_3  = NC_("RID_COMMON_START_3", "The 
presentation could not be created.Please check if the module '%PRODUCTNAME 
Impress' is installed.")
+RID_COMMON_START_4  = NC_("RID_COMMON_START_4", "The 
drawing could not be created.Please check if the module '%PRODUCTNAME Draw' 
is installed.")
+RID_COMMON_START_5  = NC_("RID_COMMON_START_5", "The 
formula could not be created.Please check if the module '%PRODUCTNAME Math' 
is installed.")
 RID_COMMON_START_6  = NC_("RID_COMMON_START_6", "The files 
required could not be found.Please start the %PRODUCTNAME Setup and choose 
'Repair'.")
 RID_COMMON_START_7  = NC_("RID_COMMON_START_7", "The file 
'' already exists.Would you like to overwrite the existing file?")
 RID_COMMON_START_8  = NC_("RID_COMMON_START_8", "Yes")
diff --git a/wizards/source/resources/resources_en_US.properties 
b/wizards/source/resources/resources_en_US.properties
index 8649b2500e6a..d75cb03bdf05 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -23,11 +23,11 @@
 #  resources for com.sun.star.wizards
 #
 RID_COMMON_0=The directory '%1' could not be created.There may not be 
enough space left on your hard disk.
-RID_COMMON_1=The text document could not be created.Please check if the 
module 'PRODUCTNAME Writer' is installed.
-RID_COMMON_2=The spreadsheet could not be created.Please check if the 
module 'PRODUCTNAME Calc' is installed.
-RID_COMMON_3=The presentation could not be created.Please check if the 
module 'PRODUCTNAME Impress' is installed.
-RID_COMMON_4=The drawing could not be created.Please check if the module 
'PRODUCTNAME Draw' is installed.
-RID_COMMON_5=The formula could not be created.Please check if the module 
'PRODUCTNAME Math' is installed.
+RID_COMMON_1=The text document could not be created.Please check if the 
module '%PRODUCTNAME Writer' is installed.
+RID_COMMON_2=The spreadsheet could not be created.Please check if the 
module '%PRODUCTNAME Calc' is installed.
+RID_COMMON_3=The presentation could not be created.Please check if the 
module '%PRODUCTNAME Impress' is installed.
+RID_COMMON_4=The drawing could not be created.Please check if the module 
'%PRODUCTNAME Draw' is installed.
+RID_COMMON_5=The formula could not be created.Please check i

[Libreoffice-commits] core.git: schema/libreoffice

[Michael Stahl (via logerrit)]

 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7757e5844a6e9f6e039f4a28e7803319bb094d94
Author: Michael Stahl 
AuthorDate: Fri Dec 9 18:37:41 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 12 10:49:40 2022 +

schema: add link for decorative proposal

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

diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index ee9b89ded8a9..6a993840e5e4 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3305,7 +3305,7 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
+  
   
 
   

[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-40'

[Thorsten Behrens (via logerrit)]

Tag 'cib-6.1-40' created by Thorsten Behrens  
at 2022-12-12 10:05 +

Release CIB Office 6.1-40
-BEGIN PGP SIGNATURE-

iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCY5b9AF8UgAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF
RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR
5ue3AQCuIyTu0PQ5gr0Cg+cds9qQR/HZM3tVmaZz3OEuIxW8FwEA0cqNGGmK4rRW
iYx3qwzE7Y8ak5VxKgGnbCcoKtxgxg0=
=PvWY
-END PGP SIGNATURE-

Changes since cib-6.1-39-6:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - cui/Library_cui.mk include/svx offapi/com oox/source schema/libreoffice svx/Library_svxcore.mk sw/inc sw/qa sw/source sw/uiconfig

[Michael Stahl (via logerrit)]

 cui/Library_cui.mk  |1 
 include/svx/diagram/datamodel.hxx   |   25 +-
 offapi/com/sun/star/text/BaseFrameProperties.idl|   10 +
 oox/source/token/namespaces-strict.txt  |2 
 oox/source/token/namespaces.txt |2 
 oox/source/token/tokens.txt |1 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |   10 +
 svx/Library_svxcore.mk  |1 
 sw/inc/hintids.hxx  |   32 +--
 sw/qa/extras/globalfilter/data/tdf143311-1.docx |binary
 sw/qa/extras/globalfilter/globalfilter.cxx  |  101 
 sw/source/core/bastyp/init.cxx  |4 
 sw/source/core/text/EnhancedPDFExportHelper.cxx |3 
 sw/source/core/unocore/unoframe.cxx |9 +
 sw/source/core/unocore/unomapproperties.hxx |1 
 sw/source/filter/ww8/docxattributeoutput.cxx|   15 +
 sw/source/ui/frmdlg/frmpage.cxx |   10 +
 sw/source/uibase/inc/frmpage.hxx|1 
 sw/uiconfig/swriter/ui/frmaddpage.ui|   20 ++
 writerfilter/source/dmapper/DomainMapper.cxx|3 
 writerfilter/source/dmapper/GraphicImport.cxx   |6 
 writerfilter/source/dmapper/PropertyIds.cxx |1 
 writerfilter/source/dmapper/PropertyIds.hxx |1 
 writerfilter/source/ooxml/model.xml |   32 +++
 xmloff/source/text/XMLTextFrameContext.cxx  |   10 +
 xmloff/source/text/txtparae.cxx |6 
 26 files changed, 273 insertions(+), 34 deletions(-)

New commits:
commit 22cb755ca9ef95cae38bce236f655f0807824d66
Author: Michael Stahl 
AuthorDate: Thu Dec 8 10:54:18 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 12 10:03:17 2022 +

tdf#143311 offapi,oox,writerfilter,xmloff,sw: decorative flag on flys

* sw core RES_DECORATIVE as a FRMATR
* sw API SwXFrame property "Decorative"
* UI checkbox "Decorative"
* ODF import/export as loext:decorative on draw:frame
* DOCX export
* DOCX import - very non-obvious how to get it from model.xml to dmapper
* PDF/UA export: tag flys with this flag as Artifact
* test for DOCX filters, ODF filters, PDF export

Change-Id: I1ceb67fdd4e1cfa212aafdeb1c5f4ccd873d433e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143815
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 31084ebb59093be7dfe5ab53a20fdb3bcfde34b6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143863

diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl 
b/offapi/com/sun/star/text/BaseFrameProperties.idl
index 72bec7ffe63c..3108067a0ad5 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -363,6 +363,16 @@ published service BaseFrameProperties
 @since LibreOffice 7.4
 */
 [optional, property] string Tooltip;
+
+/** Determines if the frame is purely decorative.
+
+If `TRUE`, it is considered not part of the document content,
+and may be ignored by assistive technologies.
+
+@since LibreOffice 7.5
+*/
+[optional, property] boolean Decorative;
+
 };
 
 
diff --git a/oox/source/token/namespaces-strict.txt 
b/oox/source/token/namespaces-strict.txt
index 7449dca99a33..59631432eb2f 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -92,6 +92,8 @@ xr2 
http://schemas.microsoft.com/office/spreadsheetml/2015/r
 
 # extlst namespaces
 
+adec
http://schemas.microsoft.com/office/drawing/2017/decorative
+
 # xls14Lst for features introduced by excel 2010
 xls14Lst   
http://schemas.microsoft.com/office/spreadsheetml/2009/9/main
 
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 849caa547695..0790c65d8817 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -92,6 +92,8 @@ xr2 
http://schemas.microsoft.com/office/spreadsheetml/2015/r
 
 # extlst namespaces
 
+adec
http://schemas.microsoft.com/office/drawing/2017/decorative
+
 # xls14Lst for features introduced by excel 2010
 xls14Lst   
http://schemas.microsoft.com/office/spreadsheetml/2009/9/main
 
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index d1a40140add9..8ed5687983b6 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -480,6 +480,7 @@ additive
 addlxml
 addressBook
 addressFieldName
+adec
 adj
 adjLst
 adjust
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoff

[Libreoffice-commits] core.git: configure.ac

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 599f9836a674ec525e56fa787a800d7ed4be3383
Author: Thorsten Behrens 
AuthorDate: Sun Dec 11 23:06:34 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 12 09:55:28 2022 +

Add oox to build side, for cross compilation

With ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058, cui now depends on oox
generated headers, so we need to build oox too, for cross builds.

Change-Id: I1af3116ab35c5094c23db3ed3dccd90c80080cef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index ccce0a06b770..6325d8c50075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5797,6 +5797,7 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
+OOX
 OPENSSL
 ORCUS
 PYTHON

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

[Stephan Bergmann (via logerrit)]

 external/zxing/UnpackedTarball_zxing.mk |1 +
 external/zxing/coroutine.patch.0|   11 +++
 sc/source/ui/unoobj/chart2uno.cxx   |9 -
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 57d3721e822fb16bb80986cb74b59e9df3dde420
Author: Stephan Bergmann 
AuthorDate: Fri Dec 9 13:17:05 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 09:30:55 2022 +

external/zxing: Silence MSVC 2022 error C3781

> workdir\UnpackedTarball\zxing\core\src\Generator.h(20): error C3781: 
Generator::promise_type: a coroutine's promise must 
declare either 'return_value' or 'return_void'

seen at least when building with --with-latest-c++ against VS 2022 17.5.0
Preview 1.0

Change-Id: Ie69100d87e6cb85526d772e8f0f5d11e1f9d6704
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143853
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e2d3baf0db4dec6b7b00192c41700611bd1d147c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143865
Reviewed-by: Xisco Fauli 

diff --git a/external/zxing/UnpackedTarball_zxing.mk 
b/external/zxing/UnpackedTarball_zxing.mk
index ac0aff061d72..9e877201a9e2 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/android_include.patch.0 \
external/zxing/missing-include.patch.0 \
external/zxing/msvc-lambdacapture.patch.0 \
+   external/zxing/coroutine.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/zxing/coroutine.patch.0 b/external/zxing/coroutine.patch.0
new file mode 100644
index ..c863ff948f88
--- /dev/null
+++ b/external/zxing/coroutine.patch.0
@@ -0,0 +1,11 @@
+--- core/src/Generator.h
 core/src/Generator.h
+@@ -26,7 +26,7 @@
+   current_value = std::move(value);
+   return {};
+   }
+-//void return_value(T&& value) noexcept { current_value = 
std::move(value); }
++  void return_void() noexcept {}
+   // Disallow co_await in generator coroutines.
+   void await_transform() = delete;
+   [[noreturn]] static void unhandled_exception() { throw; }
commit f9315df3d0f3655dc47b621005e7fa787a7b1a71
Author: Caolán McNamara 
AuthorDate: Sun Dec 11 21:26:01 2022 +
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 09:30:40 2022 +

crashtesting: use of uninitialized data in forum-mso-en4-93354.xls

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

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 18378bdfedcd..e36fba94d71e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -532,7 +532,14 @@ void Chart2Positioner::glueState()
 }
 
 ScComplexRefData aData;
-ScRefTokenHelper::getDoubleRefDataFromToken(aData, mrRefTokens.front());
+if (!ScRefTokenHelper::getDoubleRefDataFromToken(aData, 
mrRefTokens.front()))
+{
+SAL_WARN("sc", "Chart2Positioner::glueState getDoubleRefDataFromToken 
failed");
+invalidateGlue();
+mnStartCol = 0;
+mnStartRow = 0;
+return;
+}
 mnStartCol = aData.Ref1.Col();
 mnStartRow = aData.Ref1.Row();
 

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx   |6 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.hxx |1 +
 writerfilter/source/dmapper/DomainMapper.cxx |   11 ++-
 4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 2ff44f77f53170d9075ea2607debf799f96724fb
Author: Justin Luth 
AuthorDate: Thu Dec 8 11:45:05 2022 -0500
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 09:11:26 2022 +

tdf#151548 sw content controls: preserve tag for block SDTs

The tag is critical for VBA access.
Although we do not yet import blockSdts as content controls,
losing this would break any VBA macros for MS Word.
So make sure it round-trips.

I can't imagine why it wasn't treated the same as alias.
I guess because Alias is seen, while tag appears to have
no valuable function (until VBA, where it becomes the most
likely ID field.)

Change-Id: I05a04faa9d2314c7b37c5b86f107bd1a16019509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143830
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit a5098b222c9406af858fd6d94d0ceb2c3c2066a8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143867
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index d631c783b1a9..f5230adb643a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -490,6 +490,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148671, "tdf148671.docx")
 {
 // Don't assert with 'pFieldMark' failed when document is opened
 CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+if (!isExported())
+return;
+// Preserve tag on SDT blocks. (Before the fix, these were all lost)
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc, "//w:sdt/w:sdtPr/w:tag", 3);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf140668, "tdf140668.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dcafe422a0e8..95f137ec771f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -615,6 +615,8 @@ void SdtBlockHelper::DeleteAndResetTheLists()
 m_pTextAttrs.clear();
 if (!m_aAlias.isEmpty())
 m_aAlias.clear();
+if (!m_aTag.isEmpty())
+m_aTag.clear();
 if (!m_aPlaceHolderDocPart.isEmpty())
 m_aPlaceHolderDocPart.clear();
 if (!m_aColor.isEmpty())
@@ -719,6 +721,9 @@ void SdtBlockHelper::WriteExtraParams(const 
::sax_fastparser::FSHelperPtr& pSeri
 
 if (!m_aAlias.isEmpty())
 pSerializer->singleElementNS(XML_w, XML_alias, FSNS(XML_w, XML_val), 
m_aAlias);
+
+if (!m_aTag.isEmpty())
+pSerializer->singleElementNS(XML_w, XML_tag, FSNS(XML_w, XML_val), 
m_aTag);
 }
 
 void SdtBlockHelper::EndSdtBlock(const ::sax_fastparser::FSHelperPtr& 
pSerializer)
@@ -828,6 +833,11 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const 
uno::Sequence>= m_aAlias))
 SAL_WARN("sw.ww8", "DocxAttributeOutput::GrabBag: unexpected 
sdt alias value");
 }
+else if (aPropertyValue.Name == "ooxml:CT_SdtPr_tag" && 
m_aTag.isEmpty())
+{
+if (!(aPropertyValue.Value >>= m_aTag))
+SAL_WARN("sw.ww8", "DocxAttributeOutput::GrabBag: unexpected 
sdt tag value");
+}
 else if (aPropertyValue.Name == "ooxml:CT_SdtPr_id")
 m_bHasId = true;
 else if (aPropertyValue.Name == "ooxml:CT_SdtPr_citation")
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6e029cc9dfc4..f8da5a4bd32d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -144,6 +144,7 @@ public:
 OUString m_aPlaceHolderDocPart;
 bool m_bShowingPlaceHolder;
 OUString m_aAlias;
+OUString m_aTag;
 sal_Int32 m_nSdtPrToken;
 
 void DeleteAndResetTheLists();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4683ff445458..a3a4407a5971 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2910,14 +2910,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 break;
 }
 }
-else
-{
-if (nSprmId == NS_ooxml::LN_CT_SdtPr_tag)
-{
-// Tag is only handled here in case of inline SDT.
-break;
-}
-}
 
 // this is an unsupported SDT property, create a grab bag for it
 OUString sName;
@@ -2933,6 +2925,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 case

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

[László Németh (via logerrit)]

 sw/source/core/frmedt/fetab.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d0441be82ab9ea2b7aa366b1fe3e1a523b24b076
Author: László Németh 
AuthorDate: Fri Dec 9 13:44:21 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 09:10:27 2022 +

tdf#150578 sw track changes: fix table toolbar at row deletion

In Hide Changes mode with enabled change tracking, table row
deletion disabled the table toolbar, so it wasn't possible
to repeat the click on the toolbar deleting multiple rows
row by row.

Follow-up to commit 16c705ec0d1ab4b4428577ccb0ea3fc14ee0fc88
"tdf#148849 sw: fix cursor pos at tracked DeleteRow in Hide Changes".

Change-Id: I297bae405cb24f7090144344947c01a1dadf9261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143876
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit e5986baa983e1c7b5e07c45299fd84be2c230fbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143866
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 19bee641b2cf..3c0c5a4848a7 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -520,7 +520,11 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
 pPam->SetMark();// both want something
 pPam->DeleteMark();
 if ( SwWrtShell* pWrtShell = dynamic_cast(this) )
+{
 pWrtShell->UpdateCursor();
+// tdf#150578 enable the disabled table toolbar by (zero) 
cursor moving
+pWrtShell->Right( SwCursorSkipMode::Chars, false, 0, false 
);
+}
 
 EndUndo(bCompleteTable ? SwUndoId::UI_TABLE_DELETE : 
SwUndoId::ROW_DELETE);
 return true;

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

[Julien Nabet (via logerrit)]

 wizards/com/sun/star/wizards/common/strings.hrc |   10 +-
 wizards/source/resources/resources_en_US.properties |   10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 5fc797cff705c8e94541a35871f1d27fa7fb161a
Author: Julien Nabet 
AuthorDate: Fri Dec 9 13:12:11 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 09:09:47 2022 +

PRODUCTNAME -> %PRODUCTNAME

Spotted thanks to:
grep -nR PRODUCTNAME *|grep -v \%PRODUCTNAME|grep -v '${PRODUCTNAME}'|grep 
-v '\[PRODUCTNAME\]'|grep -v '\[FULLPRODUCTNAME\]'
suggested in tdf#152265 UI: "tip of the day: placeholder "PRODUCTNAME" in 
text of the tip"

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

diff --git a/wizards/com/sun/star/wizards/common/strings.hrc 
b/wizards/com/sun/star/wizards/common/strings.hrc
index bb3f07237961..d176df485b50 100644
--- a/wizards/com/sun/star/wizards/common/strings.hrc
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -30,11 +30,11 @@ def NC_(context, string):
 
 # common section
 RID_COMMON_START_0  = NC_("RID_COMMON_START_0", "The 
directory '%1' could not be created.There may not be enough space left on 
your hard disk.")
-RID_COMMON_START_1  = NC_("RID_COMMON_START_1", "The text 
document could not be created.Please check if the module 'PRODUCTNAME 
Writer' is installed.")
-RID_COMMON_START_2  = NC_("RID_COMMON_START_2", "The 
spreadsheet could not be created.Please check if the module 'PRODUCTNAME 
Calc' is installed.")
-RID_COMMON_START_3  = NC_("RID_COMMON_START_3", "The 
presentation could not be created.Please check if the module 'PRODUCTNAME 
Impress' is installed.")
-RID_COMMON_START_4  = NC_("RID_COMMON_START_4", "The 
drawing could not be created.Please check if the module 'PRODUCTNAME Draw' 
is installed.")
-RID_COMMON_START_5  = NC_("RID_COMMON_START_5", "The 
formula could not be created.Please check if the module 'PRODUCTNAME Math' 
is installed.")
+RID_COMMON_START_1  = NC_("RID_COMMON_START_1", "The text 
document could not be created.Please check if the module '%PRODUCTNAME 
Writer' is installed.")
+RID_COMMON_START_2  = NC_("RID_COMMON_START_2", "The 
spreadsheet could not be created.Please check if the module '%PRODUCTNAME 
Calc' is installed.")
+RID_COMMON_START_3  = NC_("RID_COMMON_START_3", "The 
presentation could not be created.Please check if the module '%PRODUCTNAME 
Impress' is installed.")
+RID_COMMON_START_4  = NC_("RID_COMMON_START_4", "The 
drawing could not be created.Please check if the module '%PRODUCTNAME Draw' 
is installed.")
+RID_COMMON_START_5  = NC_("RID_COMMON_START_5", "The 
formula could not be created.Please check if the module '%PRODUCTNAME Math' 
is installed.")
 RID_COMMON_START_6  = NC_("RID_COMMON_START_6", "The files 
required could not be found.Please start the %PRODUCTNAME Setup and choose 
'Repair'.")
 RID_COMMON_START_7  = NC_("RID_COMMON_START_7", "The file 
'' already exists.Would you like to overwrite the existing file?")
 RID_COMMON_START_8  = NC_("RID_COMMON_START_8", "Yes")
diff --git a/wizards/source/resources/resources_en_US.properties 
b/wizards/source/resources/resources_en_US.properties
index 8649b2500e6a..d75cb03bdf05 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -23,11 +23,11 @@
 #  resources for com.sun.star.wizards
 #
 RID_COMMON_0=The directory '%1' could not be created.There may not be 
enough space left on your hard disk.
-RID_COMMON_1=The text document could not be created.Please check if the 
module 'PRODUCTNAME Writer' is installed.
-RID_COMMON_2=The spreadsheet could not be created.Please check if the 
module 'PRODUCTNAME Calc' is installed.
-RID_COMMON_3=The presentation could not be created.Please check if the 
module 'PRODUCTNAME Impress' is installed.
-RID_COMMON_4=The drawing could not be created.Please check if the module 
'PRODUCTNAME Draw' is installed.
-RID_COMMON_5=The formula could not be created.Please check if the module 
'PRODUCTNAME Math' is installed.
+RID_COMMON_1=The text document could not be created.Please check if the 
module '%PRODUCTNAME Writer' is installed.
+RID_COMMON_2=The spreadsheet could not be created.Please check if the 
module '%PRODUCTNAME Calc' is installed.
+RID_COMMON_3=The presentation could not be created.Please check if the 
module '%PRODUCTNAME Impress' is installed.
+RID_COMMON_4=The drawing could not be created.Please check if the module 
'%PRODUCTNAME Draw' is installed.
+RID_COMMON_5=The formula could not be created.Please check if the 

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 177b346c9ea4177386a26c69533bee1d9219b261
Author: Caolán McNamara 
AuthorDate: Sun Dec 11 20:57:09 2022 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 09:08:12 2022 +

ofz#54202 Timeout

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

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 9fdb22003338..fc034d2abcd7 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -875,7 +875,7 @@ static bool AllowScale(const Size& rSource, const Size& 
rDest)
 static bool bFuzzing = utl::ConfigManager::IsFuzzing();
 if (bFuzzing)
 {
-constexpr int nMaxScaleWhenFuzzing = 512;
+constexpr int nMaxScaleWhenFuzzing = 256;
 
 auto nSourceHeight = rSource.Height();
 auto nDestHeight = rDest.Height();

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

[Patrick Luby (via logerrit)]

 vcl/inc/quartz/salbmp.h|6 +
 vcl/osx/salinst.cxx|6 +
 vcl/quartz/AquaGraphicsBackend.cxx |  139 +
 vcl/quartz/salbmp.cxx  |   60 +++
 4 files changed, 210 insertions(+), 1 deletion(-)

New commits:
commit 3243933cd75a143cb7c09b4cfd955933ff79a0c6
Author: Patrick Luby 
AuthorDate: Sat Dec 10 14:16:39 2022 -0500
Commit: Caolán McNamara 
CommitDate: Mon Dec 12 09:08:00 2022 +

Related: tdf#146842 Convert SkiaSalBitmap to QuartzSalBitmap

Commit de3f13e2175564316eb5a62dee65e9ff8f31b460 disabled Skia for printing.
However, since all SalBitmaps created are either all QuartzSalBitmaps or all
SkiaSalBitmaps, a crash occurs whenever a SkiaSalBitmap is passed to a
printer's SalGraphics instance which is now always non-Skia.

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

diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 8a9e94d043cc..459a2b528f99 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -30,6 +30,9 @@
 #include 
 #include 
 #include 
+#if HAVE_FEATURE_SKIA
+#include 
+#endif
 
 #include 
 
@@ -61,6 +64,9 @@ public:
 boolCreate( const SalBitmap& rSalBmp ) override;
 boolCreate( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) 
override;
 boolCreate( const SalBitmap& rSalBmp, vcl::PixelFormat 
eNewPixelFormat) override;
+#if HAVE_FEATURE_SKIA
+boolCreate( const SkiaSalBitmap& rSkiaSalBmp, const 
SalTwoRect& rPosAry );
+#endif
 virtual boolCreate( const css::uno::Reference< 
css::rendering::XBitmapCanvas >& rBitmapCanvas,
 Size& rSize,
 bool bMask = false ) override;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index e7f202ae7ae5..22a024bc265d 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -524,7 +524,11 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 bool AquaSalInstance::RunInMainYield( bool bHandleAllCurrentEvents )
 {
 OSX_SALDATA_RUNINMAIN_UNION( DoYield( false, bHandleAllCurrentEvents), 
boolean )
-assert( false && "Don't call this from the main thread!" );
+
+// PrinterController::removeTransparencies() calls this frequently on the
+// main thread so reduce the severity from an assert so that printing still
+// works in a debug builds
+SAL_WARN_IF( true, "vcl", "Don't call this from the main thread!" );
 return false;
 
 }
diff --git a/vcl/quartz/AquaGraphicsBackend.cxx 
b/vcl/quartz/AquaGraphicsBackend.cxx
index 987ce5b784a5..7482986dd58a 100644
--- a/vcl/quartz/AquaGraphicsBackend.cxx
+++ b/vcl/quartz/AquaGraphicsBackend.cxx
@@ -44,6 +44,11 @@
 #include 
 #endif
 
+#if HAVE_FEATURE_SKIA
+#include 
+#include 
+#endif
+
 using namespace vcl;
 
 namespace
@@ -187,6 +192,48 @@ void drawPattern50(void*, CGContextRef rContext)
 CGContextAddRects(rContext, aRects, 2);
 CGContextFillPath(rContext);
 }
+
+#if HAVE_FEATURE_SKIA
+
+// Related: tdf#146842 Convert SkiaSalBitmap to QuartzSalBitmap
+// Commit de3f13e2175564316eb5a62dee65e9ff8f31b460 disabled Skia for printing.
+// However, since all SalBitmaps created are either all QuartzSalBitmaps or all
+// SkiaSalBitmaps, a crash occurs whenever a SkiaSalBitmap is passed to a
+// printer's SalGraphics instance which is now always non-Skia.
+QuartzSalBitmap* checkAndConvertToQuartzSalBitmap(const SalTwoRect& rPosAry,
+  const SalBitmap& rSalBitmap,
+  SalTwoRect* 
pAdjustedSrcPosAry)
+{
+QuartzSalBitmap* pRet = nullptr;
+
+if (SkiaHelper::isVCLSkiaEnabled() && dynamic_cast(&rSalBitmap))
+{
+const SkiaSalBitmap& rSkiaBitmap = static_cast(rSalBitmap);
+
+SalTwoRect aSrcPosAry(rPosAry);
+aSrcPosAry.mnDestX = 0;
+aSrcPosAry.mnDestY = 0;
+
+pRet = new QuartzSalBitmap;
+if (pRet)
+{
+// Ignore any failures as returning a nullptr will lead to a crash
+pRet->Create(rSkiaBitmap, aSrcPosAry);
+
+if (pAdjustedSrcPosAry)
+{
+pAdjustedSrcPosAry->mnSrcX = 0;
+pAdjustedSrcPosAry->mnSrcY = 0;
+pAdjustedSrcPosAry->mnSrcWidth = aSrcPosAry.mnDestWidth;
+pAdjustedSrcPosAry->mnSrcHeight = aSrcPosAry.mnDestHeight;
+}
+}
+}
+
+return pRet;
+}
+
+#endif
 }
 
 AquaGraphicsBackend::AquaGraphicsBackend(AquaSharedAttributes& rShared)
@@ -904,6 +951,21 @@ void AquaGraphicsBackend::drawBitmap(const SalTwoRect& 
rPosAry, const SalBitmap&
 if (!mrShared.checkContext())
 return;
 
+#if HAVE_FEATURE_SKIA
+if (mrShared.mbPrinter)
+{
+SAL_INFO("vcl.print", "Printin

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/inc/conttree.hxx  |1 
 sw/source/uibase/utlui/content.cxx |   97 ++---
 2 files changed, 71 insertions(+), 27 deletions(-)

New commits:
commit b87ee9171b27184b1781c287fd89af3188da9377
Author: Jim Raykowski 
AuthorDate: Thu Dec 8 18:58:59 2022 -0900
Commit: Xisco Fauli 
CommitDate: Mon Dec 12 09:03:20 2022 +

tdf#152029 Bring drawing objects to attention in the document view

when mouse pointer is over drawing object entry in the Navigator
content tree

Change-Id: Idfeeb3854ffe76745f2f30a6ffac8528b2dda725
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143844
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 11b87e7601fd24eb290854e9642bf01d0b4592ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143730
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 03f331c2584f..5a9ef1a9322e 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -141,6 +141,7 @@ class SwContentTree final : public SfxListener
 void BringBookmarksToAttention(const std::vector& rNames);
 void BringURLFieldsToAttention(const SwGetINetAttrs& rINetAttrsArr);
 void BringReferencesToAttention(std::vector& 
rTextAttrsArr);
+void BringDrawingObjectsToAttention(std::vector& 
rDrawingObjectsArr);
 void BringTextFieldsToAttention(std::vector& 
rTextAttrsArr);
 
 /**
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 1033c63c84e3..dbed1715e32d 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1152,26 +1152,35 @@ IMPL_LINK(SwContentTree, MouseMoveHdl, const 
MouseEvent&, rMEvt, bool)
 // initialize the compare entry iterator with the first tree entry iterator
 if (!m_xOverlayCompareEntry && 
!m_xTreeView->get_iter_first(*m_xOverlayCompareEntry))
return false;
-bool bRemoveOverlayObject = false;
 if (rMEvt.IsLeaveWindow())
 {
-bRemoveOverlayObject = true;
+m_aOverlayObjectDelayTimer.Stop();
+if (m_xOverlayObject && m_xOverlayObject->getOverlayManager())
+{
+m_xOverlayObject->getOverlayManager()->remove(*m_xOverlayObject);
+m_xOverlayObject.reset();
+}
 }
 else if (std::unique_ptr 
xEntry(m_xTreeView->make_iterator());
 m_xTreeView->get_dest_row_at_pos(rMEvt.GetPosPixel(), 
xEntry.get(), false, false))
 {
+// Remove the overlay object if the pointer is over a different entry 
than the last time
+// it was here.
+if (m_xTreeView->iter_compare(*xEntry, *m_xOverlayCompareEntry) != 0)
+{
+m_aOverlayObjectDelayTimer.Stop();
+if (m_xOverlayObject && m_xOverlayObject->getOverlayManager())
+{
+
m_xOverlayObject->getOverlayManager()->remove(*m_xOverlayObject);
+m_xOverlayObject.reset();
+}
+}
 if (lcl_IsContent(*xEntry, *m_xTreeView)) // content entry
 {
 SwContent* pCnt = 
weld::fromId(m_xTreeView->get_id(*xEntry));
 const ContentTypeId nType = pCnt->GetParent()->GetType();
-bRemoveOverlayObject =
-nType != ContentTypeId::OUTLINE && nType != 
ContentTypeId::TABLE &&
-nType != ContentTypeId::FRAME && nType != 
ContentTypeId::GRAPHIC &&
-nType != ContentTypeId::OLE && nType != 
ContentTypeId::BOOKMARK &&
-nType != ContentTypeId::URLFIELD && nType != 
ContentTypeId::REFERENCE &&
-nType != ContentTypeId::TEXTFIELD;
-if (!bRemoveOverlayObject && (rMEvt.IsEnterWindow() ||
-m_xTreeView->iter_compare(*xEntry, 
*m_xOverlayCompareEntry) != 0))
+if (rMEvt.IsEnterWindow() ||
+m_xTreeView->iter_compare(*xEntry, 
*m_xOverlayCompareEntry) != 0)
 {
 if (nType == ContentTypeId::OUTLINE)
 {
@@ -1218,6 +1227,14 @@ IMPL_LINK(SwContentTree, MouseMoveHdl, const 
MouseEvent&, rMEvt, bool)
 BringReferencesToAttention(aTextAttrArr);
 }
 }
+else if (nType == ContentTypeId::DRAWOBJECT)
+{
+if (!pCnt->IsInvisible())
+{
+std::vector aSdrObjectArr 
{GetDrawingObjectsByContent(pCnt)};
+BringDrawingObjectsToAttention(aSdrObjectArr);
+}
+}
 else if (nType == ContentTypeId::TEXTFIELD)
 {
 if (const SwTextAttr* pTextAttr =
@@ -1233,14 +1250,8 @@ IMPL_LINK(SwContentTree, MouseMoveHdl, const 
MouseEvent&, rMEvt, bool)
 {
 const ContentTypeId nType =

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/core/layout/data/page-remove-fly-table.odt |binary
 sw/qa/core/layout/layout.cxx |   40 +++
 sw/source/core/layout/flylay.cxx |   11 ++
 3 files changed, 51 insertions(+)

New commits:
commit ee9e7a6645dca3d79d784fdda8dd1cd003f1b998
Author: Miklos Vajna 
AuthorDate: Fri Dec 9 16:52:48 2022 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 12 10:00:27 2022 +0100

sw layout: invalidate margins of body content when moving a fly from page

The (simplified) bugdoc has 9 pages, and once the ToC is updated, the
two tables below the (only) bookmark in the document has a 5879 twips
gap between them for no reason. Adding a new paragraph to the second
table "fixes" the incremental layout.

What seems to happen is that there is an anchored image on page 8, but
the layout decides that it doesn't fit there so it gets moved to page 9.
Before this move happens, SwTabFrame::Format() handles the outer of the
nested table below the unwanted gap and its CalcFlyOffsets() notices
that a large upper margin is wanted so that the table wraps around the
anchored image. Later the image gets moved to the next page, but the
removal doesn't invalidate the print area of the table with the large
top margin, so the unwanted gap appears.

Fix the problem by looking at the old page in SwPageFrame::MoveFly() and
walking through the immediate children of the body frame: if the frame
print area is invalidated, then SetYMargins() is called from
SwTabFrame::Format(), which also invalidates the size of the outer table
frame, so it will use Shrink() to have a correct size.

This appears to be a regression from commit
b9ef71476fd70bc13f50ebe80390e0730d1b7afb (tdf#134298 sw: layout: remove
left-over page frame without content, 2020-11-13).

(cherry picked from commit cf2c070de2bafeec3b476c6bff7bb4ac87ba46db)

Conflicts:
sw/qa/core/layout/layout.cxx

Change-Id: I0424d9eea4d8a030959f8534985950c7efad4686

diff --git a/sw/qa/core/layout/data/page-remove-fly-table.odt 
b/sw/qa/core/layout/data/page-remove-fly-table.odt
new file mode 100644
index ..6aaf230966ef
Binary files /dev/null and b/sw/qa/core/layout/data/page-remove-fly-table.odt 
differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 4cc7390d63f9..1f8e2e8e5482 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -10,8 +10,16 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 static char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/";
 
@@ -164,6 +172,38 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, 
testKeepwithnextFullheight)
 assertXPath(pXmlDoc, "//page[2]/body/txt/anchored/fly", 1);
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testPageRemoveFlyTable)
+{
+// Given a document with a ToC and several tables, one table marked with a 
bookmark:
+load(DATA_DIRECTORY, "page-remove-fly-table.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDocShell* pShell = pTextDoc->GetDocShell();
+SwDoc* pDoc = pShell->GetDoc();
+
+// When updating the ToC and incrementally formatting the document:
+SwView* pView = pDoc->GetDocShell()->GetView();
+SfxDispatcher& rDispatcher = *pView->GetViewFrame()->GetDispatcher();
+rDispatcher.Execute(FN_UPDATE_TOX);
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Reformat();
+
+// Then make sure that the 2nd table below the bookmark has no unwanted 
top margin:
+pWrtShell->GotoMark("test");
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1, /*bBasicCall=*/false);
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1, /*bBasicCall=*/false);
+SwPaM* pCursor = pWrtShell->GetCursor();
+SwTextNode* pTextNode = pCursor->GetPoint()->nNode.GetNode().GetTextNode();
+SwFrame* pTextFrame = pTextNode->getLayoutFrame(nullptr);
+SwTabFrame* pInnerTable = pTextFrame->FindTabFrame();
+SwTabFrame* pOuterTable = pInnerTable->GetUpper()->FindTabFrame();
+long nActual = pOuterTable->getFramePrintArea().Top();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual  : 5879
+// i.e. the bad table had a large, unwanted/leftover top margin.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), nActual);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 72d673b224d4..b8f586938454 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -987,6 +987,17 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, 
SwPageFrame *pDest )
 {
 m_pSortedObjs.reset();
 }
+
+// Removing a fly from 

[Libreoffice-commits] core.git: Branch 'feature/benchmarks' - 6 commits - include/vcl Repository.mk vcl/backendtest vcl/Executable_benchmarktests.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/so

[Akshit Kushwaha (via logerrit)]

 Repository.mk |1 
 include/vcl/outdev.hxx|2 
 vcl/Executable_benchmarktests.mk  |   41 +
 vcl/Library_vcl.mk|1 
 vcl/Module_vcl.mk |5 
 vcl/backendtest/benchmark/BenchmarkApp.cxx|  395 ++
 vcl/backendtest/benchmark/outputdevice/Benchmarks.cxx |  392 +
 vcl/inc/headless/SvpGraphicsBackend.hxx   |2 
 vcl/inc/qt5/QtGraphics.hxx|2 
 vcl/inc/quartz/salgdi.h   |2 
 vcl/inc/salgdi.hxx|7 
 vcl/inc/salgdiimpl.hxx|2 
 vcl/inc/test/Benchmarks.hxx   |   44 ++
 vcl/inc/unx/GenPspGfxBackend.hxx  |2 
 vcl/source/outdev/outdev.cxx  |5 
 vcl/unx/generic/gdi/gdiimpl.cxx   |5 
 vcl/unx/generic/gdi/gdiimpl.hxx   |2 
 vcl/win/gdi/gdiimpl.cxx   |5 
 vcl/win/gdi/gdiimpl.hxx   |2 
 19 files changed, 913 insertions(+), 4 deletions(-)

New commits:
commit b167059facb2b01de1d0a46777ef3ff01fa61a83
Author: Akshit Kushwaha 
AuthorDate: Fri Feb 18 13:14:09 2022 +0530
Commit: Tomaž Vajngerl 
CommitDate: Mon Dec 12 17:13:55 2022 +0900

Introduced the Flush() method for aiding the benchmarks

This Flush() method would help in clearing any and all
queued drawing calls in order to prevent unnecessary
time addition to the benchmarks.

Change-Id: Ie4170bc5ebbf5011b6be315daa6a0035ffb3aa24

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b2053f412b49..5ad5d5eb7de7 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -426,7 +426,7 @@ public:
 ///@{
 
 public:
-virtual voidFlush() {}
+virtual voidFlush();
 
 virtual voidDrawOutDev(
 const Point& rDestPt, const Size& 
rDestSize,
diff --git a/vcl/backendtest/benchmark/outputdevice/Benchmarks.cxx 
b/vcl/backendtest/benchmark/outputdevice/Benchmarks.cxx
index d7cf1cdeb345..94e50a8865a3 100644
--- a/vcl/backendtest/benchmark/outputdevice/Benchmarks.cxx
+++ b/vcl/backendtest/benchmark/outputdevice/Benchmarks.cxx
@@ -57,6 +57,7 @@ Bitmap Benchmark::setupMultiplePolygonsWithPolyPolygon()
 aPolyPolygon.Insert(aPolygon1);
 }
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 mpVirtualDevice->DrawPolyPolygon(aPolyPolygon);
 Bitmap aBitmap = mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), 
maVDRectangle.GetSize());
@@ -71,6 +72,7 @@ Bitmap Benchmark::setupWavelines()
 mpVirtualDevice->SetLineColor(constLineColor);
 mpVirtualDevice->SetFillColor();
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 for (int i = 1; i <= 4094; i += 2)
 {
@@ -91,6 +93,7 @@ Bitmap Benchmark::setupGrid()
 mpVirtualDevice->SetLineColor(constLineColor);
 mpVirtualDevice->SetFillColor();
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 for (int i = 1; i <= 4096; i += 2)
 {
@@ -109,6 +112,7 @@ Bitmap Benchmark::setupGridWithDottedLine()
 mpVirtualDevice->SetLineColor(constLineColor);
 mpVirtualDevice->SetFillColor();
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 for (int i = 1; i <= 4096; i += 2)
 {
@@ -148,6 +152,7 @@ Bitmap Benchmark::setupBitmap()
 Point aPoint((maVDRectangle.GetWidth() / 2.0) - (aBitmapSize.Width() / 
2.0),
  (maVDRectangle.GetHeight() / 2.0) - (aBitmapSize.Height() / 
2.0));
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 
 mpVirtualDevice->DrawBitmapEx(aPoint, BitmapEx(aBitmap));
@@ -185,6 +190,7 @@ Bitmap Benchmark::setupBitmapWithAlpha()
 Point aPoint((maVDRectangle.GetWidth() / 2.0) - (aRect.GetWidth() / 2.0),
  (maVDRectangle.GetHeight() / 2.0) - (aRect.GetHeight() / 
2.0));
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 
 mpVirtualDevice->DrawBitmapEx(tools::Rectangle(aPoint, 
aRect.GetSize()).TopLeft(),
@@ -212,6 +218,7 @@ Bitmap Benchmark::setupScaledBitmap()
 aWriteAccess->DrawRect(tools::Rectangle(i + 1, i + 1, 100 - i - 1, 100 
- i - 1));
 }
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 
 BitmapEx aBitmapEx(aBitmap);
@@ -241,6 +248,7 @@ Bitmap Benchmark::setupReducedBitmap()
 aWriteAccess->DrawRect(tools::Rectangle(i + 1, i + 1, 8096 - i - 1, 
8096 - i - 1));
 }
 
+mpVirtualDevice->Flush();
 m_xStart = std::chrono::steady_clock::now();
 
 BitmapEx aBitmapEx(aBitmap);
@@ -273,6

[Libreoffice-commits] core.git: Changes to 'feature/benchmarks'

[Miklos Vajna (via logerrit)]

New branch 'feature/benchmarks' available with the following commits: