diff options
| -rw-r--r-- | vcl/source/edit/texteng.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/uitest/uiobject.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/aboutdialog.cxx | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 333a1a201e69..0b5303fcf9e4 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1961,6 +1961,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, tools: { const sal_Int32 nL = pSelStart->GetIndex() - nTmpIndex; pOutDev->SetFont( aFont); + pOutDev->SetTextFillColor(); aPos.setX( rStartPos.X() + ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nTmpIndex+nL ) ); pOutDev->DrawText( aPos, pPortion->GetNode()->GetText(), nTmpIndex, nL ); nTmpIndex = nTmpIndex + nL; @@ -1986,6 +1987,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, tools: if ( nTmpIndex < nEnd ) { nL = nEnd-nTmpIndex; + pOutDev->SetTextFillColor(); aPos.setX( rStartPos.X() + ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nTmpIndex+nL ) ); pOutDev->DrawText( aPos, pPortion->GetNode()->GetText(), nTmpIndex, nEnd-nTmpIndex ); } @@ -1994,6 +1996,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, tools: } if ( !bDone ) { + pOutDev->SetTextFillColor(); aPos.setX( rStartPos.X() + ImpGetOutputOffset( nPara, &rLine, nTmpIndex, nEnd ) ); pOutDev->DrawText( aPos, pPortion->GetNode()->GetText(), nTmpIndex, nEnd-nTmpIndex ); } diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index aa69bd0d60b6..66d5ed2d2f18 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -273,6 +273,11 @@ WindowUIObject::WindowUIObject(const VclPtr<vcl::Window>& xWindow): StringMap WindowUIObject::get_state() { + // Double-buffering is not interesting for uitesting, but can result in direct paint for a + // double-buffered widget, which is incorrect. + if (mxWindow->SupportsDoubleBuffering()) + mxWindow->RequestDoubleBuffering(false); + StringMap aMap; aMap["Visible"] = OUString::boolean(mxWindow->IsVisible()); aMap["ReallyVisible"] = OUString::boolean(mxWindow->IsReallyVisible()); diff --git a/vcl/source/window/aboutdialog.cxx b/vcl/source/window/aboutdialog.cxx index ba09f423ab05..10074a1a3eac 100644 --- a/vcl/source/window/aboutdialog.cxx +++ b/vcl/source/window/aboutdialog.cxx @@ -56,6 +56,8 @@ AboutDialog::AboutDialog(vcl::Window* pParent, WinBits nStyle, Dialog::InitFlag m_xBuilder->get(m_xDescriptionText, "description"); m_xBuilder->get(m_xCopyrightText, "copyright"); m_xBuilder->get(m_xBuildIdLink, "buildIdLink"); + + m_xVersion->RequestDoubleBuffering(true); } void AboutDialog::set_content_area(VclBox* pBox) |