[Libreoffice-commits] core.git: sc/source

[Krisztian Pinter]

 sc/source/ui/inc/output.hxx    |    2 +-
 sc/source/ui/view/gridwin4.cxx |    2 +-
 sc/source/ui/view/output.cxx   |   10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f1cf05d81d80c87b9942daff5d60dc0ebdd474b5
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date:   Tue Jun 23 22:30:57 2015 +0200

    calc mapmode: Pass RenderContext as reference in DrawNoteMarks
    
    Change-Id: Id47f4001943bd40fb8476c7e6a81f257b34c2c7d

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 77d50f6..861faf9 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -340,7 +340,7 @@ public:
     void    DrawChangeTrack();
     void    DrawClipMarks();
 
-    void    DrawNoteMarks();
+    void    DrawNoteMarks(vcl::RenderContext& rRenderContext);
     void    AddPDFNotes();
 };
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 26ed6ae..7282b90 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -747,7 +747,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
 
     // Show Note Mark
     if ( rOpts.GetOption( VOPT_NOTES ) )
-        aOutputData.DrawNoteMarks();
+        aOutputData.DrawNoteMarks(*pContentDev);
 
     if ( !bLogicText )
         aOutputData.DrawStrings(false);     // in pixel MapMode
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index de67cc3..ce60133 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2291,7 +2291,7 @@ void ScOutputData::DrawChangeTrack()
 }
 
 //TODO: moggi Need to check if this can't be written simpler
-void ScOutputData::DrawNoteMarks()
+void ScOutputData::DrawNoteMarks(vcl::RenderContext& rRenderContext)
 {
 
     bool bFirst = true;
@@ -2329,13 +2329,13 @@ void ScOutputData::DrawNoteMarks()
                 {
                     if (bFirst)
                     {
-                        mpDev->SetLineColor(COL_WHITE);
+                        rRenderContext.SetLineColor(COL_WHITE);
 
                         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
                         if ( mbUseStyleColor && rStyleSettings.GetHighContrastMode() )
-                            mpDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+                            rRenderContext.SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
                         else
-                            mpDev->SetFillColor(COL_LIGHTRED);
+                            rRenderContext.SetFillColor(COL_LIGHTRED);
 
                         bFirst = false;
                     }
@@ -2352,7 +2352,7 @@ void ScOutputData::DrawNoteMarks()
                         }
                     }
                     if ( bLayoutRTL ? ( nMarkX >= 0 ) : ( nMarkX < nScrX+nScrW ) )
-                        mpDev->DrawRect( Rectangle( nMarkX-5*nLayoutSign,nPosY,nMarkX+1*nLayoutSign,nPosY+6 ) );
+                        rRenderContext.DrawRect( Rectangle( nMarkX-5*nLayoutSign,nPosY,nMarkX+1*nLayoutSign,nPosY+6 ) );
                 }
 
                 nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;