|
 |
f325b2 |
From eacd7a0d10a02292f723031080884a8914fc496f Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 8 Oct 2015 08:37:12 +0200
|
|
|
f325b2 |
Subject: [PATCH 195/398] editeng, sw, sc: use comphelper::string::join()
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 1cb13d87b5d887718f6d81a842444b7251dc64cf)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I9b0a32271a965bc4089720ccb61b26b67ceab7b2
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sc/source/ui/view/gridwin.cxx | 13 ++++---------
|
|
|
f325b2 |
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
index cfc0b5e27dd1..1320e27cb104 100644
|
|
|
f325b2 |
--- a/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
+++ b/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
@@ -134,6 +134,7 @@
|
|
|
f325b2 |
#include <svx/sdr/overlay/overlaymanager.hxx>
|
|
|
f325b2 |
#include <vcl/svapp.hxx>
|
|
|
f325b2 |
#include <svx/sdr/overlay/overlayselection.hxx>
|
|
|
f325b2 |
+#include <comphelper/string.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
#define LOK_USE_UNSTABLE_API
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
f325b2 |
@@ -5899,9 +5900,8 @@ static void updateLibreOfficeKitSelection(ScViewData* pViewData, ScDrawLayer* pD
|
|
|
f325b2 |
double nPPTY = pViewData->GetPPTY();
|
|
|
f325b2 |
|
|
|
f325b2 |
Rectangle aBoundingBox;
|
|
|
f325b2 |
- std::stringstream ss;
|
|
|
f325b2 |
+ std::vector<OString> aRectangles;
|
|
|
f325b2 |
|
|
|
f325b2 |
- bool bIsFirst = true;
|
|
|
f325b2 |
for (auto aRectangle : rRectangles)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
aRectangle.Right() += 1;
|
|
|
f325b2 |
@@ -5909,14 +5909,9 @@ static void updateLibreOfficeKitSelection(ScViewData* pViewData, ScDrawLayer* pD
|
|
|
f325b2 |
|
|
|
f325b2 |
aBoundingBox.Union(aRectangle);
|
|
|
f325b2 |
|
|
|
f325b2 |
- if (bIsFirst)
|
|
|
f325b2 |
- bIsFirst = false;
|
|
|
f325b2 |
- else
|
|
|
f325b2 |
- ss << "; ";
|
|
|
f325b2 |
-
|
|
|
f325b2 |
Rectangle aRect(aRectangle.Left() / nPPTX, aRectangle.Top() / nPPTY,
|
|
|
f325b2 |
aRectangle.Right() / nPPTX, aRectangle.Bottom() / nPPTY);
|
|
|
f325b2 |
- ss << aRect.toString().getStr();
|
|
|
f325b2 |
+ aRectangles.push_back(aRect.toString());
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
// selection start handle
|
|
|
f325b2 |
@@ -5930,7 +5925,7 @@ static void updateLibreOfficeKitSelection(ScViewData* pViewData, ScDrawLayer* pD
|
|
|
f325b2 |
pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END, aEnd.toString().getStr());
|
|
|
f325b2 |
|
|
|
f325b2 |
// the selection itself
|
|
|
f325b2 |
- pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, ss.str().c_str());
|
|
|
f325b2 |
+ pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, comphelper::string::join("; ", aRectangles).getStr());
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
void ScGridWindow::UpdateCursorOverlay()
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|