sw/source/core/uibase/docvw/SidebarWin.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1ffa910582f6470af2e5ee337270dc9269436235
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Wed Mar 26 13:52:38 2014 +0000
Resolves: #i124514# show/hide Overlay object to highlight...
annotated text range according the according view option which show/hides
the
annotations/comments
(cherry picked from commit b8c793949e416432619d3c7d7611fc44694c3b77)
Conflicts:
sw/source/core/uibase/docvw/SidebarWin.cxx
Change-Id: I0701ee137317349c5d917841448c183015d5513a
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx
b/sw/source/core/uibase/docvw/SidebarWin.cxx
index 4a37bf2..fb78b3b 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -573,7 +573,8 @@ void SwSidebarWin::SetPosAndSize()
}
// text range overlay
- if ( mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
+ if ( mrMgr.ShowNotes()
+ && mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
&& mrSidebarItem.maLayoutInfo.mnStartContent != -1 )
{
std::vector< basegfx::B2DRange > aAnnotationTextRanges;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
