diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2015-06-23 22:30:57 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-07-24 08:45:32 +0200 |
| commit | f1cf05d81d80c87b9942daff5d60dc0ebdd474b5 (patch) | |
| tree | 73759abedfba673a5c71ff837c1e72958843a74b /sc | |
| parent | c7350070cca3e68013b3e481d90855ab6f8344ec (diff) | |
calc mapmode: Pass RenderContext as reference in DrawNoteMarks
Change-Id: Id47f4001943bd40fb8476c7e6a81f257b34c2c7d
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/output.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output.cxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 77d50f64d527..861faf98dcb9 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 26ed6aed5336..7282b9080252 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 de67cc360c9b..ce60133f84c7 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; |