[Libreoffice-commits] core.git: configmgr/source
configmgr/source/dconf.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ef2b4b4c6624247305a22dbcc54098910584b66 Author: Stephan Bergmann AuthorDate: Mon Nov 20 07:30:15 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 08:53:42 2023 +0100 Extended loplugin:ostr: configmgr Change-Id: If9cc1f0c18a5fa344a433b338f81d191340e70f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159722 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx index a63a96c511da..8548daa46b3c 100644 --- a/configmgr/source/dconf.cxx +++ b/configmgr/source/dconf.cxx @@ -214,7 +214,7 @@ private: }; OString getRoot() { -return "/org/libreoffice/registry"; +return "/org/libreoffice/registry"_ostr; } bool decode(OUString * string, bool slash) {
[Libreoffice-bugs] [Bug 120063] [META] Options dialog's expert configuration bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=120063 Bug 120063 depends on bug 157435, which changed state. Bug 157435 Summary: Use numeric field when editing integer typed config items https://bugs.documentfoundation.org/show_bug.cgi?id=157435 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 157435] Use numeric field when editing integer typed config items
https://bugs.documentfoundation.org/show_bug.cgi?id=157435 Samuel Mehrbrodt (allotropia) changed: What|Removed |Added Whiteboard||target:24.2.0 Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |samuel.mehrbrodt@allotropia |desktop.org |.de Status|NEW |RESOLVED --- Comment #2 from Samuel Mehrbrodt (allotropia) --- Fixed with commit 1f874d384228867ee450d3e1d53c821519b51722 (forgot to mention the bug number in commit). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: comphelper/qa
comphelper/qa/string/test_string.cxx | 34 +- comphelper/qa/unit/base64_test.cxx |6 +++--- comphelper/qa/unit/propertyvalue.cxx |2 +- 3 files changed, 21 insertions(+), 21 deletions(-) New commits: commit 5ac4adaf026bab096febc2587f49edb603e98689 Author: Stephan Bergmann AuthorDate: Mon Nov 20 07:30:29 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 08:31:47 2023 +0100 Extended loplugin:ostr: comphelper Change-Id: I338c3c263e940bbe6071827b2e19763b7dadc2e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159723 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 7a97736c1e74..c6529949daee 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -88,14 +88,14 @@ void TestString::testIsdigitAsciiString() void TestString::testStripStart() { -OString aIn("abc"); +OString aIn("abc"_ostr); OString aOut; aOut = ::comphelper::string::stripStart(aIn, 'b'); -CPPUNIT_ASSERT_EQUAL(OString("abc"), aOut); +CPPUNIT_ASSERT_EQUAL("abc"_ostr, aOut); aOut = ::comphelper::string::stripStart(aIn, 'a'); -CPPUNIT_ASSERT_EQUAL(OString("bc"), aOut); +CPPUNIT_ASSERT_EQUAL("bc"_ostr, aOut); aIn = "aaa"; aOut = ::comphelper::string::stripStart(aIn, 'a'); @@ -103,19 +103,19 @@ void TestString::testStripStart() aIn = "aba"; aOut = ::comphelper::string::stripStart(aIn, 'a'); -CPPUNIT_ASSERT_EQUAL(OString("ba"), aOut); +CPPUNIT_ASSERT_EQUAL("ba"_ostr, aOut); } void TestString::testStripEnd() { -OString aIn("abc"); +OString aIn("abc"_ostr); OString aOut; aOut = ::comphelper::string::stripEnd(aIn, 'b'); -CPPUNIT_ASSERT_EQUAL(OString("abc"), aOut); +CPPUNIT_ASSERT_EQUAL("abc"_ostr, aOut); aOut = ::comphelper::string::stripEnd(aIn, 'c'); -CPPUNIT_ASSERT_EQUAL(OString("ab"), aOut); +CPPUNIT_ASSERT_EQUAL("ab"_ostr, aOut); aIn = "aaa"; aOut = ::comphelper::string::stripEnd(aIn, 'a'); @@ -123,19 +123,19 @@ void TestString::testStripEnd() aIn = "aba"; aOut = ::comphelper::string::stripEnd(aIn, 'a'); -CPPUNIT_ASSERT_EQUAL(OString("ab"), aOut); +CPPUNIT_ASSERT_EQUAL("ab"_ostr, aOut); } void TestString::testStrip() { -OString aIn("abc"); +OString aIn("abc"_ostr); OString aOut; aOut = ::comphelper::string::strip(aIn, 'b'); -CPPUNIT_ASSERT_EQUAL(OString("abc"), aOut); +CPPUNIT_ASSERT_EQUAL("abc"_ostr, aOut); aOut = ::comphelper::string::strip(aIn, 'c'); -CPPUNIT_ASSERT_EQUAL(OString("ab"), aOut); +CPPUNIT_ASSERT_EQUAL("ab"_ostr, aOut); aIn = "aaa"; aOut = ::comphelper::string::strip(aIn, 'a'); @@ -143,25 +143,25 @@ void TestString::testStrip() aIn = "aba"; aOut = ::comphelper::string::strip(aIn, 'a'); -CPPUNIT_ASSERT_EQUAL(OString("b"), aOut); +CPPUNIT_ASSERT_EQUAL("b"_ostr, aOut); } void TestString::testToken() { -OString aIn("10.11.12"); +OString aIn("10.11.12"_ostr); OString aOut; aOut = aIn.getToken(-1, '.'); CPPUNIT_ASSERT(aOut.isEmpty()); aOut = aIn.getToken(0, '.'); -CPPUNIT_ASSERT_EQUAL(OString("10"), aOut); +CPPUNIT_ASSERT_EQUAL("10"_ostr, aOut); aOut = aIn.getToken(1, '.'); -CPPUNIT_ASSERT_EQUAL(OString("11"), aOut); +CPPUNIT_ASSERT_EQUAL("11"_ostr, aOut); aOut = aIn.getToken(2, '.'); -CPPUNIT_ASSERT_EQUAL(OString("12"), aOut); +CPPUNIT_ASSERT_EQUAL("12"_ostr, aOut); aOut = aIn.getToken(3, '.'); CPPUNIT_ASSERT(aOut.isEmpty()); @@ -169,7 +169,7 @@ void TestString::testToken() void TestString::testTokenCount() { -OString aIn("10.11.12"); +OString aIn("10.11.12"_ostr); sal_Int32 nOut; nOut = ::comphelper::string::getTokenCount(aIn, '.'); diff --git a/comphelper/qa/unit/base64_test.cxx b/comphelper/qa/unit/base64_test.cxx index a1cd5d0006be..dc637f63f709 100644 --- a/comphelper/qa/unit/base64_test.cxx +++ b/comphelper/qa/unit/base64_test.cxx @@ -93,17 +93,17 @@ void Base64Test::testBase64EncodeForOStringBuffer() inputSequence = { 0, 0, 0, 0, 0, 1, 2, 3 }; comphelper::Base64::encode(aBuffer, inputSequence); -CPPUNIT_ASSERT_EQUAL(OString("AAABAgM="), aBuffer.toString()); +CPPUNIT_ASSERT_EQUAL("AAABAgM="_ostr, aBuffer.toString()); aBuffer.setLength(0); inputSequence = { 5, 2, 3, 0, 0, 1, 2, 3 }; comphelper::Base64::encode(aBuffer, inputSequence); -CPPUNIT_ASSERT_EQUAL(OString("BQIDAAABAgM="), aBuffer.toString()); +CPPUNIT_ASSERT_EQUAL("BQIDAAABAgM="_ostr, aBuffer.toString()); aBuffer.setLength(0); inputSequence = { sal_Int8(sal_uInt8(200)), 31, 77, 111, 0, 1, 2, 3 }; comphelper::Base64::encode(aBuffer, inputSequence); -CPPUNIT_ASSERT_EQUAL(OString("yB9NbwABAgM="), aBuffer.makeStringAndClear()); +
[Libreoffice-commits] core.git: emfio/qa emfio/source
emfio/qa/cppunit/emf/EmfImportTest.cxx | 824 + emfio/qa/cppunit/wmf/wmfimporttest.cxx | 364 +++--- emfio/source/reader/mtftools.cxx |8 3 files changed, 620 insertions(+), 576 deletions(-) New commits: commit e66ccbecfb414800271e066c630cf7e90d5f3b74 Author: Stephan Bergmann AuthorDate: Sun Nov 19 22:04:45 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 08:25:16 2023 +0100 Extended loplugin:ostr: emfio Change-Id: Ida43018a83c68f5d20dbee30325b8f32099e5b1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159713 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 9e892b67eaa5..8a74745b6e12 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -43,7 +43,7 @@ public: { } -const OString aXPathPrefix = "/primitive2D/metafile/transform/"; +const OString aXPathPrefix = "/primitive2D/metafile/transform/"_ostr; Primitive2DSequence parseEmf(std::u16string_view aSource); }; @@ -79,37 +79,38 @@ CPPUNIT_TEST_FIXTURE(Test, testPolyPolygon) CPPUNIT_ASSERT(pDocument); // Chart axis -assertXPath(pDocument, aXPathPrefix + "mask/polypolygon", "path", "m0 0h19746v14817h-19746z"); +assertXPath(pDocument, aXPathPrefix + "mask/polypolygon", "path"_ostr, +"m0 0h19746v14817h-19746z"); assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor", 2); -assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]", "color", "#ff"); -assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]/polypolygon", "path", +assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]", "color"_ostr, "#ff"); +assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]/polypolygon", "path"_ostr, "m0 0h19781v14852h-19781z"); -assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[2]/polypolygon", "path", +assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[2]/polypolygon", "path"_ostr, "m2574 13194v-12065h15303v12065z"); assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke", 44); assertXPathContent(pDocument, aXPathPrefix + "mask/polygonstroke[1]/polygon", "2574,13194 2574,1129"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", "color", "#00"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", "width", "0"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", "color"_ostr, "#00"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", "width"_ostr, "0"); assertXPathContent(pDocument, aXPathPrefix + "mask/polygonstroke[2]/polygon", "2574,1129 2574,1129"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", "color", "#00"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", "width", "0"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", "color"_ostr, "#00"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", "width"_ostr, "0"); assertXPathContent(pDocument, aXPathPrefix + "mask/polygonstroke[10]/polygon", "8674,1129 8674,1129"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", "color", "#00"); -assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", "width", "0"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", "color"_ostr, "#00"); +assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", "width"_ostr, "0"); assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion", 28); -assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "width", "459"); -assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "x", "9908"); -assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "text", "0.5"); -assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "fontcolor", "#00"); +assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "width"_ostr, "459"); +assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "x"_ostr, "9908"); +assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "text"_ostr, "0.5"); +assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", "fontcolor"_ostr, "#00"); assertXPath(pDocument, aXPathPrefix + "mask/pointarray", 98); -assertXPath(pDocument, aXPathPrefix + "mask/pointarray[1]", "color", "#00"); -assertXPath(pDocument, aXPathPrefix + "mask/pointarray[1]/point", "x", "2574"); -assertXPath(pDocument, aXPathPrefix + "mask/pointarray[1]/point", "y", "1129"); +
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk include/cui
cui/UIConfig_cui.mk |1 cui/source/dialogs/dlgname.cxx| 109 cui/source/options/optaboutconfig.cxx | 37 +++-- cui/uiconfig/ui/listdialog.ui | 231 ++ include/cui/dlgname.hxx | 26 +++ 5 files changed, 389 insertions(+), 15 deletions(-) New commits: commit 847db3fa1244c2707e1966d3e6579258bb6d8924 Author: Samuel Mehrbrodt AuthorDate: Thu Nov 16 21:33:25 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 20 08:24:51 2023 +0100 tdf#157438 Make string lists editable in expert config Change-Id: Ia8b8553d547e760c18624c5c599951523b74ac82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159523 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 97a4a56f3ecc..10acd83c8c39 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -113,6 +113,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/linetabpage \ cui/uiconfig/ui/lineendstabpage \ cui/uiconfig/ui/linestyletabpage \ + cui/uiconfig/ui/listdialog \ cui/uiconfig/ui/macroassigndialog \ cui/uiconfig/ui/macroassignpage \ cui/uiconfig/ui/macroselectordialog \ diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index a96b59290bbd..a06833bb6ce6 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -19,6 +19,8 @@ #include +#include + /* |* |* Dialog for editing a name @@ -144,4 +146,111 @@ IMPL_LINK_NOARG(SvxObjectTitleDescDialog, DecorativeHdl, weld::Toggleable&, void m_xDescriptionFT->set_sensitive(bEnable); } +SvxListDialog::SvxListDialog(weld::Window* pParent) +: GenericDialogController(pParent, "cui/ui/listdialog.ui", "ListDialog") +, m_xList(m_xBuilder->weld_tree_view("assignlist")) +, m_xAddBtn(m_xBuilder->weld_button("addbtn")) +, m_xRemoveBtn(m_xBuilder->weld_button("removebtn")) +, m_xEditBtn(m_xBuilder->weld_button("editbtn")) +{ +m_xList->set_size_request(m_xList->get_approximate_digit_width() * 54, + m_xList->get_height_rows(6)); +m_xAddBtn->connect_clicked(LINK(this, SvxListDialog, AddHdl_Impl)); +m_xRemoveBtn->connect_clicked(LINK(this, SvxListDialog, RemoveHdl_Impl)); +m_xEditBtn->connect_clicked(LINK(this, SvxListDialog, EditHdl_Impl)); +m_xList->connect_changed(LINK(this, SvxListDialog, SelectHdl_Impl)); +m_xList->connect_row_activated(LINK(this, SvxListDialog, DblClickHdl_Impl)); + +SelectionChanged(); +} + +SvxListDialog::~SvxListDialog() {} + +IMPL_LINK_NOARG(SvxListDialog, AddHdl_Impl, weld::Button&, void) +{ +SvxNameDialog aNameDlg(m_xDialog.get(), "", "blabla"); + +if (!aNameDlg.run()) +return; +OUString sNewText = comphelper::string::strip(aNameDlg.GetName(), ' '); +if (!sNewText.isEmpty()) +{ +m_xList->insert_text(-1, sNewText); +m_xList->select(-1); +} +} + +IMPL_LINK_NOARG(SvxListDialog, EditHdl_Impl, weld::Button&, void) { EditEntry(); } + +IMPL_LINK_NOARG(SvxListDialog, SelectHdl_Impl, weld::TreeView&, void) { SelectionChanged(); } + +IMPL_LINK_NOARG(SvxListDialog, DblClickHdl_Impl, weld::TreeView&, bool) +{ +EditEntry(); +return true; +} + +IMPL_LINK_NOARG(SvxListDialog, RemoveHdl_Impl, weld::Button&, void) +{ +int nPos = m_xList->get_selected_index(); +if (nPos == -1) +return; +m_xList->remove(nPos); +int nCount = m_xList->n_children(); +if (nCount) +{ +if (nPos >= nCount) +nPos = nCount - 1; +m_xList->select(nPos); +} +SelectionChanged(); +} + +void SvxListDialog::SelectionChanged() +{ +bool bEnable = m_xList->get_selected_index() != -1; +m_xRemoveBtn->set_sensitive(bEnable); +m_xEditBtn->set_sensitive(bEnable); +} + +std::vector SvxListDialog::GetEntries() const +{ +int nCount = m_xList->n_children(); +std::vector aList; +aList.reserve(nCount); +for (int i = 0; i < nCount; ++i) +aList.push_back(m_xList->get_text(i)); +return aList; +} + +void SvxListDialog::SetEntries(std::vector const& rEntries) +{ +m_xList->clear(); +for (auto const& sEntry : rEntries) +{ +m_xList->append_text(sEntry); +} +SelectionChanged(); +} + +void SvxListDialog::EditEntry() +{ +int nPos = m_xList->get_selected_index(); +if (nPos == -1) +return; + +OUString sOldText(m_xList->get_selected_text()); +SvxNameDialog aNameDlg(m_xDialog.get(), sOldText, "blabla"); + +if (!aNameDlg.run()) +return; +OUString sNewText = comphelper::string::strip(aNameDlg.GetName(), ' '); +if (!sNewText.isEmpty() && sNewText != sOldText) +{ +m_xList->remove(nPos); +m_xList->insert_text(nPos, sNewText); +m_xList->select(nPos);
[Libreoffice-bugs] [Bug 158108] Build failure with ICU 74
https://bugs.documentfoundation.org/show_bug.cgi?id=158108 --- Comment #6 from taichi <20001...@ymail.ne.jp> --- (In reply to Eike Rathke from comment #5) > Well, fine, but what does that actually _mean_ for our line break rules? > > Adding Khaled to Cc, maybe he knows as he touched > i18npool/source/breakiterator/data/line.txt recently. > > IMHO it's now time to align our rules with ICU upstream's > https://github.com/unicode-org/icu/blob/main/icu4c/source/data/brkitr/rules/ > line.txt and reapply the historically grown changes _if still necessary_. The minimum version of ICU required to build LibreOffice is 66. Is it no problem to use icu4c/source/data/brkitr/rules/line.txt from 74.1 or the main branch? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158137] Unify lockdown behavior of Options dialog page Writer - Mail Merge Email
https://bugs.documentfoundation.org/show_bug.cgi?id=158137 Balázs Varga (allotropia) changed: What|Removed |Added Ever confirmed|0 |1 Assignee|libreoffice-b...@lists.free |balazs.varga...@gmail.com |desktop.org | Status|UNCONFIRMED |ASSIGNED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editview.cxx |4 ++-- editeng/source/editeng/impedit.cxx |4 ++-- editeng/source/items/CustomPropertyField.cxx |2 +- editeng/source/items/flditem.cxx | 16 4 files changed, 13 insertions(+), 13 deletions(-) New commits: commit c860e7cc974c306961c421be1eb034c78c6c244f Author: Stephan Bergmann AuthorDate: Sun Nov 19 22:04:58 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:55:09 2023 +0100 Extended loplugin:ostr: editeng Change-Id: I5dbd4047d2b66c12475020abfdd2b8f16d65a8f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159714 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index adf135b8e7f6..df9f193ebfe6 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -535,7 +535,7 @@ void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bActivat static const OString aPayload = OString::boolean(true); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload); - pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); + pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible"_ostr, aPayload); } } @@ -553,7 +553,7 @@ void EditView::HideCursor(bool bDeactivate) OString aPayload = OString::boolean(false); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload); - pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); + pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible"_ostr, aPayload); } } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 393a208703b4..851e63c0453d 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -439,12 +439,12 @@ void ImpEditView::lokSelectionCallback(const std::optional & { // Another shell wants to know about our existing selection. if (mpViewShell != mpOtherShell) -mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", sRectangle); +mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection"_ostr, sRectangle); } else { mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, sRectangle); -mpViewShell->NotifyOtherViews(LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", sRectangle); +mpViewShell->NotifyOtherViews(LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection"_ostr, sRectangle); } pOutWin->GetOutDev()->Pop(); diff --git a/editeng/source/items/CustomPropertyField.cxx b/editeng/source/items/CustomPropertyField.cxx index 939a6af0c0d9..eaad4c4c4db8 100644 --- a/editeng/source/items/CustomPropertyField.cxx +++ b/editeng/source/items/CustomPropertyField.cxx @@ -45,7 +45,7 @@ bool CustomPropertyField::operator==(const SvxFieldData& rOther) const MetaAction* CustomPropertyField::createBeginComment() const { -return new MetaCommentAction("FIELD_SEQ_BEGIN"); +return new MetaCommentAction("FIELD_SEQ_BEGIN"_ostr); } OUString CustomPropertyField::GetFormatted(uno::Reference const & xDocumentProperties) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 1f6a9d9cc485..b501d40ba968 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -266,12 +266,12 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const MetaAction* SvxFieldData::createBeginComment() const { -return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); +return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); } MetaAction* SvxFieldData::createEndComment() { -return new MetaCommentAction( "FIELD_SEQ_END" ); +return new MetaCommentAction( "FIELD_SEQ_END"_ostr ); } @@ -428,7 +428,7 @@ OUString SvxDateField::GetFormatted( Date const & aDate, SvxDateFormat eFormat, MetaAction* SvxDateField::createBeginComment() const { -return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); +return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); } SvxURLField::SvxURLField() @@ -466,7 +466,7 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const MetaAction* SvxURLField::createBeginComment() const { // #i46618# Adding target URL to metafile comment -return new MetaCommentAction( "FIELD_SEQ_BEGIN", +return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr, 0, reinterpret_cast(aURL.getStr()),
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/file/filtask.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7068754492563710d3a5db06abeb0520effdf8a2 Author: Julien Nabet AuthorDate: Sun Nov 19 21:32:07 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:45:14 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (ucb) Change-Id: I9ce4ae0246f78acd7bfed89f52103c2f5e571c14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159706 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index e909c53071c0..80f4785d773e 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -507,7 +507,7 @@ TaskManager::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) if( it == m_aContent.end() ) return; -it->second.notifier.erase(std::remove(it->second.notifier.begin(), it->second.notifier.end(), pNotifier), it->second.notifier.end()); +std::erase(it->second.notifier, pNotifier); if( it->second.notifier.empty() ) m_aContent.erase( it );
[Libreoffice-commits] core.git: 2 commits - vcl/headless vcl/inc vcl/jsdialog vcl/qt5 vcl/source vcl/unx xmlsecurity/source
vcl/headless/svpframe.cxx|6 +++--- vcl/headless/svpvd.cxx |2 +- vcl/inc/impdel.hxx |2 +- vcl/jsdialog/jsdialogbuilder.cxx |3 +-- vcl/qt5/QtClipboard.cxx |3 +-- vcl/qt5/QtDragAndDrop.cxx|3 +-- vcl/qt5/QtVirtualDevice.cxx |4 +--- vcl/source/animate/Animation.cxx | 17 + vcl/source/app/session.cxx |2 +- vcl/source/app/svapp.cxx |2 +- vcl/source/app/vclevent.cxx |2 +- vcl/source/components/dtranscomp.cxx |2 +- vcl/source/control/button.cxx|3 +-- vcl/source/edit/textdoc.cxx |7 +++ vcl/source/helper/displayconnectiondispatch.cxx |2 +- vcl/source/helper/lazydelete.cxx |2 +- vcl/source/opengl/win/context.cxx|4 +--- vcl/source/opengl/x11/context.cxx|4 +--- vcl/source/window/dialog.cxx |2 +- vcl/source/window/errinf.cxx |5 ++--- vcl/source/window/event.cxx |4 ++-- vcl/unx/generic/dtrans/X11_clipboard.cxx |2 +- vcl/unx/generic/dtrans/X11_droptarget.cxx|2 +- vcl/unx/gtk3/gtkinst.cxx |4 ++-- xmlsecurity/source/helper/xmlsignaturehelper.cxx |4 ++-- 25 files changed, 37 insertions(+), 56 deletions(-) New commits: commit a761272a688d91eacc461e69cdcce55a27eb54b7 Author: Julien Nabet AuthorDate: Sun Nov 19 21:52:10 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:41:08 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (xmlsecurity) Change-Id: Ia7d9b806667a7c11743f7e9e4bb5525a1202e7fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159712 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index b20113022cde..0b5825b125a1 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -521,10 +521,10 @@ void XMLSignatureHelper::ExportSignatureContentTypes(const css::uno::Reference& rOverrides = pContentTypeInfo[1]; auto aOverrides = comphelper::sequenceToContainer< std::vector >(rOverrides); -aOverrides.erase(std::remove_if(aOverrides.begin(), aOverrides.end(), [](const beans::StringPair& rPair) +std::erase_if(aOverrides, [](const beans::StringPair& rPair) { return rPair.First.startsWith("/_xmlsignatures/sig"); -}), aOverrides.end()); +}); // Add our signature overrides. for (int i = 1; i <= nSignatureCount; ++i) commit 63d676e7557f2b63d8f2df6573e3b4af5bb46cb0 Author: Julien Nabet AuthorDate: Sun Nov 19 21:48:56 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:40:57 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (vcl) Change-Id: Ie9bb9ce20f27162bcb7d7d25dcad99107675e2be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159709 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index c6993860a7dd..e0971f85b9ac 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -82,7 +82,7 @@ SvpSalFrame::~SvpSalFrame() for( auto& rChild : Children ) rChild->SetParent( m_pParent ); if( m_pParent ) - m_pParent->m_aChildren.erase(std::remove(m_pParent->m_aChildren.begin(), m_pParent->m_aChildren.end(), this), m_pParent->m_aChildren.end()); +std::erase(m_pParent->m_aChildren, this); if( s_pFocusFrame == this ) { @@ -168,7 +168,7 @@ SalGraphics* SvpSalFrame::AcquireGraphics() void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) { SvpSalGraphics* pSvpGraphics = dynamic_cast(pGraphics); -m_aGraphics.erase(std::remove(m_aGraphics.begin(), m_aGraphics.end(), pSvpGraphics), m_aGraphics.end()); +std::erase(m_aGraphics, pSvpGraphics); delete pSvpGraphics; } @@ -475,7 +475,7 @@ void SvpSalFrame::SimulateKeyPress( sal_uInt16 /*nKeyCode*/ ) void SvpSalFrame::SetParent( SalFrame* pNewParent ) { if( m_pParent ) - m_pParent->m_aChildren.erase(std::remove(m_pParent->m_aChildren.begin(), m_pParent->m_aChildren.end(), this), m_pParent->m_aChildren.end()); +std::erase(m_pParent->m_aChildren, this); m_pParent = static_cast(pNewParent); } diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index ffbc3dc37190..c65951e02964 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -60,7 +60,7 @@ SalGraphics* SvpSalVirtualDevice::AcquireGraphics() void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfsprm.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 75f6a86ad924661f19c504380d96659e6b7d8afe Author: Julien Nabet AuthorDate: Sun Nov 19 21:50:04 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:40:41 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (writerfilter) Change-Id: Id506689954f20c3b66d417798f25807bd0e84ca3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159710 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index d98ea74abd55..4c7bf2967a53 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -103,9 +103,7 @@ void RTFSprms::set(Id nKeyword, const RTFValue::Pointer_t& pValue, RTFOverwrite { case RTFOverwrite::YES_PREPEND: { -m_pSprms->erase( -std::remove_if(m_pSprms->begin(), m_pSprms->end(), RTFSprms_compare{ nKeyword }), -m_pSprms->end()); +std::erase_if(*m_pSprms, RTFSprms_compare{ nKeyword }); m_pSprms->emplace(m_pSprms->cbegin(), nKeyword, pValue); break; }
[Libreoffice-commits] core.git: 2 commits - toolkit/source unotools/source
toolkit/source/awt/vclxtabpagecontainer.cxx |2 +- unotools/source/config/configmgr.cxx|2 +- unotools/source/misc/desktopterminationobserver.cxx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 2ea548e394a504a2277a17f333f862540d48b817 Author: Julien Nabet AuthorDate: Sun Nov 19 21:33:18 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:40:29 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (unotools) Change-Id: Iebc949486322b55f60e83b27739acc1c16d2a25e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159707 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index f3aef792e856..e19c7c694a6a 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -157,7 +157,7 @@ utl::ConfigManager::addConfigItem(utl::ConfigItem & item) { } void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) { -items_.erase(std::remove(items_.begin(), items_.end(), ), items_.end()); +std::erase(items_, ); } void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) { diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 138125a4fc10..2eeb44a92dda 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -180,7 +180,7 @@ namespace utl { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); Listeners& rListeners = getListenerAdminData().aListeners; -rListeners.erase(std::remove(rListeners.begin(), rListeners.end(), _pListener), rListeners.end()); +std::erase(rListeners, _pListener); } } // namespace utl commit 042fb18fbcb98ee7e9b3982d987421e43b99cbff Author: Julien Nabet AuthorDate: Sun Nov 19 21:30:40 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:40:15 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (toolkit) Change-Id: Ied5fc25f959e938fdd80532375486c167c370e35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159705 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 55a27ba2af27..afd3d843b7ef 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -199,7 +199,7 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const css::container::Contai Reference< awt::XControl > xControl(xTabPage,UNO_QUERY ); Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY ); pTabCtrl->RemovePage(xP->getTabPageID()); - m_aTabPages.erase(::std::remove(m_aTabPages.begin(),m_aTabPages.end(),xTabPage)); +std::erase(m_aTabPages,xTabPage); } } void SAL_CALL VCLXTabPageContainer::elementReplaced( const css::container::ContainerEvent& /*Event*/ )
[Libreoffice-commits] core.git: 2 commits - svx/source xmloff/source
svx/source/diagram/datamodel.cxx | 14 +- svx/source/dialog/charmap.cxx |5 ++--- svx/source/sdr/animation/scheduler.cxx |2 +- svx/source/svdraw/svdhdl.cxx |4 +--- svx/source/svdraw/svdmark.cxx |4 +--- svx/source/unodraw/unoshcol.cxx|2 +- svx/source/unodraw/unoshtxt.cxx|2 +- svx/source/unogallery/unogaltheme.cxx |2 +- xmloff/source/draw/shapeexport.cxx |4 +--- 9 files changed, 14 insertions(+), 25 deletions(-) New commits: commit 39aff36a842ae4df59c283dbba7f2ebfcf5d66fd Author: Julien Nabet AuthorDate: Sun Nov 19 21:51:04 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:39:56 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (xmloff) Change-Id: Idb65092e79a9afc6195bce0dbd5b3861d83a01be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159711 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index e2035da6cc4c..cbb027829713 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1046,9 +1046,7 @@ void FixZOrder(uno::Reference const& xShapes, layers[nLayer].nMax = i; } } -layers.erase(std::remove_if(layers.begin(), layers.end(), -[](Layer const& rLayer) { return rLayer.shapes.empty(); }), -layers.end()); +std::erase_if(layers, [](Layer const& rLayer) { return rLayer.shapes.empty(); }); bool isSorted(true); for (size_t i = 1; i < layers.size(); ++i) { commit 15ef2909b88ef97b84615837e8bdb448481d61c1 Author: Julien Nabet AuthorDate: Sun Nov 19 20:57:35 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:39:42 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (svx) Change-Id: If0cca803cd182f5def098ab06a0c5a4a479758bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159702 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/svx/source/diagram/datamodel.cxx b/svx/source/diagram/datamodel.cxx index 42677954bada..0cf0541cd2a1 100644 --- a/svx/source/diagram/datamodel.cxx +++ b/svx/source/diagram/datamodel.cxx @@ -125,18 +125,16 @@ bool DiagramData::removeNode(const OUString& rNodeId) aIdsToRemove.insert(aCxn.msPresId); // remove connections -maConnections.erase(std::remove_if(maConnections.begin(), maConnections.end(), +std::erase_if(maConnections, [aIdsToRemove](const Connection& rCxn) { return aIdsToRemove.count(rCxn.msSourceId) || aIdsToRemove.count(rCxn.msDestId); - }), -maConnections.end()); + }); // remove data and presentation nodes -maPoints.erase(std::remove_if(maPoints.begin(), maPoints.end(), +std::erase_if(maPoints, [aIdsToRemove](const Point& rPoint) { return aIdsToRemove.count(rPoint.msModelId); - }), - maPoints.end()); + }); // TODO: fix source/dest order return true; @@ -221,9 +219,7 @@ std::vector> DiagramData::getChildren(const OUStri } // HACK: empty items shouldn't appear there -aChildren.erase(std::remove_if(aChildren.begin(), aChildren.end(), - [](const std::pair& aItem) { return aItem.first.isEmpty(); }), -aChildren.end()); +std::erase_if(aChildren, [](const std::pair& aItem) { return aItem.first.isEmpty(); }); return aChildren; } diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b8e10ad4e048..be2d991977b5 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -1946,14 +1946,13 @@ void SubsetMap::ApplyCharMap( const FontCharMapRef& rxFontCharMap ) return; // remove subsets that are not matched in any range -maSubsets.erase(std::remove_if(maSubsets.begin(), maSubsets.end(), +std::erase_if(maSubsets, [](const Subset& rSubset) { sal_uInt32 cMin = rSubset.GetRangeMin(); sal_uInt32 cMax = rSubset.GetRangeMax(); int nCount = rxFontCharMap->CountCharsInRange( cMin, cMax ); return nCount <= 0; -}), -maSubsets.end()); +}); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index d4451c099a65..02017d915d97 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -154,7 +154,7 @@ namespace sdr::animation { if(!mvEvents.empty())
[Libreoffice-commits] core.git: svtools/source
svtools/source/config/miscopt.cxx |2 +- svtools/source/dialogs/insdlg.cxx |4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit 31795be8ee5bcc113f2d18d315f842a89e95b316 Author: Julien Nabet AuthorDate: Sun Nov 19 20:52:41 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 20 07:38:52 2023 +0100 c++20: use std::erase(_if) instead of std::remove(_if)+erase (svtools) Change-Id: I53a244ac751dbe9d40e8f541fcb6d7ff89ff83f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159701 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 625086eee24c..ca8537b1c38c 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -228,7 +228,7 @@ void SvtMiscOptions_Impl::AddListenerLink( const Link& rLin void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink ) { -aList.erase(std::remove(aList.begin(), aList.end(), rLink), aList.end()); +std::erase(aList, rLink); } void SvtMiscOptions_Impl::CallListeners() diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 7fe1728f4194..50fad4a75dcd 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -97,9 +97,7 @@ const SvObjectServer * SvObjectServerList::Get( const SvGlobalName & rName ) con void SvObjectServerList::Remove( const SvGlobalName & rName ) { -aObjectServerList.erase(std::remove_if(aObjectServerList.begin(), aObjectServerList.end(), -[rName](const SvObjectServer& rServer) { return rServer.GetClassName() == rName; }), -aObjectServerList.end()); +std::erase_if(aObjectServerList, [rName](const SvObjectServer& rServer) { return rServer.GetClassName() == rName; }); }
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/cfgmerge.cxx | 10 +- l10ntools/source/helpmerge.cxx | 16 l10ntools/source/lngex.cxx |2 +- l10ntools/source/lngmerge.cxx | 10 +- l10ntools/source/merge.cxx | 10 +- l10ntools/source/po.cxx|4 ++-- l10ntools/source/propex.cxx|2 +- l10ntools/source/propmerge.cxx |2 +- l10ntools/source/treemerge.cxx |6 +++--- l10ntools/source/xmlparse.cxx | 34 +- l10ntools/source/xrmmerge.cxx | 28 ++-- 11 files changed, 62 insertions(+), 62 deletions(-) New commits: commit 2718e9c1d5779a23bd6587a7e0e55a0281b88745 Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:41:10 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:28:07 2023 +0100 Extended loplugin:ostr: l10ntools Change-Id: I6c46535568ac6c29784e9336198b51c79c9e3859 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159695 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index f07323ef7efd..9ed721aab651 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -52,7 +52,7 @@ FILE * init(int argc, char ** argv) { common::HandledArgs aArgs; if ( !common::handleArguments(argc, argv, aArgs) ) { -common::writeUsage("cfgex","*.xcu"); +common::writeUsage("cfgex"_ostr,"*.xcu"_ostr); std::exit(EXIT_FAILURE); } global::inputPathname = aArgs.m_sInputFile; @@ -365,10 +365,10 @@ void CfgExport::WorkOnResourceEnd() if ( !bLocalize ) return; -if ( pStackData->sText["en-US"].isEmpty() ) +if ( pStackData->sText["en-US"_ostr].isEmpty() ) return; -OString sXComment = pStackData->sText[OString("x-comment")]; +OString sXComment = pStackData->sText["x-comment"_ostr]; OString sLocalId = pStackData->sIdentifier; OString sGroupId; if ( aStack.size() == 1 ) { @@ -380,11 +380,11 @@ void CfgExport::WorkOnResourceEnd() } -OString sText = pStackData->sText[ "en-US" ]; +OString sText = pStackData->sText[ "en-US"_ostr ]; sText = helper::UnQuotHTML( sText ); common::writePoEntry( -"Cfgex", pOutputStream, sPath, pStackData->sResTyp, +"Cfgex"_ostr, pOutputStream, sPath, pStackData->sResTyp, sGroupId, sLocalId, sXComment, sText); } diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index abdc47d1c1d4..991309a5ee01 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -108,17 +108,17 @@ bool HelpParser::CreatePO( auto posm = aXMLStrHM->find(pos); LangHashMap* pElem = posm->second; -XMLElement* pXMLElement = (*pElem)[ "en-US" ]; +XMLElement* pXMLElement = (*pElem)[ "en-US"_ostr ]; if( pXMLElement != nullptr ) { OString data( pXMLElement->ToOString(). -replaceAll("\n",OString()). -replaceAll("\t",OString()).trim()); +replaceAll("\n"_ostr,OString()). +replaceAll("\t"_ostr,OString()).trim()); common::writePoEntry( -"Helpex", aPoOutput, sHelpFile, rGsi1, +"Helpex"_ostr, aPoOutput, sHelpFile, rGsi1, posm->first, OString(), OString(), data); pXMLElement=nullptr; @@ -158,7 +158,7 @@ void HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile file->Extract(); XMLHashMap* aXMLStrHM = file->GetStrings(); -static ResData s_ResData("",""); +static ResData s_ResData(""_ostr,""_ostr); s_ResData.sResTyp = "help"; std::vector order = file->getOrder(); @@ -190,7 +190,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa if( sCur.equalsIgnoreAsciiCase("en-US") ) return; -pXMLElement = (*aLangHM)[ "en-US" ]; +pXMLElement = (*aLangHM)[ "en-US"_ostr ]; if( pXMLElement == nullptr ) { printf("Error: Can't find en-US entry\n"); @@ -202,10 +202,10 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa OString sSourceText( pXMLElement->ToOString(). replaceAll( -"\n", +"\n"_ostr, OString()). replaceAll( -"\t", +"\t"_ostr, OString())); // re-add spaces to the beginning of translated string, // important for indentation of Basic code examples diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 2d7c413ad1ed..69d49f885a1c 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -30,7 +30,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) common::HandledArgs aArgs; if (!common::handleArguments(argc, argv, aArgs)) { -
[Libreoffice-commits] core.git: 2 commits - idl/source o3tl/qa
idl/source/cmptools/lex.cxx|4 ++-- idl/source/objects/bastype.cxx |2 +- idl/source/objects/object.cxx |2 +- idl/source/objects/slot.cxx|2 +- idl/source/objects/types.cxx |6 +++--- idl/source/prj/database.cxx| 16 idl/source/prj/globals.cxx | 12 ++-- idl/source/prj/parser.cxx | 22 +++--- o3tl/qa/test-string_view.cxx | 12 ++-- 9 files changed, 39 insertions(+), 39 deletions(-) New commits: commit fa7dd627c9d74f5bf584caddbdc32c7a0f3543a1 Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:40:19 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:27:41 2023 +0100 Extended loplugin:ostr: o3tl Change-Id: Iac716011fd421c6dd0d40cf81dc6cbebb1ae4e71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159693 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/o3tl/qa/test-string_view.cxx b/o3tl/qa/test-string_view.cxx index 021c8decf431..f32537aa3596 100644 --- a/o3tl/qa/test-string_view.cxx +++ b/o3tl/qa/test-string_view.cxx @@ -30,12 +30,12 @@ CppUnit::assertion_traits::toString(std::u16string_view con namespace { OString ostringEmpty() { return {}; } // avoid loplugin:stringview -OString ostringDoof() { return "doof"; } // avoid loplugin:stringview -OString ostringFoo() { return "foo"; } // avoid loplugin:stringview -OString ostringFoobars() { return "foobars"; } // avoid loplugin:stringview -OString ostringFood() { return "food"; } // avoid loplugin:stringview -OString ostringOof() { return "oof"; } // avoid loplugin:stringview -OString ostringSraboof() { return "sraboof"; } // avoid loplugin:stringview +OString ostringDoof() { return "doof"_ostr; } // avoid loplugin:stringview +OString ostringFoo() { return "foo"_ostr; } // avoid loplugin:stringview +OString ostringFoobars() { return "foobars"_ostr; } // avoid loplugin:stringview +OString ostringFood() { return "food"_ostr; } // avoid loplugin:stringview +OString ostringOof() { return "oof"_ostr; } // avoid loplugin:stringview +OString ostringSraboof() { return "sraboof"_ostr; } // avoid loplugin:stringview OUString oustringEmpty() { return {}; } // avoid loplugin:stringview OUString oustringDoof() { return "doof"; } // avoid loplugin:stringview OUString oustringFoo() { return "foo"; } // avoid loplugin:stringview commit f8087b516ac1b000ca0454682d865340e790915a Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:41:41 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:27:30 2023 +0100 Extended loplugin:ostr: idl Change-Id: I22adb7f3750f1e1b9910f37046c5da98ac7ab5be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159697 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index eb9ad11703a2..e8fd0280d393 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -72,8 +72,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj ) void SvTokenStream::InitCtor() { -aStrTrue = OString("TRUE"); -aStrFalse = OString("FALSE"); +aStrTrue = "TRUE"_ostr; +aStrFalse = "FALSE"_ostr; nLine = nColumn = 0; nBufPos = 0; nMaxPos = 0; diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 6a36db617f54..3d03c7308f74 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -34,7 +34,7 @@ bool SvBOOL::ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm { rTok = rInStm.GetToken(); if( !rTok.IsBool() ) -throw SvParseException(rInStm, "xxx"); +throw SvParseException(rInStm, "xxx"_ostr); *this = rTok.GetBool(); rInStm.GetToken_Next(); } diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 4f3a0836791d..908ef3d16548 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -48,7 +48,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase, { SvMetaClass * pClass = rBase.ReadKnownClass( rInStm ); if( !pClass ) -throw SvParseException( rInStm, "unknown imported interface" ); +throw SvParseException( rInStm, "unknown imported interface"_ostr ); SvClassElement aEle; aEle.SetClass( pClass ); aClassElementList.push_back( aEle ); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 6b2d7640c077..58b3faa522b4 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -207,7 +207,7 @@ bool SvMetaSlot::Test( SvTokenStream & rInStm ) pType = pType->GetReturnType(); if( !pType->IsItem() ) { -throw SvParseException( rInStm, "this attribute is not a slot" ); +throw SvParseException( rInStm, "this attribute is not a slot"_ostr ); }
[Libreoffice-commits] core.git: filter/qa filter/source
filter/qa/unit/svg.cxx | 49 filter/source/msfilter/util.cxx |2 - filter/source/svg/svgexport.cxx |2 - filter/source/xsltfilter/OleHandler.cxx | 10 +++--- 4 files changed, 33 insertions(+), 30 deletions(-) New commits: commit 1b19c6b7d03b0f7098f43131358227df28e59d84 Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:42:51 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:27:05 2023 +0100 Extended loplugin:ostr: filter Change-Id: I1c45cecb97789a3fc229084de1b7b4968d6069c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159699 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 4c1ddd10b58a..6297e1856a06 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -65,7 +65,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg) // Make sure that the original JPG data is reused and we don't perform a PNG re-compress. xmlDocUniquePtr pXmlDoc = parseXmlStream(); -OUString aAttributeValue = getXPath(pXmlDoc, "//svg:image", "href"); +OUString aAttributeValue = getXPath(pXmlDoc, "//svg:image"_ostr, "href"_ostr); // Without the accompanying fix in place, this test would have failed with: // - Expression: aAttributeValue.startsWith("data:image/jpeg") @@ -93,7 +93,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentLine) // Get the style of the group around the actual element. xmlDocUniquePtr pXmlDoc = parseXmlStream(); OUString aStyle = getXPath( -pXmlDoc, "//svg:g[@class='com.sun.star.drawing.LineShape']/svg:g/svg:g", "style"); +pXmlDoc, "//svg:g[@class='com.sun.star.drawing.LineShape']/svg:g/svg:g"_ostr, "style"_ostr); // Without the accompanying fix in place, this test would have failed, as the style was // "mask:url(#mask1)", not "opacity: ". CPPUNIT_ASSERT(aStyle.startsWith("opacity: ", )); @@ -119,8 +119,9 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentFillWithTransparentLine) // Get the style of the group around the actual element. xmlDocUniquePtr pXmlDoc = parseXmlStream(); -OUString aStyle = getXPath( -pXmlDoc, "//svg:g[@class='com.sun.star.drawing.EllipseShape']/svg:g/svg:g", "style"); +OUString aStyle += getXPath(pXmlDoc, "//svg:g[@class='com.sun.star.drawing.EllipseShape']/svg:g/svg:g"_ostr, + "style"_ostr); CPPUNIT_ASSERT(aStyle.startsWith("opacity: ", )); int nPercent = std::round(aStyle.toDouble() * 100); // Make sure that the line is still 50% opaque @@ -128,7 +129,8 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentFillWithTransparentLine) // Get the stroke of the fill of the EllipseShape (it must be "none") OUString aStroke = getXPath( -pXmlDoc, "//svg:g[@class='com.sun.star.drawing.EllipseShape']/svg:g/svg:path", "stroke"); +pXmlDoc, "//svg:g[@class='com.sun.star.drawing.EllipseShape']/svg:g/svg:path"_ostr, +"stroke"_ostr); // Without the accompanying fix in place, this test would have failed, as the stroke was // "rgb(255,255,255)", not "none". CPPUNIT_ASSERT_EQUAL(OUString("none"), aStroke); @@ -163,13 +165,13 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentText) // - Actual : 1 // i.e. the 2nd shape lots its text. -assertXPath(pXmlDoc, "//svg:g[@class='TextShape']//svg:text", 2); +assertXPath(pXmlDoc, "//svg:g[@class='TextShape']//svg:text"_ostr, 2); // First shape has semi-transparent text. -assertXPath(pXmlDoc, "//svg:text[1]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity='0.8']"); +assertXPath(pXmlDoc, "//svg:text[1]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity='0.8']"_ostr); // Second shape has normal text. -assertXPath(pXmlDoc, "//svg:text[2]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity]", 0); +assertXPath(pXmlDoc, "//svg:text[2]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity]"_ostr, 0); } CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentMultiParaText) @@ -207,20 +209,20 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentMultiParaText) // Then make sure that the two semi-transparent paragraphs have the same X position: xmlDocUniquePtr pXmlDoc = parseXmlStream(); -assertXPath(pXmlDoc, "(//svg:g[@class='TextShape']//svg:tspan[@class='TextPosition'])[1]", "x", -"250"); +assertXPath(pXmlDoc, "(//svg:g[@class='TextShape']//svg:tspan[@class='TextPosition'])[1]"_ostr, +"x"_ostr, "250"); assertXPath(pXmlDoc, - "(//svg:g[@class='TextShape']//svg:tspan[@class='TextPosition'])[1]/svg:tspan", -"fill-opacity", "0.8"); + "(//svg:g[@class='TextShape']//svg:tspan[@class='TextPosition'])[1]/svg:tspan"_ostr, +"fill-opacity"_ostr, "0.8"); // Without the
[Libreoffice-commits] core.git: i18npool/qa
i18npool/qa/cppunit/test_defaultnumberingprovider.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f94351f54bfaa6e6da42da2a33b3fa468b878a1f Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:42:07 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:26:48 2023 +0100 Extended loplugin:ostr: i18npool Change-Id: Ia0a844bc6e3f27758c869f5e229097085288e8bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159698 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx index 69ac73d41a89..7e37f1c28ff7 100644 --- a/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx +++ b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx @@ -63,7 +63,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testNumberingIdentifi { aFail.emplace_back( "Numbering: " + OString::number(i) + " \"" + aID.toUtf8() + "\"" -+ (aID.isEmpty() ? "" ++ (aID.isEmpty() ? ""_ostr : OString(" duplicate of " + OString::number(aMap[aID]))) + "\n"); } @@ -72,7 +72,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testNumberingIdentifi if (!aFail.empty()) { -OString aMsg("Not unique numbering identifiers:\n"); +OString aMsg("Not unique numbering identifiers:\n"_ostr); for (auto const& r : aFail) aMsg += r; CPPUNIT_ASSERT_MESSAGE(aMsg.getStr(), false);
[Libreoffice-commits] core.git: 2 commits - jvmfwk/source linguistic/qa
jvmfwk/source/elements.cxx | 20 ++-- jvmfwk/source/framework.cxx|2 +- jvmfwk/source/fwkbase.cxx | 22 +++--- jvmfwk/source/fwkutil.cxx |2 +- linguistic/qa/restprotocol.cxx |4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) New commits: commit cdb5f9595f2eb6a4d5f28c19380bcacc6d2b550b Author: Stephan Bergmann AuthorDate: Sun Nov 19 20:41:28 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:26:38 2023 +0100 Extended loplugin:ostr: jvmfwk Change-Id: Ibb17d89a5ed618b4d5e6be9ac9ee89e2751c3ed7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159696 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 57b500c56d56..d47af20f2e4b 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -55,14 +55,14 @@ static OString getElement(OString const & docPath, if (doc == nullptr) throw FrameworkException( JFW_E_ERROR, -"[Java framework] Error in function getElement (elements.cxx)"); +"[Java framework] Error in function getElement (elements.cxx)"_ostr); jfw::CXPathContextPtr context(xmlXPathNewContext(doc)); if (xmlXPathRegisterNs(context, reinterpret_cast("jf"), reinterpret_cast(NS_JAVA_FRAMEWORK)) == -1) throw FrameworkException( JFW_E_ERROR, -"[Java framework] Error in function getElement (elements.cxx)"); +"[Java framework] Error in function getElement (elements.cxx)"_ostr); CXPathObjectPtr pathObj = xmlXPathEvalExpression(pathExpression, context); OString sValue; @@ -70,7 +70,7 @@ static OString getElement(OString const & docPath, { throw FrameworkException( JFW_E_ERROR, -"[Java framework] Error in function getElement (elements.cxx)"); +"[Java framework] Error in function getElement (elements.cxx)"_ostr); } sValue = reinterpret_cast(pathObj->nodesetval->nodeTab[0]->content); return sValue; @@ -85,7 +85,7 @@ OString getElementUpdated() void createSettingsStructure(xmlDoc * document, bool * bNeedsSave) { OString sExcMsg("[Java framework] Error in function createSettingsStructure " - "(elements.cxx)."); + "(elements.cxx)."_ostr); xmlNode * root = xmlDocGetRootElement(document); if (root == nullptr) throw FrameworkException(JFW_E_ERROR, sExcMsg); @@ -171,7 +171,7 @@ NodeJava::NodeJava(Layer layer): if (getMode() == JFW_MODE_DIRECT) throw FrameworkException( JFW_E_DIRECT_MODE, -"[Java framework] Trying to access settings files in direct mode."); +"[Java framework] Trying to access settings files in direct mode."_ostr); } @@ -190,7 +190,7 @@ void NodeJava::load() if (s == FILE_INVALID) throw FrameworkException( JFW_E_ERROR, -"[Java framework] Invalid file for shared Java settings."); +"[Java framework] Invalid file for shared Java settings."_ostr); else if (s == FILE_DOES_NOT_EXIST) //Writing shared data is not supported yet. return; @@ -352,7 +352,7 @@ bool NodeJava::prepareSettingsDocument() const { OString sExcMsg( "[Java framework] Error in function prepareSettingsDocument" -" (elements.cxx)."); +" (elements.cxx)."_ostr); if (!createSettingsDocument()) { return false; @@ -376,7 +376,7 @@ bool NodeJava::prepareSettingsDocument() const void NodeJava::write() const { OString sExcMsg("[Java framework] Error in function NodeJava::writeSettings " - "(elements.cxx)."); + "(elements.cxx)."_ostr); CXmlDocPtr docUser; CXPathContextPtr contextUser; CXPathObjectPtr pathObj; @@ -628,7 +628,7 @@ bool NodeJava::createSettingsDocument() const } //make sure there is a user directory OString sExcMsg("[Java framework] Error in function createSettingsDocument " - "(elements.cxx)."); + "(elements.cxx)."_ostr); // check if javasettings.xml already exist if (FILE_OK == checkSettingsFileStatus(sURL)) return true; @@ -681,7 +681,7 @@ CNodeJavaInfo::CNodeJavaInfo() : void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) { OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode " - "(elements.cxx)."); + "(elements.cxx)."_ostr); OSL_ASSERT(pJavaInfo && pDoc); if (pJavaInfo->children == nullptr) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index cfeca1f72904..0e74420e398f 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -512,7 +512,7 @@
[Libreoffice-commits] core.git: 2 commits - desktop/inc desktop/qa desktop/source extensions/source
desktop/inc/lib/init.hxx |4 desktop/qa/desktop_lib/test_desktop_lib.cxx | 178 +- desktop/source/app/dispatchwatcher.cxx|2 desktop/source/app/lockfile2.cxx |8 desktop/source/app/officeipcthread.cxx|2 desktop/source/deployment/manager/dp_extensionmanager.cxx |2 desktop/source/deployment/manager/dp_manager.cxx |2 desktop/source/deployment/misc/lockfile.cxx | 24 - desktop/source/deployment/registry/component/dp_component.cxx |8 desktop/source/deployment/registry/package/dp_package.cxx |4 extensions/source/scanner/sanedlg.cxx |8 extensions/source/update/check/download.cxx |2 extensions/source/update/check/updatecheck.cxx|2 13 files changed, 123 insertions(+), 123 deletions(-) New commits: commit f94987039b0b08db878b1c444c28b302d6723fac Author: Stephan Bergmann AuthorDate: Sun Nov 19 21:20:00 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:26:11 2023 +0100 Extended loplugin:ostr: extensions Change-Id: I0c70fc1d42031a5a6ebd900cd20b1e7e40d9352d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159703 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index f186d6c5ed27..b4f5e9a36cb7 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -1283,8 +1283,8 @@ bool SaneDlg::LoadState() if( ! aConfig.HasGroup( "SANE" ) ) return false; -aConfig.SetGroup( "SANE" ); -OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); +aConfig.SetGroup( "SANE"_ostr ); +OString aString = aConfig.ReadKey( "SO_LastSaneDevice"_ostr ); for( i = 0; i < Sane::CountDevices() && aString != OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding()); i++ ) ; if( i == Sane::CountDevices() ) return false; @@ -1356,8 +1356,8 @@ void SaneDlg::SaveState() Config aConfig( aFileName ); aConfig.DeleteGroup( "SANE" ); -aConfig.SetGroup( "SANE" ); -aConfig.WriteKey( "SO_LastSANEDevice", +aConfig.SetGroup( "SANE"_ostr ); +aConfig.WriteKey( "SO_LastSANEDevice"_ostr, OUStringToOString(mxDeviceBox->get_active_text(), RTL_TEXTENCODING_UTF8) ); static char const* pSaveOptions[] = { diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index ab5402c0ae42..f96d6ecd495e 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -293,7 +293,7 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro // Only report errors when not stopped else { -OString aMessage("Unknown error"); +OString aMessage("Unknown error"_ostr); const char * error_message = curl_easy_strerror(cc); if( nullptr != error_message ) diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 395d90444ed6..26b83f9d83f7 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -1407,7 +1407,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString ) rc = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); if ( rc != osl::FileBase::E_None ) return false; -OString aLineBuf("[InternetShortcut]\r\n"); +OString aLineBuf("[InternetShortcut]\r\n"_ostr); sal_uInt64 nWritten = 0; OUString aURL( rURL ); commit b5da85150d0b4ab693616b0f6af613842b7acde3 Author: Stephan Bergmann AuthorDate: Sun Nov 19 23:24:16 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Nov 20 07:26:01 2023 +0100 Extended loplugin:ostr: desktop Change-Id: I0c86c1207f906e19c770b71ae1c5daec1c912845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159717 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index edc1b12a0c71..323a508098f5 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -66,10 +66,10 @@ namespace desktop { OString toString() const { if (m_nPart >= -1) -return (isInfinite() ? "EMPTY" : m_aRectangle.toString()) +return (isInfinite() ? "EMPTY"_ostr : m_aRectangle.toString()) + ", " + OString::number(m_nPart) + ", " + OString::number(m_nMode); else -return (isInfinite() ? "EMPTY" : m_aRectangle.toString()); +return (isInfinite() ? "EMPTY"_ostr : m_aRectangle.toString()); } /// Infinite Rectangle
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source sc/source sw/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 24 +- drawinglayer/source/tools/primitive2dxmldump.cxx | 110 ++--- sc/source/ui/view/output.cxx |2 sc/source/ui/view/output2.cxx | 62 +++ sc/source/ui/view/viewfunc.cxx |2 sw/source/core/layout/atrfrm.cxx |6 sw/source/filter/basflt/fltshell.cxx |2 7 files changed, 104 insertions(+), 104 deletions(-) New commits: commit a5f5eb28d0dcb66d5d947db7087f501ec73e00d7 Author: Noel Grandin AuthorDate: Sun Nov 19 18:49:25 2023 +0200 Commit: Noel Grandin CommitDate: Mon Nov 20 07:25:52 2023 +0100 use the cheaper variant of SfxItemPool::areSame where possible Change-Id: I10a357293ef176fb8aba7a683cac9a73ac3ea897 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159684 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 47fdab381c9f..9d0fe1430550 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -766,7 +766,7 @@ static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, const ScPatternAttr* pPat1 = rFirst.cellInfo(nX).pPatternAttr; const ScPatternAttr* pPat2 = rOther.cellInfo(nX).pPatternAttr; if ( !pPat1 || !pPat2 || -!SfxPoolItem::areSame(>GetItem(ATTR_PROTECTION), >GetItem(ATTR_PROTECTION) ) ) +!SfxPoolItem::areSame(pPat1->GetItem(ATTR_PROTECTION), pPat2->GetItem(ATTR_PROTECTION) ) ) return false; } } diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 2d6cda3d652a..473671ea1cf3 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1029,67 +1029,67 @@ static bool StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAtt return false; else if ( !rpOldPattern ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_FONT ), >GetItem( ATTR_FONT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_FONT ), rpOldPattern->GetItem( ATTR_FONT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CJK_FONT ), >GetItem( ATTR_CJK_FONT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CJK_FONT ), rpOldPattern->GetItem( ATTR_CJK_FONT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CTL_FONT ), >GetItem( ATTR_CTL_FONT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CTL_FONT ), rpOldPattern->GetItem( ATTR_CTL_FONT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_FONT_HEIGHT ), >GetItem( ATTR_FONT_HEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_FONT_HEIGHT ), rpOldPattern->GetItem( ATTR_FONT_HEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CJK_FONT_HEIGHT ), >GetItem( ATTR_CJK_FONT_HEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CJK_FONT_HEIGHT ), rpOldPattern->GetItem( ATTR_CJK_FONT_HEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CTL_FONT_HEIGHT ), >GetItem( ATTR_CTL_FONT_HEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CTL_FONT_HEIGHT ), rpOldPattern->GetItem( ATTR_CTL_FONT_HEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_FONT_WEIGHT ), >GetItem( ATTR_FONT_WEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_FONT_WEIGHT ), rpOldPattern->GetItem( ATTR_FONT_WEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CJK_FONT_WEIGHT ), >GetItem( ATTR_CJK_FONT_WEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CJK_FONT_WEIGHT ), rpOldPattern->GetItem( ATTR_CJK_FONT_WEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CTL_FONT_WEIGHT ), >GetItem( ATTR_CTL_FONT_WEIGHT ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CTL_FONT_WEIGHT ), rpOldPattern->GetItem( ATTR_CTL_FONT_WEIGHT ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_FONT_POSTURE ), >GetItem( ATTR_FONT_POSTURE ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_FONT_POSTURE ), rpOldPattern->GetItem( ATTR_FONT_POSTURE ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CJK_FONT_POSTURE ), >GetItem( ATTR_CJK_FONT_POSTURE ) ) ) +else if ( !SfxPoolItem::areSame( pNewPattern->GetItem( ATTR_CJK_FONT_POSTURE ), rpOldPattern->GetItem( ATTR_CJK_FONT_POSTURE ) ) ) return true; -else if ( !SfxPoolItem::areSame( >GetItem( ATTR_CTL_FONT_POSTURE ), >GetItem(
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 2bbacaf8170a119099fb1a6d89ab608051194625 Author: Arnaud VERSINI AuthorDate: Sun Nov 12 16:17:44 2023 +0100 Commit: Mike Kaganski CommitDate: Mon Nov 20 07:24:19 2023 +0100 vcl gtk3 : no need to use ClearableMutexGuard instead of Guard Change-Id: I3dc75125fa89f6b584d4caa1a950e0ec9a461fc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159347 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 22b0e0273381..e3369c163f44 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -1456,14 +1456,14 @@ std::vector VclToGtkHelper::FormatsToGtk(const css::uno::Sequenc IMPL_LINK_NOARG(VclGtkClipboard, AsyncSetGtkClipboard, void*, void) { -osl::ClearableMutexGuard aGuard( m_aMutex ); +osl::Guard aGuard( m_aMutex ); m_pSetClipboardEvent = nullptr; SetGtkClipboard(); } void VclGtkClipboard::SyncGtkClipboard() { -osl::ClearableMutexGuard aGuard(m_aMutex); +osl::Guard aGuard(m_aMutex); if (m_pSetClipboardEvent) { Application::RemoveUserEvent(m_pSetClipboardEvent); @@ -1569,14 +1569,14 @@ sal_Int8 VclGtkClipboard::getRenderingCapabilities() void VclGtkClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) { -osl::ClearableMutexGuard aGuard( m_aMutex ); +osl::Guard aGuard( m_aMutex ); m_aListeners.push_back( listener ); } void VclGtkClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) { -osl::ClearableMutexGuard aGuard( m_aMutex ); +osl::Guard aGuard( m_aMutex ); m_aListeners.erase(std::remove(m_aListeners.begin(), m_aListeners.end(), listener), m_aListeners.end()); }
[Libreoffice-bugs] [Bug 129849] FILEOPEN DOCX: Math Formula size and color lost on import
https://bugs.documentfoundation.org/show_bug.cgi?id=129849 --- Comment #11 from schlebe --- Yes, you assume right. I have tested using 7.6.3.1. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143148] Use pragma once instead of include guards (Episode 2: Endgame)
https://bugs.documentfoundation.org/show_bug.cgi?id=143148 --- Comment #111 from Commit Notification --- Taichi Haradaguchi committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/76898eaf8fc665802c4fcdd129ec221d9019d4b9 tdf#143148: Use pragma once instead of include guards in vcl/inc/unx It will be available in 24.2.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/unx/cairotextrender.hxx |5 + vcl/inc/unx/cpdmgr.hxx |6 +- vcl/inc/unx/cupsmgr.hxx |5 + vcl/inc/unx/fc_fontoptions.hxx |6 +- vcl/inc/unx/gendisp.hxx |5 + vcl/inc/unx/genprn.h |5 + vcl/inc/unx/gensys.h |5 + vcl/inc/unx/gtk/gloactiongroup.h |5 + vcl/inc/unx/gtk/glomenu.h|5 + vcl/inc/unx/gtk/gtkinst.hxx |5 + vcl/inc/unx/gtk/gtkobject.hxx|6 +- vcl/inc/unx/gtk/gtksalmenu.hxx |5 + vcl/inc/unx/gtk/gtksys.hxx |6 ++ vcl/inc/unx/gtk/hudawareness.h |5 + vcl/inc/unx/helper.hxx |6 +- vcl/inc/unx/i18n_cb.hxx |6 ++ vcl/inc/unx/i18n_ic.hxx |5 + vcl/inc/unx/i18n_im.hxx |5 + vcl/inc/unx/i18n_keysym.hxx |5 + vcl/inc/unx/i18n_xkb.hxx |5 + vcl/inc/unx/saldata.hxx |5 + vcl/inc/unx/saldisp.hxx |5 + vcl/inc/unx/salframe.h |5 + vcl/inc/unx/salinst.h|5 + vcl/inc/unx/salobj.h |5 + vcl/inc/unx/saltimer.h |5 + vcl/inc/unx/saltype.h|5 ++--- vcl/inc/unx/salunx.h |5 + vcl/inc/unx/salunxtime.h |5 + vcl/inc/unx/salvd.h |5 + vcl/inc/unx/sessioninhibitor.hxx |5 + vcl/inc/unx/sm.hxx |6 ++ vcl/inc/unx/svsys.h |6 ++ vcl/inc/unx/wmadaptor.hxx|5 + vcl/inc/unx/x11/x11gdiimpl.h |5 + 35 files changed, 40 insertions(+), 143 deletions(-) New commits: commit 76898eaf8fc665802c4fcdd129ec221d9019d4b9 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Sun Nov 19 11:10:53 2023 +0900 Commit: Taichi Haradaguchi <20001...@ymail.ne.jp> CommitDate: Mon Nov 20 04:50:03 2023 +0100 tdf#143148: Use pragma once instead of include guards in vcl/inc/unx Change-Id: I91ba6c5e49ed7e9ae8e946859ce5ed2169ae590a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159648 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx index e262a9184b31..50848ed19fa6 100644 --- a/vcl/inc/unx/cairotextrender.hxx +++ b/vcl/inc/unx/cairotextrender.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX -#define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX +#pragma once #include @@ -43,6 +42,4 @@ public: virtual ~CairoTextRender(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx index 8e71d4c13015..2806f1d09b53 100644 --- a/vcl/inc/unx/cpdmgr.hxx +++ b/vcl/inc/unx/cpdmgr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_CPDMGR_HXX -#define INCLUDED_VCL_INC_UNX_CPDMGR_HXX +#pragma once #include #include @@ -120,7 +119,4 @@ public: } // namespace psp -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx index 096efdea6e77..fb172103bbd9 100644 --- a/vcl/inc/unx/cupsmgr.hxx +++ b/vcl/inc/unx/cupsmgr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX -#define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX +#pragma once #include #include @@ -87,6 +86,4 @@ public: } // namespace psp -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx index 30411d5d0c60..73bcf3421bc5 100644 --- a/vcl/inc/unx/fc_fontoptions.hxx +++ b/vcl/inc/unx/fc_fontoptions.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX -#define INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX +#pragma once #include #include @@ -38,7 +37,4 @@ private: FcPattern* mpPattern; }; - -#endif // INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx index a6188e27a16e..5ef7d445b25a 100644 --- a/vcl/inc/unx/gendisp.hxx +++ b/vcl/inc/unx/gendisp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX -#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX +#pragma once #include #include @@ -50,6 +49,4 @@ public: { return m_pCapture; } }; -#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index
[Libreoffice-bugs] [Bug 158076] Bracket shape missing drag control for bracket roundness
https://bugs.documentfoundation.org/show_bug.cgi?id=158076 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158045] updating data sources
https://bugs.documentfoundation.org/show_bug.cgi?id=158045 QA Administrators changed: What|Removed |Added Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 92676] Cannot change page orientation during SELECTION print in Calc (if page A4 and not Letter, until Page style changed)
https://bugs.documentfoundation.org/show_bug.cgi?id=92676 --- Comment #17 from QA Administrators --- Dear fabriadri, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158045] updating data sources
https://bugs.documentfoundation.org/show_bug.cgi?id=158045 --- Comment #3 from QA Administrators --- [Automated Action] NeedInfo-To-Unconfirmed -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158072] Fails to apply filter on mail merge (Writer+Calc)
https://bugs.documentfoundation.org/show_bug.cgi?id=158072 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158075] New Table function allowing shifting columns within table up or down
https://bugs.documentfoundation.org/show_bug.cgi?id=158075 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 153648] freshly pasted content in dark background Calc spreadsheet not visible in grid
https://bugs.documentfoundation.org/show_bug.cgi?id=153648 --- Comment #6 from QA Administrators --- Dear kuikout, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 153648] freshly pasted content in dark background Calc spreadsheet not visible in grid
https://bugs.documentfoundation.org/show_bug.cgi?id=153648 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145531] FILEOPEN PPTX: 3D button/cuboid with perspective shows as rectangle
https://bugs.documentfoundation.org/show_bug.cgi?id=145531 --- Comment #3 from QA Administrators --- Dear Gerald Pfeifer, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 44225] text outside contour when rotating
https://bugs.documentfoundation.org/show_bug.cgi?id=44225 --- Comment #18 from QA Administrators --- Dear ridi, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 121436] CALC editing: Shifting Cells when inserting a cut column breaks formulas after the cut column
https://bugs.documentfoundation.org/show_bug.cgi?id=121436 --- Comment #9 from QA Administrators --- Dear NISZ LibreOffice Team, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 157681] Add an opportunity to hide sections via context menu at the Navigator
https://bugs.documentfoundation.org/show_bug.cgi?id=157681 --- Comment #4 from Jim Raykowski --- Created attachment 190914 --> https://bugs.documentfoundation.org/attachment.cgi?id=190914=edit Navigator Sections context menu protect and hide section demo Here is link to a patch that adds protect and hide menu items to the Navigator Sections context menu: https://gerrit.libreoffice.org/c/core/+/159718 It also makes the same icons appear in the Navigator section entries list that are shown in the Edit Sections dialog sections list to indicate section protect and hide settings. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158270] LibreOffice.app crashes upon attempted start in Sonoma
https://bugs.documentfoundation.org/show_bug.cgi?id=158270 --- Comment #2 from n6ac --- I found and downloaded LibreOffice_7.6.3.1_MacOS_x86-64.dmg then installed over the older version. However, here on Mac Mini M1 2020 with Sonoma 14.2 Beta (23C5047e), same thing – tries to open the app, promptly crashes. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'feature/wasm' - 7135 commits - accessibility/inc accessibility/source android/Bootstrap android/default-document android/Makefile android/source animations/sour
Rebased ref, commits from common ancestor: commit 90990aae9e0424d1d0a9e708e1adffbfe7fecfc0 Author: Thorsten Behrens AuthorDate: Mon Nov 20 00:51:56 2023 +0100 Commit: Thorsten Behrens CommitDate: Mon Nov 20 01:07:18 2023 +0100 Revert "WASM: headless conversion without QT5 and with unique html" Breaks due to double use of LD_FLAGS (and duplicated embind symbols). Lets back this out for the moment, needs some gbuild debonging. This reverts commit a09b1b9e68c2285289fbf36c7f5fb6a1677e8c39. Change-Id: Idb1348a0b4a55894bb12a2c101d9460bb5e40222 diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index f27755eb3aa8..fd23ae4af437 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -45,13 +45,6 @@ #include #include -#ifdef EMSCRIPTEN -#include -#include -#include -#include -#endif - namespace weld {class Button; } namespace model {class ColorSet; } struct NamedColor; @@ -454,10 +447,6 @@ public: virtual boolPrepareClose(bool bUI = true); virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ); voidQueryHiddenInformation( HiddenWarningFact eFact ); -#ifdef EMSCRIPTEN -voidReadWASMFile(emscripten::val& contentArray, sal_Int32 nRead, css::uno::Sequence& aContent); -voidWriteWASMFile(emscripten::val& contentArray, const OUString& rFileName); -#endif boolIsSecurityOptOpenReadOnly() const; voidSetSecurityOptOpenReadOnly( bool bOpenReadOnly ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 3a722f026678..b39b5d14ee38 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3006,37 +3006,6 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& if( bOk ) { -#ifdef EMSCRIPTEN -if (aFilterName.endsWith("pdf_Export")) -{ -try -{ -sal_Int32 nRead; -Reference aTempInput = pNewFile->GetInputStream(); -sal_Int32 nBufferSize = 32767; -Sequence aSequence(nBufferSize); -emscripten::val contentArray = emscripten::val::array(); -do -{ -nRead = aTempInput->readBytes(aSequence, nBufferSize); -if (nRead < nBufferSize) -{ -Sequence aTempBuf(aSequence.getConstArray(), nRead); -ReadWASMFile(contentArray, nRead, aTempBuf); -} -else -{ -ReadWASMFile(contentArray, nRead, aSequence); -} -} while (nRead == nBufferSize); -WriteWASMFile(contentArray, pNewFile->GetName()); -} -catch (const Exception&) -{ -} -} -#endif - if( !bCopyTo ) SetModified( false ); } @@ -3082,40 +3051,6 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& } -#ifdef EMSCRIPTEN -void SfxObjectShell::ReadWASMFile(emscripten::val& contentArray, sal_Int32 nRead, css::uno::Sequence& aContent) -{ -emscripten::val fileContentView = emscripten::val(emscripten::typed_memory_view( -nRead, -reinterpret_cast(aContent.getConstArray(; -emscripten::val fileContentCopy = emscripten::val::global("ArrayBuffer").new_(nRead); -emscripten::val fileContentCopyView = emscripten::val::global("Uint8Array").new_(fileContentCopy); -fileContentCopyView.call("set", fileContentView); -contentArray.call("push", fileContentCopyView); -} -void SfxObjectShell::WriteWASMFile(emscripten::val& contentArray, const OUString& rFileName) -{ -INetURLObject aURL(rFileName); -OUString aNewname = aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset); -emscripten::val document = emscripten::val::global("document"); -emscripten::val window = emscripten::val::global("window"); -emscripten::val type = emscripten::val::object(); -type.set("type","application/octet-stream"); -emscripten::val contentBlob = emscripten::val::global("Blob").new_(contentArray, type); -emscripten::val contentUrl = window["URL"].call("createObjectURL", contentBlob); -emscripten::val contentLink = document.call("createElement", std::string("a")); -contentLink.set("href", contentUrl); -contentLink.set("download", aNewname.toUtf8().getStr()); -contentLink.set("style", "display:none"); -emscripten::val body = document["body"]; -body.call("appendChild", contentLink); -contentLink.call("click"); -body.call("removeChild",
[Libreoffice-bugs] [Bug 158277] Launching Find dialogue after selecting a word when track changes is active includes deleted text
https://bugs.documentfoundation.org/show_bug.cgi?id=158277 --- Comment #1 from Duncan Loveday --- Another example - suppose I change "cats" to "cots" - my screen shows "cots" - double click and press ^F and the Find dialogue opens with "coats". Not only does this not exist on the screen but it also doesn't exist in either the old or new version of the document. Is this the intended behaviour ? It doesn't seem to make sense - this issue came to me from a friend who has been a copy editor for 20+ years and it doesn't make sense to her either -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158277] Launching Find dialogue after selecting a word when track changes is active includes deleted text
https://bugs.documentfoundation.org/show_bug.cgi?id=158277 Duncan Loveday changed: What|Removed |Added Summary|Launching Find dialogue |Launching Find dialogue |after selecting a worfd |after selecting a word when |when track changes is |track changes is active |active includes deleted |includes deleted text |text| -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158277] New: Launching Find dialogue after selecting a worfd when track changes is active includes deleted text
https://bugs.documentfoundation.org/show_bug.cgi?id=158277 Bug ID: 158277 Summary: Launching Find dialogue after selecting a worfd when track changes is active includes deleted text Product: LibreOffice Version: 7.3.7.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: duncan1.love...@gmail.com With track changes active with "record" on but "show" off, when I delete a character from the end of a word, then double click the word, then press ctrl F to open the "Find" dialogue what appears in the find box includes the character I deleted. This then means the word I click on will not be found. A specific example: 1) Start with a document containing the text "Dogs, and cats". 2) Enable "track changes" with "record" but not "show". 3) Remove the comma after Dogs. The document now appears to contain "Dogs and cats". 4) Double click the word "Dogs". 5) Press ^F to open the "Find" dialogue. 6) Press enter Result: The "Find" box contains "Dogs," and the word that was edited is not found. Expected result: The "Find" box should contain "Dogs" - since that is what is now on the screen - and the word that was edited should be found -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f0ffc510d8722bf2e9c43c72f2a90349712eb4f Author: Andras Timar AuthorDate: Sun Nov 19 23:34:00 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Nov 19 23:34:00 2023 +0100 Update git submodules * Update helpcontent2 from branch 'distro/collabora/co-22.05' to 460ba307e572c477d12249ba1a04daeeb4adde7f - added 2 missing HIDs (2nd attempt) Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126 - added 2 missing HIDs Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250 diff --git a/helpcontent2 b/helpcontent2 index 97a69fe2915b..460ba307e572 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 97a69fe2915b78a1c0c70b432d934dd6907044e4 +Subproject commit 460ba307e572c477d12249ba1a04daeeb4adde7f
[Libreoffice-commits] help.git: Branch 'distro/collabora/co-22.05' - 2 commits - source/text
source/text/shared/01/05210200.xhp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 460ba307e572c477d12249ba1a04daeeb4adde7f Author: Andras Timar AuthorDate: Sun Nov 19 23:11:00 2023 +0100 Commit: Andras Timar CommitDate: Sun Nov 19 23:33:37 2023 +0100 added 2 missing HIDs (2nd attempt) Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index 288dcbf274..d677c2aa5d 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,8 +30,8 @@ - - + + colors;palette colors;adding commit 250330104b31ab3ddcb9e13e3127c2cbede26baf Author: Andras Timar AuthorDate: Sun Nov 19 22:23:34 2023 +0100 Commit: Andras Timar CommitDate: Sun Nov 19 23:33:25 2023 +0100 added 2 missing HIDs Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index 509d36ba95..288dcbf274 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,6 +30,8 @@ + + colors;palette colors;adding
[Libreoffice-commits] core.git: include/sfx2 sfx2/qa sfx2/source
include/sfx2/lokhelper.hxx |2 +- sfx2/qa/cppunit/doc.cxx |2 +- sfx2/qa/cppunit/test_misc.cxx| 10 +- sfx2/source/doc/guisaveas.cxx|4 ++-- sfx2/source/doc/sfxbasemodel.cxx |2 +- sfx2/source/view/ipclient.cxx|2 +- sfx2/source/view/lokhelper.cxx | 10 +- sfx2/source/view/viewsh.cxx |2 +- 8 files changed, 17 insertions(+), 17 deletions(-) New commits: commit baecfd21797310bb15ab98ca3962445d99e397db Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:30:58 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 23:23:49 2023 +0100 Extended loplugin:ostr: sfx2 Change-Id: I7b2988ed246a0b1b0af0721521ba738ba3de2f27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159677 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index f73312c56417..98eeccb74476 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -195,7 +195,7 @@ public: static OString makePayloadJSON(const SfxViewShell* pThisView, int nViewId, std::string_view rKey, const OString& rPayload); /// Makes a LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR payload, but tweaks it according to setOptionalFeatures() if needed. static OString makeVisCursorInvalidation(int nViewId, const OString& rRectangle, - bool bMispelledWord = false, const OString& rHyperlink = ""); + bool bMispelledWord = false, const OString& rHyperlink = ""_ostr); /// Helper for posting async key event static void postKeyEventAsync(const VclPtr , diff --git a/sfx2/qa/cppunit/doc.cxx b/sfx2/qa/cppunit/doc.cxx index 902ac48646e5..9eea6d29390d 100644 --- a/sfx2/qa/cppunit/doc.cxx +++ b/sfx2/qa/cppunit/doc.cxx @@ -126,7 +126,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSetDocumentPropertiesUpdate) } } } -)json"); +)json"_ostr); uno::Sequence aArgs = comphelper::containerToSequence(aArgsVec); dispatchCommand(mxComponent, ".uno:SetDocumentProperties", aArgs); diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index c93a3ad7335a..a59a1128e7df 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -76,11 +76,11 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testODFCustomMetadata) // check that custom metadata is preserved xmlDocUniquePtr pXmlDoc = parseExport("meta.xml"); -assertXPathContent(pXmlDoc, "/office:document-meta/office:meta/bork", "bork"); -assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar", 1); -assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar/baz:foo", 1); -assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar/baz:foo[@baz:bar='foo']"); -assertXPathContent(pXmlDoc, "/office:document-meta/office:meta/foo:bar/foo:baz", "bar"); +assertXPathContent(pXmlDoc, "/office:document-meta/office:meta/bork"_ostr, "bork"); +assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar"_ostr, 1); +assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar/baz:foo"_ostr, 1); +assertXPath(pXmlDoc, "/office:document-meta/office:meta/foo:bar/baz:foo[@baz:bar='foo']"_ostr); +assertXPathContent(pXmlDoc, "/office:document-meta/office:meta/foo:bar/foo:baz"_ostr, "bar"); } CPPUNIT_TEST_FIXTURE(MiscTest, testNoThumbnail) diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 1c013c4a382b..657d162ff732 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -677,7 +677,7 @@ IMPL_LINK( ModelData_Impl, OptionsDialogClosedHdl, css::ui::dialogs::DialogClose if (pEvt->DialogResult == RET_OK && m_xFilterProperties) { if ( comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() ) -SfxViewShell::Current()->libreOfficeKitViewCallback( LOK_CALLBACK_EXPORT_FILE, "PENDING" ); +SfxViewShell::Current()->libreOfficeKitViewCallback( LOK_CALLBACK_EXPORT_FILE, "PENDING"_ostr ); const uno::Sequence< beans::PropertyValue > aPropsFromDialog = m_xFilterProperties->getPropertyValues(); for ( const auto& rProp : aPropsFromDialog ) @@ -687,7 +687,7 @@ IMPL_LINK( ModelData_Impl, OptionsDialogClosedHdl, css::ui::dialogs::DialogClose } else if ( comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() ) { -SfxViewShell::Current()->libreOfficeKitViewCallback( LOK_CALLBACK_EXPORT_FILE, "ABORT" ); +SfxViewShell::Current()->libreOfficeKitViewCallback( LOK_CALLBACK_EXPORT_FILE, "ABORT"_ostr ); } } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 860bea828122..985af531358d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3265,7 +3265,7 @@ void SfxBaseModel::impl_store( const OUString&
[Libreoffice-bugs] [Bug 154088] The implementation of drawing the grid of the characters should be unified
https://bugs.documentfoundation.org/show_bug.cgi?id=154088 Amos Aidoo changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |aidooamo...@gmail.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4bf8b9f1f581f86eda7bdcb124c17dc1dae53b6 Author: Andras Timar AuthorDate: Sun Nov 19 23:11:03 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Nov 19 23:11:03 2023 +0100 Update git submodules * Update helpcontent2 from branch 'distro/collabora/co-23.05' to 11f4f5d8bb6b45210eb534b4168309a794b68b2e - added 2 missing HIDs (2nd attempt) Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126 diff --git a/helpcontent2 b/helpcontent2 index 31baa0f68401..11f4f5d8bb6b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 31baa0f68401b61d6fdb1e0aca8b18525e8886b3 +Subproject commit 11f4f5d8bb6b45210eb534b4168309a794b68b2e
[Libreoffice-commits] help.git: Branch 'distro/collabora/co-23.05' - source/text
source/text/shared/01/05210200.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 11f4f5d8bb6b45210eb534b4168309a794b68b2e Author: Andras Timar AuthorDate: Sun Nov 19 23:11:00 2023 +0100 Commit: Andras Timar CommitDate: Sun Nov 19 23:11:00 2023 +0100 added 2 missing HIDs (2nd attempt) Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index 16689b9e49..bbb7cba803 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,8 +30,8 @@ - - + + colors;palette palette;document colors
[Libreoffice-bugs] [Bug 119352] [META] Language issues
https://bugs.documentfoundation.org/show_bug.cgi?id=119352 Bug 119352 depends on bug 154028, which changed state. Bug 154028 Summary: Difficult to change the language of everything in the document https://bugs.documentfoundation.org/show_bug.cgi?id=154028 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 154028] Difficult to change the language of everything in the document
https://bugs.documentfoundation.org/show_bug.cgi?id=154028 Eyal Rozenberg changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #9 from Eyal Rozenberg --- Well, there's Tools > Language > For all Text. I'm closing this for now. -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-bugs] [Bug 154028] Difficult to change the language of everything in the document
https://bugs.documentfoundation.org/show_bug.cgi?id=154028 Eyal Rozenberg changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #9 from Eyal Rozenberg --- Well, there's Tools > Language > For all Text. I'm closing this for now. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: opencl/inc opencl/source
opencl/inc/opencl_device_selection.h | 10 +- opencl/source/opencl_device.cxx |2 +- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 235ae98ae614315cfe3bb2baf52ca442bcc2f592 Author: Stephan Bergmann AuthorDate: Sun Nov 19 18:27:25 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 22:35:12 2023 +0100 Extended loplugin:ostr: opencl Change-Id: I126ed9e9fca6d1ab8d4e42ec0fe1ffb33a5f8ae8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159689 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h index ed4914bbcf39..4baffbf2737c 100644 --- a/opencl/inc/opencl_device_selection.h +++ b/opencl/inc/opencl_device_selection.h @@ -110,7 +110,7 @@ inline OString getDeviceInfoString(cl_device_id aDeviceId, cl_device_info aDevic inline OString getDeviceType(cl_device_id aDeviceId) { -OString sType = ""; +OString sType = ""_ostr; cl_device_type aDeviceType; clGetDeviceInfo(aDeviceId, CL_DEVICE_TYPE, sizeof(aDeviceType), , nullptr); if (aDeviceType & CL_DEVICE_TYPE_CPU) @@ -263,12 +263,12 @@ inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr aProfile; ds_status status; -status = initDSProfile(aProfile, "LibreOffice v1"); +status = initDSProfile(aProfile, "LibreOffice v1"_ostr); if (status != DS_SUCCESS) {
[Libreoffice-bugs] [Bug 42673] With disconnected network printers, Calc hangs opening some files (waiting on e.g. the Windows print spooler)
https://bugs.documentfoundation.org/show_bug.cgi?id=42673 Stéphane Guillou (stragu) changed: What|Removed |Added CC||fabien.batt...@orange.fr --- Comment #75 from Stéphane Guillou (stragu) --- *** Bug 149677 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 149677] LibreOffice hangs on remote printer
https://bugs.documentfoundation.org/show_bug.cgi?id=149677 Stéphane Guillou (stragu) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||stephane.guillou@libreoffic ||e.org Whiteboard| QA:needsComment| Resolution|--- |DUPLICATE --- Comment #2 from Stéphane Guillou (stragu) --- Thank you for the report! This is a known issue, unfortunately long-standing. Marking as duplicate of bug 42673. *** This bug has been marked as a duplicate of bug 42673 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 65 -- 1 file changed, 58 insertions(+), 7 deletions(-) New commits: commit 3bd3c41bc930406ec3d995a45a7f7060d572bbd0 Author: Gökay Şatır AuthorDate: Wed Sep 27 13:01:46 2023 +0300 Commit: Caolán McNamara CommitDate: Sun Nov 19 22:28:43 2023 +0100 German keybindings: Changes (2 indentations for the replacements of currents): * CTRL + 1 / 2 / 5 for paragraph spacing 1, 2 and 1.5. * CTRL + + for superscript. * CTRL + SHIFT + + for CalculateSel. * CTRL + D for font dialog. * CTRL + SHIFT + D for double underline. * F12 for save-as. * ALT + F12 for default numbering. * F5 for GoToPage. * CTRL + F for navigator. * CTRL + SPACE for search. * Removed CTRL + H for superscript. * Defaults to find and replace now. * CTRL + SHIFT + K for italic. * CTRL + K for hyperlink dialog. * CTRL + SHIFT + L for default bullet. * CTRL + * for control codes. * CTRL + ALT + * for execute macro field. * CTRL + SHIFT + Q for small caps. * CTRL + T for subscript. for general compatibility. Signed-off-by: Gökay Şatır Change-Id: I181e2d7828bc3f53092db4f880ee1715ae262d02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157308 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 4137596ca58e927977ffe354f60c296f5771d28b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159687 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index a8555409dddb..15aa53f3be58 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -6083,12 +6083,14 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:StyleApply?Style:string=Heading 1FamilyName:string=ParagraphStyles +.uno:SpacePara1 I10N SHORTCUTS - NO TRANSLATE .uno:StyleApply?Style:string=Heading 2FamilyName:string=ParagraphStyles +.uno:SpacePara2 @@ -6107,6 +6109,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:StyleApply?Style:string=Heading 5FamilyName:string=ParagraphStyles +.uno:SpacePara15 @@ -6151,6 +6154,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:CalculateSel +.uno:SuperScript + + + + +.uno:CalculateSel @@ -6302,12 +6311,14 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:UnderlineDouble +.uno:FontDialog I10N SHORTCUTS - NO TRANSLATE .uno:ParaRightToLeft +.uno:UnderlineDouble @@ -6387,6 +6398,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:DefaultNumbering +.uno:SaveAs @@ -6401,6 +6413,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:DefaultBullet + + +I10N SHORTCUTS - NO TRANSLATE +.uno:DefaultNumbering + + I10N SHORTCUTS - NO TRANSLATE @@ -6453,6 +6471,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing I10N SHORTCUTS - NO TRANSLATE .uno:Navigator +.uno:GotoPage @@ -6559,6 +6578,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:RepeatSearch + + +I10N SHORTCUTS - NO TRANSLATE +.uno:Navigator + + I10N SHORTCUTS - NO TRANSLATE @@ -6592,12 +6617,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:StartOfDocumentSel - - -I10N SHORTCUTS - NO TRANSLATE -.uno:SuperScript - - I10N SHORTCUTS - NO TRANSLATE @@ -6638,12 +6657,14 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under
[Libreoffice-bugs] [Bug 147706] Animation pane selects additional animations to the one intended.
https://bugs.documentfoundation.org/show_bug.cgi?id=147706 Stéphane Guillou (stragu) changed: What|Removed |Added Version|7.2.0.3 rc |7.2.0.4 release -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147706] Animation pane selects additional animations to the one intended.
https://bugs.documentfoundation.org/show_bug.cgi?id=147706 Stéphane Guillou (stragu) changed: What|Removed |Added Resolution|--- |DUPLICATE Keywords|skillUI | Status|UNCONFIRMED |RESOLVED Whiteboard| QA:needsComment| Product|Impress Remote |LibreOffice Version|unspecified |7.2.0.3 rc Component|UI |Impress CC||stephane.guillou@libreoffic ||e.org OS|Windows (All) |All --- Comment #1 from Stéphane Guillou (stragu) --- Thank you for the report. Reproduced in: Version: 7.2.0.4 / LibreOffice Community Build ID: 9a9c6381e3f7a62afc1329bd359cc48accb6435b CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Not reproduced anymore in: Version: 7.3.7.2 / LibreOffice Community Build ID: e114eadc50a9ff8d8c8a0567d6da8f454beeb84f CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded I assume it is a duplicate of bug 147032, so resolved since 7.2.6, 7.3.1 and 7.4.0. *** This bug has been marked as a duplicate of bug 147032 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 129849] FILEOPEN DOCX: Math Formula size and color lost on import
https://bugs.documentfoundation.org/show_bug.cgi?id=129849 --- Comment #10 from Dieter --- (In reply to schlebe from comment #9) > As requested, I have installed LibreOffice 3.6.3.1 and I have tested issue > again. I assume, you've tested with 7.6.3.1. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b79b187af254033a6bab493472386c9ca3e134a Author: Andras Timar AuthorDate: Sun Nov 19 22:23:43 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Nov 19 22:23:43 2023 +0100 Update git submodules * Update helpcontent2 from branch 'distro/collabora/co-23.05' to 31baa0f68401b61d6fdb1e0aca8b18525e8886b3 - added 2 missing HIDs Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250 diff --git a/helpcontent2 b/helpcontent2 index 7639332c683e..31baa0f68401 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7639332c683e33daa5ecdebb939af1f5c3ebf2d6 +Subproject commit 31baa0f68401b61d6fdb1e0aca8b18525e8886b3
[Libreoffice-commits] help.git: Branch 'distro/collabora/co-23.05' - source/text
source/text/shared/01/05210200.xhp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 31baa0f68401b61d6fdb1e0aca8b18525e8886b3 Author: Andras Timar AuthorDate: Sun Nov 19 22:23:34 2023 +0100 Commit: Andras Timar CommitDate: Sun Nov 19 22:23:34 2023 +0100 added 2 missing HIDs Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index ce9af676ae..16689b9e49 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,6 +30,8 @@ + + colors;palette palette;document colors
[Libreoffice-bugs] [Bug 158270] LibreOffice.app crashes upon attempted start in Sonoma
https://bugs.documentfoundation.org/show_bug.cgi?id=158270 --- Comment #1 from Sierk Bornemann --- (In reply to n6ac from comment #0) > Description: > LibreOffice.app crashes upon attempted start in Sonoma (currently 14.2 Beta > (23C5047e)) > Double-click LibreOffice.app, it appears briefly in Dock, then crashes off. > Downloaded fresh (but identical) copy of > LibreOffice_7.6.2_MacOS_aarch64.dmg, reinstalled. Same thing. Can't reproduce, no crash, all works fine with current Sonoma release 14.1.1: Version: 7.6.3.1 (AARCH64) / LibreOffice Community Build ID: c4af5b1259bceea6e979e6fe2435dbee7a5a87c2 CPU threads: 10; OS: Mac OS X 14.1.1; UI render: Skia/Metal; VCL: osx Locale: de-DE (de_DE.UTF-8); UI: de-DE Calc: threaded Version: 24.2.0.0.alpha0+ (AARCH64) / LibreOffice Community Build ID: 4a1fac7c703068a49df897bb635ff98bf22c0468 CPU threads: 10; OS: macOS 14.1.1; UI render: Skia/Metal; VCL: osx Locale: de-DE (de_DE.UTF-8); UI: de-DE Calc: threaded % /usr/bin/sw_vers ProductName:macOS ProductVersion: 14.1.1 BuildVersion: 23B81 % uname -m arm64 % machine arm64e -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155419] PDF's created with the "export to PDF" option are flagged "as executable and may harm" when posted to Google Drive
https://bugs.documentfoundation.org/show_bug.cgi?id=155419 --- Comment #4 from Carlo Bertelli --- This happened to me when I was using CAC signature. It's the first time and version 7.4.6.2 happens to do it consistently. Italian certified email (PEC) stops messages with these attachments as well. VirusTotal says: "The sandbox DOCGuard flags this file as: GREYWARE" -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150379] LO Ignoring some print trays from Konica Minolta c284e
https://bugs.documentfoundation.org/show_bug.cgi?id=150379 Stéphane Guillou (stragu) changed: What|Removed |Added Ever confirmed|0 |1 Whiteboard| QA:needsComment| CC||stephane.guillou@libreoffic ||e.org Status|UNCONFIRMED |NEEDINFO Summary|LO Ignoring print trays |LO Ignoring some print ||trays from Konica Minolta ||c284e --- Comment #1 from Stéphane Guillou (stragu) --- Thank you for the report. Could you please: - test again with a supported version of LibreOffice (7.6 currently) - share the PPD file for this printer, located in /etc/cups/ppd/ - paste here the full version information from Help > About LibreOffice Much appreciated! -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: oox/qa oox/source
oox/qa/unit/CryptoTest.cxx|6 oox/qa/unit/export.cxx| 677 +++--- oox/qa/unit/mcgr.cxx | 48 +- oox/source/crypto/AgileEngine.cxx |8 oox/source/export/ThemeExport.cxx | 28 - oox/source/export/shapes.cxx | 18 - 6 files changed, 396 insertions(+), 389 deletions(-) New commits: commit f53172a1141f7bb3c0950f1fe00800b633846ec4 Author: Stephan Bergmann AuthorDate: Sun Nov 19 18:27:38 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 22:04:26 2023 +0100 Extended loplugin:ostr: oox Change-Id: Ic3ee80433571767dba9de1ecfb00d2d96beae4db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159690 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/oox/qa/unit/CryptoTest.cxx b/oox/qa/unit/CryptoTest.cxx index 290fce38eb4b..be04c928045e 100644 --- a/oox/qa/unit/CryptoTest.cxx +++ b/oox/qa/unit/CryptoTest.cxx @@ -74,7 +74,7 @@ CryptoTest::~CryptoTest() void CryptoTest::testCryptoHash() { // Check examples from Wikipedia (https://en.wikipedia.org/wiki/HMAC) -OString aContentString("The quick brown fox jumps over the lazy dog"); +OString aContentString("The quick brown fox jumps over the lazy dog"_ostr); std::vector aContent(aContentString.getStr(), aContentString.getStr() + aContentString.getLength()); std::vector aKey = { 'k', 'e', 'y' }; @@ -145,7 +145,7 @@ void CryptoTest::testStandard2007() SvMemoryStream aUnencryptedInput; SvMemoryStream aEncryptedStream; -OString aTestString = "1234567890ABCDEFG"; +OString aTestString = "1234567890ABCDEFG"_ostr; aUnencryptedInput.WriteBytes(aTestString.getStr(), aTestString.getLength() + 1); aUnencryptedInput.Seek(STREAM_SEEK_TO_BEGIN); @@ -418,7 +418,7 @@ void CryptoTest::testAgileEncryptingAndDecrypting() SvMemoryStream aEncryptionInfo; SvMemoryStream aEncryptedStream; -OString aTestString = "1234567890ABCDEFGH"; +OString aTestString = "1234567890ABCDEFGH"_ostr; { oox::crypto::AgileEngine aEngine; diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index 75d89a07e970..91954daa7db7 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -37,14 +37,14 @@ CPPUNIT_TEST_FIXTURE(Test, testPolylineConnectorPosition) // to group instead of being relative to anchor. That was missing for polyline and // connector. // Polyline: Without fix it would have failed with expected: 0, actual: 1800360 -assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off", "x", "0"); +assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off"_ostr, "x"_ostr, "0"); // ... failed with expected: 509400, actual: 1229400 -assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off", "y", "509400"); +assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off"_ostr, "y"_ostr, "509400"); // Connector: Without fix it would have failed with expected: 763200, actual: 2563560 -assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[3]/wps:spPr/a:xfrm/a:off", "x", "763200"); +assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[3]/wps:spPr/a:xfrm/a:off"_ostr, "x"_ostr, "763200"); // ... failed with expected: 0, actual: 72 -assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[3]/wps:spPr/a:xfrm/a:off", "y", "0"); +assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[3]/wps:spPr/a:xfrm/a:off"_ostr, "y"_ostr, "0"); // Polyline and connector were shifted 1800360EMU right, 72EMU down. } @@ -67,7 +67,7 @@ CPPUNIT_TEST_FIXTURE(Test, testRotatedShapePosition) // DrawingML::WriteShapeTransformation(), but was missing. // Without fix it would have failed with expected: 469440, actual: 92160 // The shape was about 1cm shifted up and partly outside its group. -assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off", "y", "469440"); +assertXPath(pXmlDoc, "//wpg:wgp/wps:wsp[1]/wps:spPr/a:xfrm/a:off"_ostr, "y"_ostr, "469440"); } CPPUNIT_TEST_FIXTURE(Test, testDmlGroupshapePolygon) @@ -84,11 +84,11 @@ CPPUNIT_TEST_FIXTURE(Test, testDmlGroupshapePolygon) // Then make sure that the group shape, the group shape's child size and the child shape's size // match: xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); -assertXPath(pXmlDoc, "//wpg:grpSpPr/a:xfrm/a:ext", "cx", "5328360"); +assertXPath(pXmlDoc, "//wpg:grpSpPr/a:xfrm/a:ext"_ostr, "cx"_ostr, "5328360"); // Without the accompanying fix in place, this test would have failed, the element was // not written. -assertXPath(pXmlDoc, "//wpg:grpSpPr/a:xfrm/a:chExt", "cx", "5328360"); -assertXPath(pXmlDoc, "//wps:spPr/a:xfrm/a:ext", "cx", "5328360"); +assertXPath(pXmlDoc, "//wpg:grpSpPr/a:xfrm/a:chExt"_ostr, "cx"_ostr, "5328360"); +assertXPath(pXmlDoc, "//wps:spPr/a:xfrm/a:ext"_ostr, "cx"_ostr, "5328360"); } CPPUNIT_TEST_FIXTURE(Test,
[Libreoffice-commits] core.git: sax/qa sax/source
sax/qa/cppunit/attributes.cxx|8 sax/qa/cppunit/parser.cxx|4 ++-- sax/source/fastparser/fastparser.cxx |4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 1f43e2071f5aba897946028dbc8c86c6b00825df Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:31:52 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 22:04:09 2023 +0100 Extended loplugin:ostr: sax Change-Id: Icf6ffbc746dbbc790a5a248002ecd161413f120c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159681 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sax/qa/cppunit/attributes.cxx b/sax/qa/cppunit/attributes.cxx index 5b45876e3e96..899716d62f15 100644 --- a/sax/qa/cppunit/attributes.cxx +++ b/sax/qa/cppunit/attributes.cxx @@ -56,9 +56,9 @@ void AttributesTest::test() CPPUNIT_ASSERT_EQUAL( OUString("1"), xAttributeList->getValue(1) ); CPPUNIT_ASSERT_THROW( xAttributeList->getValue(5), xml::sax::SAXException ); -xAttributeList->addUnknown("a", "a"); -xAttributeList->addUnknown("b", "b", "b"); -xAttributeList->addUnknown("c", "c"); +xAttributeList->addUnknown("a"_ostr, "a"_ostr); +xAttributeList->addUnknown("b", "b"_ostr, "b"_ostr); +xAttributeList->addUnknown("c"_ostr, "c"_ostr); CPPUNIT_ASSERT_EQUAL( sal_Int32(3), xAttributeList->getUnknownAttributes().getLength() ); CPPUNIT_ASSERT_EQUAL( sal_Int32(4), xAttributeList->getFastAttributes().getLength() ); @@ -66,7 +66,7 @@ void AttributesTest::test() xAttributeList->clear(); CPPUNIT_ASSERT( !xAttributeList->hasAttribute(1) ); CPPUNIT_ASSERT( !xAttributeList->getFastAttributes().hasElements() ); -xAttributeList->addUnknown("c", "c"); +xAttributeList->addUnknown("c"_ostr, "c"_ostr); CPPUNIT_ASSERT_EQUAL( sal_Int32(1), xAttributeList->getUnknownAttributes().getLength() ); } diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 261091fe8769..670c1afa9277 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -83,10 +83,10 @@ uno::Reference< io::XInputStream > ParserTest::createStream(const OString& sInpu void ParserTest::parse() { -maInput.aInputStream = createStream("."); +maInput.aInputStream = createStream("."_ostr); mxParser->parseStream( maInput ); -maInput.aInputStream = createStream(""); +maInput.aInputStream = createStream(""_ostr); CPPUNIT_ASSERT_THROW( mxParser->parseStream( maInput ), css::xml::sax::SAXParseException ); } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 3c67010ad1cb..ec8065016a12 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1136,7 +1136,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm if( rEntity.maNamespaceCount.empty() ) { rEntity.maNamespaceCount.push(0); -DefineNamespace( "xml", "http://www.w3.org/XML/1998/namespace;); +DefineNamespace( "xml"_ostr, "http://www.w3.org/XML/1998/namespace;); } else { @@ -1204,7 +1204,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm NormalizeURI( sNamespace ); nNamespaceToken = GetNamespaceToken( sNamespace ); if( rEntity.mxNamespaceHandler.is() ) -rEvent.mxDeclAttributes->addUnknown( "", OString( XML_CAST( namespaces[ i + 1 ] ) ) ); +rEvent.mxDeclAttributes->addUnknown( ""_ostr, OString( XML_CAST( namespaces[ i + 1 ] ) ) ); } }
[Libreoffice-bugs] [Bug 123592] Make document templates (shellnew/soffice.od*) available on Linux.
https://bugs.documentfoundation.org/show_bug.cgi?id=123592 Stéphane Guillou (stragu) changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||3044 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 153044] Template actions for desktop integration: names end with wrong ellipsis
https://bugs.documentfoundation.org/show_bug.cgi?id=153044 Stéphane Guillou (stragu) changed: What|Removed |Added Resolution|--- |NOTOURBUG See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||3592 Status|UNCONFIRMED |RESOLVED Whiteboard| QA:needsComment| CC||ilmari.lauhakangas@libreoff ||ice.org, ||stephane.guillou@libreoffic ||e.org --- Comment #1 from Stéphane Guillou (stragu) --- Thank you for the report. Which operating system and desktop environment do you use? I believe this is handled by each distribution, if and where these templates are stored, and how they are named. Closing as "not our bug", see also bug 123592. Buovjaga might be able confirm? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 129849] FILEOPEN DOCX: Math Formula size and color lost on import
https://bugs.documentfoundation.org/show_bug.cgi?id=129849 --- Comment #9 from schlebe --- As requested, I have installed LibreOffice 3.6.3.1 and I have tested issue again. The problem is already there. Nothing has been resolved. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 139611] FILESAVE: LibreOffice Base doesn't retain column formats on file save for PostgreSQL connected databases
https://bugs.documentfoundation.org/show_bug.cgi?id=139611 Stéphane Guillou (stragu) changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||6645 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156645] Random Loss of Database columns' width and currency format
https://bugs.documentfoundation.org/show_bug.cgi?id=156645 Stéphane Guillou (stragu) changed: What|Removed |Added CC||stephane.guillou@libreoffic ||e.org Summary|Random Loss of Database |Random Loss of Database |Formats |columns' width and currency ||format See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=13 ||9611 Whiteboard| QA:needsComment| Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from Stéphane Guillou (stragu) --- Thank you for the report, David. Can you please: - test with version 7.6, which will see further releases, and let us know if you can still reproduce the issue - paste here the full version info copied from Help > About LibreOffice - let us know which kind of database you are connected to Thank you! -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sal/osl sal/qa
sal/osl/unx/file.cxx|2 sal/osl/unx/pipe.cxx|2 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 1346 ++-- sal/qa/osl/file/osl_File.cxx| 172 +-- sal/qa/osl/process/osl_process.cxx |6 sal/qa/rtl/cipher/rtl_cipher.cxx| 16 sal/qa/rtl/digest/rtl_digest.cxx| 136 +- sal/qa/rtl/ostring/rtl_str.cxx | 112 +- sal/qa/rtl/oustring/rtl_OUString2.cxx | 56 - sal/qa/rtl/oustring/rtl_ustr.cxx| 22 sal/qa/rtl/strings/nonconstarray.cxx|4 sal/qa/rtl/strings/test_ostring.cxx | 42 sal/qa/rtl/strings/test_ostring_concat.cxx | 86 - sal/qa/rtl/strings/test_oustring_concat.cxx |2 sal/qa/rtl/strings/test_strings_replace.cxx | 30 15 files changed, 1017 insertions(+), 1017 deletions(-) New commits: commit 95ffa27c593a7fa31309b5e72a55d966862db9a0 Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:32:08 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 21:19:40 2023 +0100 Extended loplugin:ostr: sal Change-Id: Ic8a02784acb9f8981249689541bb6cba1b7fbfb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159682 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index a831221a3c36..7c803fd8 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -110,7 +110,7 @@ struct FileHandle_Impl rtl_String* m_memstreambuf; /*< used for in-memory streams */ #endif -explicit FileHandle_Impl(int fd, Kind kind = KIND_FD, OString path = ""); +explicit FileHandle_Impl(int fd, Kind kind = KIND_FD, OString path = ""_ostr); ~FileHandle_Impl(); static size_t getpagesize(); diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 43f577ba8f44..4dfd75ddf662 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -136,7 +136,7 @@ getBootstrapSocketPath() { return OUStringToOString(pValue, RTL_TEXTENCODING_UTF8); } -return ""; +return ""_ostr; } static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 0543db0112b3..9692d9fb2910 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -457,9 +457,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); -arrOUS[1] = OString( "1" ); +arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -582,9 +582,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); -arrOUS[1] = OString( "1" ); +arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -943,9 +943,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); -arrOUS[1] = OString( "1" ); +arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -1679,7 +1679,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -2167,7 +2167,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -2647,7 +2647,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3126,7 +3126,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); -arrOUS[3] = OString( "" ); +arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3405,7
[Libreoffice-bugs] [Bug 158260] LibreOffice won't open WebDav document via the URL handler in macOS
https://bugs.documentfoundation.org/show_bug.cgi?id=158260 --- Comment #7 from Malte Leverenz --- Your attachment is a perfect reproducible example of my reported bug. Within a browser, just LibreOffice start view open When I append the link to the soffice binary in my command line, it works as expected. So maybe there's something wrong with the registered URL scheme handler. I don't use the nextcloud plugin, but my assumption is, that it simply provides a URL scheme link to the documents inside a webdav folder. My guess is, that the plugin is not responsible. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158260] LibreOffice won't open WebDav document via the URL handler in macOS
https://bugs.documentfoundation.org/show_bug.cgi?id=158260 --- Comment #6 from Mike Kaganski --- (In reply to Malte Leverenz from comment #5) So is the issue caused by "Edit with LibreOffice" Nextcloud plugin from https://apps.nextcloud.com/apps/fileslibreofficeedit, as claimed there? Also: does my attachment 190912 also show the problem? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156048] bash script for installation for selectable versions and packages of LibreOffice suite
https://bugs.documentfoundation.org/show_bug.cgi?id=156048 --- Comment #3 from Richard Demattio --- (In reply to Stéphane Guillou (stragu) from comment #1) > Thank you very much Richard for your contribution! I just tested it and it > works great after installing a couple of dependencies I was missing. I love > the CLI dialogs. One issue was my system detecting my system as RPM-based > (but I've got Ubuntu 20.04). > This could be a very useful tool for QA. > > Please feel free to already link to it on the Wiki, I think this page it the > most suited for it: > https://wiki.documentfoundation.org/Installing_in_parallel/Linux > > Buovjaga and Xisco, what do you think? Is this a tool that could be added to > one of our repos, or should it remain external? Would be a good addition to > our AppImage tool. > > Note that, it it were to be integrated in one of the repos, the licence > compatibility needs to be checked. And please see how to get started with > submitting a contribution, including the "License Statement": > https://wiki.documentfoundation.org/Development/GetInvolved I am surprised, that the script detected your Ubuntu as RPM, because I am working on Mint and tested on Mint. It looks like my automatic decision between RPM and DEB is not reliable enough. You invited me to "link to it on the Wiki". I am not familiar with the rules of the game on the Wiki. It would be great, if you can do it for me You write about "license compatibility": If the license model I selected is incompatible to your policies, I have no problem to switch to an compatible one. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147021] Use std::size() or std::ssize() instead of SAL_N_ELEMENTS() macro
https://bugs.documentfoundation.org/show_bug.cgi?id=147021 Buovjaga changed: What|Removed |Added Assignee|pabhiramri...@gmail.com |libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158260] LibreOffice won't open WebDav document via the URL handler in macOS
https://bugs.documentfoundation.org/show_bug.cgi?id=158260 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||1224 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 151224] macOS: LibreOffice doesn't open files opened via vnd.libreoffice.command
https://bugs.documentfoundation.org/show_bug.cgi?id=151224 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||8260 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158268] General input/output error on LO draw with .cdr file (CorelDraw file) FILEOPEN
https://bugs.documentfoundation.org/show_bug.cgi?id=158268 Julien Nabet changed: What|Removed |Added Keywords||haveBacktrace Ever confirmed|0 |1 Status|UNCONFIRMED |NEW CC||fridrich.st...@bluewin.ch --- Comment #4 from Julien Nabet --- Fridrich: thought you might be interested in this one since it's related to libcdr. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158268] General input/output error on LO draw with .cdr file (CorelDraw file) FILEOPEN
https://bugs.documentfoundation.org/show_bug.cgi?id=158268 Julien Nabet changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #3 from Julien Nabet --- Created attachment 190913 --> https://bugs.documentfoundation.org/attachment.cgi?id=190913=edit gdb bt On pc Debian x86-64 with master sources updated today, I could reproduce this. I attached bt with some gdb and console logs. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno_module.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 115e7a00c3ab2927b10e569e41d60230cba93dec Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:32:21 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:39:16 2023 +0100 Extended loplugin:ostr: pyuno Change-Id: Ie8ec1e8b3debd1501b16d40567a063390749a19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159683 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index d91b608b6671..793aac834b1b 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -561,7 +561,7 @@ static PyObject *checkType( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { if( !PyTuple_Check( args ) || PyTuple_Size( args) != 1 ) { -OString buf = "pyuno.checkType : expecting one uno.Type argument"; +OString buf = "pyuno.checkType : expecting one uno.Type argument"_ostr; PyErr_SetString( PyExc_RuntimeError, buf.getStr() ); return nullptr; } @@ -584,7 +584,7 @@ static PyObject *checkEnum( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { if( !PyTuple_Check( args ) || PyTuple_Size( args) != 1 ) { -OString buf = "pyuno.checkType : expecting one uno.Type argument"; +OString buf = "pyuno.checkType : expecting one uno.Type argument"_ostr; PyErr_SetString( PyExc_RuntimeError, buf.getStr() ); return nullptr; } @@ -764,7 +764,7 @@ static PyObject * invoke(SAL_UNUSED_PARAMETER PyObject *, PyObject *args) } else { -OString buf = "uno.invoke expects object, name, (arg1, arg2, ... )\n"; +OString buf = "uno.invoke expects object, name, (arg1, arg2, ... )\n"_ostr; PyErr_SetString(PyExc_RuntimeError, buf.getStr()); } return ret; @@ -816,7 +816,7 @@ static PyObject *setCurrentContext( } else { -OString buf = "uno.setCurrentContext expects exactly one argument (the current Context)\n"; +OString buf = "uno.setCurrentContext expects exactly one argument (the current Context)\n"_ostr; PyErr_SetString( PyExc_RuntimeError, buf.getStr() ); }
[Libreoffice-commits] core.git: sd/qa sd/source
sd/qa/filter/eppt/eppt.cxx|4 sd/qa/unit/HtmlExportTest.cxx | 43 - sd/qa/unit/SVGExportTests.cxx | 100 +-- sd/qa/unit/ShapeImportExportTest.cxx | 88 +-- sd/qa/unit/dialogs-test.cxx | 44 - sd/qa/unit/export-tests-ooxml1.cxx| 387 +++--- sd/qa/unit/export-tests-ooxml2.cxx| 673 ++ sd/qa/unit/export-tests-ooxml3.cxx| 306 ++- sd/qa/unit/export-tests-ooxml4.cxx| 198 --- sd/qa/unit/export-tests.cxx | 217 sd/qa/unit/layout-tests.cxx | 97 ++- sd/qa/unit/misc-tests.cxx |3 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 38 - sd/qa/unit/tiledrendering/tiledrendering.cxx | 36 - sd/source/filter/eppt/pptx-epptooxml.cxx |2 sd/source/ui/app/sdmod.cxx|2 sd/source/ui/remotecontrol/Communicator.cxx |8 sd/source/ui/remotecontrol/ImagePreparer.cxx |4 sd/source/ui/view/ViewShellBase.cxx |6 sd/source/ui/view/drviews1.cxx|2 sd/source/ui/view/drviewse.cxx|4 sd/source/ui/view/sdview.cxx |2 22 files changed, 1205 insertions(+), 1059 deletions(-) New commits: commit c7526e303ff8113b6d4fdcc5b439b2ea2734cd51 Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:31:25 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:38:53 2023 +0100 Extended loplugin:ostr: sd Change-Id: Iadfe05a173bacd236086728ac23de1e610f0bf27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159679 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx index 08e83053ed2f..b55a5070e696 100644 --- a/sd/qa/filter/eppt/eppt.cxx +++ b/sd/qa/filter/eppt/eppt.cxx @@ -88,7 +88,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport) // Verify that this color is not lost: xmlDocUniquePtr pXmlDoc = parseExport("ppt/theme/theme1.xml"); -assertXPath(pXmlDoc, "//a:clrScheme/a:lt1/a:srgbClr", "val", +assertXPath(pXmlDoc, "//a:clrScheme/a:lt1/a:srgbClr"_ostr, "val"_ostr, "22"); // expected color 22-22-22 // Check the theme after loading again @@ -126,7 +126,7 @@ CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) // - Actual : 0 // - In <>, XPath '//p:cMediaNode/p:cTn' number of nodes is incorrect // i.e. the media node was lost on export, the video no longer looped. -assertXPath(pXmlDoc, "//p:cMediaNode/p:cTn", "repeatCount", "indefinite"); +assertXPath(pXmlDoc, "//p:cMediaNode/p:cTn"_ostr, "repeatCount"_ostr, "indefinite"); } } diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx index 93c1a21339d1..34b262f6e76c 100644 --- a/sd/qa/unit/HtmlExportTest.cxx +++ b/sd/qa/unit/HtmlExportTest.cxx @@ -26,18 +26,19 @@ public: save("impress_html_Export"); htmlDocUniquePtr htmlDoc = parseHtml(maTempFile); -assertXPath(htmlDoc, "/html", 1); -assertXPath(htmlDoc, "/html/body", 1); -assertXPath(htmlDoc, "/html/body/h1", 4); -assertXPath(htmlDoc, "/html/body/table", 1); -assertXPath(htmlDoc, "/html/body/table/tr", 5); -assertXPath(htmlDoc, "/html/body/ul", 1); -assertXPath(htmlDoc, "/html/body/ul/li", 2); +assertXPath(htmlDoc, "/html"_ostr, 1); +assertXPath(htmlDoc, "/html/body"_ostr, 1); +assertXPath(htmlDoc, "/html/body/h1"_ostr, 4); +assertXPath(htmlDoc, "/html/body/table"_ostr, 1); +assertXPath(htmlDoc, "/html/body/table/tr"_ostr, 5); +assertXPath(htmlDoc, "/html/body/ul"_ostr, 1); +assertXPath(htmlDoc, "/html/body/ul/li"_ostr, 2); -assertXPath(htmlDoc, "/html/head/meta[1]", "content", "text/html; charset=utf-8"); -assertXPath(htmlDoc, "/html/head/meta[2]", "name", "generator"); -assertXPath(htmlDoc, "/html/head/meta[3]", "name", "created"); -assertXPath(htmlDoc, "/html/head/meta[3]", "content", "2014-04-09T17:05:41.987922038"); +assertXPath(htmlDoc, "/html/head/meta[1]"_ostr, "content"_ostr, "text/html; charset=utf-8"); +assertXPath(htmlDoc, "/html/head/meta[2]"_ostr, "name"_ostr, "generator"); +assertXPath(htmlDoc, "/html/head/meta[3]"_ostr, "name"_ostr, "created"); +assertXPath(htmlDoc, "/html/head/meta[3]"_ostr, "content"_ostr, +"2014-04-09T17:05:41.987922038"); } void testTdf154989() @@ -46,21 +47,23 @@ public: save("XHTML Draw File"); xmlDocUniquePtr pXmlDoc = parseXml(maTempFile); -assertXPath(pXmlDoc, "/xhtml:html", 1); +assertXPath(pXmlDoc, "/xhtml:html"_ostr, 1); // 1 page -assertXPath(pXmlDoc, "/xhtml:html/xhtml:body/xhtml:div", 1); +assertXPath(pXmlDoc,
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/extras/htmlexporttest.cxx | 14 sc/qa/extras/macros-test.cxx |8 sc/qa/unit/SparklineImportExportTest.cxx | 67 +- sc/qa/unit/ThemeImportExportTest.cxx | 62 +- sc/qa/unit/dataproviders_test.cxx|6 sc/qa/unit/jumbosheets-test.cxx | 14 sc/qa/unit/pivottable_filters_test.cxx | 687 ++- sc/qa/unit/screenshots/screenshots.cxx | 30 - sc/qa/unit/subsequent_export_test.cxx| 560 +++--- sc/qa/unit/subsequent_export_test2.cxx | 377 -- sc/qa/unit/subsequent_export_test3.cxx | 138 ++--- sc/qa/unit/subsequent_export_test4.cxx | 318 ++-- sc/qa/unit/tiledrendering/tiledrendering.cxx | 42 - sc/qa/unit/ucalc_copypaste.cxx | 10 sc/source/core/data/document10.cxx |2 sc/source/core/data/table7.cxx |4 sc/source/filter/excel/xecontent.cxx | 18 sc/source/filter/excel/xeescher.cxx |2 sc/source/filter/excel/xeextlst.cxx | 16 sc/source/filter/excel/xepivotxml.cxx| 24 sc/source/filter/excel/xeview.cxx|2 sc/source/filter/html/htmlexp.cxx|2 sc/source/ui/app/inputhdl.cxx|6 sc/source/ui/app/scmod.cxx |2 sc/source/ui/unoobj/docuno.cxx |8 sc/source/ui/view/drawview.cxx |2 sc/source/ui/view/gridwin.cxx| 26 - sc/source/ui/view/tabview3.cxx |2 sc/source/ui/view/tabvwsh4.cxx |8 29 files changed, 1310 insertions(+), 1147 deletions(-) New commits: commit 099be392bfc5ddba21370726fa887a2fd6c99cd5 Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:31:36 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:38:33 2023 +0100 Extended loplugin:ostr: sc Change-Id: I44536a13f4c31558671c1166d06b7f6216456641 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159680 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index 6e28d791fbb3..774f75078a85 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -38,16 +38,16 @@ public: htmlDocUniquePtr pDoc = parseHtml(maTempFile); CPPUNIT_ASSERT (pDoc); -assertXPath(pDoc, "/html/body", 1); -assertXPath(pDoc, "/html/body/table/tr/td/img", 1); +assertXPath(pDoc, "/html/body"_ostr, 1); +assertXPath(pDoc, "/html/body/table/tr/td/img"_ostr, 1); setFilterOptions("SkipImages"); save("HTML (StarCalc)"); pDoc = parseHtml(maTempFile); CPPUNIT_ASSERT (pDoc); -assertXPath(pDoc, "/html/body", 1); -assertXPath(pDoc, "/html/body/table/tr/td/img", 0); +assertXPath(pDoc, "/html/body"_ostr, 1); +assertXPath(pDoc, "/html/body/table/tr/td/img"_ostr, 0); } void testTdf155244() @@ -58,10 +58,10 @@ public: xmlDocUniquePtr pXmlDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pXmlDoc); -assertXPath(pXmlDoc, "/xhtml:html", 1); +assertXPath(pXmlDoc, "/xhtml:html"_ostr, 1); // the problem was that there were 2 CSS styles named "Default" -assertXPath(pXmlDoc, "/xhtml:html/xhtml:body/xhtml:table/xhtml:tr/xhtml:td", "class", "cell-Default"); -OUString const styles = getXPathContent(pXmlDoc, "/xhtml:html/xhtml:head/xhtml:style"); +assertXPath(pXmlDoc, "/xhtml:html/xhtml:body/xhtml:table/xhtml:tr/xhtml:td"_ostr, "class"_ostr, "cell-Default"); +OUString const styles = getXPathContent(pXmlDoc, "/xhtml:html/xhtml:head/xhtml:style"_ostr); CPPUNIT_ASSERT(styles.indexOf(".graphic-Default{ background-color:#729fcf;") != -1); CPPUNIT_ASSERT(styles.indexOf(".cell-Default{ font-size:10pt; font-family:'Liberation Sans'; }") != -1); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), styles.indexOf(".Default")); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index f1602465f7d2..c483a05c9300 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -167,13 +167,13 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testMacroButtonFormControlXlsxExport) // Without the fix in place, this test would have failed with: // - XPath '//x:controlPr' no attribute 'macro' exist // i.e. the macro was lost on export. -assertXPath(pSheetDoc, "//x:controlPr", "macro", "Module1.Button1_Click"); +assertXPath(pSheetDoc, "//x:controlPr"_ostr, "macro"_ostr, "Module1.Button1_Click"); // Then also make sure that there is no defined name for the macro, which is only needed for // XLS: xmlDocUniquePtr pWorkbookDoc = parseExport("xl/workbook.xml"); CPPUNIT_ASSERT(pWorkbookDoc); -assertXPath(pWorkbookDoc, "//x:workbook/definedNames", 0);
[Libreoffice-commits] core.git: xmlsecurity/qa
xmlsecurity/qa/unit/signing/signing.cxx | 18 +- xmlsecurity/qa/unit/signing/signing2.cxx |2 +- 2 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 09622587088ee8a3d35abc17aab24b165d2eabfd Author: Stephan Bergmann AuthorDate: Sun Nov 19 13:20:51 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:38:12 2023 +0100 Extended loplugin:ostr: xmlsecurity Change-Id: I639bf4af888e5af615379515d92ad70025d8ac15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159660 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 3d87fb40030d..e564e3761aeb 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -875,14 +875,14 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testXAdESNotype) // attribute", i.e. the signature without such an attribute was not preserved correctly. assertXPathNoAttribute(pXmlDoc, "/odfds:document-signatures/dsig:Signature[1]/dsig:SignedInfo/" - "dsig:Reference[starts-with(@URI, '#idSignedProperties')]", - "Type"); + "dsig:Reference[starts-with(@URI, '#idSignedProperties')]"_ostr, + "Type"_ostr); // New signature always has the Type attribute. assertXPath(pXmlDoc, "/odfds:document-signatures/dsig:Signature[2]/dsig:SignedInfo/" -"dsig:Reference[starts-with(@URI, '#idSignedProperties')]", -"Type", "http://uri.etsi.org/01903#SignedProperties;); +"dsig:Reference[starts-with(@URI, '#idSignedProperties')]"_ostr, +"Type"_ostr, "http://uri.etsi.org/01903#SignedProperties;); } /// Creates a XAdES signature from scratch. @@ -929,15 +929,15 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testXAdES) // Assert that the digest algorithm is SHA-256 in the bAdESCompliant case, not SHA-1. assertXPath(pXmlDoc, "/odfds:document-signatures/dsig:Signature/dsig:SignedInfo/" -"dsig:Reference[@URI='content.xml']/dsig:DigestMethod", -"Algorithm", ALGO_XMLDSIGSHA256); +"dsig:Reference[@URI='content.xml']/dsig:DigestMethod"_ostr, +"Algorithm"_ostr, ALGO_XMLDSIGSHA256); // Assert that the digest of the signing certificate is included. -assertXPath(pXmlDoc, "//xd:CertDigest", 1); +assertXPath(pXmlDoc, "//xd:CertDigest"_ostr, 1); // Assert that the Type attribute is set on all URI's that start with #idSignedProperties -assertXPath(pXmlDoc, "//dsig:Reference[starts-with(@URI, '#idSignedProperties')]", "Type", -"http://uri.etsi.org/01903#SignedProperties;); +assertXPath(pXmlDoc, "//dsig:Reference[starts-with(@URI, '#idSignedProperties')]"_ostr, +"Type"_ostr, "http://uri.etsi.org/01903#SignedProperties;); } CPPUNIT_TEST_FIXTURE(SigningTest, testSigningMultipleTimes_ODT) diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx b/xmlsecurity/qa/unit/signing/signing2.cxx index d0bb816d9ee6..832a414ff2bc 100644 --- a/xmlsecurity/qa/unit/signing/signing2.cxx +++ b/xmlsecurity/qa/unit/signing/signing2.cxx @@ -62,7 +62,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest2, testPreserveMacroSignatureODB) xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get()); // Make sure the signature is still there -assertXPath(pXmlDoc, "//dsig:Signature", "Id", +assertXPath(pXmlDoc, "//dsig:Signature"_ostr, "Id"_ostr, "ID_00a7002f009000bc00ce00f7004400460080002f002e00e400e0003700df00e8"); }
[Libreoffice-commits] core.git: sdext/qa sdext/source
sdext/qa/unit/pdfimport.cxx| 110 ++--- sdext/source/pdfimport/filterdet.cxx |4 sdext/source/pdfimport/pdfparse/pdfentries.cxx | 26 ++-- sdext/source/pdfimport/test/pdfunzip.cxx | 10 - sdext/source/pdfimport/tree/drawtreevisiting.cxx | 28 ++--- sdext/source/pdfimport/tree/style.cxx |2 sdext/source/pdfimport/tree/writertreevisiting.cxx | 30 ++--- 7 files changed, 105 insertions(+), 105 deletions(-) New commits: commit 9407c1f96aaea4bd2751301a6d7ee262bef89b74 Author: Stephan Bergmann AuthorDate: Sun Nov 19 17:31:13 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:37:56 2023 +0100 Extended loplugin:ostr: sdext Change-Id: If4e8ccf288846fc768b3e035706a8bd0b2207f4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159678 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx index 8a65dff940ee..60840702e636 100644 --- a/sdext/qa/unit/pdfimport.cxx +++ b/sdext/qa/unit/pdfimport.cxx @@ -565,7 +565,7 @@ namespace nullptr)); xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast(aOutput.getStr(; // This ensures that the imported text contains all of the characters -OString xpath = "//draw:frame[@draw:z-index='3'][1]/draw:text-box/text:p/text:span[1]"; +OString xpath = "//draw:frame[@draw:z-index='3'][1]/draw:text-box/text:p/text:span[1]"_ostr; OUString sContent = getXPathContent(pXmlDoc, xpath).replaceAll("\n", ""); CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"敏捷的狐狸跨过慵懒的"_ustr, sContent); xpath = "//draw:frame[@draw:z-index='4'][1]/draw:text-box/text:p/text:span[1]"; @@ -593,116 +593,116 @@ namespace //CPPUNIT_ASSERT(pXmlDoc); /* Test for the 1st paragraph */ -OUString styleName = getXPath(pXmlDoc, "//draw:frame[1]//text:span[1]", "style-name"); +OUString styleName = getXPath(pXmlDoc, "//draw:frame[1]//text:span[1]"_ostr, "style-name"_ostr); OString xpath = "//office:automatic-styles/style:style[@style:name=\"" + OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) + "\"]/style:text-properties"; // the font-weight and font-style should be normal -assertXPath(pXmlDoc, xpath, "font-weight", "normal"); -assertXPathNoAttribute(pXmlDoc, xpath, "font-style"); +assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal"); +assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr); /* Test for the 2nd paragraph */ -styleName = getXPath(pXmlDoc, "//draw:frame[2]//text:span[1]", "style-name"); +styleName = getXPath(pXmlDoc, "//draw:frame[2]//text:span[1]"_ostr, "style-name"_ostr); xpath = "//office:automatic-styles/style:style[@style:name=\"" + OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) + "\"]/style:text-properties"; // there should be a font-weight="bold", but no font-style italic -assertXPath(pXmlDoc, xpath, "font-weight", "bold"); -assertXPathNoAttribute(pXmlDoc, xpath, "font-style"); +assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold"); +assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr); /* Test for the 3rd paragraph */ -styleName = getXPath(pXmlDoc, "//draw:frame[3]//text:span[1]", "style-name"); +styleName = getXPath(pXmlDoc, "//draw:frame[3]//text:span[1]"_ostr, "style-name"_ostr); xpath = "//office:automatic-styles/style:style[@style:name=\"" + OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) + "\"]/style:text-properties"; // there should be a font-style="italic", but no font-weight bold -assertXPath(pXmlDoc, xpath, "font-weight", "normal"); -assertXPath(pXmlDoc, xpath, "font-style", "italic"); +assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal"); +assertXPath(pXmlDoc, xpath, "font-style"_ostr, "italic"); /* Test for the 4th paragraph */ -styleName = getXPath(pXmlDoc, "//draw:frame[4]//text:span[1]", "style-name"); +styleName = getXPath(pXmlDoc, "//draw:frame[4]//text:span[1]"_ostr, "style-name"_ostr); xpath = "//office:automatic-styles/style:style[@style:name=\"" + OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) + "\"]/style:text-properties"; // there should be both font-style="italic" and font-weight="bold" -assertXPath(pXmlDoc, xpath, "font-weight", "bold"); -assertXPath(pXmlDoc, xpath, "font-style", "italic"); +assertXPath(pXmlDoc, xpath,
[Libreoffice-commits] core.git: svgio/qa
svgio/qa/cppunit/SvgImportTest.cxx | 1230 ++--- 1 file changed, 615 insertions(+), 615 deletions(-) New commits: commit 142beb47ac285126aa5e2cbe9035394ecce952bf Author: Stephan Bergmann AuthorDate: Sun Nov 19 15:23:55 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:37:38 2023 +0100 Extended loplugin:ostr: svgio Change-Id: I5a93e5f0a3cfc0fd85ac53ba2f58131561508386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159675 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index 91bb2efe53c3..1b0be44177fe 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -66,15 +66,15 @@ void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive) CPPUNIT_ASSERT (pDocument); -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00cc00"); // rect background color -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "height", "100"); // rect background height -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "width", "100"); // rect background width -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "minx", "10"); -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "miny", "10"); -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "maxx", "110"); -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon", "maxy", "110"); -assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "color", "#ff"); // rect stroke color -assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "width", "3"); // rect stroke width +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor"_ostr, "color"_ostr, "#00cc00"); // rect background color +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "height"_ostr, "100"); // rect background height +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "width"_ostr, "100"); // rect background width +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "minx"_ostr, "10"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "miny"_ostr, "10"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "maxx"_ostr, "110"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "maxy"_ostr, "110"); +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line"_ostr, "color"_ostr, "#ff"); // rect stroke color +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line"_ostr, "width"_ostr, "3"); // rect stroke width } @@ -132,7 +132,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSymbol) // - Expected: 1 // - Actual : 2 // number of nodes is incorrect -assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00d000"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor"_ostr, "color"_ostr, "#00d000"); } CPPUNIT_TEST_FIXTURE(Test, testTdf150124) @@ -145,8 +145,8 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf150124) CPPUNIT_ASSERT (pDocument); -assertXPathChildren(pDocument, "/primitive2D", 1); -assertXPath(pDocument, "/primitive2D/hiddengeometry", 1); +assertXPathChildren(pDocument, "/primitive2D"_ostr, 1); +assertXPath(pDocument, "/primitive2D/hiddengeometry"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Test, testTdf155819) @@ -159,12 +159,12 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf155819) CPPUNIT_ASSERT (pDocument); -assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", 1); -assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/polypolygon", 1); +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line"_ostr, 1); +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/polypolygon"_ostr, 1); // Without the fix in place, this test would have failed with // - Expected: 4 // - Actual : 0 -assertXPath(pDocument, "/primitive2D/transform/transform", 4); +assertXPath(pDocument, "/primitive2D/transform/transform"_ostr, 4); } CPPUNIT_TEST_FIXTURE(Test, testFeColorMatrix) @@ -177,10 +177,10 @@ CPPUNIT_TEST_FIXTURE(Test, testFeColorMatrix) CPPUNIT_ASSERT (pDocument); -assertXPath(pDocument, "/primitive2D/transform/mask/modifiedColor[1]", "modifier", "matrix"); -assertXPath(pDocument, "/primitive2D/transform/mask/modifiedColor[2]", "modifier", "saturate"); -assertXPath(pDocument, "/primitive2D/transform/mask/modifiedColor[3]", "modifier", "hueRotate"); -assertXPath(pDocument,
[Libreoffice-commits] core.git: starmath/qa starmath/source
starmath/qa/extras/mmlexport-test.cxx | 41 +++--- starmath/source/smmod.cxx |2 - 2 files changed, 25 insertions(+), 18 deletions(-) New commits: commit 75d256929387eb8258439808e830b73abcdf2d8b Author: Stephan Bergmann AuthorDate: Sun Nov 19 15:24:11 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 20:37:13 2023 +0100 Extended loplugin:ostr: starmath Change-Id: I24ab27d0f92d2d5d10ca2694138d7964ae947b62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159676 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx index 98607dbec3f2..402df43130d5 100644 --- a/starmath/qa/extras/mmlexport-test.cxx +++ b/starmath/qa/extras/mmlexport-test.cxx @@ -62,8 +62,8 @@ void MathMLExportTest::testBlank() save("MathML XML (Math)"); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mspace[1]", "width", "0.5em"); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mspace[2]", "width", "4em"); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mspace[1]"_ostr, "width"_ostr, "0.5em"); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mspace[2]"_ostr, "width"_ostr, "4em"); } void MathMLExportTest::testTdf97049() @@ -75,8 +75,8 @@ void MathMLExportTest::testTdf97049() save("MathML XML (Math)"); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mo[1]", "stretchy", "true"); -auto aContent = getXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:mo[1]"); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mo[1]"_ostr, "stretchy"_ostr, "true"); +auto aContent = getXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:mo[1]"_ostr); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aContent.getLength()); CPPUNIT_ASSERT_EQUAL(u'\x222B', aContent[0]); } @@ -89,19 +89,23 @@ void MathMLExportTest::checkMathVariant(SmDocShell& rDocShell, bool bCapital, bo xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); if (bCapital) -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[1]", "mathvariant"); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[1]"_ostr, "mathvariant"_ostr); else -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mi[1]", "mathvariant", "normal"); -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[1]/m:mi[1]", "mathvariant"); -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[2]", "mathvariant"); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[2]/m:mi[1]", "mathvariant", "normal"); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mi[1]"_ostr, "mathvariant"_ostr, "normal"); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[1]/m:mi[1]"_ostr, + "mathvariant"_ostr); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[2]"_ostr, "mathvariant"_ostr); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[2]/m:mi[1]"_ostr, "mathvariant"_ostr, +"normal"); if (bSmall) -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[3]", "mathvariant"); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[3]"_ostr, "mathvariant"_ostr); else -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mi[3]", "mathvariant", "normal"); -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[3]/m:mi[1]", "mathvariant"); -assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[4]", "mathvariant"); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[4]/m:mi[1]", "mathvariant", "normal"); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mi[3]"_ostr, "mathvariant"_ostr, "normal"); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[3]/m:mi[1]"_ostr, + "mathvariant"_ostr); +assertXPathNoAttribute(pDoc, "/m:math/m:semantics/m:mrow/m:mi[4]"_ostr, "mathvariant"_ostr); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:mstyle[4]/m:mi[1]"_ostr, "mathvariant"_ostr, +"normal"); rDocShell.SetText(""); } @@ -130,8 +134,10 @@ void MathMLExportTest::testMaj() save("MathML XML (Math)"); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); -assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo", "stretchy", "false"); -assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo", u"\U0001EEF0"_ustr); +assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo"_ostr, "stretchy"_ostr, +"false"); +assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo"_ostr, + u"\U0001EEF0"_ustr); } void
[Libreoffice-bugs] [Bug 158260] LibreOffice won't open WebDav document via the URL handler in macOS
https://bugs.documentfoundation.org/show_bug.cgi?id=158260 --- Comment #5 from Malte Leverenz --- Probably a duplicate of https://bugs.documentfoundation.org/show_bug.cgi?id=151224 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/attarray.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97516a3153efcc4996512139b8c80f20b9d246b4 Author: Andrea Gelmini AuthorDate: Sun Nov 19 19:46:14 2023 +0100 Commit: Julien Nabet CommitDate: Sun Nov 19 20:03:12 2023 +0100 Fix typo Change-Id: I4a1f624793c0bf2e97ee862b4599aa9c8fb9f9d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159692 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index c2f3b0b75195..67d0ac67b088 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -297,7 +297,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd // changed to create pNewPattern only if needed, else use already // existing pPattern. This shows by example how to avoid that special // handling of ATTR_PATTERN/ScPatternAttr in SC and massive -// incarnations/desctructions of that Item (which contains an ItemSet) +// incarnations/destructions of that Item (which contains an ItemSet) std::unique_ptr pNewPattern; if(pPattern) {
[Libreoffice-bugs] [Bug 158276] New: Since version 7.5.8.2 (x86_64) bookmarks in LO Writer do not hold alpha sort
https://bugs.documentfoundation.org/show_bug.cgi?id=158276 Bug ID: 158276 Summary: Since version 7.5.8.2 (x86_64) bookmarks in LO Writer do not hold alpha sort Product: LibreOffice Version: 7.5.8.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: bhavil...@outlook.com Description: Since version 7.5.8.2 (x86_64) bookmarks in LO Writer do not hold alpha sort and must be re-sorted each time the document is opened. Annoying extra step when working with multiple docs daily. Steps to Reproduce: 1.open document with bookmarks in same window as doc 2.Note bookmarks are not alpha sorted 3.Choose alpha sort Actual Results: See above - I CAN alpha sort but it should not have to be done each time I open the doc Expected Results: that alpha sort would hold going forward day to day Reproducible: Always User Profile Reset: No Additional Info: Version: 7.5.8.2 (X86_64) / LibreOffice Community Build ID: f718d63693263970429a68f568db6046aaa9df01 CPU threads: 8; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 42428] Split-pane window for side-by-side / above-and-below editing of a single document
https://bugs.documentfoundation.org/show_bug.cgi?id=42428 Mike Kaganski changed: What|Removed |Added CC||lel...@protonmail.com --- Comment #35 from Mike Kaganski --- *** Bug 158275 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158275] Add "Split Window" to LO Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=158275 Mike Kaganski changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Mike Kaganski --- *** This bug has been marked as a duplicate of bug 42428 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158198] My macro changes the bookmark text and the bookmark disappears
https://bugs.documentfoundation.org/show_bug.cgi?id=158198 Mike Kaganski changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #6 from Mike Kaganski --- (In reply to ToanTran from comment #3) That is exactly what JBrown reported, isn't it? Are you asking JBrown to confirm comment 0? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source
desktop/source/lib/init.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 36df8d1c247d8bc54a1505d289f9bc292edae8ee Author: Noel Grandin AuthorDate: Fri Nov 17 11:58:54 2023 +0200 Commit: Caolán McNamara CommitDate: Sun Nov 19 18:33:18 2023 +0100 cool#6893 pre-init dictionary list so the forked processes don't need to Change-Id: Id37688ac88c14679e216cca744563ee75c7c4736 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159570 Tested-by: Jenkins CollaboraOffice Reviewed-by: Caolán McNamara diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index aff6e4954a45..2e6960e9ee52 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -126,6 +126,7 @@ #include #include +#include #include #include #include @@ -7458,6 +7459,7 @@ static void preloadData() setLanguageToolConfig(); // preload all available dictionaries + linguistic2::DictionaryList::create(comphelper::getProcessComponentContext()); css::uno::Reference xLngSvcMgr = css::linguistic2::LinguServiceManager::create(comphelper::getProcessComponentContext()); css::uno::Reference xSpellChecker(xLngSvcMgr->getSpellChecker());
[Libreoffice-commits] core.git: 2 commits - svl/qa svtools/qa svtools/source
svl/qa/unit/test_INetContentType.cxx |6 +-- svtools/qa/unit/testHtmlReader.cxx |6 +-- svtools/qa/unit/testHtmlWriter.cxx | 60 +-- svtools/source/svhtml/parhtml.cxx|2 - 4 files changed, 37 insertions(+), 37 deletions(-) New commits: commit 6ccd536aae8b5fb5ec01796a1d48d8c5e0b21582 Author: Stephan Bergmann AuthorDate: Sun Nov 19 14:43:07 2023 +0100 Commit: Stephan Bergmann CommitDate: Sun Nov 19 18:27:05 2023 +0100 Extended loplugin:ostr: svtools Change-Id: I4aa6ab1c132a5666b0ee4a4e9f68aaca58a38ceb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159672 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/svtools/qa/unit/testHtmlReader.cxx b/svtools/qa/unit/testHtmlReader.cxx index 37f74e903bcc..5605060eab34 100644 --- a/svtools/qa/unit/testHtmlReader.cxx +++ b/svtools/qa/unit/testHtmlReader.cxx @@ -53,7 +53,7 @@ class Test : public CppUnit::TestFixture CPPUNIT_TEST_FIXTURE(Test, testTdf114428) { SvMemoryStream aStream; -OString aDocument("\nhello"); +OString aDocument("\nhello"_ostr); aStream.WriteBytes(aDocument.getStr(), aDocument.getLength()); aStream.Seek(0); @@ -68,7 +68,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf114428) CPPUNIT_TEST_FIXTURE(Test, testLineBreak) { SvMemoryStream aStream; -OString aDocument("aaabbb"); +OString aDocument("aaabbb"_ostr); aStream.WriteBytes(aDocument.getStr(), aDocument.getLength()); aStream.Seek(0); @@ -84,7 +84,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCdata) { // Given a document with CDATA: SvMemoryStream aStream; -OString aDocument("AC"); +OString aDocument("AC"_ostr); aStream.WriteBytes(aDocument.getStr(), aDocument.getLength()); aStream.Seek(0); diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx index 702bf64464ab..19e5b6078947 100644 --- a/svtools/qa/unit/testHtmlWriter.cxx +++ b/svtools/qa/unit/testHtmlWriter.cxx @@ -37,11 +37,11 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElement) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); +aHtml.start("abc"_ostr); aHtml.end(); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } { @@ -49,11 +49,11 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElement) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.single("abc"); +aHtml.single("abc"_ostr); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } } @@ -64,13 +64,13 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithAttributes) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); +aHtml.start("abc"_ostr); aHtml.attribute("x", "y"); aHtml.end(); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } { @@ -78,14 +78,14 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithAttributes) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); +aHtml.start("abc"_ostr); aHtml.attribute("x", "y"); aHtml.attribute("q", "w"); aHtml.end(); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } } @@ -95,12 +95,12 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithContent) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); +aHtml.start("abc"_ostr); aHtml.end(); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithContentAndAttributes) @@ -109,14 +109,14 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithContentAndAttributes) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); +aHtml.start("abc"_ostr); aHtml.attribute("x", "y"); aHtml.attribute("q", "w"); aHtml.end(); OString aString = extractFromStream(aStream); -CPPUNIT_ASSERT_EQUAL(OString(""), aString); +CPPUNIT_ASSERT_EQUAL(""_ostr, aString); } CPPUNIT_TEST_FIXTURE(Test, testNested) @@ -125,14 +125,14 @@ CPPUNIT_TEST_FIXTURE(Test, testNested) HtmlWriter aHtml(aStream); aHtml.prettyPrint(false); -aHtml.start("abc"); -aHtml.start("xyz"); +aHtml.start("abc"_ostr); +aHtml.start("xyz"_ostr); aHtml.end(); aHtml.end(); OString aString = extractFromStream(aStream); -
[Libreoffice-bugs] [Bug 158230] Growing Liberty Template: preview in master page panel does not correspond to the applied master page
https://bugs.documentfoundation.org/show_bug.cgi?id=158230 Laurent Balland changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |jumbo4...@yahoo.fr |desktop.org | Status|UNCONFIRMED |ASSIGNED Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.
coverity versions
We were using cov-analysis-2022.6.0, we tried cov-analysis-2022.12.2 and were flooded with hundreds of extra warnings of little use so went back to 2022.6.0. With the recent release of cov-analysis-2023.6.2 builds with 2022.6.0 aren't accepted anymore, so I'll try 2023.6.2 for the next one.
[Libreoffice-bugs] [Bug 158275] New: Add "Split Window" to LO Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=158275 Bug ID: 158275 Summary: Add "Split Window" to LO Writer Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: lel...@protonmail.com Would it be possible to add a "split Window" feature (in the "View" menu) in Libreoffice writer? I simply do not understand why this so useful and basic feature is not implemented while it is in Libreoffice Calc? -- Some may say that there is already a built-in equivalent with "Window - New Window" which I completely disagree. First, this option opens a new instance of the file and takes much more screen space which can be a problem on small laptops for instance. Second, because it is another LO Writer's instance, the whole menu on the top and the icons are also present which makes less available screen. Third, the "split screen" option is quicker because there is no need to move any window, which improves the workflow. If already implemented in one of your software (LO Calc), why not adding it to LO Writer? Is it a patent problem with MS Office which offers that option? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 157032] Add ability to group frames in LO Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=157032 --- Comment #6 from Le Lord --- I downloaded the latest version of LibreOffice and grouping option for frames is still not implemented despite the last comment implying it should be. Have I missed something? (And great overall work for the software, the management of frames/text boxes is much better programmed in LibreOffice than MS Word, the latter tends to overuse microprocessor resources, LibreOffice does not hence easier work on more limited computers). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 158258] Rank Function not working
https://bugs.documentfoundation.org/show_bug.cgi?id=158258 --- Comment #9 from GyleMc --- THANK YOU ady! Adding the value in f20~ to the rank values is exactly what I needed. The IF() functions can be eliminated as they were in case the value was lower or higher than the existing ten numbers. Now that the value is included in the range it returns the 1 or 11 as needed. This simplifies the formula greatly and again, thank you for this solution!! -- You are receiving this mail because: You are the assignee for the bug.