sc/source/ui/view/gridwin4.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2d1abfff0156c17cdaabf27c01e92b5e3f0bbbf4
Author: Laurent Godard <lgodard.li...@laposte.net>
Date: Tue May 19 14:36:44 2015 +0200
draw Note mark before text for correct ZOrder tdf#89182
the cell content is now drawn over the cell note rectangle
Change-Id: Idce05497b7a9f67e5e315f5bc2f9c59e53898131
Reviewed-on: https://gerrit.libreoffice.org/15802
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a3e5170..c175d02 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -741,6 +741,11 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
aOutputData.DrawShadow();
aOutputData.DrawFrame();
+
+ // Show Note Mark
+ if ( rOpts.GetOption( VOPT_NOTES ) )
+ aOutputData.DrawNoteMarks();
+
if ( !bLogicText )
aOutputData.DrawStrings(false); // in pixel MapMode
@@ -757,11 +762,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
DrawButtons(nX1, nX2, rTableInfo, pContentDev); // Pixel
- // Notiz-Anzeiger
-
- if ( rOpts.GetOption( VOPT_NOTES ) )
- aOutputData.DrawNoteMarks();
-
aOutputData.DrawClipMarks();
// Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch
bei !bGridFirst
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
