summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-06-21 17:55:01 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-07-03 16:38:48 +0200
commit3e73f52cc76cbf8ff45b0194d21ebd6e5ddb0cbd (patch)
treefbf9f139522df243bef6ac9799f37045214a6e63 /sw/inc
parentfafbd0cbf3f09168f42a30e3ecc1be2d61e54096 (diff)
sw comments on frames: fix layout to place anchor next to the image
With this, if you load sw/qa/extras/unowriter/data/image-comment-at-char.odt, the comment anchor leads to the commented image, not to the anchor of the image (between "aaa" and "bbb"). (cherry picked from commit ac246d6ea1bc43bfc82c9b4c69c9c0f1fd678129) Conflicts: sw/qa/extras/unowriter/unowriter.cxx Change-Id: I99389c9fc849269eb20d0266f8f604db89faec12
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/postithelper.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index e0f934dfe025..2a9fb448f7da 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -35,6 +35,7 @@ class IDocumentRedlineAccess;
namespace sw { namespace annotation {
class SwAnnotationWin;
} }
+namespace sw::mark { class IMark; }
struct SwPosition;
@@ -78,7 +79,7 @@ namespace SwPostItHelper
SwLayoutStatus getLayoutInfos(
SwLayoutInfo& o_rInfo,
const SwPosition& rAnchorPos,
- const SwPosition* pAnnotationStartPos = nullptr );
+ const sw::mark::IMark* pAnnotationMark = nullptr );
long getLayoutHeight( const SwRootFrame* pRoot );
void setSidebarChanged( SwRootFrame* pRoot, bool bBrowseMode );