[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/app/sdmod1.cxx | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
New commits:
commit bfa12f692e0738a0ff10a1d65f91376bb251b774
Author: Caolán McNamara
AuthorDate: Wed Nov 22 21:14:41 2023 +
Commit: Miklos Vajna
CommitDate: Fri Nov 24 08:50:18 2023 +0100
reuse AllowedLinkProtocolFromDocument in impress/draw
Change-Id: I73ca4f087946a45dbf92d69a0dc1e769de9b5690
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159843
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit f0942eed2eb328b04856f20613f5226d66b66a20)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159759
Reviewed-by: Michael Stahl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159859
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
(cherry picked from commit 402fd49351123c476650c7280471d05d4de85d5d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159880
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index f3ec8b3df514..aec7a3dcb2d8 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -193,26 +194,32 @@ void SdModule::Execute(SfxRequest& rReq)
{
bool bIntercept = false;
::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell
*>( SfxObjectShell::Current() );
-if (pDocShell)
+::sd::ViewShell* pViewShell = pDocShell ?
pDocShell->GetViewShell() : nullptr;
+if (pViewShell)
{
-::sd::ViewShell* pViewShell = pDocShell->GetViewShell();
-if (pViewShell)
+if( sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() )
)
{
-if( sd::SlideShow::IsRunning(
pViewShell->GetViewShellBase() ) )
+// Prevent documents from opening while the slide
+// show is running, except when this request comes
+// from a shape interaction.
+if (rReq.GetArgs() == nullptr)
{
-// Prevent documents from opening while the slide
-// show is running, except when this request comes
-// from a shape interaction.
-if (rReq.GetArgs() == nullptr)
-{
-bIntercept = true;
-}
+bIntercept = true;
}
}
}
if (!bIntercept)
{
+if (const SfxStringItem* pURLItem =
rReq.GetArg(SID_FILE_NAME))
+{
+if (!pViewShell ||
!SfxObjectShell::AllowedLinkProtocolFromDocument(pURLItem->GetValue(),
+
pViewShell->GetObjectShell(),
+
pViewShell->GetFrameWeld()))
+{
+return;
+}
+}
SfxGetpApp()->ExecuteSlot(rReq, SfxGetpApp()->GetInterface());
}
else
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/unoidl/unomodel.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit cfa1fc9be9831a61fba736d428c2c2e56fbf7617
Author: Miklos Vajna
AuthorDate: Mon May 22 09:15:50 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue May 23 05:21:19 2023 +0200
sd: fix crash in SdXImpressDocument::postMouseEvent()
Crashreport signature:
program/libsdlo.so
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)
sd/source/ui/unoidl/unomodel.cxx:2615
program/libmergedlo.so
doc_postMouseEvent
desktop/source/lib/init.cxx:5007
Change-Id: I321f39b284f5917048925bf45c9a6417ac9cb2ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152079
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8e02660f628f..eac9ad74385b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2612,6 +2612,11 @@ void SdXImpressDocument::postMouseEvent(int nType, int
nX, int nY, int nCount, i
SdrPageView* pPageView = pDrawView->GetSdrPageView();
SdrPage* pPage = pPageView->GetPage();
::sd::Window* pActiveWin = pViewShell->GetActiveWindow();
+if (!pActiveWin)
+{
+return;
+}
+
if (LokControlHandler::postMouseEvent(pPage, pDrawView, *pActiveWin,
nType, aPointHMM, nCount, nButtons, nModifier))
return;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/view/ViewTabBar.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 769b8517b6ce237ccb34dd11dc7151de72849699
Author: Miklos Vajna
AuthorDate: Wed Mar 8 08:58:52 2023 +0100
Commit: Andras Timar
CommitDate: Thu Mar 9 20:07:37 2023 +
sd: fix crash in ViewTabBar::dispose()
Crashreport signature:
program/libsdlo.so
sd::ViewTabBar::disposing()
sd/source/ui/view/ViewTabBar.cxx:113 (discriminator 1)
program/libuno_cppuhelpergcc3.so.3
cppu::WeakComponentImplHelperBase::dispose()
cppuhelper/source/implbase.cxx:104
program/libuno_cppuhelpergcc3.so.3
cppu::WeakComponentImplHelperBase::release()
cppuhelper/source/implbase.cxx:84
program/libsdlo.so
sd::ViewTabBar::ViewTabBar(com::sun::star::uno::Reference
const&, com::sun::star::uno::Reference
const&) [clone .cold]
include/cppuhelper/compbase.hxx:65
program/libsdlo.so
sd::framework::BasicToolBarFactory::createResource(com::sun::star::uno::Reference
const&)
sd/source/ui/framework/factories/BasicToolBarFactory.cxx:129
(discriminator 2)
I.e. the ViewTabBar got deleted by a smart pointer before its ctor
finished, guard against this.
Change-Id: I3d6ccc21167355047e3752316c8d0b9b02470f57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148459
Reviewed-by: Noel Grandin
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index fd8c83f8841c..19722039877b 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -66,6 +66,9 @@ ViewTabBar::ViewTabBar (
mpViewShellBase(nullptr),
mnNoteBookWidthPadding(0)
{
+// Do this manually instead of via uno::Reference, so we don't delete
ourselves.
+osl_atomic_increment(_refCount);
+
// Tunnel through the controller and use the ViewShellBase to obtain the
// view frame.
try
@@ -100,6 +103,8 @@ ViewTabBar::ViewTabBar (
{
mpViewShellBase->SetViewTabBar(this);
}
+
+osl_atomic_decrement(_refCount);
}
ViewTabBar::~ViewTabBar()
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/app/sddll.cxx | 24 ++--
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit d47593982345c06a0abe918bdf25db72ea75a876
Author: Henry Castro
AuthorDate: Wed Feb 15 11:25:19 2023 -0400
Commit: Henry Castro
CommitDate: Tue Feb 21 12:03:44 2023 +
sd: lok: only register supported views
The Presentation ViewShells:
SlideSorter,
Outline,
Presentation
They are not supported in tiled rendering case,
so switch to default view.
Signed-off-by: Henry Castro
Change-Id: I33b255e0ca530734af6490d14fe48a2512272afc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147354
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Patrick Luby
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 4e20d0997fb8..698a13af0d82 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -91,12 +91,24 @@ void SdDLL::RegisterFactorys()
{
::sd::ImpressViewShellBase::RegisterFactory (
::sd::IMPRESS_FACTORY_ID);
-::sd::SlideSorterViewShellBase::RegisterFactory (
-::sd::SLIDE_SORTER_FACTORY_ID);
-::sd::OutlineViewShellBase::RegisterFactory (
-::sd::OUTLINE_FACTORY_ID);
-::sd::PresentationViewShellBase::RegisterFactory (
-::sd::PRESENTATION_FACTORY_ID);
+if (comphelper::LibreOfficeKit::isActive())
+{
+::sd::ImpressViewShellBase::RegisterFactory (
+::sd::SLIDE_SORTER_FACTORY_ID);
+::sd::ImpressViewShellBase::RegisterFactory (
+::sd::OUTLINE_FACTORY_ID);
+::sd::ImpressViewShellBase::RegisterFactory (
+::sd::PRESENTATION_FACTORY_ID);
+}
+else
+{
+::sd::SlideSorterViewShellBase::RegisterFactory (
+::sd::SLIDE_SORTER_FACTORY_ID);
+::sd::OutlineViewShellBase::RegisterFactory (
+::sd::OUTLINE_FACTORY_ID);
+::sd::PresentationViewShellBase::RegisterFactory (
+::sd::PRESENTATION_FACTORY_ID);
+}
}
if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw())
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source sfx2/source sw/source
sd/source/ui/unoidl/unomodel.cxx | 19 +++
sfx2/source/view/lokstarmathhelper.cxx | 15 ++-
sw/source/uibase/uno/unotxdoc.cxx |7 +++
3 files changed, 28 insertions(+), 13 deletions(-)
New commits:
commit 9fdf1cd68e3cfe2ee64ed4092b75b15b2eea33dd
Author: Mike Kaganski
AuthorDate: Wed Nov 16 17:40:27 2022 +0300
Commit: Mike Kaganski
CommitDate: Wed Nov 16 18:59:27 2022 +0100
lok: handle mouse/keyboard events in Math embedded in Impress/Draw
Since Impress/Draw use mm100, we need to convert object area that
SfxInPlaceClient provides, which is in parent units, into twips.
TODO: how would taking the units from object shell with Calc, given
that it does not call SetMapUnit in ScDocShell ctor?
Change-Id: I8de2088a3e0e7f9070d6c3c234b40038b6e00f15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142777
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 2d4cde2f75d4aaa3a69fdd65ee7584eb15d20275)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142692
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a71f3e9d1747..789e00a8159b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2411,16 +2411,16 @@ VclPtr SdXImpressDocument::getDocWindow()
{
SolarMutexGuard aGuard;
DrawViewShell* pViewShell = GetViewShell();
-VclPtr pWindow;
-if (pViewShell)
-pWindow = pViewShell->GetActiveWindow();
+if (!pViewShell)
+return {};
-LokChartHelper aChartHelper(pViewShell->GetViewShell());
-VclPtr pChartWindow = aChartHelper.GetWindow();
-if (pChartWindow)
-pWindow = pChartWindow;
+SfxViewShell* pSfxViewShell = pViewShell->GetViewShell();
+if (VclPtr pWindow =
LokChartHelper(pSfxViewShell).GetWindow())
+return pWindow;
+if (VclPtr pWindow =
LokStarMathHelper(pSfxViewShell).GetWidgetWindow())
+return pWindow;
-return pWindow;
+return pViewShell->GetActiveWindow();
}
void SdXImpressDocument::setPartMode( int nPartMode )
@@ -2593,6 +2593,9 @@ void SdXImpressDocument::postMouseEvent(int nType, int
nX, int nY, int nCount, i
nCount, nButtons, nModifier,
fScale, fScale))
return;
+if (LokStarMathHelper(pViewShell->GetViewShell())
+.postMouseEvent(nType, nX, nY, nCount, nButtons, nModifier,
fScale, fScale))
+return;
// check if the user hit a chart which is being edited by someone else
// and, if so, skip current mouse event
diff --git a/sfx2/source/view/lokstarmathhelper.cxx
b/sfx2/source/view/lokstarmathhelper.cxx
index a1ee4c2ccacb..d9c559746ba2 100644
--- a/sfx2/source/view/lokstarmathhelper.cxx
+++ b/sfx2/source/view/lokstarmathhelper.cxx
@@ -12,10 +12,12 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -135,7 +137,18 @@ const SfxViewShell* LokStarMathHelper::GetSmViewShell()
tools::Rectangle LokStarMathHelper::GetBoundingBox() const
{
-return mpIPClient ? mpIPClient->GetObjArea() : tools::Rectangle{};
+if (mpIPClient)
+{
+tools::Rectangle r(mpIPClient->GetObjArea());
+if (SfxObjectShell* pObjShell =
const_cast(mpViewShell)->GetObjectShell())
+{
+const o3tl::Length unit = MapToO3tlLength(pObjShell->GetMapUnit());
+if (unit != o3tl::Length::twip && unit != o3tl::Length::invalid)
+r = o3tl::convert(r, unit, o3tl::Length::twip);
+}
+return r;
+}
+return {};
}
bool LokStarMathHelper::postMouseEvent(int nType, int nX, int nY, int nCount,
int nButtons,
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 696529b61ab0..b23083cabc6a 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3539,16 +3539,15 @@ VclPtr SwXTextDocument::getDocWindow()
{
SolarMutexGuard aGuard;
SwView* pView = m_pDocShell->GetView();
+if (!pView)
+return {};
if (VclPtr pWindow = LokChartHelper(pView).GetWindow())
return pWindow;
if (VclPtr pWindow =
LokStarMathHelper(pView).GetWidgetWindow())
return pWindow;
-if (pView)
-return &(pView->GetEditWin());
-
-return {};
+return &(pView->GetEditWin());
}
void SwXTextDocument::initializeForTiledRendering(const
css::uno::Sequence& rArguments)
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/view/drviews1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6e277447c765b9199077e4e0e9df2c2704039548
Author: Szymon Kłos
AuthorDate: Tue Nov 15 16:49:15 2022 +0100
Commit: Ashod Nakashian
CommitDate: Wed Nov 16 12:45:56 2022 +0100
lok: masterpage: don't switch page on mode change
Go back to the last used page when closing MasterPage.
There was a bug when one user was in MasterPage mode and
other switched page - then on close we opened other user
page.
Change-Id: I02f3b36429a62b855b215803d6684b3382228326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142740
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 4c3e446963a5..7f2201552d7d 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -404,7 +404,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
OUString aPageName = pPage->GetName();
maTabControl->InsertPage(pPage->getPageId(), aPageName);
-if ( pPage->IsSelected() )
+if ( !comphelper::LibreOfficeKit::isActive() &&
pPage->IsSelected() )
{
nActualPageId = pPage->getPageId();
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit d83ffaafb58c36658b9d2a7e34468ff921de79c3
Author: Szymon Kłos
AuthorDate: Mon Nov 14 11:38:40 2022 +0100
Commit: Ashod Nakashian
CommitDate: Wed Nov 16 12:41:30 2022 +0100
lok: masterpage: don't remove old cache
In multi user view when switching between MasterPage and Page
mode it was failing to find cache because it was removed by other
views. We need that to allow invalidation after master page changed
something.
Change-Id: I070345b0fe6942965aece5bf729ceb37b7d99397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142697
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 45afd93c96f3..79eeb1b3476b 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -26,6 +26,8 @@
#include
#include
+#include
+
namespace {
/** Collection of data that is stored for all active preview caches.
@@ -297,7 +299,8 @@ std::shared_ptr PageCacheManager::ChangeSize (
pResult = rpCache;
}
-else
+// In multi user view this can happen - no issue (reset after
switching MasterPage)
+else if (!comphelper::LibreOfficeKit::isActive())
{
assert(iCacheToChange != mpPageCaches->end());
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source sw/source
sd/source/ui/view/sdwindow.cxx| 12 sw/source/uibase/docvw/edtwin.cxx | 12 2 files changed, 24 deletions(-) New commits: commit 510bca3d3ab0b2fd21f0083b4e0fe14ff8c903c3 Author: Mike Kaganski AuthorDate: Sun Oct 23 09:35:18 2022 +0200 Commit: Mike Kaganski CommitDate: Sun Oct 23 19:06:10 2022 +0200 Simplify SwEditWin::LogicMouse* and sd::Window::LogicMouse* These are intended to be called in LibreOfficeKit case. Setting pointer position appeared in commits b780822f5afbf8cd6c2a8c756251a7edf248f55e Author Miklos Vajna DateTue Feb 24 14:30:41 2015 +0100 Introduce SdXImpressDocument::postMouseEvent() override and cc7d10c04fe3047f18b6d5271a5f46a31b80d360 Author Miklos Vajna Date Tue Mar 03 12:09:04 2015 +0100 SwEditWin: disable map mode in LogicMouseButtonUp/Down The only effect of Window::SetPointerPosPixel is realized by a call to SalFrame::SetPointerPos; and in SVP case, which is used in case of LibreOfficeKit on Linux, it is a noop (see SvpSalFrame::SetPointerPos in vcl/headless/svpframe.cxx). But e.g. when running gtktiledviewer on Windows, WinSalFrame::SetPointerPos is called, which actually sets system cursor position, causing unexpected jumps. And it is unclear why the mouse actions should restore previous mouse positions after executing their functions in the first place. The other overrides (vcl/source/control/ctrl.cxx, sc/source/ui/view/gridwin.cxx, chart2/source/controller/main/ChartWindow.cxx) don't do that. So remove these SetPointerPosPixel calls altogether. The question remains: if these LogicMouse* are still needed, or if they may be replaced with respective Window::Mouse* calls. Change-Id: Id6103f8eaaddafc72fe5e4264532dbc8a658d240 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141697 Tested-by: Jenkins CollaboraOffice Reviewed-by: Mike Kaganski diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index f639b463e124..b637a1a01aa8 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -1050,12 +1050,8 @@ void Window::LogicMouseButtonDown(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint = GetPointerPosPixel(); SetLastMousePos(rMouseEvent.GetPosPixel()); - mpViewShell->MouseButtonDown(rMouseEvent, this); - -SetPointerPosPixel(aPoint); } void Window::LogicMouseButtonUp(const MouseEvent& rMouseEvent) @@ -1063,12 +1059,8 @@ void Window::LogicMouseButtonUp(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint = GetPointerPosPixel(); SetLastMousePos(rMouseEvent.GetPosPixel()); - mpViewShell->MouseButtonUp(rMouseEvent, this); - -SetPointerPosPixel(aPoint); } void Window::LogicMouseMove(const MouseEvent& rMouseEvent) @@ -1076,12 +1068,8 @@ void Window::LogicMouseMove(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint = GetPointerPosPixel(); SetLastMousePos(rMouseEvent.GetPosPixel()); - mpViewShell->MouseMove(rMouseEvent, this); - -SetPointerPosPixel(aPoint); } FactoryFunction Window::GetUITestFactory() const diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 9b953b38c7cb..1c9d6cf4ef69 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -6651,12 +6651,8 @@ void SwEditWin::LogicMouseButtonDown(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint = GetPointerPosPixel(); SetLastMousePos(rMouseEvent.GetPosPixel()); - MouseButtonDown(rMouseEvent); - -SetPointerPosPixel(aPoint); } void SwEditWin::LogicMouseButtonUp(const MouseEvent& rMouseEvent) @@ -6664,12 +6660,8 @@ void SwEditWin::LogicMouseButtonUp(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint = GetPointerPosPixel(); SetLastMousePos(rMouseEvent.GetPosPixel()); - MouseButtonUp(rMouseEvent); - -SetPointerPosPixel(aPoint); } void SwEditWin::LogicMouseMove(const MouseEvent& rMouseEvent) @@ -6677,12 +6669,8 @@ void SwEditWin::LogicMouseMove(const MouseEvent& rMouseEvent) // When we're not doing tiled rendering, then positions must be passed as pixels. assert(comphelper::LibreOfficeKit::isActive()); -Point aPoint =
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/core/stlpool.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e6e109cf027577d1b30cdea73db13444242b123
Author: Tor Lillqvist
AuthorDate: Tue Sep 6 11:30:10 2022 +0300
Commit: Tor Lillqvist
CommitDate: Tue Sep 6 22:04:23 2022 +0200
Replace leftover use of StarSymbol with OpenSymbol
Change-Id: I2cfc88dfbdb0d5d4f296dea6f5b72122a0af7965
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139479
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 503bb3f184b5..b40d4c1559f8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1079,7 +1079,7 @@ void SdStyleSheetPool::PutNumBulletItem(
SfxStyleSheetBase* pSheet,
// Standard template
SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL);
aNumberFormat.SetBulletFont();
-aNumberFormat.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
+aNumberFormat.SetBulletChar( 0x25CF ); // U+25CF: BLACK CIRCLE
aNumberFormat.SetBulletRelSize(45);
aNumberFormat.SetBulletColor(COL_AUTO);
aNumberFormat.SetStart(1);
@@ -1166,7 +1166,7 @@ void SdStyleSheetPool::PutNumBulletItem(
SfxStyleSheetBase* pSheet,
vcl::Font SdStyleSheetPool::GetBulletFont()
{
-vcl::Font aBulletFont( "StarSymbol", Size(0, 1000) );
+vcl::Font aBulletFont( "OpenSymbol", Size(0, 1000) );
aBulletFont.SetCharSet(RTL_TEXTENCODING_UNICODE);
aBulletFont.SetWeight(WEIGHT_NORMAL);
aBulletFont.SetUnderline(LINESTYLE_NONE);
