openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1582330 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/ui/docvw/SidebarWin.cxx
Date Thu, 27 Mar 2014 14:51:24 GMT
Author: orw
Date: Thu Mar 27 14:51:24 2014
New Revision: 1582330

URL: http://svn.apache.org/r1582330
Log:
B124514: show/hide Overlay object to highlight annotated text range according to the corresponding
view option which show/hides the annotations/comments

	cherry-picked from trunk


Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/sw/source/ui/docvw/SidebarWin.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1581840

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1581840

Modified: openoffice/branches/AOO410/main/sw/source/ui/docvw/SidebarWin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/docvw/SidebarWin.cxx?rev=1582330&r1=1582329&r2=1582330&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/ui/docvw/SidebarWin.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/docvw/SidebarWin.cxx Thu Mar 27 14:51:24
2014
@@ -579,7 +579,8 @@ void SwSidebarWin::SetPosAndSize()
     }
 
     // text range overlay
-    if ( mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
+    if ( mrMgr.ShowNotes()
+         && mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
          && mrSidebarItem.maLayoutInfo.mnStartContent != STRING_NOTFOUND )
     {
         std::vector< basegfx::B2DRange > aAnnotationTextRanges;



Mime
View raw message