[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source vcl/source
László Németh
laszlo.nemeth at collabora.com
Sat Jun 20 02:28:09 PDT 2015
svx/source/dialog/paraprev.cxx | 2 +-
vcl/source/window/tabpage.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4715513dcbc15c4f32c158abb4997c94b7a30f34
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Fri Jun 19 20:58:34 2015 +0200
fix tabpage rendering
Change-Id: I2448787c306a8a4ba531c0560e0435fefadb4dc8
Reviewed-on: https://gerrit.libreoffice.org/16379
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 188e197..e68f61f 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -204,7 +204,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext, bool b
rRenderContext.DrawRect(Lines[i]);
rRenderContext.SetFillColor(aFillCol);
}
- DrawRect( aRect );
+ rRenderContext.DrawRect( aRect );
Lines[i] = aRect;
}
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 0f32675..24a48cad 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -126,7 +126,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-void TabPage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void TabPage::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
{
// draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design)
if( IsNativeControlSupported(CTRL_TAB_BODY, PART_ENTIRE_CONTROL) && GetParent() && (GetParent()->GetType() == WINDOW_TABCONTROL) )
@@ -143,7 +143,7 @@ void TabPage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
// pass the whole window region to NWF as the tab body might be a gradient or bitmap
// that has to be scaled properly, clipping makes sure that we do not paint too much
Rectangle aCtrlRegion( aPoint, GetOutputSizePixel() );
- DrawNativeControl( CTRL_TAB_BODY, part, aCtrlRegion, nState,
+ rRenderContext.DrawNativeControl( CTRL_TAB_BODY, part, aCtrlRegion, nState,
aControlValue, OUString() );
}
}
More information about the Libreoffice-commits
mailing list