diff options
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/adddlg.cxx | 16 | ||||
| -rw-r--r-- | padmin/source/helper.cxx | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 7128bd052bce..a2d845704e26 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -90,11 +90,11 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo ) { if( m_aPDFBtn.IsChecked() ) { - rInfo.m_aFeatures = OUString::createFromAscii( "pdf=" ); + rInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("pdf=")); } else if( m_aFaxBtn.IsChecked() ) { - rInfo.m_aFeatures = OUString::createFromAscii( "fax" ); + rInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("fax")); } else rInfo.m_aFeatures = OUString(); @@ -694,7 +694,7 @@ void APFaxDriverPage::fill( PrinterInfo& rInfo ) { if( isDefault() ) { - rInfo.m_aDriverName = OUString::createFromAscii( "SGENPRT" ); + rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("SGENPRT")); } } @@ -727,9 +727,9 @@ bool APPdfDriverPage::check() void APPdfDriverPage::fill( PrinterInfo& rInfo ) { if( isDefault() ) - rInfo.m_aDriverName = OUString::createFromAscii( "SGENPRT" ); + rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("SGENPRT")); else if( isDist() ) - rInfo.m_aDriverName = OUString::createFromAscii( "ADISTILL" ); + rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("ADISTILL")); } //-------------------------------------------------------------------- @@ -1015,13 +1015,13 @@ void AddPrinterDialog::addPrinter() } else if( m_pChooseDevicePage->isFax() ) { - aInfo.m_aFeatures = OUString::createFromAscii( "fax=" ); + aInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("fax=")); if( m_pFaxNamePage->isFaxSwallow() ) - aInfo.m_aFeatures += OUString::createFromAscii( "swallow" ); + aInfo.m_aFeatures += OUString(RTL_CONSTASCII_USTRINGPARAM("swallow")); } else if( m_pChooseDevicePage->isPDF() ) { - OUString aPdf( OUString::createFromAscii( "pdf=" ) ); + OUString aPdf( RTL_CONSTASCII_USTRINGPARAM("pdf=") ); aPdf += m_pPdfCommandPage->getPdfDir(); aInfo.m_aFeatures = aPdf; } diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 3d5d18c596be..fb5ce09ad355 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -70,11 +70,11 @@ ResId padmin::PaResId( sal_uInt32 nId ) utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), - OUString::createFromAscii( "org.openoffice.Setup/L10N" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/L10N")) ); if ( aNode.isValid() ) { rtl::OUString aLoc; - Any aValue = aNode.getNodeValue( OUString::createFromAscii( "ooLocale" ) ); + Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")) ); if( aValue >>= aLoc ) { // LanguageType nTmpLang = MsLangId::convertIsoStringToLanguage( aLoc ); |