From 2d1abfff0156c17cdaabf27c01e92b5e3f0bbbf4 Mon Sep 17 00:00:00 2001 From: Laurent Godard Date: Tue, 19 May 2015 14:36:44 +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: Idce05497b7a9f67e5e315f5bc2f9c59e53898131 Reviewed-on: https://gerrit.libreoffice.org/15802 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard --- 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 a3e51704c31e..c175d022a0a0 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 -- cgit v1.2.3