diff options
| author | Laurent Godard <lgodard.libre@laposte.net> | 2015-05-19 14:36:44 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-19 15:49:34 +0000 |
| commit | 2d1abfff0156c17cdaabf27c01e92b5e3f0bbbf4 (patch) | |
| tree | 20bde8c7262fda092ffaa113781e7e804d27173e | |
| parent | 697d49cbb43c7d12bb88ba4f67dafe069cb1c5bd (diff) | |
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.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 10 |
1 files 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 |