svx/source/gallery2/galbrws1.cxx | 1 -
svx/source/svdraw/svdmrkv.cxx | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d759c8b39ce04ee9c1a515c01f7ed104ccb81cc1
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Mon Mar 11 17:21:48 2024 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Mar 11 20:42:20 2024 +0100
Remove duplicated include
Change-Id: Iba8d8295252670c0f0ab590934bcb654f2bd2625
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164665
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 85d43005b515..c68c2d8ba83e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -48,7 +48,6 @@
#include <comphelper/propertyvalue.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/processfactory.hxx>
-#include <comphelper/propertyvalue.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
commit caddd0199ea1f07e1fdef6d4231da5d3f8e9c367
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Mar 11 19:19:01 2024 +0530
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Mar 11 20:42:09 2024 +0100
LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT
Change-Id: Id0a3a84fcadc1ab216b856760fd168b23bed2827
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164672
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ccb873811143..49c67aa8f21f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -817,8 +817,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const
if (!comphelper::LibreOfficeKit::isActive())
return;
SfxViewShell* pViewShell = GetSfxViewShell();
- if (pViewShell)
- pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT,
CreateInnerTextRectString());
+ OString sRectString = CreateInnerTextRectString();
+ if (pViewShell && !sRectString.isEmpty())
+ pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT,
sRectString);
}
void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell)
