cui/source/tabpages/tpcolor.cxx | 2 +- editeng/qa/unit/core-test.cxx | 4 ++-- include/svx/SvxColorIconView.hxx | 2 +- svx/source/tbxctrls/Palette.cxx | 4 ++-- svx/source/tbxctrls/PaletteManager.cxx | 6 +++--- svx/source/tbxctrls/SvxColorIconView.cxx | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit e8590211565b23540dbe4490e4e8de020fcb2360 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Feb 20 22:26:30 2026 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Feb 20 19:27:23 2026 +0100 Fix Windows build C:/lo/core2/editeng/qa/unit/core-test.cxx(2381): error C2668: 'EditDoc::GetParaAsString': ambiguous call to overloaded function C:\lo C:\lo C:/lo/core2/editeng/qa/unit/core-test.cxx(2381): note: while trying to match the argument list '(int)' C:/lo/core2/editeng/qa/unit/core-test.cxx(2381): error C2672: 'CppUnit::assertEquals': no matching overloaded function found C:/lo/core2/editeng/qa/unit/core-test.cxx(2381): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string &)': expects 4 arguments - 3 provided C:\louild2\workdir\UnpackedTarball C:/lo/core2/editeng/qa/unit/core-test.cxx(2404): error C2668: 'EditDoc::GetParaAsString': ambiguous call to overloaded function C:\lo C:\lo C:/lo/core2/editeng/qa/unit/core-test.cxx(2404): note: while trying to match the argument list '(int)' C:/lo/core2/editeng/qa/unit/core-test.cxx(2404): error C2672: 'CppUnit::assertEquals': no matching overloaded function found C:/lo/core2/editeng/qa/unit/core-test.cxx(2404): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string &)': expects 4 arguments - 3 provided C:\louild2\workdir\UnpackedTarball Change-Id: I8f9b6fc32669d7b0626c07f2fb4c7dbd254dfc1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199902 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index fe6773e4f842..6e3f977496d5 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -2378,7 +2378,7 @@ void Test::testEscapementNotPreservedOnParaBreak() OUString aParaText = u"item 1st"_ustr; aEditEngine.SetText(aParaText); - CPPUNIT_ASSERT_EQUAL(aParaText, rDoc.GetParaAsString(0)); + CPPUNIT_ASSERT_EQUAL(aParaText, rDoc.GetParaAsString(sal_Int32(0))); { std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); @@ -2401,7 +2401,7 @@ void Test::testEscapementNotPreservedOnParaBreak() rDoc.InsertParaBreak(aEndPaM, true /* bKeepEndingAttribs */); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), rDoc.Count()); - CPPUNIT_ASSERT_EQUAL(aParaText, rDoc.GetParaAsString(0)); + CPPUNIT_ASSERT_EQUAL(aParaText, rDoc.GetParaAsString(sal_Int32(0))); CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(1)); // Check new para's character attributes commit c5f6227d8e71680d4034c79aa65437e927694885 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Feb 20 22:26:55 2026 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Feb 20 19:27:09 2026 +0100 10000 GDI handles limit: use ScopedVclPtr to avoid leaks Similar to commit c11463cdc5415707d05ab6da08736ff7212db4a0 (tdf#154016: use ScopedVclPtr, 2023-04-17). Change-Id: Ie17d36618af6ca3bda79b453df3cd018df831e98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199903 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 2b174b259382..1da93474a9d4 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -372,7 +372,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, weld::Button&, void) batch->commit(); OUString sLastColorItemId = nSize > 0 ? m_xIconViewColorList->get_id(nSize - 1) : OUString(); sal_Int32 nId = !sLastColorItemId.isEmpty() ? sLastColorItemId.toInt32() : -1; - VclPtr<VirtualDevice> pVDev = SvxColorIconView::createColorVirtualDevice(m_aCurrentColor.m_aColor); + auto pVDev = SvxColorIconView::createColorVirtualDevice(m_aCurrentColor.m_aColor); OUString sId = OUString::number(nId + 1); m_xIconViewColorList->insert( nId + 1, &aName, &sId, pVDev, nullptr); m_xIconViewColorList->select( nId + 1 ); diff --git a/include/svx/SvxColorIconView.hxx b/include/svx/SvxColorIconView.hxx index aceaa7b4bddc..bb7c8d9eb7c2 100644 --- a/include/svx/SvxColorIconView.hxx +++ b/include/svx/SvxColorIconView.hxx @@ -34,7 +34,7 @@ public: static void addEntriesForColorSet(weld::IconView& pIconView, const std::set<Color>& rColorSet, std::u16string_view rNamePrefix); - static VclPtr<VirtualDevice> createColorVirtualDevice(const Color& rColor); + static ScopedVclPtr<VirtualDevice> createColorVirtualDevice(const Color& rColor); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index 0ec40852a906..7af6a412bce2 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/svx/source/tbxctrls/Palette.cxx @@ -58,7 +58,7 @@ void PaletteASE::LoadColorSet(weld::IconView& pIconView) int nIx = 0; for (const auto& rColor : maColors) { - VclPtr<VirtualDevice> pColorVDev = SvxColorIconView::createColorVirtualDevice(rColor.m_aColor); + auto pColorVDev = SvxColorIconView::createColorVirtualDevice(rColor.m_aColor); OUString sColorName = rColor.m_aName; OUString sId = OUString::number(nIx); pIconView.insert(nIx, &sColorName, &sId, pColorVDev, nullptr); @@ -340,7 +340,7 @@ void PaletteGPL::LoadColorSet(weld::IconView& pIconView) int nIx = 0; for (const auto& rColor : maColors) { - VclPtr<VirtualDevice> pColorVDev = SvxColorIconView::createColorVirtualDevice(rColor.m_aColor); + auto pColorVDev = SvxColorIconView::createColorVirtualDevice(rColor.m_aColor); OUString sColorName = rColor.m_aName; OUString sId = OUString::number(nIx); pIconView.insert(nIx, &sColorName, &sId, pColorVDev, nullptr); diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index cbad66557c5a..4f7fdaae4fbc 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -273,7 +273,7 @@ void PaletteManager::ReloadColorSet(weld::IconView &pIconView) for (int i = 0; i < CustomColorList.getLength(); ++i) { Color aColor(ColorTransparency, CustomColorList[i]); - VclPtr<VirtualDevice> pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); + auto pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); OUString sId = OUString::number(i); OUString sColorName = CustomColorNameList[i]; pIconView.insert(i, &sColorName, &sId, pColorVDev, nullptr); @@ -303,7 +303,7 @@ void PaletteManager::ReloadColorSet(weld::IconView &pIconView) { auto const& rEffect = rColorData.maEffects[nEffect]; Color aColor = rEffect.maColor; - VclPtr<VirtualDevice> pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); + auto pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); OUString sColorName = rEffect.maColorName; OUString sId = OUString::number(nItemId); pIconView.insert(nItemId, &sColorName, &sId, pColorVDev, nullptr); @@ -342,7 +342,7 @@ void PaletteManager::ReloadRecentColorSet(weld::IconView& pIconView) for (int i = 0; i < Colorlist.getLength(); ++i) { Color aColor(ColorTransparency, Colorlist[i]); - VclPtr<VirtualDevice> pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); + auto pColorVDev = SvxColorIconView::createColorVirtualDevice(aColor); OUString sColorName = bHasColorNames ? ColorNamelist[i] : ("#" + aColor.AsRGBHexString().toAsciiUpperCase()); maRecentColors.emplace_back(aColor, sColorName); OUString sId = OUString::number(nIx); diff --git a/svx/source/tbxctrls/SvxColorIconView.cxx b/svx/source/tbxctrls/SvxColorIconView.cxx index 857fc6ad3c94..fe3b70a6b922 100644 --- a/svx/source/tbxctrls/SvxColorIconView.cxx +++ b/svx/source/tbxctrls/SvxColorIconView.cxx @@ -49,7 +49,7 @@ void SvxColorIconView::addEntriesForXColorList(weld::IconView& pIconView, if (pEntry) { - VclPtr<VirtualDevice> pColorVDev = createColorVirtualDevice(pEntry->GetColor()); + auto pColorVDev = createColorVirtualDevice(pEntry->GetColor()); OUString sColorName = pEntry->GetName(); OUString sId = OUString::number(nIndex); pIconView.insert(nIndex, &sColorName, &sId, pColorVDev, nullptr); @@ -70,7 +70,7 @@ void SvxColorIconView::addEntriesForColorSet(weld::IconView& pIconView, { for (const auto& rColor : rColorSet) { - VclPtr<VirtualDevice> pColorVDev = createColorVirtualDevice(rColor); + auto pColorVDev = createColorVirtualDevice(rColor); OUString sName = OUString::Concat(rNamePrefix) + OUString::number(nStartIndex); OUString sId = OUString::number(nStartIndex); // InsertEntry(sName, aColorImage, aColorImage); @@ -82,7 +82,7 @@ void SvxColorIconView::addEntriesForColorSet(weld::IconView& pIconView, { for (const auto& rColor : rColorSet) { - VclPtr<VirtualDevice> pColorVDev = createColorVirtualDevice(rColor); + auto pColorVDev = createColorVirtualDevice(rColor); OUString sId = OUString::number(nStartIndex); OUString sName = u""_ustr; // InsertEntry(u""_ustr, aColorImage, aColorImage); @@ -92,7 +92,7 @@ void SvxColorIconView::addEntriesForColorSet(weld::IconView& pIconView, } } -VclPtr<VirtualDevice> SvxColorIconView::createColorVirtualDevice(const Color& rColor) +ScopedVclPtr<VirtualDevice> SvxColorIconView::createColorVirtualDevice(const Color& rColor) { const sal_uInt32 nEdgeLength = getEntryEdgeLength() - 2; VclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create();
