summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/source/app/brand.cxx4
-rw-r--r--vcl/source/app/settings.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx6
-rw-r--r--vcl/unx/source/dtrans/X11_clipboard.cxx2
-rw-r--r--vcl/unx/source/dtrans/X11_droptarget.cxx2
-rw-r--r--vcl/unx/source/dtrans/X11_selection.cxx2
-rw-r--r--vcl/unx/source/printer/cupsmgr.cxx2
-rw-r--r--vcl/unx/source/printergfx/printerjob.cxx6
-rw-r--r--vcl/workben/outdevgrind.cxx4
-rw-r--r--vcl/workben/svpclient.cxx4
11 files changed, 20 insertions, 18 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index b1765eabaa2f..1657be61c4ff 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -67,9 +67,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
rtl::OLocale aLoc( pLoc );
rtl::OUString aName = aBaseName + aPng;
- rtl::OUString aLocaleName = ( aBaseName + rtl::OUString::createFromAscii ("-") +
+ rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) +
aLoc.getLanguage() +
- rtl::OUString::createFromAscii ("_") +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) +
aLoc.getCountry() + aPng );
return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) ||
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1530a0649689..d8146275e4b4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1310,7 +1310,7 @@ void MiscSettings::SetDisablePrinting( BOOL bEnable )
vcl::SettingsConfigItem::get()->
setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ),
- rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) );
+ bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) );
mpData->mnDisablePrinting = bEnable ? 1 : 0;
}
}
@@ -1366,7 +1366,7 @@ void MiscSettings::SetEnableATToolSupport( BOOL bEnable )
vcl::SettingsConfigItem::get()->
setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ),
- rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) );
+ bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) );
mpData->mnEnableATT = bEnable ? 1 : 0;
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b3e5362be198..713503d21fb3 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11802,7 +11802,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
rNewWidget.m_nTextStyle =
TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK;
- rNewWidget.m_aValue = OUString::createFromAscii( rBox.Checked ? "Yes" : "Off" );
+ rNewWidget.m_aValue = rBox.Checked ? OUString(RTL_CONSTASCII_USTRINGPARAM("Yes")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Off" ));
// create default appearance before m_aRect gets transformed
createDefaultCheckBoxAppearance( rNewWidget, rBox );
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c380791de83b..887ca0ea8600 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -653,7 +653,8 @@ void PrintDialog::JobTabPage::storeToSettings()
maCopyCountField.GetText() );
pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
- rtl::OUString::createFromAscii( maCollateBox.IsChecked() ? "true" : "false" ) );
+ maCollateBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
}
void PrintDialog::JobTabPage::Resize()
@@ -709,7 +710,8 @@ void PrintDialog::OutputOptPage::storeToSettings()
SettingsConfigItem* pItem = SettingsConfigItem::get();
pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ),
- rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) );
+ maToFileBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))
+ : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
}
void PrintDialog::OutputOptPage::Resize()
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index 30a6c07857fd..afe7c17595e8 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.cxx
@@ -261,7 +261,7 @@ Reference< XInterface > X11Clipboard::getReference() throw()
OUString SAL_CALL X11Clipboard::getImplementationName( )
throw(RuntimeException)
{
- return OUString::createFromAscii(X11_CLIPBOARD_IMPLEMENTATION_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(X11_CLIPBOARD_IMPLEMENTATION_NAME));
}
// ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index ab12c917297a..ce4851ace375 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.cxx
@@ -203,7 +203,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
OUString DropTarget::getImplementationName() throw()
{
- return OUString::createFromAscii(XDND_DROPTARGET_IMPLEMENTATION_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_DROPTARGET_IMPLEMENTATION_NAME));
}
// ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 91c168c4c5c5..118162c06422 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -4164,7 +4164,7 @@ void SelectionManagerHolder::startDrag(
OUString SelectionManagerHolder::getImplementationName() throw()
{
- return OUString::createFromAscii(XDND_IMPLEMENTATION_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_IMPLEMENTATION_NAME));
}
// ------------------------------------------------------------------------
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index fdab933a494c..cb4a2de7ed73 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.cxx
@@ -1109,7 +1109,7 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
const char* pRet = NULL;
#ifdef ENABLE_CUPS
- OUString aLib = OUString::createFromAscii( _XSALSET_LIBNAME );
+ OUString aLib(RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ));
oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
if( pLib )
{
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index 897357ad27cb..1d8924913703 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -110,7 +110,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE
nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
if (nError != osl::File::E_None)
return NULL;
- aFileURL = maSpoolDirName + rtl::OUString::createFromAscii ("/") + aFileURL;
+ aFileURL = maSpoolDirName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL;
pFile = new osl::File (aFileURL);
nError = pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create);
@@ -397,7 +397,7 @@ PrinterJob::StartJob (
maSpoolDirName = createSpoolDir ();
maJobTitle = rJobName;
- rtl::OUString aExt = rtl::OUString::createFromAscii (".ps");
+ rtl::OUString aExt(RTL_CONSTASCII_USTRINGPARAM (".ps"));
mpJobHeader = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_head")), aExt);
mpJobTrailer = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_tail")), aExt);
if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor
@@ -668,7 +668,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
InitPaperSize (rJobSetup);
rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
- rtl::OUString aExt = aPageNo + rtl::OUString::createFromAscii (".ps");
+ rtl::OUString aExt = aPageNo + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (".ps"));
osl::File* pPageHeader = CreateSpoolFile (
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_pghead")), aExt);
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 513ce9aabc9d..1951684b2747 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -959,8 +959,8 @@ void GrindApp::Main()
// Create UCB.
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
- aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+ aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+ aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
TestWindow pWindow;
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 2f5fa442127a..94971f292dc3 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -100,8 +100,8 @@ SAL_IMPLEMENT_MAIN()
* Create UCB.
*/
Sequence< Any > aArgs( 2 );
- aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
- aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+ aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+ aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
#if OSL_DEBUG_LEVEL > 1
sal_Bool bSuccess =
#endif
generated by cgit (git 2.34.1) at 2025-03-12 06:00:46 +0000