summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Godard <lgodard.libre@laposte.net>2015-05-19 18:10:18 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-20 11:24:55 +0000
commitab6ea2f8e73c4a0785bb2a6b256fc521ee120d98 (patch)
tree8cc3525e04ea45f9121a02993d571177d32e127a
parent7ce44f5f8e786a1bfd56aad8e30ef52702115ba2 (diff)
draw Note mark before text for correct ZOrder tdf#89182
the cell content is now drawn over the cell note rectangle Change-Id: I6874ecd879b01ebc27b5eb912d472af704387a1f Reviewed-on: https://gerrit.libreoffice.org/15823 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sc/source/ui/view/gridwin4.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 545e071d4086..1ab1b3b785bd 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -693,6 +693,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aOutputData.DrawShadow();
aOutputData.DrawFrame();
+
+ // Show Note Mark
+ if ( rOpts.GetOption( VOPT_NOTES ) )
+ aOutputData.DrawNoteMarks();
+
if ( !bLogicText )
aOutputData.DrawStrings(false); // in pixel MapMode
@@ -709,11 +714,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
DrawButtons( nX1, nX2, aTabInfo, 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