Kaydet (Commit) 6d243a10 authored tarafından Pranav Kant's avatar Pranav Kant Kaydeden (comit) pranavk

lok: Send complete anchor rectangle

... instead of just sending the X, Y coordinates

Change-Id: Ie87b252ebfd64e806e1e5f66cfc27e77282cbaab
Reviewed-on: https://gerrit.libreoffice.org/33875Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarpranavk <pranavk@collabora.co.uk>
üst 0b819a1f
...@@ -81,6 +81,7 @@ class SwSidebarWin : public vcl::Window ...@@ -81,6 +81,7 @@ class SwSidebarWin : public vcl::Window
void CheckMetaText(); void CheckMetaText();
inline Point GetAnchorPos() { return mAnchorRect.Pos(); } inline Point GetAnchorPos() { return mAnchorRect.Pos(); }
inline const SwRect& GetAnchorRect() { return mAnchorRect; }
inline const std::vector<basegfx::B2DRange>& GetAnnotationTextRanges() { return maAnnotationTextRanges; } inline const std::vector<basegfx::B2DRange>& GetAnnotationTextRanges() { return maAnnotationTextRanges; }
SwEditWin& EditWin(); SwEditWin& EditWin();
......
...@@ -152,7 +152,11 @@ namespace { ...@@ -152,7 +152,11 @@ namespace {
sw::annotation::SwAnnotationWin* pWin = static_cast<sw::annotation::SwAnnotationWin*>((pItem)->pPostIt.get()); sw::annotation::SwAnnotationWin* pWin = static_cast<sw::annotation::SwAnnotationWin*>((pItem)->pPostIt.get());
const SwPostItField* pField = pWin->GetPostItField(); const SwPostItField* pField = pWin->GetPostItField();
const OString aAnchorPos = OString::number(pWin->GetAnchorPos().X()) + ", " + OString::number(pWin->GetAnchorPos().Y()); const SwRect& aRect = pWin->GetAnchorRect();
const Rectangle aSVRect(aRect.Pos().getX(),
aRect.Pos().getY(),
aRect.Pos().getX() + aRect.SSize().Width(),
aRect.Pos().getY() + aRect.SSize().Height());
std::vector<OString> aRects; std::vector<OString> aRects;
for (const basegfx::B2DRange& aRange : pWin->GetAnnotationTextRanges()) for (const basegfx::B2DRange& aRange : pWin->GetAnnotationTextRanges())
{ {
...@@ -166,7 +170,7 @@ namespace { ...@@ -166,7 +170,7 @@ namespace {
aAnnotation.put("author", pField->GetPar1().toUtf8().getStr()); aAnnotation.put("author", pField->GetPar1().toUtf8().getStr());
aAnnotation.put("text", pField->GetPar2().toUtf8().getStr()); aAnnotation.put("text", pField->GetPar2().toUtf8().getStr());
aAnnotation.put("dateTime", utl::toISO8601(pField->GetDateTime().GetUNODateTime())); aAnnotation.put("dateTime", utl::toISO8601(pField->GetDateTime().GetUNODateTime()));
aAnnotation.put("anchorPos", aAnchorPos.getStr()); aAnnotation.put("anchorPos", aSVRect.toString());
aAnnotation.put("textRange", sRects.getStr()); aAnnotation.put("textRange", sRects.getStr());
} }
......
...@@ -3194,7 +3194,11 @@ OUString SwXTextDocument::getPostIts() ...@@ -3194,7 +3194,11 @@ OUString SwXTextDocument::getPostIts()
sw::annotation::SwAnnotationWin* pWin = static_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt.get()); sw::annotation::SwAnnotationWin* pWin = static_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt.get());
const SwPostItField* pField = pWin->GetPostItField(); const SwPostItField* pField = pWin->GetPostItField();
const OString aAnchorPos = OString::number(pWin->GetAnchorPos().X()) + ", " + OString::number(pWin->GetAnchorPos().Y()); const SwRect& aRect = pWin->GetAnchorRect();
const Rectangle aSVRect(aRect.Pos().getX(),
aRect.Pos().getY(),
aRect.Pos().getX() + aRect.SSize().Width(),
aRect.Pos().getY() + aRect.SSize().Height());
std::vector<OString> aRects; std::vector<OString> aRects;
for (const basegfx::B2DRange& aRange : pWin->GetAnnotationTextRanges()) for (const basegfx::B2DRange& aRange : pWin->GetAnnotationTextRanges())
{ {
...@@ -3209,7 +3213,7 @@ OUString SwXTextDocument::getPostIts() ...@@ -3209,7 +3213,7 @@ OUString SwXTextDocument::getPostIts()
aAnnotation.put("author", pField->GetPar1().toUtf8().getStr()); aAnnotation.put("author", pField->GetPar1().toUtf8().getStr());
aAnnotation.put("text", pField->GetPar2().toUtf8().getStr()); aAnnotation.put("text", pField->GetPar2().toUtf8().getStr());
aAnnotation.put("dateTime", utl::toISO8601(pField->GetDateTime().GetUNODateTime())); aAnnotation.put("dateTime", utl::toISO8601(pField->GetDateTime().GetUNODateTime()));
aAnnotation.put("anchorPos", aAnchorPos.getStr()); aAnnotation.put("anchorPos", aSVRect.toString());
aAnnotation.put("textRange", sRects.getStr()); aAnnotation.put("textRange", sRects.getStr());
aAnnotations.push_back(std::make_pair("", aAnnotation)); aAnnotations.push_back(std::make_pair("", aAnnotation));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment