summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.com>2020-05-25 23:53:21 +0530
committerDennis Francis <dennis.francis@collabora.com>2020-05-26 22:08:56 +0530
commit4f157cd93d52665ca7799f506d4832bc24e56fe6 (patch)
tree5254a5783f5efc217960a802271d2c5f82ae3961
parent11f4a63732602db6c8feb03b5252b3d99fa331ea (diff)
lokit: scPrintTwipsMsgs: LOK_CALLBACK_COMMENTfeature/calc-coordinates
Allow print twips coordinates in LOK_CALLBACK_COMMENT Change-Id: I052dacb311c651c49d61fd9937951fa5b81b32d5
-rw-r--r--sc/source/ui/docshell/docsh4.cxx33
1 files changed, 22 insertions, 11 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 226fad060971..7ead65a06037 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2499,17 +2499,28 @@ void ScDocShell::LOKCommentNotify(LOKCommentNotificationType nType, const ScDocu
ScViewData* pViewData = GetViewData();
if (pViewData && pViewData->GetActiveWin())
{
- Point aScrPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), pViewData->GetActivePart(), true);
- long nSizeXPix;
- long nSizeYPix;
- pViewData->GetMergeSizePixel(rPos.Col(), rPos.Row(), nSizeXPix, nSizeYPix);
-
- const double fPPTX = pViewData->GetPPTX();
- const double fPPTY = pViewData->GetPPTY();
- tools::Rectangle aRect(Point(aScrPos.getX() / fPPTX, aScrPos.getY() / fPPTY),
- Size(nSizeXPix / fPPTX, nSizeYPix / fPPTY));
-
- aAnnotation.put("cellPos", aRect.toString());
+ bool bInPrintTwips = comphelper::LibreOfficeKit::isCompatFlagSet(
+ comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs);
+ OString aRectString;
+ if (bInPrintTwips)
+ {
+ Point aTopLeft = pViewData->GetPrintTwipsPos(rPos.Col(), rPos.Row());
+ long nSizeX, nSizeY;
+ pViewData->GetMergeSizePrintTwips(rPos.Col(), rPos.Row(), nSizeX, nSizeY);
+ aRectString = tools::Rectangle(aTopLeft, Size(nSizeX, nSizeY)).toString();
+ }
+ else
+ {
+ Point aTopLeft = pViewData->GetScrPos(rPos.Col(), rPos.Row(),
+ pViewData->GetActivePart(), true);
+ long nSizeXPix, nSizeYPix;
+ pViewData->GetMergeSizePixel(rPos.Col(), rPos.Row(), nSizeXPix, nSizeYPix);
+ const double fPPTX = pViewData->GetPPTX();
+ const double fPPTY = pViewData->GetPPTY();
+ aRectString = tools::Rectangle(Point(aTopLeft.getX() / fPPTX, aTopLeft.getY() / fPPTY),
+ Size(nSizeXPix / fPPTX, nSizeYPix / fPPTY)).toString();
+ }
+ aAnnotation.put("cellPos", aRectString);
}
}