[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/childwin.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit bf29483599c67cebfe0c3e06d063d3ae233b28dc Author: Noel Grandin AuthorDate: Tue Jun 7 21:06:10 2022 +0200 Commit: Noel Grandin CommitDate: Wed Jun 8 08:40:26 2022 +0200 tdf#81293 dialog “manage names” forgets size and column width settings I can't see any reason for this code to be this way. I can see that Jim has tried to make some dialogs retain window size and position. Surely all dialogs should be able to do this? Unfortunately, it has been this way since initial commit. Let us live dangerously and see what happens if we give power to ALL the dialogs. VIVA LA REVOLUTION!!! Change-Id: I44e389ba3cb46793365607d36a05474584ee6490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135478 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 75d72cae0e2b..1740459e7aea 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -233,13 +233,11 @@ std::unique_ptr SfxChildWindow::CreateChildWindow( sal_uInt16 nI pFact = pMod->GetChildWinFactoryById(nId); if ( pFact ) { -SfxChildWinInfo& rFactInfo = pFact->aInfo; if ( rInfo.bVisible ) { if ( pBindings ) pBindings->ENTERREGISTRATIONS(); -SfxChildWinInfo aInfo = (nId == SID_SEARCH_DLG || nId == SID_NAVIGATOR) ? -rInfo : rFactInfo; +SfxChildWinInfo aInfo = rInfo; Application::SetSystemWindowMode( SystemWindowFlags::NOAUTOMODE ); pChild = pFact->pCtor( pParent, nId, pBindings, &aInfo ); Application::SetSystemWindowMode( nOldMode );
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/txtnode/justify.cxx | 25 ++ sw/qa/extras/uiwriter/data/tdf149089.odt |binary sw/qa/extras/uiwriter/uiwriter7.cxx | 11 + sw/source/core/txtnode/fntcache.cxx | 265 +-- sw/source/core/txtnode/justify.cxx | 27 +++ sw/source/core/txtnode/justify.hxx | 10 + 6 files changed, 120 insertions(+), 218 deletions(-) New commits: commit 3e754c07fabd1f74d57f42f273ea46e03dbdc094 Author: Mark Hung AuthorDate: Sun May 29 15:44:49 2022 +0800 Commit: Miklos Vajna CommitDate: Wed Jun 8 08:14:25 2022 +0200 tdf#149089 fix extra mini space in text grid. 1. Create Justify::SnapToGridEdge() to adjust kern array under CJK textgrid GRID_LINES_CHARS mode when snap to chars is off. This function can handle a) Unicode IVS b) rInf.GetSpace() like what CJKJustify() does. c) rInf.GetKern() value for letter spacing. Excluded parts comparing to original kern array adjustment: a) Kana compression under textgrid mode has been removed. Kana compression is used to compress space of punctuation. It doesn't make sense to perform that under textgrid node. b) Inserting nSpaceAdd for CH_BLANK is removed. I don't know its purpose. 2. Use Justify::SnapToGridEdge() in GetTextSize(), GetTextBreak(), DrawText(), GetModelPositionForViewPoint() to adjust kern array consistently. Change-Id: I136a92f513fae05af2fb429e747356ba7eedec7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135086 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/qa/core/txtnode/justify.cxx b/sw/qa/core/txtnode/justify.cxx index 8f8956f5a736..0bdcd01e38d5 100644 --- a/sw/qa/core/txtnode/justify.cxx +++ b/sw/qa/core/txtnode/justify.cxx @@ -154,4 +154,29 @@ CPPUNIT_TEST_FIXTURE(SwCoreJustifyTest, testSnapToGridIVS) CPPUNIT_ASSERT_EQUAL(aExpected, aActual); CPPUNIT_ASSERT_EQUAL(tools::Long(0), nDelta); } + +CPPUNIT_TEST_FIXTURE(SwCoreJustifyTest, testSnapToGridEdge1) +{ +CharWidthArray aActual{ 640, 640, 640, 640, 640, 640, 320, 960 }; +CharWidthArray aExpected{ 840, 840, 840, 840, 840, 840, 440, 1240 }; +aActual.InvokeWithKernArray([&] { Justify::SnapToGridEdge(aActual.maArray, 8, 400, 40, 0); }); +CPPUNIT_ASSERT_EQUAL(aExpected, aActual); +} + +CPPUNIT_TEST_FIXTURE(SwCoreJustifyTest, testSnapToGridEdge2) +{ +CharWidthArray aActual{ 640, 640, 640, 640, 640, 640, 320, 640 }; +CharWidthArray aExpected{ 840, 840, 840, 840, 840, 840, 440, 840 }; +aActual.InvokeWithKernArray([&] { Justify::SnapToGridEdge(aActual.maArray, 8, 100, 40, 80); }); +CPPUNIT_ASSERT_EQUAL(aExpected, aActual); +} + +CPPUNIT_TEST_FIXTURE(SwCoreJustifyTest, testSnapToGridEdgeIVS) +{ +CharWidthArray aActual{ 640, 0, 0, 640, 640, 640, 640, 640 }; +CharWidthArray aExpected{ 840, 0, 0, 840, 840, 840, 840, 840 }; +aActual.InvokeWithKernArray([&] { Justify::SnapToGridEdge(aActual.maArray, 8, 400, 40, 0); }); +CPPUNIT_ASSERT_EQUAL(aExpected, aActual); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/uiwriter/data/tdf149089.odt b/sw/qa/extras/uiwriter/data/tdf149089.odt new file mode 100644 index ..08cb5a4db594 Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf149089.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx index 0cb70e91076b..8b5a23d1a695 100644 --- a/sw/qa/extras/uiwriter/uiwriter7.cxx +++ b/sw/qa/extras/uiwriter/uiwriter7.cxx @@ -2775,6 +2775,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149184) xStorable->storeToURL(aTempFile.GetURL(), aStoreProps); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149089) +{ +createSwDoc(DATA_DIRECTORY, "tdf149089.odt"); +xmlDocUniquePtr pXmlDoc = parseLayoutDump(); +sal_Int32 nTextPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[1]", "width").toInt32(); +sal_Int32 nKernPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[2]", "width").toInt32(); +// nKernPortionWidth was about 1/3 of nTextPortionWidth +double nRatio = double(nKernPortionWidth) / nTextPortionWidth; +CPPUNIT_ASSERT_LESS(0.05, nRatio); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 559633126cf8..12613bfd3b7f 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -72,24 +72,6 @@ tools::Long SwFntObj::s_nPixWidth; MapMode* SwFntObj::s_pPixMap = nullptr; static vcl::DeleteOnDeinit< VclPtr > s_pFntObjPixOut {}; -namespace -{ - -tools::Long EvalGridWidthAdd( const SwTextGridItem *const pGrid, -const SwDrawTextInfo &rInf, tools::Long nFontWidth ) -{ -const SwDoc* pDoc = rInf.GetShell()->GetDoc(); -const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc); -tools::Long nGridWidthAdd = nGridWidth - nFontWidth; - -
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 0515ad196654c929dfd345dcf11f97fc09820cfc Author: Caolán McNamara AuthorDate: Tue Jun 7 20:34:48 2022 +0100 Commit: Julien Nabet CommitDate: Wed Jun 8 07:26:50 2022 +0200 add LIBTIFF to cross-compiling targets with an eye to win_arm64 cross build failure Change-Id: I6872859f288168352e3e70c1d559f4d318439958 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135479 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/configure.ac b/configure.ac index d4cbd2410e0f..2c8973dc3d2c 100644 --- a/configure.ac +++ b/configure.ac @@ -5742,6 +5742,7 @@ if test "$cross_compiling" = "yes"; then LibO LIBFFI LIBPN +LIBTIFF LIBWEBP LIBXML2 LIBXSLT
[Libreoffice-commits] core.git: sc/qa sw/qa sw/source
sc/qa/uitest/calc_tests/formatCells.py|2 +- sw/qa/uitest/writer_tests2/formatCharacter.py |2 +- sw/source/core/txtnode/justify.cxx|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f593c328b1c8fc10dafcbdc8c23ea6ac51a26d47 Author: Andrea Gelmini AuthorDate: Tue Jun 7 13:37:36 2022 +0200 Commit: Julien Nabet CommitDate: Wed Jun 8 07:21:59 2022 +0200 Fix typos Change-Id: If282a3a9f68de2cf0f1576ea34b56b9316f03ef6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135470 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/qa/uitest/calc_tests/formatCells.py b/sc/qa/uitest/calc_tests/formatCells.py index 98bb1c6c40be..e258721fbb5c 100644 --- a/sc/qa/uitest/calc_tests/formatCells.py +++ b/sc/qa/uitest/calc_tests/formatCells.py @@ -76,7 +76,7 @@ class formatCell(UITestCase): xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #tab Font -# xNoteBook = xDialog.getChild("nbWestern") //western notbook is always active +# xNoteBook = xDialog.getChild("nbWestern") //western notebook is always active xSizeFont = xDialog.getChild("cbWestSize") xSizeFont.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xSizeFont.executeAction("TYPE", mkPropertyValues({"TEXT":"18"}))#set font size 18 diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py index b661d25d2198..196313368134 100644 --- a/sw/qa/uitest/writer_tests2/formatCharacter.py +++ b/sw/qa/uitest/writer_tests2/formatCharacter.py @@ -24,7 +24,7 @@ class formatCharacter(UITestCase): xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") -# xNoteBook = xDialog.getChild("nbWestern") //western notbook is always active +# xNoteBook = xDialog.getChild("nbWestern") //western notebook is always active xSizeFont = xDialog.getChild("cbWestSize") xLangFont = xDialog.getChild("cbWestLanguage") xSizeFont.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) diff --git a/sw/source/core/txtnode/justify.cxx b/sw/source/core/txtnode/justify.cxx index f9a9a271a3be..6a1228d13169 100644 --- a/sw/source/core/txtnode/justify.cxx +++ b/sw/source/core/txtnode/justify.cxx @@ -63,7 +63,7 @@ tools::Long lcl_OffsetFromGridEdge(tools::Long nMinWidth, tools::Long nCharWidth nOffset = nMinWidth - nCharWidth; break; default: -// CLOSE_BRACKET ro COMMA_OR_FULLSTOP: +// CLOSE_BRACKET or COMMA_OR_FULLSTOP: // Align to previous edge, closer to previous ideograph. break; }
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15e182148bbd3213c13d10f5b519edd750987982 Author: Rafael Lima AuthorDate: Tue Jun 7 23:44:20 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 7 23:44:20 2022 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 40ee3181de08d372b5a25bb691644a94d3ffe9bd - Related tdf#38948 Warn that Calc Solver does not save model to file Based on Comment 36 from bug 38948, the help should make it clearer that Solver models are not saved to the file by LO Calc. This patch changes the current into a and makes it clearer that solver settings are not saved. Change-Id: Ie1cdf5a82c105c371e05b85ccad6736ed5e74a3f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135272 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index aa1b42c379b9..40ee3181de08 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aa1b42c379b95fc484853a82325dbd61ceb6e73d +Subproject commit 40ee3181de08d372b5a25bb691644a94d3ffe9bd
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/solver.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40ee3181de08d372b5a25bb691644a94d3ffe9bd Author: Rafael Lima AuthorDate: Fri Jun 3 15:03:26 2022 +0200 Commit: Olivier Hallot CommitDate: Tue Jun 7 23:44:18 2022 +0200 Related tdf#38948 Warn that Calc Solver does not save model to file Based on Comment 36 from bug 38948, the help should make it clearer that Solver models are not saved to the file by LO Calc. This patch changes the current into a and makes it clearer that solver settings are not saved. Change-Id: Ie1cdf5a82c105c371e05b85ccad6736ed5e74a3f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135272 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp index 188b05f8c..be910d44d 100644 --- a/source/text/scalc/01/solver.xhp +++ b/source/text/scalc/01/solver.xhp @@ -52,7 +52,7 @@ target cell Solver settings -The dialog settings are retained until you close the current document. +Beware that solver settings are not saved to the file by %PRODUCTNAME Calc. Closing and reopening the file will reset the solver dialog to default settings. Target Cell
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit3.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1581fe4cc1d7ea0c8b3f54fec3e16c8348b7027 Author: Tomoyuki Kubota AuthorDate: Sat May 7 04:53:57 2022 +0100 Commit: Noel Grandin CommitDate: Tue Jun 7 21:10:21 2022 +0200 rPosition to pPosition Change-Id: I5c1bda5419752288e494e2116bef8d258a1de4c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133869 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 14525b494ea0..4f0444f7e982 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3276,7 +3276,7 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev, tools::Rectangle aClipRect, Po aTmpFont.SetFillColor( COL_LIGHTGRAY ); aTmpFont.SetTransparent( sal_False ); } -else if ( GetI18NScriptType( EditPaM( rPortion.GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX ) +else if ( GetI18NScriptType( EditPaM( pPortion->GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX ) { aTmpFont.SetFillColor( COL_LIGHTCYAN ); aTmpFont.SetTransparent( sal_False );
[Libreoffice-commits] core.git: bin/attachment_mimetypes.py bin/get-bugzilla-attachments-by-mimetype bin/get-forum-attachments.py
bin/attachment_mimetypes.py | 157 ++ bin/get-bugzilla-attachments-by-mimetype | 158 --- bin/get-forum-attachments.py | 106 3 files changed, 264 insertions(+), 157 deletions(-) New commits: commit 8b8e9d3126d4232c6c13e6059ab3542a521251d8 Author: Xisco Fauli AuthorDate: Mon Jun 6 17:28:57 2022 +0200 Commit: Xisco Fauli CommitDate: Tue Jun 7 20:26:13 2022 +0200 bin: Add script to get attachments from OO forums Testing it locally, I could download 52.000 documents Reuse mimetypes dictionary from get-bugzilla-attachments-by-mimetype by putting it into an external file Change-Id: I875d90f6119c3c3bdfea6a0efd3bbc8c5be1eb63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135457 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/bin/attachment_mimetypes.py b/bin/attachment_mimetypes.py new file mode 100644 index ..ede5fcb39fb9 --- /dev/null +++ b/bin/attachment_mimetypes.py @@ -0,0 +1,157 @@ +mimetypes = { +# ODF +'application/vnd.oasis.opendocument.base': 'odb', +'application/vnd.oasis.opendocument.database': 'odb', +'application/vnd.oasis.opendocument.chart': 'odc', +'application/vnd.oasis.opendocument.chart-template': 'otc', +'application/vnd.oasis.opendocument.formula': 'odf', +'application/vnd.oasis.opendocument.formula-template': 'otf', +'application/vnd.oasis.opendocument.graphics': 'odg', +'application/vnd.oasis.opendocument.graphics-template': 'otg', +'application/vnd.oasis.opendocument.graphics-flat-xml': 'fodg', +'application/vnd.oasis.opendocument.presentation': 'odp', +'application/vnd.oasis.opendocument.presentation-template': 'otp', +'application/vnd.oasis.opendocument.presentation-flat-xml': 'fodp', +'application/vnd.oasis.opendocument.spreadsheet': 'ods', +'application/vnd.oasis.opendocument.spreadsheet-template': 'ots', +'application/vnd.oasis.opendocument.spreadsheet-flat-xml': 'fods', +'application/vnd.oasis.opendocument.text': 'odt', +'application/vnd.oasis.opendocument.text-flat-xml': 'fodt', +'application/vnd.oasis.opendocument.text-master': 'odm', +'application/vnd.oasis.opendocument.text-template': 'ott', +'application/vnd.oasis.opendocument.text-master-template': 'otm', +'application/vnd.oasis.opendocument.text-web': 'oth', +# OOo XML +'application/vnd.sun.xml.base': 'odb', +'application/vnd.sun.xml.calc': 'sxc', +'application/vnd.sun.xml.calc.template': 'stc', +'application/vnd.sun.xml.chart': 'sxs', +'application/vnd.sun.xml.draw': 'sxd', +'application/vnd.sun.xml.draw.template': 'std', +'application/vnd.sun.xml.impress': 'sxi', +'application/vnd.sun.xml.impress.template': 'sti', +'application/vnd.sun.xml.math': 'sxm', +'application/vnd.sun.xml.writer': 'sxw', +'application/vnd.sun.xml.writer.global': 'sxg', +'application/vnd.sun.xml.writer.template': 'stw', +'application/vnd.sun.xml.writer.web': 'stw', +# MSO +'application/rtf': 'rtf', +'text/rtf': 'rtf', +'application/msword': 'doc', +'application/vnd.ms-powerpoint': 'ppt', +'application/vnd.ms-excel': 'xls', +'application/vnd.ms-excel.sheet.binary.macroEnabled.12': 'xlsb', +'application/vnd.ms-excel.sheet.macroEnabled.12': 'xlsm', +'application/vnd.ms-excel.template.macroEnabled.12': 'xltm', +'application/vnd.ms-powerpoint.presentation.macroEnabled.12': 'pptm', +'application/vnd.ms-powerpoint.slide.macroEnabled.12': 'sldm', +'application/vnd.ms-powerpoint.slideshow.macroEnabled.12': 'ppsm', +'application/vnd.ms-powerpoint.template.macroEnabled.12': 'potm', +'application/vnd.ms-word.document.macroEnabled.12': 'docm', +'application/vnd.ms-word.template.macroEnabled.12': 'dotm', +'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': 'xlsx', +'application/vnd.openxmlformats-officedocument.spreadsheetml.template': 'xltx', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation': 'pptx', +'application/vnd.openxmlformats-officedocument.presentationml.template': 'potx', +'application/vnd.openxmlformats-officedocument.presentationml.slideshow': 'ppsx', +'application/vnd.openxmlformats-officedocument.presentationml.slide': 'sldx', +'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 'docx', +'application/vnd.openxmlformats-officedocument.wordprocessingml.template': 'dotx', +'application/vnd.visio': 'vsd', +'application/visio.drawing': 'vsd', +'application/vnd.visio2013': 'vsdx', +'application/vnd.visio.xml': 'vdx', +'application/x-mspublisher': 'pub', +#WPS Office +'application/wps-office.doc': 'doc', +'application/wps-office.docx': 'docx', +'application/wps-office.xls': 'xls', +'application/wps-office.xlsx': 'xlsx', +'application/wps-o
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/tiledrendering/data/tdf43244_SpacesOnMargin.odt |binary sw/qa/extras/tiledrendering/tiledrendering.cxx | 46 +++ sw/source/core/text/portxt.cxx | 15 +++ 3 files changed, 59 insertions(+), 2 deletions(-) New commits: commit 8741fd0e0ae9e346de2e09887f0668b831c9b48b Author: Attila Szűcs AuthorDate: Fri May 27 13:12:27 2022 +0200 Commit: László Németh CommitDate: Tue Jun 7 19:28:48 2022 +0200 tdf#43244 sw: show stripped line-end spaces on margin in View->Formatting Marks mode instead of hiding them This way it's possible to avoid interoperability issues better, when these (now visible) spaces are stripped only in Writer, but not in MSO, resulting different layout, i.e. bad paragraph alignment, because the users can notice the extra spaces and remove them in Writer. Extend SwHolePortion::Paint() to paint its text, what is probably just a bunch of spaces. It's an initial fix for tdf#43100, tdf#120715 and tdf#104683 (cursor movement on the hidden spaces, end of paragraph sign before the hidden spaces, unable to select spaces after the margin). Follow-up to commit 93d7bdcb855362b88cdcfcb18ea401d89da973fb "fdo#33167, i#20878: Show spaces at the end of line". Co-authored-by: Tibor Nagy (NISZ) Change-Id: I48df3b41af37c77fd594bb6776ca30e845c51490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135104 Tested-by: László Németh Reviewed-by: László Németh diff --git a/sw/qa/extras/tiledrendering/data/tdf43244_SpacesOnMargin.odt b/sw/qa/extras/tiledrendering/data/tdf43244_SpacesOnMargin.odt new file mode 100644 index ..76c293dc0bd5 Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/tdf43244_SpacesOnMargin.odt differ diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 42f7f9e21889..7354782563c4 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -2809,6 +2809,52 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining) comphelper::dispatchCommand(".uno:ControlCodes", {}); } +CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin) +{ +// Load a document where the top left tile contains +// paragraph and line break symbols with redlining. +SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt"); + +// show non printing characters, including pilcrow and +// line break symbols with redlining +comphelper::dispatchCommand(".uno:ControlCodes", {}); + +// Render a larger area, and then get the colors from the right side of the page. +size_t nCanvasWidth = 1024; +size_t nCanvasHeight = 512; +size_t nTileSize = 64; +std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0); +ScopedVclPtrInstance pDevice(DeviceFormat::DEFAULT); +pDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); +pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), +Fraction(1.0), Point(), aPixmap.data()); +pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, +/*nTilePosY=*/0, /*nTileWidth=*/15360, /*nTileHeight=*/7680); +pDevice->EnableMapMode(false); +Bitmap aBitmap = pDevice->GetBitmap(Point(730, 120), Size(nTileSize, nTileSize)); +Bitmap::ScopedReadAccess pAccess(aBitmap); + +//Test if we see any spaces on the right margin in a 47x48 rectangle +bool bSpaceFound = false; +for (int i = 1; i < 48 && !bSpaceFound; i++) +{ +for (int j = 0; j < i; j++) +{ +Color aColor2(pAccess->GetPixel(j, i)); +Color aColor1(pAccess->GetPixel(i, j + 1)); + +if (aColor1.GetRed() < 255 || aColor2.GetRed() < 255) +{ +bSpaceFound = true; +break; +} +} +} +CPPUNIT_ASSERT(bSpaceFound); + +comphelper::dispatchCommand(".uno:ControlCodes", {}); +} + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testClipText) { // Load a document where the top left tile contains table text with diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 140e29c168cc..a5ae0ea7e287 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -760,8 +760,10 @@ void SwHolePortion::Paint( const SwTextPaintInfo &rInf ) const if( !rInf.GetOut() ) return; +bool bPDFExport = rInf.GetVsh()->GetViewOptions()->IsPDFExport(); + // #i16816# export stuff only needed for tagged pdf support -if (!SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut()) ) +if (bPDFExport && !SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut()) ) return; // #i68503# the hole must have no decoration for a consistent visual appearance @@ -779,7 +781,16 @@ void
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx|4 ++-- sc/source/core/tool/refdata.cxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ea91f8f9b1bccce73a22af8b4c1626ccb834b9d1 Author: Eike Rathke AuthorDate: Mon Jun 6 14:34:34 2022 +0200 Commit: Xisco Fauli CommitDate: Tue Jun 7 19:22:35 2022 +0200 Resolves: tdf#148163 Preserve names of bad cell reference input again A regression of commit e247262327d04ad9933f4af354050f4420c6e303 CommitDate: Tue Jul 30 23:49:55 2013 -0400 More on avoiding direct access to data members. that changed, for example, invalid sheet references -aRef.nTab = MAXTAB+3; +aRef.SetTabDeleted(true); The then following commit 8a19af57bbcc57a02a7d87c6408d1e3212a6deba CommitDate: Tue Jul 30 23:50:03 2013 -0400 Now nobody accesses reference members directly. Make them private. changed ScSingleRefData::Valid() -return nCol >= 0 && nCol <= MAXCOL && -nRow >= 0 && nRow <= MAXROW && -nTab >= 0 && nTab <= MAXTAB; +return ColValid() && RowValid() && TabValid(); without taking the deleted flags into account, where previous to commit e247262327d04ad9933f4af354050f4420c6e303 nTab > MAXTAB fulfilled the condition of not valid. This makes it necessary to adjust the TestFormula::testFuncRangeOp() test case that relied on the broken behaviour. Change-Id: I42e769ca0d56a2eb786bb6f65917f0c15d082763 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135453 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit 104596d005b32bd2bba15554e8c9ae740327aa46) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135379 Reviewed-by: Xisco Fauli diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 551834284f76..dce22b2c25a4 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -7363,8 +7363,8 @@ void TestFormula::testFuncRangeOp() // have to be adapted. aPos.IncRow(); m_pDoc->SetString( aPos, "=SUM(B1:Sheet2.B2:Sheet3.B3)"); -ASSERT_FORMULA_EQUAL(*m_pDoc, aPos, "SUM(#REF!.B2:#REF!.B3)", "Wrong formula."); -CPPUNIT_ASSERT_EQUAL( OUString("#REF!"), m_pDoc->GetString(aPos)); +ASSERT_FORMULA_EQUAL(*m_pDoc, aPos, "SUM(b1:sheet2.b2:Sheet3.B3)", "Wrong formula."); +CPPUNIT_ASSERT_EQUAL( OUString("#NAME?"), m_pDoc->GetString(aPos)); aPos.IncRow(); m_pDoc->SetString( aPos, "=SUM(Sheet1.B1:Sheet3.B2:Sheet2.B3)"); diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 59a224dbcfbd..9cdadc57da10 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -129,7 +129,7 @@ bool ScSingleRefData::IsDeleted() const bool ScSingleRefData::Valid(const ScDocument& rDoc) const { -return ColValid(rDoc) && RowValid(rDoc) && TabValid(); +return !IsDeleted() && ColValid(rDoc) && RowValid(rDoc) && TabValid(); } bool ScSingleRefData::ColValid(const ScDocument& rDoc) const
[Libreoffice-commits] core.git: cui/source sw/qa sw/source writerfilter/source
cui/source/tabpages/paragrph.cxx |2 ++ sw/qa/extras/mailmerge/mailmerge.cxx |2 +- sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 25 + sw/source/filter/ww8/docxexport.cxx |4 writerfilter/source/dmapper/DomainMapper.cxx |3 --- writerfilter/source/dmapper/PropertyIds.cxx |1 + writerfilter/source/dmapper/PropertyIds.hxx |1 + writerfilter/source/dmapper/SettingsTable.cxx |5 + 8 files changed, 39 insertions(+), 4 deletions(-) New commits: commit 5a079652c1b1f968a851f47995b0a65b84d2d192 Author: László Németh AuthorDate: Tue Jun 7 16:39:47 2022 +0200 Commit: László Németh CommitDate: Tue Jun 7 18:08:04 2022 +0200 tdf#149421 DOCX: import/export hyphenation zone Hyphenation is a document-level setting in OOXML (only disabling hyphenation is a paragraph-level setting), import/export hyphenation zone in Standard style, similar to IsHyphenation. Note: Remove HyphenationZone from grab bag to allow its modification in Writer. Fix also grayed out hyphenation zone input box in Text Flow, when enabling hyphenation. Follow-up to commit 7a1d4b7d1db93ca1f541856a8d00d621d50e7bd6 "tdf#149420 sw offapi xmloff: add hyphenation zone". Change-Id: Ic1a3f13ba4e80338227c3206a0ed619589809328 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135474 Tested-by: Jenkins Reviewed-by: László Németh diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 4b9aaff94f85..0a0cb96487d8 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2003,6 +2003,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::Dia m_xMaxHyphenLabel->set_sensitive(false); m_xMaxHyphenEdit->set_sensitive(false); m_xMinWordLength->set_sensitive(false); +m_xHyphenZone->set_sensitive(false); m_xPageNumBox->set_sensitive(false); m_xPagenumEdit->set_sensitive(false); // no column break in HTML @@ -2137,6 +2138,7 @@ void SvxExtParagraphTabPage::HyphenClickHdl() m_xMaxHyphenLabel->set_sensitive(bEnable); m_xMaxHyphenEdit->set_sensitive(bEnable); m_xMinWordLength->set_sensitive(bEnable); +m_xHyphenZone->set_sensitive(bEnable); m_xHyphenBox->set_state(bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); } diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index c5b0a6cb16b8..a9e2c829c93d 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -1336,7 +1336,7 @@ DECLARE_MAILMERGE_TEST(testGrabBag, "grabbagtest.docx", "onecell.xlsx", "Sheet1" mxComponent, uno::UNO_QUERY_THROW); uno::Sequence aInteropGrabBag; pTextDoc->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag; -CPPUNIT_ASSERT_EQUAL(sal_Int32(13), aInteropGrabBag.getLength()); +CPPUNIT_ASSERT_EQUAL(sal_Int32(12), aInteropGrabBag.getLength()); // check table border - comes from table style "Tabellenraster" uno::Reference const xTable(getParagraphOrTable(1, pTextDoc->getText()), uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 8d7068e4faa2..f5b0438a5c80 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -752,6 +752,31 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121661) loadAndSave("tdf121661.docx"); xmlDocUniquePtr pXmlSettings = parseExport("word/settings.xml"); assertXPath(pXmlSettings, "/w:settings/w:hyphenationZone", "val", "851"); + +// tdf#149421 +uno::Reference xStyle(getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY); +// This was false +CPPUNIT_ASSERT_GREATER( static_cast(0), getProperty(xStyle, "ParaHyphenationZone")); +} + +DECLARE_OOXMLEXPORT_TEST(testTdf149421, "tdf121661.docx") +{ +uno::Reference xStyle(getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY); +// This was false +CPPUNIT_ASSERT_GREATER( static_cast(0), getProperty(xStyle, "ParaHyphenationZone")); + +if (!mbExported) +{ +CPPUNIT_ASSERT_EQUAL( static_cast(851), getProperty(xStyle, "ParaHyphenationZone")); +// modify hyphenation zone (note: only hyphenation zone set in Standard paragraph style +// is exported, according to the document-level hyphenation settings of OOXML) +xStyle->setPropertyValue("ParaHyphenationZone", uno::Any(static_cast(2000))); +} +else +{ +// check the export of the modified hyphenation zone +CPPUNIT_ASSERT_EQUAL( static_cast(2000), getProperty(xStyle, "ParaHyphenationZone")); +} } CPPUNIT_TEST_FIXTURE(Test, testTdf121658) diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index b86655365162..a31b51edda25 100644 --- a/sw/source/filter
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a0f39cece651b787a21d3778d0b69625a25dae6b Author: Olivier Hallot AuthorDate: Tue Jun 7 12:52:51 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Jun 7 17:52:51 2022 +0200 Update git submodules * Update helpcontent2 from branch 'master' to aa1b42c379b95fc484853a82325dbd61ceb6e73d - Revisit Insert Image help page Updates on menus and instructions Change-Id: I45bbc4709baf550d0caad5700754e7f168c64ba3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135423 Tested-by: Jenkins Reviewed-by: Olivier Hallot Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index ba3b8d5bc641..aa1b42c379b9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba3b8d5bc6416cec3ab2d86ba8452c292681086e +Subproject commit aa1b42c379b95fc484853a82325dbd61ceb6e73d
[Libreoffice-commits] help.git: source/text
source/text/sdraw/main_insert.xhp |3 - source/text/shared/01/0414.xhp | 17 +++-- source/text/shared/guide/insert_bitmap.xhp | 57 +--- source/text/swriter/guide/insert_graphic_dialog.xhp | 49 +++-- 4 files changed, 59 insertions(+), 67 deletions(-) New commits: commit aa1b42c379b95fc484853a82325dbd61ceb6e73d Author: Olivier Hallot AuthorDate: Sat Jun 4 08:12:43 2022 -0300 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jun 7 17:52:49 2022 +0200 Revisit Insert Image help page Updates on menus and instructions Change-Id: I45bbc4709baf550d0caad5700754e7f168c64ba3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135423 Tested-by: Jenkins Reviewed-by: Olivier Hallot Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sdraw/main_insert.xhp b/source/text/sdraw/main_insert.xhp index 3d6440e79..bcee2b629 100644 --- a/source/text/sdraw/main_insert.xhp +++ b/source/text/sdraw/main_insert.xhp @@ -32,8 +32,7 @@ This menu allows you to insert elements, such as graphics and guides, into Draw documents. - Image - Insert an image + Table diff --git a/source/text/shared/01/0414.xhp b/source/text/shared/01/0414.xhp index 021fb21c6..27f19fea9 100644 --- a/source/text/shared/01/0414.xhp +++ b/source/text/shared/01/0414.xhp @@ -29,19 +29,24 @@ -Inserting Images -Inserts an image into the current document with optimal page wrapping and centered on the line -at the current cell position -centered on the page or slide. +Image +Opens a file selection dialog to insert an image into the current document. - -Frame Style + + +Style Select the frame style for the graphic. + + + Anchor + Select the anchor type for the image at the current cell position. + + diff --git a/source/text/shared/guide/insert_bitmap.xhp b/source/text/shared/guide/insert_bitmap.xhp index e6530fcf0..d40579549 100644 --- a/source/text/shared/guide/insert_bitmap.xhp +++ b/source/text/shared/guide/insert_bitmap.xhp @@ -1,6 +1,6 @@ - + - - + + Inserting, Editing, Saving Bitmaps @@ -50,18 +50,23 @@ pictures;filters filters;pictures mw made "illustrations,..." a see-reference -Inserting, Editing, Saving Bitmaps - -Inserting Bitmaps +Inserting, Editing, Saving Bitmaps Images + +Inserting Bitmaps A bitmap image can be inserted in $[officename] Writer, $[officename] Calc, $[officename] Draw and $[officename] Impress documents. + + -Choose Insert - Image - From File. +Choose Insert - Image. Select the file. In the File type box you can restrict the selection to certain file types. +Select the frame style for the image.Select the anchor type for the image at the current cell position.Check below. + + Click the Link box if you want a link to the original file. If the Link box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed. If the Link box is not marked, you are always working with the copy created when the graphic was first inserted. @@ -71,15 +76,16 @@ Click Open to insert the image. -Editing Bitmaps -Icons on the Image bar + +Editing Bitmaps +Icons on the Image bar When you select the bitmap image, the Image Bar offers you the tools for editing the image. Only a local copy is edited in the document, even if you have inserted an image as a link. -The Image Bar may look slightly different depending to the module you are using. +The Image Bar may look slightly different depending to the module you are using. A number of filters are located on the Image Filter toolbar, which you can open with the icon on the Image Bar. The original image file will not be changed by the filters. Filters are applied to an image only inside the document. Some of the filters open a dialog, which you can use to select, for example, the intensity of the filter. Most filters can be applied multiple times to increase the filter effect. -In $[officename] Draw and $[officename] Impress, you can add text and graphics, select these objects together with the bitmap, and export the selection as a new bitmap image. -The Image dialog +In $[officename] Draw and $[officename] Impress, you can add text and graphics, select these objects together with the bitmap, and export the selection as a new bitmap image. +The Image dialog Right-click the image and choose Image from the submenu to open a properties dialog. @@ -88,7 +94,7 @@ Change the properties of the selected image, then click OK. -Saving Bitmaps +Saving Bitmaps If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image. To export a bitmap in Draw or Impress: @@ -
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |2 ++ i18nlangtag/source/isolang/isolang.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit b545b6b2bf7e56047211ea4ec974054a522cc2e9 Author: Eike Rathke AuthorDate: Tue Jun 7 15:36:03 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jun 7 17:51:25 2022 +0200 Related: tdf#147390 Accept oc-FR-lengadoc and oc-ES-aranes for oc-FR and oc-ES ... as aliases for forward compatibility with the change in LO 7.4 Change-Id: I13848f982a0c76abd8e2186d81bbfc9770c89a7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135473 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 84e363d01eb4..7b875c5832d5 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -749,6 +749,8 @@ bool checkMapping( std::u16string_view rStr1, std::u16string_view rStr2 ) if (rStr1 == u"cmn-CN" ) return rStr2 == u"zh-CN"; if (rStr1 == u"cmn-TW" ) return rStr2 == u"zh-TW"; if (rStr1 == u"kw-UK" ) return rStr2 == u"kw-GB"; +if (rStr1 == u"oc-FR-lengadoc" ) return rStr2 == u"oc-FR"; +if (rStr1 == u"oc-ES-aranes" ) return rStr2 == u"oc-ES"; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 5d0a23c1f6d7..2a7a46763886 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -778,6 +778,8 @@ Bcp47CountryEntry const aImplBcp47CountryEntries[] = { LANGUAGE_USER_ENGLISH_UK_OED, "en-GB-oed", "GB", "", LANGUAGE_USER_ENGLISH_UK_OXENDICT }, // grandfathered, deprecated, prefer en-GB-oxendict { LANGUAGE_SPANISH_DATED, "es-ES-u-co-trad", "ES", "es-u-co-trad", k0 }, // RFC6067/CLDR { LANGUAGE_SPANISH_DATED, "es-ES_tradnl", "ES", "", kSAME }, // MS malformed +{ LANGUAGE_OCCITAN_FRANCE, "oc-FR-lengadoc", "FR", "oc-lengadoc", kSAME }, // forward compatibility +{ LANGUAGE_USER_OCCITAN_ARANESE, "oc-ES-aranes", "ES", "oc-aranes", kSAME }, // forward compatibility // { LANGUAGE_YUE_CHINESE_HONGKONG, "zh-yue-HK", "HK", "", 0 }, // MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can handle it to not call liblangtag for rsc! { LANGUAGE_YIDDISH, "yi-001", "", "", k0 }, // MS since rev.15, was "yi-Hebr" reserved, "001"="World" { LANGUAGE_FRENCH_WEST_INDIES, "fr-029", "", "", k0 }, // MS since rev.15, was "Neither defined nor reserved", "029"="Caribbean"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/inc
sw/inc/ndindex.hxx |9 + 1 file changed, 9 insertions(+) New commits: commit 21e0122310dedf3b33144cc77f880ec51446186b Author: Michael Stahl AuthorDate: Sun May 22 13:50:11 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Jun 7 17:35:30 2022 +0200 sw: SwNodeIndex GCC12 spurious -Werror=dangling-pointer= It doesn't understand that ~SwNodeIndex() will remove the pointer, which is obfuscated by over-boostified code. In member function ‘void SwNodeIndex::RegisterIndex(SwNodes&)’, inlined from ‘SwNodeIndex::SwNodeIndex(SwNodes&, SwNodeOffset)’ at sw/inc/ndindex.hxx:54:22, inlined from ‘bool SwNodes::InsBoxen(SwTableNode*, SwTableLine*, SwTableBoxFormat*, SwTextFormatColl*, const SfxItemSet*, sal_uInt16, sal_uInt16)’ at sw/source/core/docnode/ndtbl.cxx:301:41: sw/inc/ndindex.hxx:37:31: error: storing the address of local variable ‘aEndIdx’ in ‘*this.SwNodes::m_vIndices’ [-Werror=dangling-pointer=] 37 | rNodes.m_vIndices = this; | ~~^~ sw/source/core/docnode/ndtbl.cxx: In member function ‘bool SwNodes::InsBoxen(SwTableNode*, SwTableLine*, SwTableBoxFormat*, SwTextFormatColl*, const SfxItemSet*, sal_uInt16, sal_uInt16)’: sw/source/core/docnode/ndtbl.cxx:301:17: note: ‘aEndIdx’ declared here 301 | SwNodeIndex aEndIdx( *this, nIdxPos ); | ^~~ sw/source/core/docnode/ndtbl.cxx:301:17: note: ‘’ declared here Change-Id: I3f24cd8e3e0b1fd0a0943150d3d83d09f2c984fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134741 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 486991b8ec2b63324c8cf5a26e9091942c24b3d9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134774 Reviewed-by: Thorsten Behrens diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 7d03b0bcadaf..64201ac3e1b3 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -36,7 +36,16 @@ class SW_DLLPUBLIC SwNodeIndex final : public sw::Ring void RegisterIndex( SwNodes& rNodes ) { if(!rNodes.m_vIndices) +{ +#if defined(__GNUC__) && __GNUC__ == 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif rNodes.m_vIndices = this; +#if defined(__GNUC__) && __GNUC__ == 12 +#pragma GCC diagnostic pop +#endif +} MoveTo(rNodes.m_vIndices); } void DeRegisterIndex( SwNodes& rNodes )
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - svx/source
svx/source/form/formcontrolling.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 13bbabd0a7d52b8a823f9fce704c32818b44ceb3 Author: Michael Stahl AuthorDate: Sun May 22 13:25:50 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Jun 7 17:34:57 2022 +0200 svx: work around GCC12 spurious -Werror=stringop-overflow /usr/include/c++/12/bits/stl_algobase.h:431:30: error: ‘void* __builtin_memcpy(void*, const void*, long unsigned int)’ writing 1 or more bytes into a region of size 0 overflows the destination [-Werror=stringop-overflow=] Change-Id: Ib581b5788ff5d363b688000e700a42074c3b78eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134740 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit d37486537e7d404b19acdfaec358cb0ad706940c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134633 Reviewed-by: Thorsten Behrens diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 456e5a88ffbf..221ae3584f21 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -425,6 +425,7 @@ namespace svx SID_FM_VIEW_AS_GRID }; sal_Int32 nFeatureCount = SAL_N_ELEMENTS( pSupportedFeatures ); +aSupportedFeatures.reserve(nFeatureCount); // work around GCC12 spurious -Werror=stringop-overflow= aSupportedFeatures.insert( aSupportedFeatures.begin(), pSupportedFeatures, pSupportedFeatures + nFeatureCount ); m_pInvalidationCallback->invalidateFeatures( aSupportedFeatures );
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/source
vcl/source/helper/strhelper.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 0a49da180c1e071360bb1b5bf664cb6264173885 Author: Michael Stahl AuthorDate: Sun May 22 12:51:35 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Jun 7 17:34:09 2022 +0200 vcl: WhitespaceToSpace() spurious -Werror=maybe-uninitialized vcl/source/helper/strhelper.cxx:366:9: error: ‘pBuffer[-1]’ may be used uninitialized [-Werror=maybe-uninitialized] Change-Id: I37250b0790bd9c33eb01c552c8267251bc0026f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134738 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit cd4976646dc2e5b28c3328a7fa96361e147b23b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134631 Reviewed-by: Thorsten Behrens diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 782c9ce123e1..81648d9a7a43 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -360,9 +360,15 @@ OString WhitespaceToSpace(const OString& rLine) // there might be a space at beginning or end pLeap--; +#if defined(__GNUC__) && __GNUC__ == 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif if( *pLeap == ' ' ) *pLeap = 0; - +#if defined(__GNUC__) && __GNUC__ == 12 +#pragma GCC diagnostic pop +#endif return *pBuffer == ' ' ? pBuffer+1 : pBuffer; }
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/fldfuncpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1e57cb128eb085ede312ebb189c982b8bda49377 Author: Stephan Bergmann AuthorDate: Tue Jun 7 14:38:24 2022 +0200 Commit: Stephan Bergmann CommitDate: Tue Jun 7 15:49:23 2022 +0200 Duplicate object ID > instdir/share/config/soffice.cfg/modules/swriter/ui/fldfuncpage.ui:723:1 Duplicate object ID 'liststore4' (previously on line 30) since 7e2a8abf0cd8c60cdfae100eece4839b4959c70e "liststore used twice by different widgets" Change-Id: I9e1b90ae352ba5c1fd5e634401096c70cdafb2bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135472 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui index 16b0be96e98b..042727bc4542 100644 --- a/sw/uiconfig/swriter/ui/fldfuncpage.ui +++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui @@ -26,7 +26,7 @@ - + @@ -545,7 +545,7 @@ True True True -liststore4 +liststore5 False False 0
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aa79ca510027f4e07311b8aaa045bef56da8d2cb Author: Martin Srebotnjak AuthorDate: Tue Jun 7 15:12:05 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 7 15:12:05 2022 +0200 Update git submodules * Update translations from branch 'master' to 1cb47d77ece911852b9fc5ff728b92ac779e39bf - Updated Slovenian translation Change-Id: Ie86b805a08a629c9acb045cd083b6e0f326c47c1 diff --git a/translations b/translations index 40da1e34cabf..1cb47d77ece9 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 40da1e34cabf93b04d900b7b6ab501fb3160efef +Subproject commit 1cb47d77ece911852b9fc5ff728b92ac779e39bf
[Libreoffice-commits] translations.git: source/sl
source/sl/basctl/messages.po| 4 source/sl/chart2/messages.po| 4 source/sl/cui/messages.po | 147 ++-- source/sl/dbaccess/messages.po | 4 source/sl/dictionaries/ckb.po | 4 source/sl/editeng/messages.po | 167 ++-- source/sl/extensions/messages.po| 4 source/sl/forms/messages.po | 4 source/sl/fpicker/messages.po | 4 source/sl/helpcontent2/source/text/sbasic/shared.po | 4 source/sl/helpcontent2/source/text/sbasic/shared/03.po | 4 source/sl/helpcontent2/source/text/scalc/01.po | 364 +- source/sl/helpcontent2/source/text/scalc/guide.po | 4 source/sl/helpcontent2/source/text/shared.po| 4 source/sl/helpcontent2/source/text/shared/00.po | 8 source/sl/helpcontent2/source/text/shared/01.po | 16 source/sl/helpcontent2/source/text/shared/02.po | 4 source/sl/helpcontent2/source/text/shared/guide.po | 212 + source/sl/helpcontent2/source/text/shared/optionen.po | 4 source/sl/helpcontent2/source/text/simpress/guide.po| 180 source/sl/helpcontent2/source/text/smath/guide.po | 4 source/sl/helpcontent2/source/text/swriter/00.po| 12 source/sl/helpcontent2/source/text/swriter/01.po| 4 source/sl/helpcontent2/source/text/swriter/guide.po | 12 source/sl/instsetoo_native/inc_openoffice/windows/msi_languages.po | 4 source/sl/librelogo/source/pythonpath.po| 4 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 58 + source/sl/reportdesign/messages.po | 4 source/sl/sc/messages.po| 171 ++-- source/sl/scp2/source/ooo.po| 4 source/sl/sd/messages.po| 8 source/sl/sfx2/messages.po | 42 - source/sl/starmath/messages.po | 6 source/sl/svtools/messages.po | 168 ++-- source/sl/svx/messages.po | 31 source/sl/sw/messages.po| 357 + source/sl/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po | 4 source/sl/uui/messages.po | 4 38 files changed, 1283 insertions(+), 760 deletions(-) New commits: commit 1cb47d77ece911852b9fc5ff728b92ac779e39bf Author: Martin Srebotnjak AuthorDate: Tue Jun 7 15:11:51 2022 +0200 Commit: Andras Timar CommitDate: Tue Jun 7 15:11:51 2022 +0200 Updated Slovenian translation Change-Id: Ie86b805a08a629c9acb045cd083b6e0f326c47c1 diff --git a/source/sl/basctl/messages.po b/source/sl/basctl/messages.po index ada75cd40f8..af77d9a2153 100644 --- a/source/sl/basctl/messages.po +++ b/source/sl/basctl/messages.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 7.4\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2022-03-09 21:26+0100\n" +"POT-Creation-Date: 2022-06-07 09:29+0200\n" "PO-Revision-Date: 2022-06-06 19:19+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/chart2/messages.po b/source/sl/chart2/messages.po index 76dbcca2a05..b0df0f5dc89 100644 --- a/source/sl/chart2/messages.po +++ b/source/sl/chart2/messages.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 7.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2022-02-10
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/view/viewimp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50c496c8460bb91cfd38d7a312ffd092713614cb Author: Luboš Luňák AuthorDate: Tue Jun 7 12:21:28 2022 +0200 Commit: Miklos Vajna CommitDate: Tue Jun 7 14:37:45 2022 +0200 fix SwViewShellImp::AddPaintRect() rectangle compression (tdf#148255) Both the checks test whether a follow-up rectangle can be merged with the previous one by merging it at the bottom or the right of it, so the previous one should be always the top-left and the follow-up one should be the bottom-right. Change-Id: Ie5809595ec9bf28bd169fc503a6b391c6188d0b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135468 Tested-by: Jenkins Reviewed-by: Luboš Luňák (cherry picked from commit 0372da98bf9b2af82afc2e4ff919068bdcaae7db) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135382 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index f1b2c2531897..854a9aaa03de 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -144,7 +144,7 @@ bool SwViewShellImp::AddPaintRect( const SwRect &rRect ) if(last2.Top() == last.Top() && last2.Height() == last.Height() && last2.Right() + 1 >= last.Left() && last2.Right() <= last2.Right()) { -last2 = SwRect( last.TopLeft(), rRect.BottomRight()); +last2 = SwRect( last2.TopLeft(), last.BottomRight()); m_pPaintRegion->pop_back(); return true; }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/frmedt/feshview.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af666ed27485ea52b2d7ccd68c91e55b15fa419c Author: Miklos Vajna AuthorDate: Tue Jun 7 12:54:12 2022 +0200 Commit: Miklos Vajna CommitDate: Tue Jun 7 14:35:54 2022 +0200 sw: fix crash in SwFEShell::SelectObj() Fatal signal received: SIGSEGV code: 1 for address: 0x0 SwLayoutFrame::Lower() const sw/source/core/inc/layfrm.hxx:101 SwFEShell::SelectObj(Point const&, unsigned char, SdrObject*) sw/source/core/frmedt/feshview.cxx:317 SwEditWin::MouseButtonDown(MouseEvent const&) sw/source/uibase/docvw/edtwin.cxx:? Change-Id: I6c4076eef21dd80381b37ed89aa2dc8bc20fbc98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135469 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index e0212c28d57c..eab41d781c7a 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -314,7 +314,7 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj ) { const SwFlyFrame *pTmp = GetFlyFromMarked( &rMrkList, this ); OSL_ENSURE( pTmp, "Graphic without Fly" ); -if ( static_cast(pTmp->Lower())->HasAnimation() ) +if ( pTmp && static_cast(pTmp->Lower())->HasAnimation() ) static_cast(pTmp->Lower())->StopAnimation( GetOut() ); } }
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewimp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0372da98bf9b2af82afc2e4ff919068bdcaae7db Author: Luboš Luňák AuthorDate: Tue Jun 7 12:21:28 2022 +0200 Commit: Luboš Luňák CommitDate: Tue Jun 7 13:56:17 2022 +0200 fix SwViewShellImp::AddPaintRect() rectangle compression (tdf#148255) Both the checks test whether a follow-up rectangle can be merged with the previous one by merging it at the bottom or the right of it, so the previous one should be always the top-left and the follow-up one should be the bottom-right. Change-Id: Ie5809595ec9bf28bd169fc503a6b391c6188d0b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135468 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index d9f2c63267ad..3b216a09b443 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -147,7 +147,7 @@ bool SwViewShellImp::AddPaintRect( const SwRect &rRect ) if(last2.Top() == last.Top() && last2.Height() == last.Height() && last2.Right() + 1 >= last.Left() && last2.Right() <= last2.Right()) { -last2 = SwRect( last.TopLeft(), rRect.BottomRight()); +last2 = SwRect( last2.TopLeft(), last.BottomRight()); m_pPaintRegion->pop_back(); return true; }
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc026248fe44321b44240fb5d9f4e6d3335380c8 Author: Eike Rathke AuthorDate: Tue Jun 7 13:53:04 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 7 13:53:04 2022 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ba3b8d5bc6416cec3ab2d86ba8452c292681086e - Include metacharacters fragment in ICU regexp URI So it leads to Regular Expression Metacharacters instead of just the page that starts with all sort of developer information not relevant to users. Change-Id: Id1efca75302d023a83b45a4bc81654ffe8c2980f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135471 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 7b9677237835..ba3b8d5bc641 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7b96772378358eba9af18e8bf3dd99c5d8042eba +Subproject commit ba3b8d5bc6416cec3ab2d86ba8452c292681086e
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_regex.xhp |2 +- source/text/shared/01/0211.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ba3b8d5bc6416cec3ab2d86ba8452c292681086e Author: Eike Rathke AuthorDate: Tue Jun 7 13:46:52 2022 +0200 Commit: Eike Rathke CommitDate: Tue Jun 7 13:53:03 2022 +0200 Include metacharacters fragment in ICU regexp URI So it leads to Regular Expression Metacharacters instead of just the page that starts with all sort of developer information not relevant to users. Change-Id: Id1efca75302d023a83b45a4bc81654ffe8c2980f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135471 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/source/text/scalc/01/func_regex.xhp b/source/text/scalc/01/func_regex.xhp index 3b29f7492..82119a3df 100644 --- a/source/text/scalc/01/func_regex.xhp +++ b/source/text/scalc/01/func_regex.xhp @@ -29,7 +29,7 @@ REGEX( Text ; Expression [ ; [ Replacement ] [ ; Flags|Occurrence ] ] ) Text: A text or reference to a cell where the regular expression is to be applied. -Expression: A text representing the regular expression, using https://unicode-org.github.io/icu/userguide/strings/regexp.html"; name="ICU REGEXP">ICU regular expressions. If there is no match and Replacement is not given, #N/A is returned. +Expression: A text representing the regular expression, using https://unicode-org.github.io/icu/userguide/strings/regexp.html#regular-expression-metacharacters"; name="ICU REGEXP">ICU regular expressions. If there is no match and Replacement is not given, #N/A is returned. Replacement: Optional. The replacement text and references to capture groups. If there is no match, Text is returned unmodified. Flags: Optional. "g" replaces all matches of Expression in Text, not extracted. If there is no match, Text is returned unmodified. Occurrence: Optional. Number to indicate which match of Expression in Text is to be extracted or replaced. If there is no match and Replacement is not given, #N/A is returned. If there is no match and Replacement is given, Text is returned unmodified. If Occurrence is 0, Text is returned unmodified. diff --git a/source/text/shared/01/0211.xhp b/source/text/shared/01/0211.xhp index 273f41b19..b7caadd4a 100644 --- a/source/text/shared/01/0211.xhp +++ b/source/text/shared/01/0211.xhp @@ -315,7 +315,7 @@ -For a full list of supported metacharacters and syntax, see https://unicode-org.github.io/icu/userguide/strings/regexp.html"; name="ICU Regular Expressions documentation">ICU Regular Expressions documentation +For a full list of supported metacharacters and syntax, see https://unicode-org.github.io/icu/userguide/strings/regexp.html#regular-expression-metacharacters"; name="ICU Regular Expressions documentation">ICU Regular Expressions documentation Regular expression terms can be combined to form complex and sophisticated regular expressions for searches as show in the following examples. Examples
[Libreoffice-commits] core.git: officecfg/registry osx/soffice.xcodeproj sc/inc sc/Library_scui.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 osx/soffice.xcodeproj/project.pbxproj |1 sc/Library_scui.mk|1 sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |2 sc/inc/pch/precompiled_scui.hxx |1 sc/inc/scabstdlg.hxx | 13 sc/inc/strings.hrc|3 sc/sdi/scalc.sdi |4 sc/source/ui/attrdlg/scdlgfact.cxx| 32 + sc/source/ui/attrdlg/scdlgfact.hxx| 18 sc/source/ui/inc/gototabdlg.hxx | 43 ++ sc/source/ui/miscdlgs/gototabdlg.cxx | 81 sc/source/ui/view/tabvwsh3.cxx| 48 ++ sc/uiconfig/scalc/menubar/menubar.xml |1 sc/uiconfig/scalc/ui/gotosheetdialog.ui | 201 ++ 16 files changed, 451 insertions(+), 7 deletions(-) New commits: commit d93e9430bfbf6fa8a679ea2d4d98f955774026f6 Author: Laurent BP AuthorDate: Mon May 16 22:47:25 2022 +0200 Commit: Laurent Balland-Poirier CommitDate: Tue Jun 7 13:43:20 2022 +0200 tdf#129674 Add GoTo Sheet command Insert command in menu Sheet > Navigate (alongs with To Previous/Next Sheet) Use .uno:JumpToTable command from Navigator Use its own Go To Sheet dialog Add a Search entry to type partial name of sheet Menu translation missing? Change-Id: I16b8b56a688c8396159617f04a2a7e034721ce31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134714 Tested-by: Jenkins Reviewed-by: Laurent Balland-Poirier diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 5c608969da64..d953e76d552f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -557,6 +557,14 @@ 1 + + + ~Go to Sheet... + + + 1 + + Ch~art... diff --git a/osx/soffice.xcodeproj/project.pbxproj b/osx/soffice.xcodeproj/project.pbxproj index ec10b807a1ec..7c201c130e24 100644 --- a/osx/soffice.xcodeproj/project.pbxproj +++ b/osx/soffice.xcodeproj/project.pbxproj @@ -124,6 +124,7 @@ BE017BF925AF568900244ED8 /* mtrindlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mtrindlg.cxx; path = ../sc/source/ui/miscdlgs/mtrindlg.cxx; sourceTree = ""; }; BE017BFA25AF568900244ED8 /* linkarea.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = linkarea.cxx; path = ../sc/source/ui/miscdlgs/linkarea.cxx; sourceTree = ""; }; BE017BFB25AF568900244ED8 /* shtabdlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shtabdlg.cxx; path = ../sc/source/ui/miscdlgs/shtabdlg.cxx; sourceTree = ""; }; + BE017BFB25AF568900244ED8 /* gototabdlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gototabdlg.cxx; path = ../sc/source/ui/miscdlgs/gototabdlg.cxx; sourceTree = ""; }; BE017BFC25AF568900244ED8 /* inscodlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = inscodlg.cxx; path = ../sc/source/ui/miscdlgs/inscodlg.cxx; sourceTree = ""; }; BE017BFD25AF568A00244ED8 /* crdlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = crdlg.cxx; path = ../sc/source/ui/miscdlgs/crdlg.cxx; sourceTree = ""; }; BE017BFE25AF568A00244ED8 /* datafdlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datafdlg.cxx; path = ../sc/source/ui/miscdlgs/datafdlg.cxx; sourceTree = ""; }; diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 4d4cffa12bd4..02c2bc8244d1 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -95,6 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/miscdlgs/delcldlg \ sc/source/ui/miscdlgs/delcodlg \ sc/source/ui/miscdlgs/filldlg \ +sc/source/ui/miscdlgs/gototabdlg \ sc/source/ui/miscdlgs/groupdlg \ sc/source/ui/miscdlgs/inscldlg \ sc/source/ui/miscdlgs/inscodlg \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index cf5f7e0951bf..13a4b98a6c7c 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -139,6 +139,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/floatinglinestyle \
[Libreoffice-commits] core.git: sw/source
sw/source/core/table/swtable.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 19a6adddec0f5a6ee771939a17f85bdde4a44ce3 Author: Xisco Fauli AuthorDate: Mon Jun 6 10:43:15 2022 +0200 Commit: Xisco Fauli CommitDate: Tue Jun 7 13:41:33 2022 +0200 sw: Divide-by-zero follow-up of aeeb0141aca4f1698b09bc8f06ded41247b54279 "sw: avoid another EXCEPTION_INT_DIVIDE_BY_ZERO" Change-Id: I0b5cc10c4f7976a611f222f3d4c8764c5d04dba0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135443 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 89b6e50e4c1e..c2ff14822a8e 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -249,7 +249,8 @@ namespace template T lcl_MulDiv64(sal_uInt64 nA, sal_uInt64 nM, sal_uInt64 nD) { -return static_cast((nA*nM)/nD); +assert(nD != 0); +return nD == 0 ? static_cast(nA*nM) : static_cast((nA*nM)/nD); } } @@ -299,8 +300,7 @@ static void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const tools::Long nOld, SwFrameFormat *pFormat = rBox.GetFrameFormat(); sal_uInt64 nBox = pFormat->GetFrameSize().GetWidth(); nOriginalSum += nBox; -nBox *= nNew; -nBox = nOld == 0 ? nBox : nBox / nOld; +nBox = lcl_MulDiv64(nBox, nNew, nOld); const sal_uInt64 nWishedSum = lcl_MulDiv64(nOriginalSum, nNew, nOld) - nSum; if( nWishedSum > 0 ) {
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py | 26 +++-- wizards/com/sun/star/wizards/common/NoValidPathException.py| 26 +++-- wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 27 +++--- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 25 +++-- wizards/com/sun/star/wizards/ui/WizardDialog.py| 27 +++--- 5 files changed, 105 insertions(+), 26 deletions(-) New commits: commit e55e3e1362910a9ea38b8283f5bb2b886e803cf3 Author: Noel Grandin AuthorDate: Mon Jun 6 12:21:16 2022 +0200 Commit: Noel Grandin CommitDate: Tue Jun 7 13:37:02 2022 +0200 use more complex scheme on newer Python (>=3.7) to avoid DeprecationWarning similiar to commit 069f0eb13f7d26ce4b854160bbb9592c25609b38 Change-Id: I08577ced705df620d99781da53b6085398f52821 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135450 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py index 15631123fbcb..9d42e6317f95 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py @@ -26,15 +26,31 @@ class AgendaWizardDialogResources(object): def __init__(self): import sys, os -# imp is deprecated since Python v.3.4 -if sys.version_info >= (3,3): +if sys.version_info < (3,4): +import imp +imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')) +import strings +elif sys.version_info < (3,7): +# imp is deprecated since Python v.3.4 from importlib.machinery import SourceFileLoader SourceFileLoader('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')).load_module() +import strings else: -import imp -imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')) +# have to jump through hoops since 3.7, partly because python does not like loading modules that do have a .py extension +import importlib +import importlib.util +import importlib.machinery +module_name = 'strings' +path = os.path.join(os.path.dirname(__file__), '../common/strings.hrc') +spec = importlib.util.spec_from_loader( +module_name, +importlib.machinery.SourceFileLoader(module_name, path) +) +module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(module) +sys.modules[module_name] = module +strings = module -import strings self.resAgendaWizardDialog_title = strings.RID_AGENDAWIZARDDIALOG_START_1 self.resoptMakeChanges_value = strings.RID_AGENDAWIZARDDIALOG_START_2 diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.py b/wizards/com/sun/star/wizards/common/NoValidPathException.py index 54fb58613c09..565f67fefcee 100644 --- a/wizards/com/sun/star/wizards/common/NoValidPathException.py +++ b/wizards/com/sun/star/wizards/common/NoValidPathException.py @@ -24,14 +24,30 @@ class NoValidPathException(Exception): if xMSF: import sys, os -# imp is deprecated since Python v.3.4 -if sys.version_info >= (3,3): +if sys.version_info < (3,4): +import imp +imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')) +import strings +elif sys.version_info < (3,7): +# imp is deprecated since Python v.3.4 from importlib.machinery import SourceFileLoader SourceFileLoader('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')).load_module() +import strings else: -import imp -imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc')) +# have to jump through hoops since 3.7, partly because python does not like loading modules that do have a .py extension +import importlib +import importlib.util +import importlib.machinery +module_name = 'strings' +path = os.path.join(os.path.dirname(__file__), '../common/strings.hrc') +spec = importlib.util.spec_from_loader( +module_name, +importlib.machinery.SourceFileLoader(module_name, path) +) +module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(module) +
Re: [libreoffice-accessibility] Re: ESC meeting minutes: 2022-05-26 [IAccessible2 support in JAWS]
Hi Christophe, On 07/06/2022 12.14, Christophe Strobbe wrote: After some online searching, it seems that JAWS at least used to support IAccessible2, originally mainly for IBM Lotus Symphony. According to a tweet by Marco Zehe from December last year, JAWS handles Chromium and Edge via IAccessible2. (See https://twitter.com/MarcoInEnglish/status/1471523578805997570 ) That sounds promising, JAWS was what I vaguely had in mind about having been mentioned of presumably not supporting IAccessible2 (well) in the past. Twitter is not an ideal source, but I couldn't find any documentation related to IAccessible2 on Freedom Scientific's website. They do have documentation on to use script access to UIAutomation: https://support.freedomscientific.com/support/jawsdocumentation/UIAScriptAPI but nothing similar for IAccessible2. This calls for some LibreOffice testing with JAWS; I hope to do some of that next weekend. Thanks a lot, that's much appreciated! Best regards, Michael
[Libreoffice-commits] core.git: wizards/source
wizards/source/sfunittests/SF_UnitTest.xba | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) New commits: commit b4735aac82c6db0afd5692f485364510ac2d9a5d Author: Jean-Pierre Ledure AuthorDate: Tue Jun 7 11:48:48 2022 +0200 Commit: Jean-Pierre Ledure CommitDate: Tue Jun 7 13:11:26 2022 +0200 ScriptForge - (SF_UnitTest) fix typos + layout reviews Typos in comment lines Minor improvements of test report layout Change-Id: Ic19e55a84475b098959055ac1c573de629e21731 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135466 Tested-by: Jean-Pierre Ledure Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/sfunittests/SF_UnitTest.xba b/wizards/source/sfunittests/SF_UnitTest.xba index 5237bb7ce88b..5007fb6a7255 100644 --- a/wizards/source/sfunittests/SF_UnitTest.xba +++ b/wizards/source/sfunittests/SF_UnitTest.xba @@ -271,7 +271,7 @@ End Property' SFUnitTests.SF_UnitTest.ReturnCode (get) REM - Property Get Verbose() As Variant -''' The Verbose property indicates if all assertions are reported +''' The Verbose property indicates if all assertions (True AND False) are reported Verbose = _PropertyGet("Verbose") End Property ' SFUnitTests.SF_UnitTest.Verbose (get) @@ -975,8 +975,6 @@ End Function' SFUnitTests.SF_UnitTest.AssertTrue REM - Public Sub Fail(Optional ByVal Message As Variant) ''' Forces a test failure -''' Args: - Dim bAssert As Boolean ' Fictive return value Const cstThisSub = "UnitTest.Fail" @@ -996,7 +994,7 @@ End Sub ' SFUnitTests.SF_UnitTest.Fail REM - Public Sub Log(Optional ByVal Message As Variant) -''' Forces to record the given message in the test report (console) +''' Records the given message in the test report (console) Dim bAssert As Boolean ' Fictive return value Dim bVerbose As Boolean: bVerbose = _Verbose @@ -1170,7 +1168,7 @@ Public Function RunTest(Optional ByVal TestSuite As Variant _ ''' The default pattern is "Test_*" ''' Message: the message to be displayed in the console when the test starts. ''' Returns: -''' The return code of the execution (RCxxx constants) +''' One of the return codes of the execution (RCxxx constants) ''' Examples: ''' GlobalScope.BasicLibraries.loadLibrary("ScriptForge") ''' Dim test: test = CreateScriptService("UnitTest", ThisComponent, "Tests") @@ -1326,7 +1324,7 @@ Public Function SkipTest(Optional ByVal Message As Variant) As Boolean ''' Args: ''' Message: the message to be displayed in the console ''' Returns: -''' The return code of the execution (RCxxx constants) +''' True when successful ''' Examples: ''' GlobalScope.BasicLibraries.loadLibrary("ScriptForge") ''' Dim test: test = CreateScriptService("UnitTest", ThisComponent, "Tests") @@ -1357,7 +1355,7 @@ Try: _ReturnCode = RCSKIPTEST bSkip = True ' Exit message - sSkipMessage = _Duration("Test", True) & "SKIPTEST TESTSUITE='" & _Module & "'" + sSkipMessage = "SKIPTEST testsuite='" & LibraryName & "." & _Module & "' " & _Duration("Suite", True) _ReportMessage(sSkipMessage, Message) End If @@ -1630,7 +1628,7 @@ Try: End Select If Not IsNull(oTimer) Then sDuration = CStr(oTimer.Duration) & " " - If pvBrackets Then sDuration = "(" & Trim(sDuration) & " sec) " + If pvBrackets Then sDuration = "(" & Trim(sDuration) & " sec)" Else sDuration = "" End If @@ -1817,4 +1815,4 @@ Const cstMaxLength = 50 ' Maximum length for items End Function ' SFUnitTests.SF_UnitTest._Repr REM == END OF SFUNITTESTS.SF_UNITTEST - + \ No newline at end of file
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - starmath/uiconfig vcl/unx
starmath/uiconfig/smath/ui/dockingelements.ui |1 + vcl/unx/gtk3/gtkinst.cxx | 11 +++ 2 files changed, 8 insertions(+), 4 deletions(-) New commits: commit b73e350c797535337b20165a0325434ddc0395c3 Author: Mike Kaganski AuthorDate: Tue Jun 7 11:52:07 2022 +0300 Commit: Mike Kaganski CommitDate: Tue Jun 7 12:36:46 2022 +0200 Fix ImageView without text on GTK Change-Id: I2c1884722de2d40e96282d1efbba4be0ad078bd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135465 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 6ccff201088590274247fb9f63b7fa997cfee327) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135380 Tested-by: Jenkins CollaboraOffice diff --git a/starmath/uiconfig/smath/ui/dockingelements.ui b/starmath/uiconfig/smath/ui/dockingelements.ui index a7dfec85ebaf..a9f1086204f8 100644 --- a/starmath/uiconfig/smath/ui/dockingelements.ui +++ b/starmath/uiconfig/smath/ui/dockingelements.ui @@ -41,6 +41,7 @@ True True 6 +True True True liststore1 diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d01f8fae7d45..5ef64a01e4f0 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -15988,9 +15988,10 @@ private: void insert_item(GtkTreeIter& iter, int pos, const OUString* pId, const OUString* pText, const OUString* pIconName) { +// m_nTextCol may be -1, so pass it last, to not terminate the sequence before the Id value gtk_tree_store_insert_with_values(m_pTreeStore, &iter, nullptr, pos, - m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), m_nIdCol, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(), + m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), -1); if (pIconName) { @@ -16003,9 +16004,10 @@ private: void insert_item(GtkTreeIter& iter, int pos, const OUString* pId, const OUString* pText, const VirtualDevice* pIcon) { +// m_nTextCol may be -1, so pass it last, to not terminate the sequence before the Id value gtk_tree_store_insert_with_values(m_pTreeStore, &iter, nullptr, pos, - m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), m_nIdCol, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(), + m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), -1); if (pIcon) { @@ -16053,7 +16055,7 @@ public: : GtkInstanceWidget(GTK_WIDGET(pIconView), pBuilder, bTakeOwnership) , m_pIconView(pIconView) , m_pTreeStore(GTK_TREE_STORE(gtk_icon_view_get_model(m_pIconView))) -, m_nTextCol(gtk_icon_view_get_text_column(m_pIconView)) +, m_nTextCol(gtk_icon_view_get_text_column(m_pIconView)) // May be -1 , m_nImageCol(gtk_icon_view_get_pixbuf_column(m_pIconView)) , m_nSelectionChangedSignalId(g_signal_connect(pIconView, "selection-changed", G_CALLBACK(signalSelectionChanged), this)) @@ -16063,7 +16065,7 @@ public: #endif , m_pSelectionChangeEvent(nullptr) { -m_nIdCol = m_nTextCol + 1; +m_nIdCol = std::max(m_nTextCol, m_nImageCol) + 1; } virtual int get_item_width() const override @@ -16112,6 +16114,7 @@ public: { weld::IconView::connect_query_tooltip(rLink); m_nQueryTooltipSignalId = g_signal_connect(m_pIconView, "query-tooltip", G_CALLBACK(signalQueryTooltip), this); +gtk_widget_set_has_tooltip(GTK_WIDGET(m_pIconView), true); } virtual OUString get_selected_id() const override
[Libreoffice-commits] core.git: starmath/uiconfig vcl/unx
starmath/uiconfig/smath/ui/dockingelements.ui |1 + vcl/unx/gtk3/gtkinst.cxx | 11 +++ 2 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 6ccff201088590274247fb9f63b7fa997cfee327 Author: Mike Kaganski AuthorDate: Tue Jun 7 11:52:07 2022 +0300 Commit: Mike Kaganski CommitDate: Tue Jun 7 11:53:13 2022 +0200 Fix ImageView without text on GTK Change-Id: I2c1884722de2d40e96282d1efbba4be0ad078bd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135465 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/starmath/uiconfig/smath/ui/dockingelements.ui b/starmath/uiconfig/smath/ui/dockingelements.ui index a7dfec85ebaf..a9f1086204f8 100644 --- a/starmath/uiconfig/smath/ui/dockingelements.ui +++ b/starmath/uiconfig/smath/ui/dockingelements.ui @@ -41,6 +41,7 @@ True True 6 +True True True liststore1 diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 4ad8f424e653..97039a3c4e8f 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -16186,9 +16186,10 @@ private: void insert_item(GtkTreeIter& iter, int pos, const OUString* pId, const OUString* pText, const OUString* pIconName) { +// m_nTextCol may be -1, so pass it last, to not terminate the sequence before the Id value gtk_tree_store_insert_with_values(m_pTreeStore, &iter, nullptr, pos, - m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), m_nIdCol, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(), + m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), -1); if (pIconName) { @@ -16201,9 +16202,10 @@ private: void insert_item(GtkTreeIter& iter, int pos, const OUString* pId, const OUString* pText, const VirtualDevice* pIcon) { +// m_nTextCol may be -1, so pass it last, to not terminate the sequence before the Id value gtk_tree_store_insert_with_values(m_pTreeStore, &iter, nullptr, pos, - m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), m_nIdCol, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(), + m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(), -1); if (pIcon) { @@ -16251,7 +16253,7 @@ public: : GtkInstanceWidget(GTK_WIDGET(pIconView), pBuilder, bTakeOwnership) , m_pIconView(pIconView) , m_pTreeStore(GTK_TREE_STORE(gtk_icon_view_get_model(m_pIconView))) -, m_nTextCol(gtk_icon_view_get_text_column(m_pIconView)) +, m_nTextCol(gtk_icon_view_get_text_column(m_pIconView)) // May be -1 , m_nImageCol(gtk_icon_view_get_pixbuf_column(m_pIconView)) , m_nSelectionChangedSignalId(g_signal_connect(pIconView, "selection-changed", G_CALLBACK(signalSelectionChanged), this)) @@ -16261,7 +16263,7 @@ public: #endif , m_pSelectionChangeEvent(nullptr) { -m_nIdCol = m_nTextCol + 1; +m_nIdCol = std::max(m_nTextCol, m_nImageCol) + 1; } virtual int get_item_width() const override @@ -16310,6 +16312,7 @@ public: { weld::IconView::connect_query_tooltip(rLink); m_nQueryTooltipSignalId = g_signal_connect(m_pIconView, "query-tooltip", G_CALLBACK(signalQueryTooltip), this); +gtk_widget_set_has_tooltip(GTK_WIDGET(m_pIconView), true); } virtual OUString get_selected_id() const override
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/fecopy.cxx | 45 ++- 1 file changed, 30 insertions(+), 15 deletions(-) New commits: commit badad69848f10b462a11f5b5e784cb468a94b180 Author: Michael Stahl AuthorDate: Fri Jun 3 17:56:02 2022 +0200 Commit: Michael Stahl CommitDate: Tue Jun 7 11:47:59 2022 +0200 sw: fix pasting multiple flys in SwFEShell::Paste() This was most recently fixed in 3cfd63cb55ab1a7e6df53eaeb2a7623be05983d0 but that didn't take into account that now with Ctrl+A multiple flys can be selected and copied, and all of them should be pasted; remove the odd restriction to paste only one text frame. This reveals that pasting a text frame will actually select the text frame, so subsequent flys end up anchored inside the text frame; delay selection until all flys have been pasted. Change-Id: I049f60ca9656e5075d481d4501bb1ffdd28a4e21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135366 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index f1db6d946f45..19102b85f0cf 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -709,7 +709,7 @@ namespace { } namespace { -bool lcl_PasteFlyOrDrawFormat(SwPaM& rPaM, SwFrameFormat* pCpyFormat, SwFEShell& rSh) +SwFrameFormat* lcl_PasteFlyOrDrawFormat(SwPaM& rPaM, SwFrameFormat* pCpyFormat, SwFEShell& rSh) { auto& rImp = *rSh.Imp(); auto& rDoc = *rSh.GetDoc(); @@ -752,7 +752,7 @@ namespace { // positioning for group members pNew->NbcSetAnchorPos(aGrpAnchor); pNew->SetSnapRect(aSnapRect); -return true; +return nullptr; } } SwFormatAnchor aAnchor(pCpyFormat->GetAnchor()); @@ -766,18 +766,18 @@ namespace { { const SdrObject *pCpyObj = pCpyFormat->FindSdrObject(); if(pCpyObj && CheckControlLayer(pCpyObj)) -return true; +return nullptr; } else if(pCpyFormat->Which() == RES_FLYFRMFMT && IsInTextBox(pCpyFormat)) { // This is a fly frame which is anchored in a TextBox, ignore it as // it's already copied as part of copying the content of the // TextBox. -return true; +return nullptr; } // Ignore TextBoxes, they are already handled in sw::DocumentLayoutManager::CopyLayoutFormat(). if(SwTextBoxHelper::isTextBox(pCpyFormat, RES_FLYFRMFMT)) -return true; +return nullptr; aAnchor.SetAnchor(pPos); } else if(RndStdIds::FLY_AT_PAGE == aAnchor.GetAnchorId()) @@ -791,9 +791,13 @@ namespace { } SwFrameFormat* pNew = rDoc.getIDocumentLayoutAccess().CopyLayoutFormat(*pCpyFormat, aAnchor, true, true); +return pNew; +} +void lcl_SelectFlyFormat(SwFrameFormat *const pNew, SwFEShell& rSh) +{ if(!pNew) -return true; +return; switch(pNew->Which()) { case RES_FLYFRMFMT: @@ -803,10 +807,11 @@ namespace { SwFlyFrame* pFlyFrame = static_cast(pNew)->GetFrame(&aPt); if(pFlyFrame) rSh.SelectFlyFrame(*pFlyFrame); -return false; +break; } case RES_DRAWFRMFMT: { +auto& rDrawView = *rSh.Imp()->GetDrawView(); assert(dynamic_cast(pNew)); SwDrawFrameFormat* pDrawFormat = static_cast(pNew); // #i52780# - drawing object has to be made visible on paste. @@ -821,7 +826,6 @@ namespace { default: SAL_WARN("sw.core", "unknown fly type"); } -return true; } } @@ -1038,13 +1042,24 @@ bool SwFEShell::Paste(SwDoc& rClpDoc, bool bNestedTable) // we need a DrawView if(!Imp()->GetDrawView()) MakeDrawView(); -for(auto pCpyFormat: *rClpDoc.GetSpzFrameFormats()) -if(pCpyFormat->Which() != RES_FLYFRMFMT) -lcl_PasteFlyOrDrawFormat(rPaM, pCpyFormat, *this); -for(auto pCpyFormat: *rClpDoc.GetSpzFrameFormats()) -if(pCpyFormat->Which() == RES_FLYFRMFMT) -if(!lcl_PasteFlyOrDrawFormat(rPaM, pCpyFormat, *this)) -break; +::std::vector inserted; +for (auto const pFlyFormat : *rClpDoc.GetSpzFrameFormats()) +{ +// if anchored inside other fly, will be copied when copying +// top-level fly, so skip here! (other non-body anchor +
Mohammad Ehsan Movahedian license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
Re: [libreoffice-accessibility] Re: ESC meeting minutes: 2022-05-26
On 31/05/2022 16.24, Christophe Strobbe wrote: I don't have a comprehensive overview of LibreOffice UI accessibility either, unfortunately. However, if you are looking for ways to prioritise issues, one way may be based on the accessibility requirements in the ETSI standard EN 301 549, which defines the requirements that software, documents and a number of other IT products will need to fulfil in the EU starting June 2025. If you want the biggest bang for your buck, my recommendations are the following: (1) With regard to the UI, focus on Windows-based accessibility issues first, since that is where (a) the majority of people with disabilities are and (b) the version that is most likely to get audited if accessibility audits get done. (As a Linux user, I would also like GTK-related to get fixed, but I am not representative of the market.) With regard to applications, I would focus on Writer before Impress or Calc. (I don't know how often Base and Draw are used in professional contexts, if at all.) Thanks, Christophe, that's really helpful. I generally agree with the priorities. (FWIW, looking at, comparing and working a bit on the a11y implementations of all of Windows/gtk3/qt has proven to be very useful to me to get a deeper overall understanding, though.) One other aspect that came to my mind: For Windows, we currently support IAccessible2, but not UIA. That's fine for NVDA, but I have heard/read at times that other screen readers/AT rely more on UIA. (But I haven't done any further research so far.) Does anybody know more about this and whether it would actually be necessary to implement native UIA support in LO for those AT to properly interact with LO? (Or is it more about having proper plugins/app modules/scripts for LO for the single AT, since e.g. NVDA and JAWS appear to rely heavily on those to properly support specific apps?)
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svtools include/svx sc/qa sd/qa solenv/sanitizers sw/qa
cui/source/inc/chardlg.hxx| 10 cui/source/tabpages/chardlg.cxx | 140 +- cui/uiconfig/ui/charnamepage.ui | 1554 ++ include/svtools/ctrlbox.hxx |4 include/svx/langbox.hxx |5 sc/qa/uitest/calc_tests/formatCells.py| 50 sc/qa/uitest/calc_tests3/clearCells.py|2 sc/qa/uitest/calc_tests8/tdf126248.py |4 sd/qa/uitest/impress_tests/tdf127900.py |2 solenv/sanitizers/ui/cui.suppr| 10 sw/qa/uitest/findReplace/findReplace.py |2 sw/qa/uitest/findReplace/tdf119462.py |2 sw/qa/uitest/table/tdf115572.py |4 sw/qa/uitest/table/tdf115573.py |8 sw/qa/uitest/writer_tests2/formatCharacter.py | 57 sw/qa/uitest/writer_tests7/tdf145158.py |2 16 files changed, 783 insertions(+), 1073 deletions(-) New commits: commit 196d9e16b7017db2225531cd240e7b6e8f7c1d66 Author: Heiko Tietze AuthorDate: Fri May 20 10:35:08 2022 +0200 Commit: Heiko Tietze CommitDate: Tue Jun 7 11:11:19 2022 +0200 Resolves tdf#146928 - Redesign charnamedialog Dialog was changed in d73602dc51aa8829fc88e5e67e2b0c4da6b8f715 to fit vertical size on small screens by placing Western/CJK/CTL into a notebook. But for CJK and CTL it's required to have Western fonts visible in parallel. * dual solution for western with nocjk and cjk dropped western scales to the dialog width if no CJK nor CTL is enabled * CJK and CTL placed in a notebook, Western as well for proper alignment * font names are presented in lists but size and style per simple dropdowns * info text sized at 80% * variables renamed to keep track of controls (old names kept in l10n descriotion) * UITests adjusted for variable names and tab positioning Change-Id: I45b40e9bc37565f6364f1dfc1b5d837270fe4644 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134666 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 70935a6eaaf6..e61675c1e2c3 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -65,7 +65,7 @@ private: std::unique_ptr m_pImpl; -std::unique_ptr m_xWestFrame; +std::unique_ptr m_xWestern; std::unique_ptr m_xWestFontNameFT; std::unique_ptr m_xWestFontNameLB; std::unique_ptr m_xWestFontStyleFT; @@ -74,10 +74,10 @@ private: std::unique_ptr m_xWestFontSizeLB; std::unique_ptr m_xWestFontLanguageFT; std::unique_ptr m_xWestFontLanguageLB; -std::unique_ptr m_xWestFontTypeFT; std::unique_ptr m_xWestFontFeaturesButton; -std::unique_ptr m_xLangNotebook; +std::unique_ptr m_xWestFontTypeFT; +std::unique_ptr m_xCJK_CTL; std::unique_ptr m_xEastFontNameFT; std::unique_ptr m_xEastFontNameLB; std::unique_ptr m_xEastFontStyleFT; @@ -86,8 +86,8 @@ private: std::unique_ptr m_xEastFontSizeLB; std::unique_ptr m_xEastFontLanguageFT; std::unique_ptr m_xEastFontLanguageLB; -std::unique_ptr m_xEastFontTypeFT; std::unique_ptr m_xEastFontFeaturesButton; +std::unique_ptr m_xEastFontTypeFT; std::unique_ptr m_xCTLFontNameFT; std::unique_ptr m_xCTLFontNameLB; @@ -97,8 +97,8 @@ private: std::unique_ptr m_xCTLFontSizeLB; std::unique_ptr m_xCTLFontLanguageFT; std::unique_ptr m_xCTLFontLanguageLB; -std::unique_ptr m_xCTLFontTypeFT; std::unique_ptr m_xCTLFontFeaturesButton; +std::unique_ptr m_xCTLFontTypeFT; //for getting FontFeatures ScopedVclPtrInstance m_xVDev; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 2c2d912ae006..638643601980 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -190,27 +190,40 @@ struct SvxCharNamePage_Impl SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet) : SvxCharBasePage(pPage, pController, "cui/ui/charnamepage.ui", "CharNamePage", rInSet) , m_pImpl(new SvxCharNamePage_Impl) -, m_xLangNotebook(m_xBuilder->weld_notebook("notebook")) -, m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft")) -, m_xEastFontNameLB(m_xBuilder->weld_combo_box("eastfontnamelb")) -, m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft")) -, m_xEastFontStyleLB(new FontStyleBox(m_xBuilder->weld_combo_box("eaststylelb"))) -, m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft")) -, m_xEastFontSizeLB(new FontSizeBox(m_xBuilder->weld_combo_box("eastsizelb"))) -, m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft")) -, m_xEastFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("eastlanglb"))) -, m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo")) -, m_xEastFontFeaturesButton(m_xBuilder->weld_bu
Re: ESC meeting minutes: 2022-05-26
On 31/05/2022 12.36, Caolán McNamara wrote: If the overview is there are a thousand little things and not a small set of large scale specific projects then that's still a useful overview. We could still sweep them into some general themes. Indeed. Thanks for adding the subtopics that came up during the discussion on the wiki page. (I have also *heard* that Base seems to be most problematic in general, but haven't had much to do with it myself yet.) I wonder if it's the initial base screen (I think I might have replaced some custom widgets there with more standard ones which might have improved matters) or the "design view" rows/columns screen which is a custom widget, but one I think that does at least have an a11y implementation. In general custom widgets lead to forgotten a11y, like the extensions dialog. How about math? I see a bug 140659 for math still open linked to the meta bug, which says "formula editor not operable with screenreaders", but then the commentary seems maybe less bleak Does anyone (affected users?) have any further insights/experiences with either Base or Math and could say where the main a11y problems are or whether it's mostly working fine by now? (For Math, might makes sense to retest that after a11y has been restored for the elements panel after d79c527c2a599c7821d27cf03b95cb79e2abe685 ("Use IconView in SmElementsControl"), which mentions that as a TODO in the commit message and Mike already has a WIP change for that.) Depends of what is being read out of course, missing labels for .ui widgetry are super trivial to fix[1]. Something not read out from a document can range from some small missing piece to some difficult total lack of a11y. Indeed, and I've seen various root causes when looking at different issues, so it's really hard to say where the problems are without taking a closer look into the single issues. The a11y meta bug tdf#101912 [1] currently lists ~200 specific issues. (I also have a ranked list from Richard, CCed, a blind user who uses the NVDA screen reader on Windows.) If Richard is ok with sharing that here it could help get a general feel on what's lacking. Read-only link to Richard's ranked list: https://www.dropbox.com/s/2m5cr0m8gzz027n/NvdaAndLoAccessibilityBugSummary.xlsx?dl=0 (no need to sign in, just click the "Download" button on the top left, and switch to the "Summary" table to see the actual list) Since the main focus is using LO with NVDA on Windows, the basis for the list were: 1) all LO Bugzilla issues set as directly blocking one of tdf#60251 (Windows a11y meta bug), tdf#101912 (general a11y meta bug) or tdf#103440 (sidebar a11y meta bug): https://bugs.documentfoundation.org/buglist.cgi?f1=blocked&list_id=1464413&o1=anywordssubstr&query_format=advanced&resolution=---&v1=60251%20101912%20103440 i.e. e.g. Linux- or macOS-specific issues or PDF a11y bugs are not covered, since those have their own meta bugs underneath tdf#101912. 2) a list of issues related to LO/AOO from the NVDA issue tracker on Github Since various issues have been reported for both, LO and NVDA, Richard also matched the corresponding bug reports with each other (entries that have both a "LO Bug ID" and an "NVDA Bug ID"). The underlying data from the two issue trackers is mostly from one year ago, so newer issues don't show up unless they were blocking work on existing ones. (If of any practical value for upcoming steps, the list could be updated or turned into a different form as needed.)
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/escher.hxx | 10 +- sw/source/filter/ww8/wrtw8esh.cxx | 52 ++-- sw/source/filter/ww8/wrtw8sty.cxx | 12 +- sw/source/filter/ww8/wrtww8.cxx | 164 +++--- sw/source/filter/ww8/ww8atr.cxx | 56 ++-- 5 files changed, 147 insertions(+), 147 deletions(-) New commits: commit 410a64b472ae9de0bb06ddd8f4b55fd16686c860 Author: Miklos Vajna AuthorDate: Tue Jun 7 07:57:25 2022 +0200 Commit: Miklos Vajna CommitDate: Tue Jun 7 10:10:12 2022 +0200 sw: prefix members of SwEscherEx, SwWW8WrTabu, WW8_WrFkp and WW8_WrPlc0 See tdf#94879 for motivation. Change-Id: Ia8f3150b7da815c7b5f253f76e65dada3ef8256a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135461 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index 102d933702e8..179b3a16f3d3 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -141,10 +141,10 @@ private: class SwEscherEx : public SwBasicEscherEx { private: -std::vector aFollowShpIds; -EscherExHostAppData aHostData; -WinwordAnchoring aWinwordAnchoring; -WW8_WrPlcTextBoxes *pTextBxs; +std::vector m_aFollowShpIds; +EscherExHostAppData m_aHostData; +WinwordAnchoring m_aWinwordAnchoring; +WW8_WrPlcTextBoxes *m_pTextBxs; sal_uInt32 GetFlyShapeId(const SwFrameFormat& rFormat, unsigned int nHdFtIndex, DrawObjPointerVector &rPVec); @@ -171,7 +171,7 @@ public: virtual void WriteFrameExtraData(const SwFrameFormat& rFormat) override; -EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const tools::Rectangle*) override {return &aHostData;} +EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const tools::Rectangle*) override {return &m_aHostData;} private: SwEscherEx(const SwEscherEx&) = delete; SwEscherEx &operator=(const SwEscherEx&) = delete; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index b946c62f75ac..9881868a9e17 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1763,8 +1763,8 @@ void SwBasicEscherEx::SetPicId(const SdrObject &, sal_uInt32, void SwEscherEx::SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId, EscherPropertyContainer &rPropOpt) { -pTextBxs->Append(rSdrObj, nShapeId); -sal_uInt32 nPicId = pTextBxs->Count(); +m_pTextBxs->Append(rSdrObj, nShapeId); +sal_uInt32 nPicId = m_pTextBxs->Count(); nPicId *= 0x1; rPropOpt.AddOpt( ESCHER_Prop_pictureId, nPicId ); } @@ -2169,9 +2169,9 @@ void SwBasicEscherEx::WritePictures() SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) : SwBasicEscherEx(pStrm, rWW8Wrt), -pTextBxs(nullptr) +m_pTextBxs(nullptr) { -aHostData.SetClientData(&aWinwordAnchoring); +m_aHostData.SetClientData(&m_aWinwordAnchoring); OpenContainer( ESCHER_DggContainer ); sal_uInt16 nColorCount = 4; @@ -2187,17 +2187,17 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) sal_uInt8 i = 2; // for header/footer and the other PlcDrawObj *pSdrObjs = mrWrt.m_pHFSdrObjs.get(); -pTextBxs = mrWrt.m_pHFTextBxs.get(); +m_pTextBxs = mrWrt.m_pHFTextBxs.get(); // if no header/footer -> skip over if (!pSdrObjs->size()) { --i; pSdrObjs = mrWrt.m_pSdrObjs.get(); -pTextBxs = mrWrt.m_pTextBxs.get(); +m_pTextBxs = mrWrt.m_pTextBxs.get(); } -for( ; i--; pSdrObjs = mrWrt.m_pSdrObjs.get(), pTextBxs = mrWrt.m_pTextBxs.get() ) +for( ; i--; pSdrObjs = mrWrt.m_pSdrObjs.get(), m_pTextBxs = mrWrt.m_pTextBxs.get() ) { // "dummy char" (or any Count ?) - why? Only Microsoft knows it. GetStream().WriteChar( i ); @@ -2235,7 +2235,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) break; case ww8::Frame::eDrawing: { -aWinwordAnchoring.SetAnchoring(rFormat); +m_aWinwordAnchoring.SetAnchoring(rFormat); const SdrObject* pSdrObj = rFormat.FindRealSdrObject(); if (pSdrObj) { @@ -2706,8 +2706,8 @@ void WinwordAnchoring::SetAnchoring(const SwFrameFormat& rFormat) void SwEscherEx::WriteFrameExtraData( const SwFrameFormat& rFormat ) { -aWinwordAnchoring.SetAnchoring(rFormat); -aWinwordAnchoring.WriteData(*this); +m_aWinwordAnchoring.SetAnchoring(rFormat); +m_aWinwordAnchoring.WriteData(*this); AddAtom(4, ESCHER_ClientAnchor); GetStream().WriteInt32( 0 ); @@ -2753,11 +2753,11 @@ sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId, rShapeId = GetFlyShapeId(rFormat, rObj.mnHdFtIndex, rPVec); if( !nOff )
Re: ESC meeting minutes: 2022-05-26
On 31/05/2022 12.01, Colomban Wendling wrote: * Only on-screen elements of the document are exposed to ATs. This is on purpose probably for performance (not sure if we have any numbers to base it on?) so elements are lazy-loaded and destroyed, but it has non-trivial impact on various AT features. There are some things supposed to help mitigate the issues (like flows-from and flows-to relationships), but they present their own sets of issues (like some elements from there not having proper parent/child relationships, etc.). tdf#35652 [1] ("ACC: AT-SPI accessible tree omits objects which are not visible on the screen.") sounds like a related bug report here. * Some relations are missing, like for annotations and footnotes. There's e.g. tdf#96481 ("Connect annotations to the paragraphs they describe"). Also there is a lack of semantics for change tracking leading to messy output from ATs. There's e.g. tdf#96487 ("Expose tracked changes to ATs via accessible objects and attributes"). I have added links to those tickets to the wiki page [2] as well. [1] https://bugs.documentfoundation.org/show_bug.cgi?id=35652 [2] https://wiki.documentfoundation.org/Development/Under-loved_areas#Document_Level_Accessibility
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f30b49b82e563d5d7f88a04080cd5d844872a3be Author: Martin Srebotnjak AuthorDate: Tue Jun 7 09:27:53 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 7 09:27:53 2022 +0200 Update git submodules * Update translations from branch 'master' to 40da1e34cabf93b04d900b7b6ab501fb3160efef - Updated Slovenian translation Change-Id: If7fea40ad58b893757b644d670f1470c40dcbfde diff --git a/translations b/translations index ed14d57f503d..40da1e34cabf 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ed14d57f503d87230572addc845e16da818e530a +Subproject commit 40da1e34cabf93b04d900b7b6ab501fb3160efef
[Libreoffice-commits] translations.git: source/sl
source/sl/basctl/messages.po| 8 source/sl/chart2/messages.po| 6 source/sl/cui/messages.po | 140 +- source/sl/dbaccess/messages.po | 16 - source/sl/dictionaries/ckb.po | 6 source/sl/editeng/messages.po | 2 source/sl/extensions/messages.po| 12 source/sl/forms/messages.po | 6 source/sl/fpicker/messages.po | 6 source/sl/helpcontent2/source/text/sbasic/shared.po | 12 source/sl/helpcontent2/source/text/sbasic/shared/03.po | 6 source/sl/helpcontent2/source/text/scalc/01.po | 18 - source/sl/helpcontent2/source/text/scalc/guide.po | 6 source/sl/helpcontent2/source/text/shared.po| 4 source/sl/helpcontent2/source/text/shared/00.po | 6 source/sl/helpcontent2/source/text/shared/01.po | 14 - source/sl/helpcontent2/source/text/shared/02.po | 12 source/sl/helpcontent2/source/text/shared/guide.po | 10 source/sl/helpcontent2/source/text/shared/optionen.po | 12 source/sl/helpcontent2/source/text/smath/guide.po | 10 source/sl/helpcontent2/source/text/swriter/01.po| 34 +- source/sl/helpcontent2/source/text/swriter/guide.po | 12 source/sl/instsetoo_native/inc_openoffice/windows/msi_languages.po | 10 source/sl/librelogo/source/pythonpath.po| 6 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 14 - source/sl/reportdesign/messages.po | 10 source/sl/sc/messages.po| 40 +- source/sl/scp2/source/ooo.po| 10 source/sl/sd/messages.po| 20 - source/sl/sfx2/messages.po | 28 +- source/sl/starmath/messages.po | 6 source/sl/svtools/messages.po | 10 source/sl/svx/messages.po | 30 +- source/sl/sw/messages.po| 28 +- source/sl/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po | 8 source/sl/uui/messages.po | 14 - 36 files changed, 296 insertions(+), 296 deletions(-) New commits: commit 40da1e34cabf93b04d900b7b6ab501fb3160efef Author: Martin Srebotnjak AuthorDate: Tue Jun 7 09:27:43 2022 +0200 Commit: Andras Timar CommitDate: Tue Jun 7 09:27:43 2022 +0200 Updated Slovenian translation Change-Id: If7fea40ad58b893757b644d670f1470c40dcbfde diff --git a/source/sl/basctl/messages.po b/source/sl/basctl/messages.po index d048b259595..ada75cd40f8 100644 --- a/source/sl/basctl/messages.po +++ b/source/sl/basctl/messages.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: LibreOffice 7.4\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; "POT-Creation-Date: 2022-03-09 21:26+0100\n" -"PO-Revision-Date: 2022-05-30 22:10+0200\n" +"PO-Revision-Date: 2022-06-06 19:19+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -252,7 +252,7 @@ msgid "" "Continue?" msgstr "" "Po tej spremembi morate program ponovno zagnati.\n" -"Želite nadaljevati?" +"Ali želite nadaljevati?" #: basctl/inc/strings.hrc:72 msgctxt "RID_STR_SEARCHALLMODULES" @@ -724,12 +724,12 @@ msgstr "Izbriši vire jezika" #: basctl/uiconfig/basicide/ui/deletelangdialog.ui:14 msgctxt "deletelangdialog|DeleteLangDialog" msgid "Do you want to delete the resources of the selected language(s)?" -msgstr "Želite izbrisati sredstva izbranih jezikov?" +msgstr "Ali želite izbrisati vire izbranih jezikov?" #: basctl/uiconfig/basicide/ui/deletelangdialog.ui:15 msgctxt "deletelangdialog|DeleteLangDialog" msgid "You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted." -msgstr "Ste pred tem, da pobrišete vsa sredstva izbranih jezikov. Vsi nizi uporabniškega vmesnika za te je