summaryrefslogtreecommitdiff
path: root/vcl/android
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-01 15:32:38 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-02 21:00:01 +0200
commitbcfd6ac251afeba25413c0ffa7fd2344d11bf308 (patch)
tree1da2fd18751464f985747ab0049ce2906179381d /vcl/android
parenta8ee2fd020477ceee9ca91976e2ea90de45141af (diff)
RTL_CONSTASCII_USTRINGPARAM removal
Change-Id: I0c50dea9d86d3ec15ec327883867a384cbf2a6e8
Diffstat (limited to 'vcl/android')
-rw-r--r--vcl/android/androidinst.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 46e6588b2482..7fa77792e441 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -715,16 +715,15 @@ public:
// Clobber the UI fonts
#if 0
psp::FastPrintFontInfo aInfo;
- aInfo.m_aFamilyName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Roboto" ) );
+ aInfo.m_aFamilyName = rtl::OUString( "Roboto" );
aInfo.m_eItalic = ITALIC_NORMAL;
aInfo.m_eWeight = WEIGHT_NORMAL;
aInfo.m_eWidth = WIDTH_NORMAL;
psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
#endif
- // FIXME: is 12 point enough ?
- Font aFont( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Roboto" ) ),
- Size( 0, 14 ) );
+ // FIXME: is 14 point enough ?
+ Font aFont( rtl::OUString( "Roboto" ), Size( 0, 14 ) );
StyleSettings aStyleSet = rSettings.GetStyleSettings();
aStyleSet.SetAppFont( aFont );
@@ -776,7 +775,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
const OUString& SalGetDesktopEnvironment()
{
- static rtl::OUString aEnv( RTL_CONSTASCII_USTRINGPARAM( "android" ) );
+ static rtl::OUString aEnv( "android" );
return aEnv;
}