From ab6ea2f8e73c4a0785bb2a6b256fc521ee120d98 Mon Sep 17 00:00:00 2001 From: Laurent Godard Date: Tue, 19 May 2015 18:10:18 +0200 Subject: 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 Tested-by: Adolfo Jayme Barrientos --- sc/source/ui/view/gridwin4.cxx | 10 +++++----- 1 file 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 -- cgit v1.2.3