[Libreoffice-commits] core.git: uitest/uitest
uitest/uitest/test.py | 17 + 1 file changed, 1 insertion(+), 16 deletions(-) New commits: commit 6b41d3f6778b91838c98d1648eb652de48b0511d Author: Xisco Fauli AuthorDate: Mon Dec 4 20:41:06 2023 +0100 Commit: Xisco Fauli CommitDate: Tue Dec 5 09:24:59 2023 +0100 uitest: remove crash report handler Unneded since a4a1f2ecee2e7b1d50e0065e25090e262863e1c4 "Disallow crash reporting in UITests" Change-Id: I661b6111bd5142e67ee73a82c071e7651300 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160324 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py index fcf9d3dee783..08c9a89ef9f5 100644 --- a/uitest/uitest/test.py +++ b/uitest/uitest/test.py @@ -176,17 +176,6 @@ class UITest(object): return time.sleep(DEFAULT_SLEEP) -def _handle_crash_reporter(self): -xCrashReportDlg = self._xUITest.getTopFocusWindow() -state = get_state_as_dict(xCrashReportDlg) -print(state) -if state['ID'] != "CrashReportDialog": -return False -print("found a crash reporter") -xCancelBtn = xCrashReportDlg.getChild("btn_cancel") -self.close_dialog_through_button(xCancelBtn) -return True - # Calls UITest.close_doc at exit @contextmanager def create_doc_in_start_center(self, app): @@ -194,11 +183,7 @@ class UITest(object): try: xBtn = xStartCenter.getChild(app + "_all") except RuntimeException: -if self._handle_crash_reporter(): -xStartCenter = self._xUITest.getTopFocusWindow() -xBtn = xStartCenter.getChild(app + "_all") -else: -raise +raise with EventListener(self._xContext, "OnNew") as event: xBtn.executeAction("CLICK", tuple())
[Libreoffice-commits] core.git: bin/upload_symbols.py
bin/upload_symbols.py |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 5b78bb218cc48207bc3943bd1eb0a34a9f7b60c3 Author: Xisco Fauli AuthorDate: Fri Dec 1 10:25:51 2023 +0100 Commit: Xisco Fauli CommitDate: Tue Dec 5 09:45:27 2023 +0100 upload_symbols: give some feedback Change-Id: I2a1faa91ec502cfe8b62324f8fa80264bdb9d31f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160197 Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py index fc6a2d8c1c95..f0ae2dcf3ca3 100755 --- a/bin/upload_symbols.py +++ b/bin/upload_symbols.py @@ -48,7 +48,11 @@ def main(): data['csrfmiddlewaretoken'] = csrftoken -session.post(upload_url, headers=headers, files=files, data=data) +response = session.post(upload_url, headers=headers, files=files, data=data) +if response.ok: +print("Symbols uploaded successfully") +else: +print(response.text) if __name__ == "__main__":
[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - 2 commits - include/onlineupdate onlineupdate/Executable_mbsdiff.mk onlineupdate/Executable_updater.mk onlineupdate/Executable_update_
include/onlineupdate/mozilla/Attributes.h | 16 onlineupdate/Executable_mbsdiff.mk |4 onlineupdate/Executable_update_service.mk |8 ++-- onlineupdate/Executable_updater.mk |3 +-- onlineupdate/StaticLibrary_libmar.mk |4 onlineupdate/StaticLibrary_libmarverify.mk |1 + onlineupdate/StaticLibrary_updatehelper.mk |1 + 7 files changed, 17 insertions(+), 20 deletions(-) New commits: commit ec46d6dc31f015298a049ff1f1d3e325e4dc7885 Author: Thorsten Behrens AuthorDate: Tue Dec 5 08:48:53 2023 + Commit: Thorsten Behrens CommitDate: Tue Dec 5 09:54:43 2023 +0100 Fix windows build some more Change-Id: Ib90844096565d164226c72a9dedaccf6f49a74f1 diff --git a/include/onlineupdate/mozilla/Attributes.h b/include/onlineupdate/mozilla/Attributes.h index 1f05ad3315b3..6b93ee1b2193 100644 --- a/include/onlineupdate/mozilla/Attributes.h +++ b/include/onlineupdate/mozilla/Attributes.h @@ -87,22 +87,6 @@ #endif #endif -/** - * Per clang's documentation: - * - * If a statement is marked nomerge and contains call expressions, those call - * expressions inside the statement will not be merged during optimization. This - * attribute can be used to prevent the optimizer from obscuring the source - * location of certain calls. - * - * This is useful to have clearer information on assertion failures. - */ -#if defined(__clang__) && __has_attribute(nomerge) -#define MOZ_NOMERGE __attribute__((nomerge)) -#else -#define MOZ_NOMERGE -#endif - /* * MOZ_NEVER_INLINE is a macro which expands to tell the compiler that the * method decorated with it must never be inlined, even if the compiler would diff --git a/onlineupdate/Executable_mbsdiff.mk b/onlineupdate/Executable_mbsdiff.mk index fded20228f10..562ad184a0ea 100644 --- a/onlineupdate/Executable_mbsdiff.mk +++ b/onlineupdate/Executable_mbsdiff.mk @@ -25,6 +25,10 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,mbsdiff,\ ws2_32.lib \ )) + +$(eval $(call gb_Executable_add_defs,mbsdiff,\ + -DXP_WIN=1 \ +)) endif $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\ diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 1ac72e854293..5ad5667732d9 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -48,6 +48,10 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\ /ENTRY:wmainCRTStartup \ )) +$(eval $(call gb_Executable_add_defs,update_service,\ + -DXP_WIN=1 \ +)) + $(eval $(call gb_Executable_add_exception_objects,update_service,\ onlineupdate/source/update/common/certificatecheck \ onlineupdate/source/service/maintenanceservice \ diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index ab6b485e0ccb..7273ab397ec1 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -22,6 +22,10 @@ $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\ onlineupdate/source/libmar/src/mar_read \ )) +$(eval $(call gb_StaticLibrary_add_defs,libmar,\ + -DXP_WIN=1 \ +)) + $(eval $(call gb_StaticLibrary_use_static_libraries,\ libmarverify \ )) diff --git a/onlineupdate/StaticLibrary_libmarverify.mk b/onlineupdate/StaticLibrary_libmarverify.mk index 1a9204a867c9..c4c4c8e2104e 100644 --- a/onlineupdate/StaticLibrary_libmarverify.mk +++ b/onlineupdate/StaticLibrary_libmarverify.mk @@ -19,6 +19,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\ ifneq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\ -DMAR_NSS \ + -DXP_WIN=1 \ )) $(eval $(call gb_StaticLibrary_use_externals,libmarverify,\ diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk index 96129fdba267..cbb0130759e9 100644 --- a/onlineupdate/StaticLibrary_updatehelper.mk +++ b/onlineupdate/StaticLibrary_updatehelper.mk @@ -20,6 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\ $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\ -DNSS3 \ -DVERIFY_MAR_SIGNATURE \ + -DXP_WIN=1 \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\ commit d143109b49908db2142cdd8435b4cf3164bb510f Author: Thorsten Behrens AuthorDate: Mon Dec 4 23:23:43 2023 + Commit: Thorsten Behrens CommitDate: Tue Dec 5 09:54:37 2023 +0100 Fixup windows Change-Id: Ic8426edfe6d5686791c14ddde31347f6139c7b3e diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 6ff9afd1a6a8..1ac72e854293 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -49,9 +49,9 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\ )) $(eval $(call gb_Executable_add_exception_objects,update_service,\ - onlineupdate/source/service/cert
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/data/floattable-wrapped-by-table.docx |binary sw/qa/core/layout/tabfrm.cxx| 30 sw/source/core/layout/tabfrm.cxx| 22 +++ 3 files changed, 51 insertions(+), 1 deletion(-) New commits: commit 868140fcc1311259b9d5f37b33d226511a53 Author: Miklos Vajna AuthorDate: Tue Dec 5 08:39:10 2023 +0100 Commit: Miklos Vajna CommitDate: Tue Dec 5 10:15:52 2023 +0100 tdf#60558 sw floattable: allow wrap of table on the right of a floattable The bugdoc shows that Word wraps inline tables around floating tables if they have enough space, but Writer didn't do this. Table frames may wrap fly frames by adding some top, left or right margin to the table at a layout level, this is calculated in SwTabFrame::CalcFlyOffsets(). There we currently decide the give a top margin to such tables, which fixes the overlap problem, but the bugdoc is now of 2 pages instead of 1 page, since we don't wrap. Fix the problem by improving the "shift down" case by checking if shifting to the right would also work (has enough space). If so, do that in case the fly frame is a split fly. Note that this could be done for all flys as well, but that would have to be conditional on some Word compat flag and that's not needed to fix the bugdoc, so leave that for later. Change-Id: Idb45413257758fd0334b17ef348ba28010a52316 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160331 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/qa/core/layout/data/floattable-wrapped-by-table.docx b/sw/qa/core/layout/data/floattable-wrapped-by-table.docx new file mode 100644 index ..a53f652183ea Binary files /dev/null and b/sw/qa/core/layout/data/floattable-wrapped-by-table.docx differ diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx index e83767992aa6..091b78cd2478 100644 --- a/sw/qa/core/layout/tabfrm.cxx +++ b/sw/qa/core/layout/tabfrm.cxx @@ -169,6 +169,36 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTableJoin) CPPUNIT_ASSERT(pFly->GetPrecede()); CPPUNIT_ASSERT(!pFly->HasFollow()); } + +CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWrappedByTable) +{ +// Given a document with a floating table, wrapped by an inline table: +// When laying out the document: +createSwDoc("floattable-wrapped-by-table.docx"); + +// Then make sure the inline table wraps around the floating table: +SwDoc* pDoc = getSwDoc(); +SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); +auto pPage = pLayout->Lower()->DynCastPageFrame(); +CPPUNIT_ASSERT(pPage); +// Get the top of the inline table, ignoring margins: +CPPUNIT_ASSERT(pPage->GetSortedObjs()); +SwSortedObjs& rPageObjs = *pPage->GetSortedObjs(); +CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size()); +auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); +CPPUNIT_ASSERT(pFly); +// Get the bottom of of the floating table, ignoring margins: +SwTwips nFloatingBottom = pFly->getFrameArea().Top() + pFly->getFramePrintArea().Height(); +SwFrame* pBody = pPage->FindBodyCont(); +auto pTab = pBody->GetLower()->GetNext()->DynCastTabFrame(); +SwTwips nInlineTop = pTab->getFrameArea().Top() + pTab->getFramePrintArea().Top(); +// Make sure the inline table is on the right of the floating one, not below it: +// Without the accompanying fix in place, this test would have failed with: +// - Expected less than: 7287 +// - Actual : 7287 +// i.e. the inline table was under the floating one, not on the right of it. +CPPUNIT_ASSERT_LESS(nFloatingBottom, nInlineTop); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 4367d86255a2..c1acc0c9e9fe 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3179,6 +3179,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper, nSurround = text::WrapTextMode_PARALLEL; bool bShiftDown = css::text::WrapTextMode_NONE == nSurround; +bool bSplitFly = pFly->IsFlySplitAllowed(); if (!bShiftDown && bAddVerticalFlyOffsets) { if (nSurround == text::WrapTextMode_PARALLEL && isHoriOrientShiftDown) @@ -3201,6 +3202,18 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper, // normally an SwFlyPortion is created instead that increases the height // of the first table row. bShiftDown = aTabRange.overlaps(aFlyRange); + +if (bSplitFly && pFly->GetAnchorFrame()->GetUpper() == GetUpper()) +{ +// Split fly followed by an inline table. Check if we have enough space to shift +// to the right instead. +SwTwips nShift
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - editeng/source include/vcl sc/qa sc/source vcl/source
editeng/source/editeng/editview.cxx |5 - include/vcl/window.hxx |2 sc/qa/unit/tiledrendering/tiledrendering.cxx | 115 +++ sc/source/ui/inc/gridwin.hxx |1 sc/source/ui/view/gridwin4.cxx | 26 ++ vcl/source/window/paint.cxx |5 + 6 files changed, 153 insertions(+), 1 deletion(-) New commits: commit 8a732d9ff15ba73835c3fa60208f954b772f5a9c Author: Marco Cecchetti AuthorDate: Mon Dec 4 09:31:23 2023 +0100 Commit: Caolán McNamara CommitDate: Tue Dec 5 11:08:34 2023 +0100 calc: on editing invalidation of view with different zoom is wrong This patch fixes the following invalidation issue: There are 2 views with different zoom levels. In a view text editing for a cell occurs. The other view is not invalidated properly: the computed invalidation rectangle is misplaced. Change-Id: I72db61486647640ee68e6cb2db96b2902de5b997 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160303 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 0f53a53de045..6cb2913be3da 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -231,7 +231,10 @@ void EditView::InvalidateOtherViewWindows( const tools::Rectangle& rInvRect ) for (auto& pWin : pImpEditView->aOutWindowSet) { if (pWin) -pWin->Invalidate( bNegativeX ? lcl_negateRectX(rInvRect) : rInvRect ); +{ +if (!pWin->InvalidateByForeignEditView(this)) +pWin->Invalidate( bNegativeX ? lcl_negateRectX(rInvRect) : rInvRect ); +} } } } diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d03555bd5b99..829b9f174b57 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -62,6 +62,7 @@ class VclWindowEvent; class AllSettings; class InputContext; class VclEventListeners; +class EditView; enum class ImplPaintFlags; enum class VclEventId; enum class PointerStyle; @@ -970,6 +971,7 @@ public: */ virtual voidLogicInvalidate(const tools::Rectangle* pRectangle); +virtual boolInvalidateByForeignEditView(EditView* ); /** * Notification about some rectangle of the output device got invalidated. Used for the * dialogs and floating windows (e.g. context menu, popup). diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 1f18401a970c..7d89cb787c85 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -60,6 +61,31 @@ static std::ostream& operator<<(std::ostream& os, ViewShellId const & id) os << static_cast(id); return os; } +// for passing data to testInvalidateOnTextEditWithDifferentZoomLevels +struct ColRowZoom +{ +SCCOL col; +SCROW row; +int zoom; +}; + +CPPUNIT_NS_BEGIN +namespace StringHelper +{ +// used by CPPUNIT_TEST_PARAMETERIZED for testInvalidateOnTextEditWithDifferentZoomLevels +template<> +inline std::string toString(const ColRowZoom& item) +{ +std::ostringstream ss; +ss << "zoom level: " << item.zoom << ", " + << "col: " << item.col << ", " + << "row: " << item.row; +return ss.str(); +} + +} +CPPUNIT_NS_END + namespace { @@ -129,6 +155,7 @@ public: void testUndoReorderingRedo(); void testUndoReorderingMulti(); void testGetViewRenderState(); +void testInvalidateOnTextEditWithDifferentZoomLevels(const ColRowZoom& rData); CPPUNIT_TEST_SUITE(ScTiledRenderingTest); CPPUNIT_TEST(testRowColumnHeaders); @@ -190,6 +217,14 @@ public: CPPUNIT_TEST(testUndoReorderingRedo); CPPUNIT_TEST(testUndoReorderingMulti); CPPUNIT_TEST(testGetViewRenderState); +CPPUNIT_TEST_PARAMETERIZED(testInvalidateOnTextEditWithDifferentZoomLevels, + std::initializer_list + { + // zoom level 120% + {0, 999, 1}, {99, 0, 1}, + // zoom level 40% + {0, 999, -5}, {99, 0, -5} + }); CPPUNIT_TEST_SUITE_END(); private: @@ -3286,6 +3321,86 @@ void ScTiledRenderingTest::testGetViewRenderState() CPPUNIT_ASSERT_EQUAL(OString(";Default"), pModelObj->getViewRenderState()); } +/* + * testInvalidateOnTextEditWithDifferentZoomLevels + * steps: + * set view 1 zoom to the passed zoom level + * in view 1 type a char at the passed cell address + * store invalidation rectangle + * exit from in place editing (press es
[Libreoffice-commits] core.git: extras/source
extras/source/templates/presnt/Grey_Elegant/content.xml | 310 ++-- extras/source/templates/presnt/Grey_Elegant/meta.xml|6 extras/source/templates/presnt/Grey_Elegant/styles.xml | 604 ++-- 3 files changed, 490 insertions(+), 430 deletions(-) New commits: commit 146663cc75d3954ae4a4e2f6f1f64d831618b56f Author: Laurent Balland AuthorDate: Sat Nov 4 10:40:50 2023 +0100 Commit: Laurent Balland CommitDate: Tue Dec 5 11:22:42 2023 +0100 tdf#158022 Grey Elegant template: restore placeholders - Restore preview of slide in notes (master notes and notes, same size and position than other templates) - Enable header/date-time/footer/page number in master notes - Uniformisation of font Noto Sans - Bring to front header and outlines - Add date/time, footer and slide number on all master pages (except Title) - Improve Header and Outline positions - Use placeholders for example texts - Move credits on master slide "Table of content" and slide 9 to meta.xml - Change name of Title master page due to tdf#158496 Change-Id: I29eec8ad61fdf35a53be15678fd09aefc2b11a60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158956 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Grey_Elegant/content.xml b/extras/source/templates/presnt/Grey_Elegant/content.xml index 1f7b0d3fa9f2..4b274f28ec61 100644 --- a/extras/source/templates/presnt/Grey_Elegant/content.xml +++ b/extras/source/templates/presnt/Grey_Elegant/content.xml @@ -2,18 +2,8 @@ http://openoffice.org/2009/office"; xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument: xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:xsd="ht tp://www.w3.org/2001/XMLSchema" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3"> - - - - - - - - - - @@ -41,10 +31,6 @@ - - - - @@ -171,10 +157,6 @@ - - - - @@ -316,11 +298,6 @@ - - - - - @@ -362,7 +339,7 @@ - + @@ -399,14 +376,6 @@ - - - - - - - - @@ -447,9 +416,6 @@ - - - @@ -466,10 +432,7 @@ - - - - + @@ -513,63 +476,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 902c9a5fcaca2dce59f7ad0c55e512598507bb18 Author: Andras Timar AuthorDate: Tue Dec 5 11:37:34 2023 +0100 Commit: Andras Timar CommitDate: Tue Dec 5 11:37:34 2023 +0100 Bump version to 23.05.6.2 Change-Id: I0403bbf985a33be473d2bb705c2ae75f852dc4d6 diff --git a/configure.ac b/configure.ac index 25eb99556fe2..bd43c4ad78f7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[23.05.6.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.6.2],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-23.05.6-2'
Tag 'cp-23.05.6-2' created by Andras Timar at 2023-12-05 10:37 + cp-23.05.6-2 Changes since co-23.05-branch-point: Andras Timar (1): On Linux dictionaries are packaged separately --- Module_dictionaries.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-23.05.6-2'
Tag 'cp-23.05.6-2' created by Andras Timar at 2023-12-05 10:37 + cp-23.05.6-2 Changes since cp-23.05.5-4-1: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-23.05.6-2'
Tag 'cp-23.05.6-2' created by Andras Timar at 2023-12-05 10:37 + cp-23.05.6-2 Changes since cp-23.05.5-4-2: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.6-2'
Tag 'cp-23.05.6-2' created by Andras Timar at 2023-12-05 10:37 + cp-23.05.6-2 Changes since co-23.05.6-1-2: --- 0 files changed ---
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 44 --- sc/source/core/tool/viewopti.cxx | 34 +-- 2 files changed, 4 insertions(+), 74 deletions(-) New commits: commit 464d5f1265bd3ed2eff0c809152b8ccb53b785df Author: Gabor Kelemen AuthorDate: Thu Nov 30 23:06:37 2023 +0100 Commit: Gabor Kelemen CommitDate: Tue Dec 5 12:41:09 2023 +0100 [API CHANGE] Drop unused XAxis/YAxis config groups from Calc grid options. Spotted while researching for tdf#158473 last mention of ther getters was commented out in 2001 by: commit a4e5d2cb47275e91834e41a9d51f1bf11ec409b1 Change-Id: Iffc7b5c4fb50352ad7063fc911039707a20dca4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160169 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index e1fe88dfa1d9..d54b092eca66 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -780,50 +780,6 @@ true - - - - -Defines the horizontal distance between the single grid points in 1/100th millimeters. -X axis - - - - Specifies the distance that is used with locales that use the metric system. - - -1000 - - - - Specifies the distance that is used with locales that don't use the metric system. - - -1270 - - - - - - -Defines the vertical distance between the single grid points in 1/100th millimeters. -Y axis - - - - Specifies the distance that is used with locales that use the metric system. - - -1000 - - - - Specifies the distance that is used with locales that don't use the metric system. - - -1270 - - diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 41394ded9a16..39e2e6e0e762 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -46,15 +46,11 @@ void ScGridOptions::SetDefaults() { nFldDrawX = 1000; // 1cm nFldDrawY = 1000; -nFldSnapX = 1000; -nFldSnapY = 1000; } else { nFldDrawX = 1270; // 0,5" nFldDrawY = 1270; -nFldSnapX = 1270; -nFldSnapY = 1270; } nFldDivisionX = 1; nFldDivisionY = 1; @@ -66,8 +62,6 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const && nFldDivisionX== rCpy.nFldDivisionX && nFldDrawY== rCpy.nFldDrawY && nFldDivisionY== rCpy.nFldDivisionY -&& nFldSnapX== rCpy.nFldSnapX -&& nFldSnapY== rCpy.nFldSnapY && bUseGridsnap == rCpy.bUseGridsnap && bSynchronize == rCpy.bSynchronize && bGridVisible == rCpy.bGridVisible @@ -156,8 +150,6 @@ std::unique_ptr ScViewOptions::CreateGridItem() const pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() ); pItem->SetFieldDrawY ( aGridOpt.GetFieldDrawY() ); pItem->SetFieldDivisionY ( aGridOpt.GetFieldDivisionY() ); -pItem->SetFieldSnapX ( aGridOpt.GetFieldSnapX() ); -pItem->SetFieldSnapY ( aGridOpt.GetFieldSnapY() ); pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() ); pItem->SetSynchronize ( aGridOpt.GetSynchronize() ); pItem->SetGridVisible ( aGridOpt.GetGridVisible() ); @@ -227,12 +219,10 @@ constexpr OUStringLiteral CFGPATH_GRID = u"Office.Calc/Grid"; #define SCGRIDOPT_RESOLU_Y 1 #define SCGRIDOPT_SUBDIV_X 2 #define SCGRIDOPT_SUBDIV_Y 3 -#define SCGRIDOPT_OPTION_X 4 -#define SCGRIDOPT_OPTION_Y 5 -#define SCGRIDOPT_SNAPTOGRID6 -#define SCGRIDOPT_SYNCHRON 7 -#define SCGRIDOPT_VISIBLE 8 -#define SCGRIDOPT_SIZETOGRID9 +#define SCGRIDOPT_SNAPTOGRID4 +#define SCGRIDOPT_SYNCHRON 5 +#define SCGRIDOPT_VISIBLE 6 +#define SCGRIDOPT_SIZETOGRID7 Sequence ScViewCfg::GetLayoutPropertyNames() { @@ -273,10 +263,6 @@ Sequence ScViewCfg::GetGridPropertyNames() : OUString("Resolution/YAxis/NonMetric")), // SCGRIDOPT_RESOLU_Y "Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X "Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y -(bIsMetric ? OUString("O
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit 2f4938caebc5e8b5c7dcce45b9a5191794ceffcd Author: Miklos Vajna AuthorDate: Tue Dec 5 11:43:42 2023 +0100 Commit: Caolán McNamara CommitDate: Tue Dec 5 12:58:44 2023 +0100 writerfilter: fix crash in DomainMapper_Impl::PushSdt() Crashreport signature: Fatal signal received: SIGSEGV code: 1 for address: 0x0 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper_Impl::PushSdt() writerfilter/source/dmapper/DomainMapper_Impl.cxx:987 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper::lcl_attribute(unsigned int, writerfilter::Value&) include/tools/ref.hxx:56 program/libwriterfilterlo.so writerfilter::ooxml::OOXMLProperty::resolve(writerfilter::Properties&) include/tools/ref.hxx:56 program/libwriterfilterlo.so writerfilter::ooxml::OOXMLPropertySet::resolve(writerfilter::Properties&) include/tools/ref.hxx:157 Change-Id: I76416ca707a4ac40495e5c22f62fcd017bcb5e48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160336 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f3558bfeac1e..897ff2f83eca 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -983,8 +983,19 @@ void DomainMapper_Impl::PushSdt() } uno::Reference xTextAppend = m_aTextAppendStack.top().xTextAppend; +if (!xTextAppend.is()) +{ +return; +} + +uno::Reference xText = xTextAppend->getText(); +if (!xText.is()) +{ +return; +} + uno::Reference xCursor -= xTextAppend->getText()->createTextCursorByRange(xTextAppend->getEnd()); += xText->createTextCursorByRange(xTextAppend->getEnd()); // Offset so the cursor is not adjusted as we import the SDT's content. bool bStart = !xCursor->goLeft(1, /*bExpand=*/false); m_xSdtStarts.push({bStart, OUString(), xCursor->getStart()});
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc |1 + sc/source/ui/view/viewfunc.cxx |5 + 2 files changed, 6 insertions(+) New commits: commit fd11b63244f784b336690d9096cd3f820cdbb9ee Author: Henry Castro AuthorDate: Mon Dec 4 10:33:01 2023 -0400 Commit: Caolán McNamara CommitDate: Tue Dec 5 12:59:14 2023 +0100 sc: show a message dialog if insert cells fail Use case, go to the max row and insert a row. Signed-off-by: Henry Castro Change-Id: I930d7724b9c94e10e9207ec749b7249d2fee0e39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160314 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit eccbe3bb4ed6f0bed4e7fbacfaf50762c93f9464) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160183 Tested-by: Jenkins diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index e8e45fc01b2e..8b07dc508edd 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -566,6 +566,7 @@ #define STR_UNDO_EDIT_SPARKLINE NC_("STR_UNDO_EDIT_SPARKLINE", "Edit Sparkline") #define STR_UNDO_THEME_CHANGE NC_("STR_UNDO_THEME_CHANGE", "Theme Change") #define STR_UNDO_THEME_COLOR_CHANGE NC_("STR_UNDO_THEME_COLOR_CHANGE", "Theme Color Change") +#define STR_ERR_INSERT_CELLSNC_("STR_ERR_INSERT_CELLS", "Failed to insert cells") #endif diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 98d2a1ebbe42..0b8b0865f0fc 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1786,6 +1786,11 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool bRecord, bool bPartOfPaste ) true /* bGroups */, GetViewData().GetTabNo()); } } +else +{ +ErrorMessage(STR_ERR_INSERT_CELLS); +} + OUString aStartAddress = aRange.aStart.GetColRowString(); OUString aEndAddress = aRange.aEnd.GetColRowString(); collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}}, "INSERT_CELLS");
New Defects reported by Coverity Scan for LibreOffice
Hi, Please find the latest report on new defect(s) introduced to LibreOffice found with Coverity Scan. 1 new defect(s) introduced to LibreOffice found with Coverity Scan. 49 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 1 of 1 defect(s) ** CID 1558795: Null pointer dereferences (FORWARD_NULL) /svx/source/svdraw/svdoedge.cxx: 1515 in SdrEdgeObj::ImpCalcEdgeTrack(const Point &, long, const tools::Rectangle &, const tools::Rectangle &, const Point &, long, const tools::Rectangle &, const tools::Rectangle &, unsigned long *, SdrEdgeInfoRec *) const() *** CID 1558795: Null pointer dereferences (FORWARD_NULL) /svx/source/svdraw/svdoedge.cxx: 1515 in SdrEdgeObj::ImpCalcEdgeTrack(const Point &, long, const tools::Rectangle &, const tools::Rectangle &, const Point &, long, const tools::Rectangle &, const tools::Rectangle &, unsigned long *, SdrEdgeInfoRec *) const() 1509 } 1510 } 1511 // make the connector a bezier curve, if appropriate 1512 if (eKind != SdrEdgeKind::Bezier || nPointCount <= 2) 1513 return aXP1; 1514 >>> CID 1558795: Null pointer dereferences (FORWARD_NULL) >>> Dereferencing null pointer "pInfo". 1515 if (pInfo->m_bUseOOXMLCurve) // Routing method OOXML 1516 { 1517 // The additional points needed are located on the segments of the path of the 1518 // corresponding bentConnector as calculated above. 1519 auto SegmentPoint = [&aXP1](const sal_uInt16& nEnd, const double& fFactor) { 1520 return Point( To view the defects in Coverity Scan visit, https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNnPiSHxWPOELPnIxzXoBNaw-3DPLQ2_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiEJPLiT23hy3EjHjIq7B9VOM2ANPhev2kaF6dBmkQf2Rwu7UXoc6klD761S-2BJnFRxCX5aKoHLytF-2F9rD2197sWC54GcLg1P3WbmUJUoznRsBPgOESh7562tf0FT83bUQeCHqdoTnTISJvYIVLxHVJB86uxLAfLppvO4ykJ9r4Ofw-3D
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-23.05.6-2'
Tag 'co-23.05.6-2' created by Andras Timar at 2023-12-05 13:06 + co-23.05.6-2 Changes since cp-23.05.5-4-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-23.05.6-2'
Tag 'co-23.05.6-2' created by Andras Timar at 2023-12-05 13:06 + co-23.05.6-2 Changes since co-23.05-branch-point: Andras Timar (1): On Linux dictionaries are packaged separately --- Module_dictionaries.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-23.05.6-2'
Tag 'co-23.05.6-2' created by Andras Timar at 2023-12-05 13:06 + co-23.05.6-2 Changes since cp-23.05.5-4-2: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-23.05.6-2'
Tag 'co-23.05.6-2' created by Andras Timar at 2023-12-05 13:06 + co-23.05.6-2 Changes since cp-23.05.6-2: Miklos Vajna (1): writerfilter: fix crash in DomainMapper_Impl::PushSdt() --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) ---
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/layout/tabfrm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 192c581395e2db07829ff9ba1ed79d5492dcbbce Author: Andrea Gelmini AuthorDate: Tue Dec 5 13:08:37 2023 +0100 Commit: Julien Nabet CommitDate: Tue Dec 5 14:14:13 2023 +0100 Fix typo Change-Id: I5f000f53f4dfec62a6d5a332361c380dc142d2bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160342 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx index 091b78cd2478..9357fc2df133 100644 --- a/sw/qa/core/layout/tabfrm.cxx +++ b/sw/qa/core/layout/tabfrm.cxx @@ -187,7 +187,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWrappedByTable) CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size()); auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); CPPUNIT_ASSERT(pFly); -// Get the bottom of of the floating table, ignoring margins: +// Get the bottom of the floating table, ignoring margins: SwTwips nFloatingBottom = pFly->getFrameArea().Top() + pFly->getFramePrintArea().Height(); SwFrame* pBody = pPage->FindBodyCont(); auto pTab = pBody->GetLower()->GetNext()->DynCastTabFrame();
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfexport/rtfexport6.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d9291c24a21ef02240df7b0bd06f86cac1c6f659 Author: Andrea Gelmini AuthorDate: Tue Dec 5 13:07:57 2023 +0100 Commit: Julien Nabet CommitDate: Tue Dec 5 14:14:33 2023 +0100 Fix typo Change-Id: Id5c6ac6c1358334dba4b96fcc6dee9e40859ec32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160341 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx b/sw/qa/extras/rtfexport/rtfexport6.cxx index e65e57fd3192..275d2593d2df 100644 --- a/sw/qa/extras/rtfexport/rtfexport6.cxx +++ b/sw/qa/extras/rtfexport/rtfexport6.cxx @@ -178,7 +178,7 @@ DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat, "tdf108505_fieldCharFormat DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat2, "tdf108505_fieldCharFormat2.rtf") { -// not exported properly. Currrently xyz exports as run 6, red, italic. +// not exported properly. Currently xyz exports as run 6, red, italic. if (isExported()) return;
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/complextext.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9b5964cf5931d7c09e4fd624d68595891c2afb58 Author: Chris Sherlock AuthorDate: Tue Nov 14 02:13:17 2023 +1100 Commit: Tomaž Vajngerl CommitDate: Tue Dec 5 14:23:50 2023 +0100 vcl: add unit test for cached glyphs based on tdf#103492 Change-Id: Id66be996053435c92b667eb142ae1e271ff33b90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159386 Tested-by: Jenkins Tested-by: Tomaž Vajngerl Reviewed-by: Tomaž Vajngerl diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index d4eb3db67093..37f4fbc0766c 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -191,6 +191,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCaching) testCachedGlyphs( "test", "Dejavu Sans" ); // This font does not have latin characters, will need fallback. testCachedGlyphs( "test", "Noto Kufi Arabic" ); +// see tdf#103492 +testCachedGlyphs( u"يوسف My name is"_ustr, "Liberation Sans"); } static void testCachedGlyphsSubstring( const OUString& aText, const OUString& aFontName, bool rtl )
[Libreoffice-commits] core.git: 2 commits - basctl/source vcl/inc vcl/source
basctl/source/basicide/baside2b.cxx |6 +- vcl/inc/printdlg.hxx|1 - vcl/source/window/printdlg.cxx | 11 --- 3 files changed, 5 insertions(+), 13 deletions(-) New commits: commit a639b7432e7d35b271fbfea9021f5df56d681006 Author: Caolán McNamara AuthorDate: Tue Dec 5 11:55:01 2023 + Commit: Caolán McNamara CommitDate: Tue Dec 5 14:43:10 2023 +0100 Resolves: tdf#158534 two help pages from print help button its either use the default "help" response, or have an explicit handler for the help button. Its more consistent to just use the default "help" response for the print dialog as done everywhere else. Change-Id: I0bb173e67a3bea1c10cc315cfcf212376f2710c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160340 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index fc4085a99b4a..bf058b079717 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -131,7 +131,6 @@ namespace vcl std::unique_ptr mxOKButton; std::unique_ptr mxCancelButton; -std::unique_ptr mxHelpButton; std::unique_ptr mxBackwardBtn; std::unique_ptr mxForwardBtn; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index da0c481655dd..3c1f5d0d36e5 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -543,7 +543,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptrweld_check_button("reverseorder")) , mxOKButton(m_xBuilder->weld_button("ok")) , mxCancelButton(m_xBuilder->weld_button("cancel")) -, mxHelpButton(m_xBuilder->weld_button("help")) , mxBackwardBtn(m_xBuilder->weld_button("backward")) , mxForwardBtn(m_xBuilder->weld_button("forward")) , mxFirstBtn(m_xBuilder->weld_button("btnFirst")) @@ -676,7 +675,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptrconnect_clicked(LINK(this, PrintDialog, ClickHdl)); mxCancelButton->connect_clicked(LINK(this, PrintDialog, ClickHdl)); -mxHelpButton->connect_clicked(LINK(this, PrintDialog, ClickHdl)); mxSetupButton->connect_clicked( LINK( this, PrintDialog, ClickHdl ) ); mxBackwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl)); mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl)); @@ -1872,15 +1870,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) storeToSettings(); m_xDialog->response(&rButton == mxOKButton.get() ? RET_OK : RET_CANCEL); } -else if( &rButton == mxHelpButton.get() ) -{ -// start help system -Help* pHelp = Application::GetHelp(); -if( pHelp ) -{ -pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get()); -} -} else if( &rButton == mxForwardBtn.get() ) { previewForward(); commit 6aba19406767a54bb61eaffb2903c1b2902da9a8 Author: Caolán McNamara AuthorDate: Tue Dec 5 10:58:57 2023 + Commit: Caolán McNamara CommitDate: Tue Dec 5 14:43:04 2023 +0100 Resolves: tdf#158441 we don't want to return early for all handled keys a problem since: commit c39bd1f6690ade936d62a66265b9b277061024d8 Author: Caolán McNamara Date: Wed Feb 19 10:13:15 2020 + weld CodeCompleteWindow Change-Id: I520a591bad89515c973098f4200f01ae0ddbdc34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160337 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index e62ba50683fb..d410a5e325d6 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -562,7 +562,11 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) if (pCodeCompleteWnd->IsVisible() && CodeCompleteOptions::IsCodeCompleteOn()) { -if (pCodeCompleteWnd->HandleKeyInput(rKEvt)) +pCodeCompleteWnd->HandleKeyInput(rKEvt); +if( rKEvt.GetKeyCode().GetCode() == KEY_UP +|| rKEvt.GetKeyCode().GetCode() == KEY_DOWN +|| rKEvt.GetKeyCode().GetCode() == KEY_TAB +|| rKEvt.GetKeyCode().GetCode() == KEY_POINT) return; }
[Libreoffice-commits] core.git: extras/source
extras/source/templates/presnt/Vintage/styles.xml | 54 -- 1 file changed, 54 deletions(-) New commits: commit 23c300a06dbfb5399cf479d603e6f7fe1433d134 Author: Laurent Balland AuthorDate: Sun Dec 3 20:48:06 2023 +0100 Commit: Laurent Balland CommitDate: Tue Dec 5 14:49:58 2023 +0100 Vintage Impress template: remove unused styles These old styles are used in the template and is no more in use in LO. So they remain untranslated when changing UI language. Change-Id: I130eb25df9b76783d498d6ab1e5191551b9a4d0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160269 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Vintage/styles.xml b/extras/source/templates/presnt/Vintage/styles.xml index a870b0926dcb..5bdd81803fd7 100644 --- a/extras/source/templates/presnt/Vintage/styles.xml +++ b/extras/source/templates/presnt/Vintage/styles.xml @@ -63,63 +63,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
android: Bump minSdkVersion to 21 (Android 5.0)
Android NDK 26 dropped support for Android API levels lower than 21 (Android 5). [1] [2] To ease maintenance, I would like to do the same for our Android build. According to [2] and [3], more than 99% of Android devices have an Android version of at least 5.0 by now. If there are any concerns about this, please raise them before or during the ESC call this Thursday. Otherwise, I plan to merge the corresponding Gerrit change. [4] (No changes on Jenkins side are required, but this will unify the API level that the 32- and 64-bit Android builds use, since 64-bit builds already require API level 21 anyway, and 32-bit builds on Jenkins currently use API level 19.) [1] https://github.com/android/ndk/issues/1751 [2] https://developer.android.com/ndk/downloads/revision_history [3] https://apilevels.com/ [4] https://gerrit.libreoffice.org/c/core/+/160334 OpenPGP_signature.asc Description: OpenPGP digital signature
[Libreoffice-commits] core.git: 2 commits - editeng/source sd/source vcl/source
editeng/source/misc/svxacorr.cxx |4 +++- sd/source/filter/eppt/pptx-epptooxml.cxx |6 +- vcl/source/window/printdlg.cxx |1 + 3 files changed, 9 insertions(+), 2 deletions(-) New commits: commit e507fd525404d5ac078a47650df11e5e18a88a81 Author: Caolán McNamara AuthorDate: Tue Dec 5 13:54:19 2023 + Commit: Caolán McNamara CommitDate: Tue Dec 5 17:19:03 2023 +0100 Related: tdf#158534 set fallback help page for optional print content Change-Id: I79d843cbf2591ab5a8625087e2ec5897b26a8056 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160371 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 3c1f5d0d36e5..9c5f519f7cfb 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1330,6 +1330,7 @@ void PrintDialog::setupOptionalUI() rOption.Value >>= sOptionsUIFile; mxCustomOptionsUIBuilder = Application::CreateBuilder(mxCustom.get(), sOptionsUIFile); std::unique_ptr xWindow = mxCustomOptionsUIBuilder->weld_container("box"); +xWindow->set_help_id("vcl/ui/printdialog/PrintDialog"); xWindow->show(); continue; } commit a28a721ef9f2daced3e08f30578e603abd119773 Author: Caolán McNamara AuthorDate: Tue Dec 5 12:45:43 2023 + Commit: Caolán McNamara CommitDate: Tue Dec 5 17:18:57 2023 +0100 cid#1546503 Using invalid iterator and cid#1546284 Using invalid iterator Change-Id: I9ff3498b65ce392dbe859566b49e60a31e0779f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160370 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 15cbecc32db3..2788c6694c09 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2146,7 +2146,9 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang, if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || CreateLanguageFile(aLanguageTag, false)) { //the language is available - so bring it on -const SvStringsISortDtor* pList = m_aLangTable.find(aLanguageTag)->second.GetCplSttExceptList(); +const auto iter = m_aLangTable.find(aLanguageTag); +assert(iter != m_aLangTable.end() && "CreateLanguageFile can't fail"); +const SvStringsISortDtor* pList = iter->second.GetCplSttExceptList(); if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() ) return true; } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index ae8ccc063cf2..291565871ff2 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2335,9 +2335,13 @@ void PowerPointExport::WritePlaceholderReferenceShapes(PowerPointShapeExport& rD || mXPagePropSet->getPropertyValue("IsDateTimeFixed") == false))) { if ((xShape = GetReferencedPlaceholderXShape(DateAndTime, ePageType))) +{ +const auto iter = maPlaceholderShapeToIndexMap.find(xShape); +assert(iter != maPlaceholderShapeToIndexMap.end()); rDML.WritePlaceholderReferenceShape(DateAndTime, - maPlaceholderShapeToIndexMap.find(xShape)->second, +iter->second, ePageType, mXPagePropSet); +} } }
[Libreoffice-commits] core.git: 2 commits - desktop/source
desktop/source/app/app.cxx |1 + desktop/source/app/updater.cxx | 22 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) New commits: commit 8686b480ba1d79463f33fe931a454d9d92c3d739 Author: Stephan Bergmann AuthorDate: Tue Dec 5 14:05:36 2023 +0100 Commit: Stephan Bergmann CommitDate: Tue Dec 5 18:07:06 2023 +0100 Fix apparent copy/paste typo ...present ever since the code got introduced in 569269078576fa832143ec4f0bf03283ff358f48 "improve the update checker" Change-Id: I38d0efee3cb3f6954dd30690ba9afddf0b66c959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160348 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index 1af82cf85fc9..0cd95da8d4e7 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -477,7 +477,7 @@ update_info parse_response(const std::string& rResponse) } orcus::json::node aLanguageNode = aDocumentRoot.child("languages"); -if (aUpdateNode.type() != orcus::json::node_t::object) +if (aLanguageNode.type() != orcus::json::node_t::object) { throw invalid_update_info(); } commit 7f49fa220225d2afbefac756a03586212d8ce1c6 Author: Stephan Bergmann AuthorDate: Tue Dec 5 12:35:08 2023 +0100 Commit: Stephan Bergmann CommitDate: Tue Dec 5 18:06:51 2023 +0100 Make --enable-online-update=mar at least compile again, on Linux Seen it build (but no idea yet whether it actually would work) with autogen.input including > --enable-online-update=mar > --with-update-config=/home/sberg/lo/update.ini and ~/lo/update.ini containing > [Updater] > ServerURL=TODO > base-url=TODO > certificate-der=/home/sberg/lo/certificate.der > certificate-name=TODO > certificate-path=TODO > channel=TODO > upload-url=TODO and ~/lo/certificate.der containing > TODO Change-Id: Ib40417c09c6454fe9cf678c029a06716415e5cb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160339 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cd1d1de0d6ea..4c13a2a8e716 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -118,6 +118,7 @@ #include #include #include +#include #include #include #include diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index edac2cb38350..1af82cf85fc9 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -36,7 +36,6 @@ #include #include -#include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include namespace { @@ -391,9 +391,9 @@ public: } }; -OUString toOUString(const std::string& rStr) +OUString toOUString(const std::string_view& rStr) { -return OUString::fromUtf8(rStr.c_str()); +return OUString::fromUtf8(rStr); } update_file parse_update_file(orcus::json::node& rNode) @@ -422,12 +422,12 @@ update_file parse_update_file(orcus::json::node& rNode) } update_file aUpdateFile; -aUpdateFile.aURL = toOUString(aURLNode.string_value().str()); +aUpdateFile.aURL = toOUString(aURLNode.string_value()); if (aUpdateFile.aURL.isEmpty()) throw invalid_update_info(); -aUpdateFile.aHash = toOUString(aHashNode.string_value().str()); +aUpdateFile.aHash = toOUString(aHashNode.string_value()); aUpdateFile.nSize = static_cast(aSizeNode.numeric_value()); return aUpdateFile; } @@ -454,7 +454,7 @@ update_info parse_response(const std::string& rResponse) { update_info aUpdateInfo; auto aMsgNode = aDocumentRoot.child("response"); -aUpdateInfo.aMessage = toOUString(aMsgNode.string_value().str()); +aUpdateInfo.aMessage = toOUString(aMsgNode.string_value()); return aUpdateInfo; } @@ -483,17 +483,17 @@ update_info parse_response(const std::string& rResponse) } update_info aUpdateInfo; -aUpdateInfo.aFromBuildID = toOUString(aFromNode.string_value().str()); -aUpdateInfo.aSeeAlsoURL = toOUString(aSeeAlsoNode.string_value().str()); +aUpdateInfo.aFromBuildID = toOUString(aFromNode.string_value()); +aUpdateInfo.aSeeAlsoURL = toOUString(aSeeAlsoNode.string_value()); aUpdateInfo.aUpdateFile = parse_update_file(aUpdateNode); -std::vector aLanguages = aLanguageNode.keys(); +std::vector aLanguages = aLanguageNode.keys(); for (auto const& language : aLanguages) { language_file aLanguageFile; auto aLangEntry = aLanguageNode.child(language); -aLanguageFile.aLangCode = toOUString(language.str()); +aLanguageFile.aLangCode = toOUString(language); aLanguageFile.aUpdateFile = parse_update_file(aLangEntry); aUpdateInfo.aLanguageFiles.push_back(aLanguageFile); }
[Libreoffice-commits] core.git: uitest/uitest
uitest/uitest/test.py | 48 +++- 1 file changed, 19 insertions(+), 29 deletions(-) New commits: commit faefc434efdc38587ddad0a65618efde81431e38 Author: Mike Kaganski AuthorDate: Tue Dec 5 14:29:00 2023 +0100 Commit: Mike Kaganski CommitDate: Tue Dec 5 19:28:28 2023 +0100 Deduplicate execute_dialog_through_* Use Python 3.3's 'yield from', which should be OK, because the baseline rhel8 has Python 3.6. If needed, older Python could use replacement like this: for dialog in self.wait_and_yield_dialog(event, xDialogParent, close_button): yield dialog Change-Id: Ic70bdf19fed730e41b7ce2868990ec88423eab33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160352 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py index 08c9a89ef9f5..db2bc1828be1 100644 --- a/uitest/uitest/test.py +++ b/uitest/uitest/test.py @@ -124,6 +124,23 @@ class UITest(object): finally: self.close_doc() +def wait_and_yield_dialog(self, event, parent, close_button): +while not event.executed: +time.sleep(DEFAULT_SLEEP) +dialog = self._xUITest.getTopFocusWindow() +if parent == dialog: +raise Exception("executing the action did not open the dialog") +try: +yield dialog +except: +if not close_button: +if 'cancel' in dialog.getChildren(): +self.close_dialog_through_button(dialog.getChild("cancel")) +raise +finally: +if close_button: +self.close_dialog_through_button(dialog.getChild(close_button)) + # Calls UITest.close_dialog_through_button at exit @contextmanager def execute_dialog_through_command(self, command, printNames=False, close_button = "ok", eventName = "DialogExecute"): @@ -131,23 +148,7 @@ class UITest(object): xDialogParent = self._xUITest.getTopFocusWindow() if not self._xUITest.executeDialog(command): raise Exception("Dialog not executed for: " + command) -while True: -if event.executed: -xDialog = self._xUITest.getTopFocusWindow() -if xDialogParent == xDialog: -raise Exception("executing the action did not open the dialog") -try: -yield xDialog -except: -if not close_button: -if 'cancel' in xDialog.getChildren(): - self.close_dialog_through_button(xDialog.getChild("cancel")) -raise -finally: -if close_button: - self.close_dialog_through_button(xDialog.getChild(close_button)) -return -time.sleep(DEFAULT_SLEEP) +yield from self.wait_and_yield_dialog(event, xDialogParent, close_button) @contextmanager def execute_modeless_dialog_through_command(self, command, printNames=False, close_button = "ok"): @@ -163,18 +164,7 @@ class UITest(object): xDialogParent = self._xUITest.getTopFocusWindow() with EventListener(self._xContext, event_name) as event: ui_object.executeAction(action, parameters) -while True: -if event.executed: -xDialog = self._xUITest.getTopFocusWindow() -if xDialogParent == xDialog: -raise Exception("executing the action did not open the dialog") -try: -yield xDialog -finally: -if close_button: - self.close_dialog_through_button(xDialog.getChild(close_button)) -return -time.sleep(DEFAULT_SLEEP) +yield from self.wait_and_yield_dialog(event, xDialogParent, close_button) # Calls UITest.close_doc at exit @contextmanager
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit 24135dc15a797ca91dd32c70cbc4d26a05dfd127 Author: Miklos Vajna AuthorDate: Tue Dec 5 11:43:42 2023 +0100 Commit: Caolán McNamara CommitDate: Tue Dec 5 20:29:03 2023 +0100 writerfilter: fix crash in DomainMapper_Impl::PushSdt() Crashreport signature: Fatal signal received: SIGSEGV code: 1 for address: 0x0 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper_Impl::PushSdt() writerfilter/source/dmapper/DomainMapper_Impl.cxx:987 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper::lcl_attribute(unsigned int, writerfilter::Value&) include/tools/ref.hxx:56 program/libwriterfilterlo.so writerfilter::ooxml::OOXMLProperty::resolve(writerfilter::Properties&) include/tools/ref.hxx:56 program/libwriterfilterlo.so writerfilter::ooxml::OOXMLPropertySet::resolve(writerfilter::Properties&) include/tools/ref.hxx:157 Change-Id: I76416ca707a4ac40495e5c22f62fcd017bcb5e48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160336 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit 728f6ec104b1a91c8c8ea0790bc7f56471c67737) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160351 Tested-by: Jenkins diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 183d71d5833a..e9d57ea34cef 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -977,8 +977,19 @@ void DomainMapper_Impl::PushSdt() } uno::Reference xTextAppend = m_aTextAppendStack.top().xTextAppend; +if (!xTextAppend.is()) +{ +return; +} + +uno::Reference xText = xTextAppend->getText(); +if (!xText.is()) +{ +return; +} + uno::Reference xCursor -= xTextAppend->getText()->createTextCursorByRange(xTextAppend->getEnd()); += xText->createTextCursorByRange(xTextAppend->getEnd()); // Offset so the cursor is not adjusted as we import the SDT's content. bool bStart = !xCursor->goLeft(1, /*bExpand=*/false); m_xSdtStarts.push({bStart, OUString(), xCursor->getStart()});
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/inc/conttree.hxx |4 + sw/source/uibase/utlui/content.cxx | 91 - 2 files changed, 93 insertions(+), 2 deletions(-) New commits: commit 8286c9ebe47aaf24b055f51136a8cb06f1e6429c Author: Jim Raykowski AuthorDate: Mon Nov 27 22:51:28 2023 -0900 Commit: Jim Raykowski CommitDate: Tue Dec 5 21:52:22 2023 +0100 tdf#157729 SwNavigator: enhancement to group comments by threads Change-Id: I64bc02e64d540a2bf602d2124deda1990dfb9f7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160011 Tested-by: Jenkins Reviewed-by: Jim Raykowski diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 9e1653fd08e3..b693a7da97a4 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -106,8 +106,10 @@ class SwContentTree final : public SfxListener SwWrtShell* m_pActiveShell; // the active or a const. open view SwNavigationConfig* m_pConfig; +// these maps store the expand state of nodes with children std::map< void*, bool > mOutLineNodeMap; -std::map m_aRegionNodeExpandMap; // stores expand state of nodes with children +std::map m_aRegionNodeExpandMap; +std::map m_aPostItNodeExpandMap; sal_Int32 m_nActiveBlock; // used to restore content types expand state sal_Int32 m_nHiddenBlock; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 4ca633697cdd..29ab1b964c26 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -119,6 +119,8 @@ #include +#include + #define CTYPE_CNT 0 #define CTYPE_CTT 1 @@ -2312,6 +2314,45 @@ bool SwContentTree::RequestingChildren(const weld::TreeIter& rParent) } } } +else if (pCntType->GetType() == ContentTypeId::POSTIT) +{ +std::vector> aParentCandidates; +for(size_t i = 0; i < nCount; ++i) +{ +const SwPostItContent* pCnt = +static_cast(pCntType->GetMember(i)); + +OUString sEntry = pCnt->GetName(); +OUString sId(weld::toId(pCnt)); + +const SwPostItField* pPostItField = +static_cast(pCnt->GetPostIt()->GetField()); +auto lambda = [&pPostItField, this](const std::unique_ptr& xEntry) +{ +SwPostItContent* pParentCandidateCnt = + weld::fromId(m_xTreeView->get_id(*xEntry)); +return pPostItField->GetParentPostItId() == +static_cast(pParentCandidateCnt->GetPostIt() + ->GetField())->GetPostItId(); +}; + +// if a parent candidate is not found use the passed root node +auto aFind = std::find_if(aParentCandidates.rbegin(), aParentCandidates.rend(), lambda); +if (aFind != aParentCandidates.rend()) +insert(aFind->get(), sEntry, sId, false, xChild.get()); +else +insert(&rParent, sEntry, sId, false, xChild.get()); + +m_xTreeView->set_sensitive(*xChild, !pCnt->IsInvisible()); + +// clear parent candidates when encountering a postit that doesn't have a parent +// following postits can't have a parent that is in these candidates +if (pPostItField->GetParentPostItId() == 0) +aParentCandidates.clear(); + + aParentCandidates.emplace_back(m_xTreeView->make_iterator(xChild.get())); +} +} else InsertContent(rParent); @@ -2485,6 +2526,47 @@ void SwContentTree::Expand(const weld::TreeIter& rParent, m_aRegionNodeExpandMap[key] = true; } } +else if (m_nRootType == ContentTypeId::POSTIT || (m_nRootType == ContentTypeId::UNKNOWN && + eParentContentTypeId == ContentTypeId::POSTIT)) +{ +if (bParentIsContentType) +{ +std::map aCurrentPostItNodeExpandMap; +if (RequestingChildren(rParent)) +{ +std::unique_ptr xChild(m_xTreeView->make_iterator(&rParent)); +while (m_xTreeView->iter_next(*xChild) && lcl_IsContent(*xChild, *m_xTreeView)) +{ +if (m_xTreeView->iter_has_child(*xChild)) +{ + assert(dynamic_cast(weld::fromId(m_xTreeView->get_id(*xChild; +const void* key = +static_cast(weld::fromId( + m_xTreeView->get_id(*xChild))->GetPostIt()); +bool bExpandNode = +
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/refupdat.cxx | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) New commits: commit f35b540279b00575ff79eda1c65fb0f8caad86bf Author: Eike Rathke AuthorDate: Tue Dec 5 20:58:49 2023 +0100 Commit: Eike Rathke CommitDate: Tue Dec 5 22:40:50 2023 +0100 Resolves: tdf#158223 Revert "fix" for tdf#156174 and follow-up ... introducing a real fix. commit 94ca402cd1fe2fd9776d08448f7216b7f638e69a CommitDate: Tue Jul 25 15:04:01 2023 +0200 tdf#156174 sc DBData: fix regression of database ranges just cured a symptom by removing a condition that shouldn't had been removed, instead of getting to the real cause of an odd reference update. Shrinking the end of a sheet reference range and thus moving it one before the previously referenced relative position is only possible if the deleted sheet actually touches the referenced range, which here the start value points to and thus checking ref>=start+delta is not necessary and subtracting 1 even harms. This is different from deleting columns or rows where the start value points behind the deleted area of moving the following area. Change-Id: If9ae5dd6f6ae5cd248ad5d999f1aa7577d4ec035 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160374 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index e05a14d0137f..95f738c4ed84 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -25,12 +25,12 @@ #include template< typename R, typename S, typename U > -static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) +static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask, bool bShrink = true ) { bool bCut = false; if ( rRef >= nStart ) rRef = sal::static_int_cast( rRef + nDelta ); -else if ( nDelta < 0 && rRef >= nStart + nDelta ) +else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta ) rRef = nStart + nDelta; //TODO: limit ??? if ( rRef < 0 ) { @@ -46,12 +46,12 @@ static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) } template< typename R, typename S, typename U > -static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask ) +static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask, bool bShrink = true ) { bool bCut = false; if ( rRef >= nStart ) rRef = sal::static_int_cast( rRef + nDelta ); -else if ( nDelta < 0 && rRef >= nStart + nDelta ) +else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta ) rRef = nStart + nDelta - 1; //TODO: limit ??? if (rRef < 0) { @@ -284,9 +284,14 @@ ScRefUpdateRes ScRefUpdate::Update( const ScDocument* pDoc, UpdateRefMode eUpdat SCTAB nMaxTab = pDoc->GetTableCount() - 1; nMaxTab = sal::static_int_cast(nMaxTab + nDz); // adjust to new count bool bExp = (bExpand && IsExpand( theTab1, theTab2, nTab1, nDz )); -bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab ); -bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab ); -if ( bCut1 || bCut2 ) +bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab, false /*bShrink*/); +bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab, false /*bShrink*/); +if ( theTab2 < theTab1 ) +{ +eRet = UR_INVALID; +theTab2 = theTab1; +} +else if ( bCut1 || bCut2 ) eRet = UR_UPDATED; if ( bExp ) {
[Libreoffice-commits] core.git: extras/source
extras/source/templates/presnt/Beehive/styles.xml |2 extras/source/templates/presnt/Blue_Curve/content.xml |8 - extras/source/templates/presnt/DNA/content.xml |2 extras/source/templates/presnt/DNA/styles.xml | 18 +- extras/source/templates/presnt/Focus/content.xml |2 extras/source/templates/presnt/Focus/styles.xml| 74 +- extras/source/templates/presnt/Nature_Illustration/content.xml |8 - extras/source/templates/presnt/Progress/content.xml|8 - extras/source/templates/presnt/Progress/styles.xml | 48 +++--- extras/source/templates/presnt/Vivid/content.xml |8 - extras/source/templates/presnt/Vivid/styles.xml| 38 ++--- 11 files changed, 93 insertions(+), 123 deletions(-) New commits: commit a9ad36ae46ff76c0d59b0d170314fdd3a9ee5d35 Author: Laurent Balland AuthorDate: Tue Nov 28 21:31:43 2023 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Dec 5 23:20:39 2023 +0100 Impress templates: restore font declarations Some warnings appear when opening the template due to some missing font declarations Remove date declaration Fix some minor errors detected with ODFValidator Focus: remove DejaVu Sans2 font declaration (duplicate) Change-Id: I48a61d7df651d8113d5f15ba0c5877f6553e5003 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160064 Tested-by: Jenkins Reviewed-by: Laurent Balland Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/templates/presnt/Beehive/styles.xml b/extras/source/templates/presnt/Beehive/styles.xml index 43408af8019d..02d4d06cc9f4 100644 --- a/extras/source/templates/presnt/Beehive/styles.xml +++ b/extras/source/templates/presnt/Beehive/styles.xml @@ -441,7 +441,7 @@ - + diff --git a/extras/source/templates/presnt/Blue_Curve/content.xml b/extras/source/templates/presnt/Blue_Curve/content.xml index a5e6a3954b3d..3e2190dea407 100644 --- a/extras/source/templates/presnt/Blue_Curve/content.xml +++ b/extras/source/templates/presnt/Blue_Curve/content.xml @@ -14,13 +14,6 @@ - - - . - - . - - @@ -54,7 +47,6 @@ - diff --git a/extras/source/templates/presnt/DNA/content.xml b/extras/source/templates/presnt/DNA/content.xml index b10ed4dd4a19..0644ebd1eddc 100644 --- a/extras/source/templates/presnt/DNA/content.xml +++ b/extras/source/templates/presnt/DNA/content.xml @@ -4,6 +4,8 @@ + + diff --git a/extras/source/templates/presnt/DNA/styles.xml b/extras/source/templates/presnt/DNA/styles.xml index bf3366a7ca3e..ab202f0232a5 100644 --- a/extras/source/templates/presnt/DNA/styles.xml +++ b/extras/source/templates/presnt/DNA/styles.xml @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -179,12 +179,12 @@ - + - + @@ -232,7 +232,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -347,7 +347,7 @@ - + diff --git a/extras/source/templates/presnt/Focus/content.xml b/extras/source/templates/presnt/Focus/content.xml index fb38594989d0..1d88905e6b15 100644 --- a/extras/source/templates/presnt/Focus/content.xml +++ b/extras/source/templates/presnt/Focus/content.xml @@ -2,7 +2,7 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1 .0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 7 commits - configure.ac embeddedobj/source include/svx reportdesign/source svx/source sw/source xmloff/source
configure.ac |2 - embeddedobj/source/commonembedding/persistence.cxx | 25 - include/svx/unoshape.hxx |6 ++- reportdesign/source/core/sdr/ReportDrawPage.cxx|2 - svx/source/unodraw/shapeimpl.hxx |7 ++- svx/source/unodraw/unomod.cxx |6 ++- svx/source/unodraw/unopage.cxx | 14 +++ svx/source/unodraw/unoshap4.cxx| 38 +++-- sw/source/uibase/wrtsh/wrtsh2.cxx |8 ++-- xmloff/source/draw/ximpshap.cxx|4 ++ 10 files changed, 67 insertions(+), 45 deletions(-) New commits: commit 9c4258eca006fd4524c11ab31a26d886dcad1ec7 Author: Thorsten Behrens AuthorDate: Wed Dec 6 06:33:02 2023 +0100 Commit: Thorsten Behrens CommitDate: Wed Dec 6 06:33:02 2023 +0100 Bump version to 6.4.0.22 Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf diff --git a/configure.ac b/configure.ac index 39cc33d13928..ac34e147b005 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.22],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit 2bb9d59c9bd1c7893fccfce8e9b4034a8b4165e8 Author: Caolán McNamara AuthorDate: Fri Nov 17 08:57:09 2023 + Commit: Thorsten Behrens CommitDate: Wed Dec 6 06:22:54 2023 +0100 we can have just one LoadURL for writer Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d) diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index ec88a639a4e9..87375f30c8b7 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -23,7 +23,6 @@ #include class SwViewShell; -class SwView; enum class LoadUrlFlags { NONE= 0x00, @@ -36,10 +35,6 @@ namespace o3tl { void LoadURL( SwViewShell& rSh, const OUString& rName, LoadUrlFlags nFilter, const OUString& rTargetFrameName ); -void LoadURL( SwView& rView, const OUString& rName, - LoadUrlFlags nFilter, const OUString& rTargetFrameName ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 820b131e60b6..0e3ba07c3973 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) const SvxFieldData* pField = pOLV->GetFieldAtCursor(); if (const SvxURLField* pURLField = dynamic_cast(pField)) { -::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE, +::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE, pURLField->GetTargetFrame()); } } commit 2644737c313540dcd1e33e9c5c6802c6d228afa2 Author: Caolán McNamara AuthorDate: Wed Nov 15 21:01:48 2023 + Commit: Thorsten Behrens CommitDate: Wed Dec 6 06:21:58 2023 +0100 combine these hyperlink dispatchers into one call Conflicts: sw/source/uibase/shells/drwtxtex.cxx sw/source/uibase/wrtsh/wrtsh2.cxx Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb) diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index 87375f30c8b7..ec88a639a4e9 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -23,6 +23,7 @@ #include class SwViewShell; +class SwView; enum class LoadUrlFlags { NONE= 0x00, @@ -35,6 +36,10 @@ namespace o3tl { void LoadURL( SwViewShell& rSh, const OUString& rName, LoadUrlFlags nFilter, const OUString& rTargetFrameName ); +void LoadURL( SwView& rView, const OUString& rName, + LoadUrlFlags nFilter, const OUString& rTargetFrameName ); + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 0e3ba07c3973..820b131e60b6 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/BitmapInfoAccess.hxx |9 + include/vcl/BitmapPalette.hxx |6 + vcl/source/bitmap/BitmapInfoAccess.cxx |6 + vcl/source/bitmap/bitmappaint.cxx | 171 +++-- vcl/source/bitmap/bitmappalette.cxx| 20 +++ 5 files changed, 140 insertions(+), 72 deletions(-) New commits: commit bb3157e38bfffd23505abc35f790043392f43d2c Author: Noel Grandin AuthorDate: Tue Dec 5 10:45:33 2023 +0200 Commit: Noel Grandin CommitDate: Wed Dec 6 07:08:18 2023 +0100 Remove the special-casing in Bitmap::Invert (and fix) and rather rely on the backends doing the right thing, which is considerably faster. Which uncovers a bug in the existing code - it is not legal to simply invert the value when dealing with palette-based images. Fix this by sharing some code with Bitmap::ReplaceMask. Change-Id: I2ef340a9f251c8c7e27b68ab451ce85df07c1035 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160332 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx index c0ef7fb5be1e..6e255c97e7ec 100644 --- a/include/vcl/BitmapInfoAccess.hxx +++ b/include/vcl/BitmapInfoAccess.hxx @@ -77,6 +77,9 @@ public: return mpBuffer ? mpBuffer->mnBitCount : 0; } +/// Returns the BitmapColor (i.e. palette index) that is either an exact match +/// of the required color, or failing that, the entry that is the closest i.e. least error +/// as measured by Color::GetColorError. BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor) const { if (HasPalette()) @@ -121,7 +124,13 @@ public: return pBuffer->maPalette[nColor]; } +/// Returns the BitmapColor (i.e. palette index) that is either an exact match +/// of the required color, or failing that, the entry that is the closest i.e. least error +/// as measured by Color::GetColorError. sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const; +/// Returns the BitmapColor (i.e. palette index) that is an exact match +/// of the required color. Returns SAL_MAX_UINT16 if nothing found. +sal_uInt16 GetMatchingPaletteIndex(const BitmapColor& rBitmapColor) const; const ColorMask& GetColorMask() const { diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx index 4f20970e15ec..1d5f79de5adf 100644 --- a/include/vcl/BitmapPalette.hxx +++ b/include/vcl/BitmapPalette.hxx @@ -65,7 +65,13 @@ public: const BitmapColor& operator[](sal_uInt16 nIndex) const; BitmapColor& operator[](sal_uInt16 nIndex); +/// Returns the BitmapColor (i.e. palette index) that is either an exact match +/// of the required color, or failing that, the entry that is the closest i.e. least error +/// as measured by Color::GetColorError. sal_uInt16 GetBestIndex(const BitmapColor& rCol) const; +/// Returns the BitmapColor (i.e. palette index) that is an exact match +/// of the required color. Returns SAL_MAX_UINT16 if nothing found. +sal_uInt16 GetMatchingIndex(const BitmapColor& rCol) const; /// Returns true if the palette is 8-bit grey palette. bool IsGreyPalette8Bit() const; diff --git a/vcl/source/bitmap/BitmapInfoAccess.cxx b/vcl/source/bitmap/BitmapInfoAccess.cxx index 50607e94dde3..318317519928 100644 --- a/vcl/source/bitmap/BitmapInfoAccess.cxx +++ b/vcl/source/bitmap/BitmapInfoAccess.cxx @@ -77,4 +77,10 @@ sal_uInt16 BitmapInfoAccess::GetBestPaletteIndex(const BitmapColor& rBitmapColor return (HasPalette() ? pBuffer->maPalette.GetBestIndex(rBitmapColor) : 0); } +sal_uInt16 BitmapInfoAccess::GetMatchingPaletteIndex(const BitmapColor& rBitmapColor) const +{ +assert(HasPalette()); +return mpBuffer->maPalette.GetMatchingIndex(rBitmapColor); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index 5d405322e6ed..758f36bc1e93 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -31,6 +31,12 @@ #include #include +static BitmapColor UpdatePaletteForNewColor(BitmapScopedWriteAccess& pAcc, +const sal_uInt16 nActColors, +const sal_uInt16 nMaxColors, const tools::Long nHeight, +const tools::Long nWidth, +const BitmapColor& rWantedColor); + bool Bitmap::Erase(const Color& rFillColor) { if (IsEmpty()) @@ -63,32 +69,6 @@ bool Bitmap::Invert() if (!mxSalBmp) return false; -// For alpha masks, we need to actually invert the underlying data -// or the optimisations elsewhere do not work right. -if (typeid(*this) != typeid(AlphaMask)) -{ -// We want to avoid using ScopedReadAccess until we real
[Libreoffice-commits] core.git: sw/qa
sw/qa/inc/swmodeltestbase.hxx |8 sw/qa/unit/swmodeltestbase.cxx |4 2 files changed, 12 deletions(-) New commits: commit fa38d98155a857908641380c7a1a5a34fafe934e Author: Miklos Vajna AuthorDate: Tue Dec 5 19:57:53 2023 +0100 Commit: Miklos Vajna CommitDate: Wed Dec 6 08:19:43 2023 +0100 Remove now unused SwModelTestBase::preTest() Which was a way to place test setup code far from the test itself, so good to get rid of it. Change-Id: I9f88ded958e7b546f0b1ecd7ce025e72a2a5e245 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160373 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index 7eb41f2eda7c..950136e66eba 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -140,14 +140,6 @@ protected: CPPUNIT_FAIL( "verify method must be overridden" ); } -/** - * Override this function if some special filename-specific setup is needed - */ -virtual std::unique_ptr preTest(const char* /*filename*/) -{ -return nullptr; -} - /// Override this function if some special file-specific setup is needed during export test: after load, but before save. virtual void postLoad(const char* /*pFilename*/) { diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 5029421a631a..d5248bd414fb 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -66,7 +66,6 @@ void SwModelTestBase::executeImportTest(const char* filename, const char* pPassw { maTempFile.EnableKillingFile(false); header(); -std::unique_ptr const pChanges(preTest(filename)); loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword); verify(); finish(); @@ -77,7 +76,6 @@ void SwModelTestBase::executeLoadVerifyReloadVerify(const char* filename, const { maTempFile.EnableKillingFile(false); header(); -std::unique_ptr const pChanges(preTest(filename)); loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword); verify(); postLoad(filename); @@ -91,7 +89,6 @@ void SwModelTestBase::executeLoadReloadVerify(const char* filename, const char* { maTempFile.EnableKillingFile(false); header(); -std::unique_ptr const pChanges(preTest(filename)); loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword); postLoad(filename); saveAndReload(mpFilter, pPassword); @@ -104,7 +101,6 @@ void SwModelTestBase::executeImportExport(const char* filename, const char* pPas { maTempFile.EnableKillingFile(false); header(); -std::unique_ptr const pChanges(preTest(filename)); loadAndSave(filename, pPassword); maTempFile.EnableKillingFile(false); verify();
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa xmloff/inc xmloff/source
sw/qa/extras/fodfexport/data/SvgImageTest.fodt | 321 + sw/qa/extras/fodfexport/fodfexport.cxx | 25 + xmloff/inc/xmlmultiimagehelper.hxx |1 xmloff/source/core/xmlmultiimagehelper.cxx | 28 +- xmloff/source/draw/ximpshap.cxx| 24 + xmloff/source/draw/ximpshap.hxx|3 xmloff/source/text/XMLTextFrameContext.cxx | 11 xmloff/source/text/XMLTextFrameContext.hxx |1 8 files changed, 399 insertions(+), 15 deletions(-) New commits: commit d6ca6718a3514f383b2b4b678bbcca7188493c86 Author: Tomaž Vajngerl AuthorDate: Sat Dec 2 16:57:30 2023 +0900 Commit: Miklos Vajna CommitDate: Wed Dec 6 08:20:46 2023 +0100 tdf#123396 actually use the mimetype set in the from document In the document we set the mime type for the images stored, but at import we never actually used the mime types. We always did mime type detection from the filename extension. The problem with this is that files stored as base64 streams don't have a filename so it is also not possible to determine the mime type from the file name. The consequence of this is that we can't know which image to take if we have multiple images (fallback images) so we always take the last one, which could be the wrong one. This happend in the test document. This changes the behavior so that we always first use the document set mime type as there is no reason to not trust that. Only if the mime type isn't provided by the document we use other mime type detection methods. Change-Id: I175c509ce5f11eab2c0454d4d9901ca1fe975272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160237 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit f5cf0c10eb7050feff19190b06b4597aab2d400a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160338 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/qa/extras/fodfexport/data/SvgImageTest.fodt b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt new file mode 100644 index ..4246a7cb5e5e --- /dev/null +++ b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt @@ -0,0 +1,321 @@ + + +http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> + 2023-12-01T21:40:25.0108966092023-12-02T14:20:24.763250978PT2M41S2LibreOffice/7.6.3.1$Linux_X86_64 LibreOffice_project/60$Build-1 + + + 0 + 0 + 58104 + 33657 + true + false + + + view2 + 20551 + 17866 + 0 + 0 + 58103 + 33655 + 0 + 1 + false + 100 + false + false + false + false + false + false + + + + + true + false + true + false + true + false + false + 0 + true + false + true + false + false + fa
[Libreoffice-commits] core.git: chart2/export_setup.mk oox/inc oox/source sd/qa sw/qa
chart2/export_setup.mk | 60 oox/inc/drawingml/misccontexts.hxx |4 + oox/source/core/xmlfilterbase.cxx |1 oox/source/drawingml/misccontexts.cxx | 37 ++ sd/qa/unit/data/odp/SvgImageTest.odp|binary sd/qa/unit/export-tests.cxx | 31 sw/qa/extras/globalfilter/data/SvgImageTest.odt |binary sw/qa/extras/globalfilter/globalfilter.cxx | 37 ++ 8 files changed, 100 insertions(+), 70 deletions(-) New commits: commit 1db193c6c744289139b1df2af0b8defcf974b238 Author: Tomaž Vajngerl AuthorDate: Mon Sep 25 09:03:54 2023 +0200 Commit: Tomaž Vajngerl CommitDate: Wed Dec 6 08:23:34 2023 +0100 tdf#126084 import svg image from ooxml document that use svgBlip elem. In an OOXML document the svg image is defined in an svgBlip, which is an OOXML extension. This change checks for the svgBlip element and imports that instead the normal "blip" element that is still provided as a fallback (PNG image). Add roundtrip SVG image test for ODF and OOXML, Impress and Writer. testGraphicBlipXLSX test failed after this change, because some component was missing. Changed to enable use_rdb for all chart2 export tests, so issues like this won't happen anymore. Change-Id: Idf0e754775254d7dcfd0321dfca2ed6d00c42c09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157238 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/chart2/export_setup.mk b/chart2/export_setup.mk index b2bcf75e..723df9897c4a 100644 --- a/chart2/export_setup.mk +++ b/chart2/export_setup.mk @@ -71,65 +71,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,chart2_export$(1))) $(eval $(call gb_CppunitTest_use_ure,chart2_export$(1))) $(eval $(call gb_CppunitTest_use_vcl,chart2_export$(1))) - -$(eval $(call gb_CppunitTest_use_components,chart2_export$(1),\ -basic/util/sb \ -animations/source/animcore/animcore \ -chart2/source/controller/chartcontroller \ -chart2/source/chartcore \ -comphelper/util/comphelp \ -configmgr/source/configmgr \ -dbaccess/util/dba \ -embeddedobj/util/embobj \ -emfio/emfio \ -eventattacher/source/evtatt \ -filter/source/config/cache/filterconfig1 \ -filter/source/odfflatxml/odfflatxml \ -filter/source/storagefilterdetect/storagefd \ -filter/source/xmlfilteradaptor/xmlfa \ -filter/source/xmlfilterdetect/xmlfd \ -forms/util/frm \ -framework/util/fwk \ -i18npool/util/i18npool \ -linguistic/source/lng \ -oox/util/oox \ -package/source/xstor/xstor \ -package/util/package2 \ -sax/source/expatwrap/expwrap \ -sc/util/sc \ -sc/util/scd \ -sc/util/scfilt \ -sw/util/sw \ -sw/util/swd \ -sw/util/msword \ -sd/util/sd \ -sd/util/sdd \ -$(call gb_Helper_optional,SCRIPTING, \ - sc/util/vbaobj) \ -scaddins/source/analysis/analysis \ -scaddins/source/datefunc/date \ -scripting/source/basprov/basprov \ -scripting/util/scriptframe \ -sfx2/util/sfx \ -sot/util/sot \ -svl/source/fsstor/fsstorage \ -svl/util/svl \ - svtools/util/svt \ -svx/util/svx \ -svx/util/svxcore \ -toolkit/util/tk \ -vcl/vcl.common \ -ucb/source/core/ucb1 \ -ucb/source/ucp/file/ucpfile1 \ -ucb/source/ucp/tdoc/ucptdoc1 \ -unotools/util/utl \ -unoxml/source/rdf/unordf \ -unoxml/source/service/unoxml \ -uui/util/uui \ -writerfilter/util/writerfilter \ -xmloff/util/xo \ -xmlscript/util/xmlscript \ -)) +$(eval $(call gb_CppunitTest_use_rdb,chart2_export$(1),services)) $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_export$(1), \ modules/swriter \ diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx index c79816282ae7..1b7f05444ac7 100644 --- a/oox/inc/drawingml/misccontexts.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -102,7 +102,8 @@ class BlipExtensionContext final : public ::oox::core::ContextHandler2 public: explicitBlipExtensionContext( ::oox::core::ContextHandler2Helper const & rParent, -BlipFillProperties& rBlipProps ); +BlipFillProperties& rBlipProps, +model::BlipFill* pBlipFill); virtual ~BlipExtensionContext() override; virtual ::oox::core::ContextHandlerRef @@ -112,6 +113,7 @@ public: private: BlipFillProperties& mrBlipProps; +model::BlipFill* mpBlipFill; }; diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index d197440133da..93b5816812a1 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -149,6 +149,7 @@ const Sequence< beans::Pair< OUString, sal_Int32 > >& NamespaceIds() {"http://sche