diff options
author | Laurent Godard <lgodard.libre@laposte.net> | 2015-05-19 18:10:18 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-06-03 15:12:48 +0200 |
commit | a873d9db69bed4e9b933793a23bfef6581761b74 (patch) | |
tree | 4014b1887a4c4290c4883eda9f6330aeeafa02c4 /sc | |
parent | 9e9561f69354725a793acab92966c728dcf1569a (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>
Diffstat (limited to 'sc')
-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 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 |