diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /vcl/qa | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 3f03d620e377..ed5cb45ccc33 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -48,7 +48,7 @@ void VclComplexTextTest::testArabic() OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin ); - Font aFont = OutputDevice::GetDefaultFont( + vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, LANGUAGE_ARABIC_SAUDI_ARABIA, DEFAULTFONT_FLAGS_ONLYONE, 0 ); @@ -59,7 +59,7 @@ void VclComplexTextTest::testArabic() Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree ); // now rotate 270 degress - Font aRotated( aFont ); + vcl::Font aRotated( aFont ); aRotated.SetOrientation( 2700 ); pOutDev->SetFont( aRotated ); Rectangle aRectRot = pOutDev->GetTextRect( aInput, aOneTwoThree ); |