[Libreoffice-commits] .: 4 commits - vcl/null vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 12 01:01:39 PST 2013
vcl/null/printerinfomanager.cxx | 2
vcl/source/app/dbggui.cxx | 107 +++++++++++++--------------
vcl/source/app/settings.cxx | 10 +-
vcl/source/app/svapp.cxx | 2
vcl/source/components/fontident.cxx | 4 -
vcl/source/components/stringmirror.cxx | 4 -
vcl/source/control/field.cxx | 6 -
vcl/source/control/field2.cxx | 8 +-
vcl/source/control/throbber.cxx | 4 -
vcl/source/edit/texteng.cxx | 16 ++--
vcl/source/edit/vclmedit.cxx | 2
vcl/source/filter/FilterConfigCache.cxx | 4 -
vcl/source/filter/FilterConfigItem.cxx | 16 +---
vcl/source/filter/graphicfilter.cxx | 30 +++----
vcl/source/filter/igif/gifread.cxx | 4 -
vcl/source/filter/ixbm/xbmread.cxx | 4 -
vcl/source/filter/jpeg/jpeg.cxx | 4 -
vcl/source/filter/sgvtext.cxx | 30 +++----
vcl/source/filter/wmf/emfwr.cxx | 4 -
vcl/source/filter/wmf/winmtf.cxx | 8 --
vcl/source/gdi/bitmapex.cxx | 4 -
vcl/source/gdi/configsettings.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 3
vcl/source/gdi/gdimtf.cxx | 18 ++--
vcl/source/gdi/graph.cxx | 6 -
vcl/source/gdi/impimagetree.cxx | 10 +-
vcl/source/gdi/metaact.cxx | 10 +-
vcl/source/gdi/oldprintadaptor.cxx | 2
vcl/source/gdi/outdev3.cxx | 26 +++---
vcl/source/gdi/pdfwriter_impl.cxx | 54 ++++++-------
vcl/source/gdi/pdfwriter_impl2.cxx | 28 +++----
vcl/source/gdi/print.cxx | 30 +++----
vcl/source/gdi/print3.cxx | 126 ++++++++++++++++----------------
vcl/source/gdi/svgdata.cxx | 4 -
vcl/source/gdi/virdev.cxx | 2
vcl/source/window/dialog.cxx | 14 +--
vcl/source/window/layout.cxx | 50 ++++++------
vcl/source/window/menu.cxx | 5 -
vcl/source/window/printdlg.cxx | 12 +--
vcl/source/window/syschild.cxx | 2
vcl/source/window/window.cxx | 5 -
vcl/source/window/window2.cxx | 58 ++++++--------
42 files changed, 364 insertions(+), 376 deletions(-)
New commits:
commit 08def320062ad7c5cf98e577a2af1fad7c8eb267
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sat Jan 12 09:57:37 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in vcl/[source,null]
Change-Id: Icedb5ad5c1023829689d56367043451b8fe95eed
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index a92246b..3af6955 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -49,7 +49,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
m_eType( eType ),
m_bUseIncludeFeature( false ),
m_bUseJobPatch( true ),
- m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ),
+ m_aSystemDefaultPaper( "A4" ),
#ifdef LIBO_HEADLESS
m_bDisableCUPS( true )
#else
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a488516..879a548 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -510,7 +510,7 @@ DbgWindow::DbgWindow() :
SetWindowState( aState );
}
- SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarView Debug Window")));
+ SetText("StarView Debug Window");
Show();
Update();
}
@@ -595,7 +595,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt )
// build the string to copy to the clipboard
rtl::OUStringBuffer sAssertion;
rtl::OUString sLineFeed = convertLineEnd(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")),
+ rtl::OUString("\n"),
GetSystemLineEnd());
while ( nAssertionFirst < nAssertionLast )
{
@@ -686,7 +686,7 @@ DbgDialog::DbgDialog() :
{
maXtorThis.Show();
- maXtorThis.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("T~his" )));
+ maXtorThis.SetText("T~his");
if ( pData->nTestFlags & DBG_TEST_XTOR_THIS )
maXtorThis.Check( sal_True );
maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ),
@@ -695,7 +695,7 @@ DbgDialog::DbgDialog() :
{
maXtorFunc.Show();
- maXtorFunc.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Function")));
+ maXtorFunc.SetText("~Function");
if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC )
maXtorFunc.Check( sal_True );
maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ),
@@ -704,7 +704,7 @@ DbgDialog::DbgDialog() :
{
maXtorExit.Show();
- maXtorExit.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("E~xit")));
+ maXtorExit.SetText("E~xit");
if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT )
maXtorExit.Check( sal_True );
maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ),
@@ -713,7 +713,7 @@ DbgDialog::DbgDialog() :
{
maXtorReport.Show();
- maXtorReport.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Report")));
+ maXtorReport.SetText("~Report");
if ( pData->nTestFlags & DBG_TEST_XTOR_REPORT )
maXtorReport.Check( sal_True );
maXtorReport.SetPosSizePixel( LogicToPixel( Point( 205, 15 ), aAppMap ),
@@ -722,7 +722,7 @@ DbgDialog::DbgDialog() :
{
maXtorTrace.Show();
- maXtorTrace.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Trace")));
+ maXtorTrace.SetText("~Trace");
if ( pData->nTestFlags & DBG_TEST_XTOR_TRACE )
maXtorTrace.Check( sal_True );
maXtorTrace.SetPosSizePixel( LogicToPixel( Point( 270, 15 ), aAppMap ),
@@ -731,14 +731,14 @@ DbgDialog::DbgDialog() :
{
maBox1.Show();
- maBox1.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Object Tests")));
+ maBox1.SetText("Object Tests");
maBox1.SetPosSizePixel( LogicToPixel( Point( 5, 5 ), aAppMap ),
LogicToPixel( Size( 330, 30 ), aAppMap ) );
}
{
maProf.Show();
- maProf.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Profiling")));
+ maProf.SetText("~Profiling");
if ( pData->nTestFlags & DBG_TEST_PROFILING )
maProf.Check( sal_True );
maProf.SetPosSizePixel( LogicToPixel( Point( 10, 95 ), aAppMap ),
@@ -747,7 +747,7 @@ DbgDialog::DbgDialog() :
{
maRes.Show();
- maRes.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Resourcen")));
+ maRes.SetText("~Resourcen");
if ( pData->nTestFlags & DBG_TEST_RESOURCE )
maRes.Check( sal_True );
maRes.SetPosSizePixel( LogicToPixel( Point( 75, 95 ), aAppMap ),
@@ -756,7 +756,7 @@ DbgDialog::DbgDialog() :
{
maDialog.Show();
- maDialog.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Dialog")));
+ maDialog.SetText("~Dialog");
if ( pData->nTestFlags & DBG_TEST_DIALOG )
maDialog.Check( sal_True );
maDialog.SetPosSizePixel( LogicToPixel( Point( 140, 95 ), aAppMap ),
@@ -765,7 +765,7 @@ DbgDialog::DbgDialog() :
{
maBoldAppFont.Show();
- maBoldAppFont.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Bold AppFont")));
+ maBoldAppFont.SetText("~Bold AppFont");
if ( pData->nTestFlags & DBG_TEST_BOLDAPPFONT )
maBoldAppFont.Check( sal_True );
maBoldAppFont.SetPosSizePixel( LogicToPixel( Point( 205, 95 ), aAppMap ),
@@ -775,7 +775,7 @@ DbgDialog::DbgDialog() :
{
maBox3.Show();
- maBox3.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test Options")));
+ maBox3.SetText("Test Options");
maBox3.SetPosSizePixel( LogicToPixel( Point( 5, 85 ), aAppMap ),
LogicToPixel( Size( 330, 30 ), aAppMap ) );
}
@@ -790,7 +790,7 @@ DbgDialog::DbgDialog() :
{
maOverwrite.Show();
- maOverwrite.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite ~File")));
+ maOverwrite.SetText("Overwrite ~File");
if ( pData->bOverwrite )
maOverwrite.Check( sal_True );
maOverwrite.SetPosSizePixel( LogicToPixel( Point( 205, 130 ), aAppMap ),
@@ -799,7 +799,7 @@ DbgDialog::DbgDialog() :
{
maHookOSLBox.Show();
- maHookOSLBox.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Reroute osl debug ~messages")));
+ maHookOSLBox.SetText("Reroute osl debug ~messages");
if ( pData->bHookOSLAssert )
maHookOSLBox.Check( sal_True );
maHookOSLBox.SetPosSizePixel( LogicToPixel( Point( 10, 240 ), aAppMap ),
@@ -808,7 +808,7 @@ DbgDialog::DbgDialog() :
{
maInclClassText.Show();
- maInclClassText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Include-ObjectTest-Filter")));
+ maInclClassText.SetText("~Include-ObjectTest-Filter");
maInclClassText.SetPosSizePixel( LogicToPixel( Point( 10, 150 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
@@ -823,7 +823,7 @@ DbgDialog::DbgDialog() :
{
maExclClassText.Show();
- maExclClassText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Exclude-ObjectTest-Filter")));
+ maExclClassText.SetText("~Exclude-ObjectTest-Filter");
maExclClassText.SetPosSizePixel( LogicToPixel( Point( 115, 150 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
@@ -838,7 +838,7 @@ DbgDialog::DbgDialog() :
{
maInclText.Show();
- maInclText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Include-Filter")));
+ maInclText.SetText("~Include-Filter");
maInclText.SetPosSizePixel( LogicToPixel( Point( 10, 180 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
@@ -853,7 +853,7 @@ DbgDialog::DbgDialog() :
{
maExclText.Show();
- maExclText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Exclude-Filter")));
+ maExclText.SetText("~Exclude-Filter");
maExclText.SetPosSizePixel( LogicToPixel( Point( 115, 180 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
@@ -868,20 +868,20 @@ DbgDialog::DbgDialog() :
{
maTraceText.Show();
- maTraceText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Trace" )));
+ maTraceText.SetText("~Trace");
maTraceText.SetPosSizePixel( LogicToPixel( Point( 10, 210 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
{
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("None" )));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shell")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageBox")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestTool")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Debugger")));
- maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Abort")));
+ maTraceBox.InsertEntry("None");
+ maTraceBox.InsertEntry("File");
+ maTraceBox.InsertEntry("Window");
+ maTraceBox.InsertEntry("Shell");
+ maTraceBox.InsertEntry("MessageBox");
+ maTraceBox.InsertEntry("TestTool");
+ maTraceBox.InsertEntry("Debugger");
+ maTraceBox.InsertEntry("Abort");
ImplAppendUserDefinedChannels( maTraceBox );
ImplSelectChannel( maTraceBox, pData->nTraceOut, 0 );
maTraceBox.Show();
@@ -891,20 +891,20 @@ DbgDialog::DbgDialog() :
{
maWarningText.Show();
- maWarningText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Warning")));
+ maWarningText.SetText("~Warning");
maWarningText.SetPosSizePixel( LogicToPixel( Point( 115, 210 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
{
- maWarningBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("None")));
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Window" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shell" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageBox" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TestTool" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debugger" ) ) );
- maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) ) );
+ maWarningBox.InsertEntry("None");
+ maWarningBox.InsertEntry("File");
+ maWarningBox.InsertEntry("Window");
+ maWarningBox.InsertEntry("Shell");
+ maWarningBox.InsertEntry("MessageBox");
+ maWarningBox.InsertEntry("TestTool");
+ maWarningBox.InsertEntry("Debugger");
+ maWarningBox.InsertEntry("Abort");
ImplAppendUserDefinedChannels( maWarningBox );
ImplSelectChannel( maWarningBox, pData->nWarningOut, 0 );
maWarningBox.Show();
@@ -914,7 +914,7 @@ DbgDialog::DbgDialog() :
{
maErrorText.Show();
- maErrorText.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~Error" ) ) );
+ maErrorText.SetText( "~Error");
maErrorText.SetPosSizePixel( LogicToPixel( Point( 220, 210 ), aAppMap ),
LogicToPixel( Size( 95, 9 ), aAppMap ) );
}
@@ -922,18 +922,18 @@ DbgDialog::DbgDialog() :
{
if ( DbgIsAllErrorOut() )
{
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Window" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shell" ) ) );
+ maErrorBox.InsertEntry( "None" );
+ maErrorBox.InsertEntry( "File" );
+ maErrorBox.InsertEntry( "Window" );
+ maErrorBox.InsertEntry( "Shell" );
mnErrorOff = 0;
}
else
mnErrorOff = 4;
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageBox" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TestTool" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debugger" ) ) );
- maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) ) );
+ maErrorBox.InsertEntry( "MessageBox" );
+ maErrorBox.InsertEntry( "TestTool" );
+ maErrorBox.InsertEntry( "Debugger" );
+ maErrorBox.InsertEntry( "Abort" );
ImplAppendUserDefinedChannels( maErrorBox );
ImplSelectChannel( maErrorBox, pData->nErrorOut, mnErrorOff );
maErrorBox.Show();
@@ -943,7 +943,7 @@ DbgDialog::DbgDialog() :
{
maBox4.Show();
- maBox4.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Output" ) ) );
+ maBox4.SetText( "Output" );
maBox4.SetPosSizePixel( LogicToPixel( Point( 5, 120 ), aAppMap ),
LogicToPixel( Size( 330, 135 ), aAppMap ) );
}
@@ -962,7 +962,7 @@ DbgDialog::DbgDialog() :
{
maInfoButton.Show();
maInfoButton.SetClickHdl( LINK( this, DbgDialog, ClickHdl ) );
- maInfoButton.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~Info..." ) ) );
+ maInfoButton.SetText( "~Info..." );
maInfoButton.SetPosSizePixel( LogicToPixel( Point( 130, 260 ), aAppMap ),
LogicToPixel( Size( 50, 15 ), aAppMap ) );
}
@@ -973,7 +973,7 @@ DbgDialog::DbgDialog() :
}
{
- SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL Debug Options" ) ) );
+ SetText( "VCL Debug Options" );
SetOutputSizePixel( LogicToPixel( Size( 340, 280 ), aAppMap ) );
}
}
@@ -1080,7 +1080,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
aDbgInfoBuf[0] = '\0';
DbgXtorInfo( aDbgInfoBuf );
XubString aInfoText( aDbgInfoBuf, RTL_TEXTENCODING_UTF8 );
- aInfoDialog.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug InfoReport" ) ) );
+ aInfoDialog.SetText( "Debug InfoReport" );
aInfoDialog.SetInfoText( aInfoText );
aInfoDialog.Execute();
}
@@ -1102,7 +1102,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
aHelpText.AppendAscii( *pHelpStrs );
pHelpStrs++;
}
- aInfoDialog.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug Hilfe" ) ) );
+ aInfoDialog.SetText( "Debug Hilfe" );
aInfoDialog.SetInfoText( aHelpText );
aInfoDialog.Execute();
}
@@ -1677,7 +1677,7 @@ void DbgPrintMsgBox( const char* pLine )
if ( aMessageBox.didTimeout() )
DbgPrintShell( pLine );
else if ( nResult == RET_YES )
- GetpApp()->Abort( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug-Utilities-Error" ) ) );
+ GetpApp()->Abort( "Debug-Utilities-Error" );
else if ( nResult == RET_CANCEL )
DbgCoreDump();
}
@@ -1791,8 +1791,7 @@ void DbgGUIStart()
}
else
{
- ErrorBox( 0, WB_OK,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TOOLS Library has no Debug-Routines" ) ) ).Execute();
+ ErrorBox( 0, WB_OK, "TOOLS Library has no Debug-Routines" ).Execute();
}
}
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 32366fa..9991b90 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -624,10 +624,10 @@ sal_uLong StyleSettings::GetAutoSymbolsStyle() const
rtl::OUString const & env = Application::GetDesktopEnvironment();
sal_uLong nRet;
- if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")) ||
- env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
+ if ( env.equalsIgnoreAsciiCase("tde") ||
+ env.equalsIgnoreAsciiCase("kde") )
nRet = STYLE_SYMBOLS_CRYSTAL;
- else if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
+ else if ( env.equalsIgnoreAsciiCase("kde4") )
nRet = STYLE_SYMBOLS_OXYGEN;
else
nRet = STYLE_SYMBOLS_TANGO;
@@ -1057,7 +1057,7 @@ sal_Bool MiscSettings::GetDisablePrinting() const
vcl::SettingsConfigItem::get()->
getValue( rtl::OUString( "DesktopManagement" ),
rtl::OUString( "DisablePrinting" ) );
- mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+ mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
}
return (sal_Bool)mpData->mnDisablePrinting;
@@ -1113,7 +1113,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
vcl::SettingsConfigItem::get()->
getValue( rtl::OUString( "Accessibility" ),
rtl::OUString( "EnableATToolSupport" ) );
- mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+ mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
}
else
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c6c6c5a..73530fd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1563,7 +1563,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
{
- ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateUnoWrapper" ) );
+ OUString aFunctionName( "CreateUnoWrapper" );
FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)osl_getFunctionSymbol( hTkLib, aFunctionName.pData );
if ( fnCreateWrapper )
{
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 8fb3b1c..e4187cc 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -158,14 +158,14 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException)
Sequence< OUString > FontIdentificator_getSupportedServiceNames()
{
- static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.FontIdentificator" ) );
+ static OUString aServiceName( "com.sun.star.awt.FontIdentificator" );
static Sequence< OUString > aServiceNames( &aServiceName, 1 );
return aServiceNames;
}
OUString FontIdentificator_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::FontIdentificator" ) );
+ return OUString( "vcl::FontIdentificator" );
}
Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& )
diff --git a/vcl/source/components/stringmirror.cxx b/vcl/source/components/stringmirror.cxx
index 43d478a..2c10976 100644
--- a/vcl/source/components/stringmirror.cxx
+++ b/vcl/source/components/stringmirror.cxx
@@ -72,14 +72,14 @@ public:
Sequence< OUString > StringMirror_getSupportedServiceNames()
{
- static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.StringMirror" ) );
+ static OUString aServiceName( "com.sun.star.awt.StringMirror" );
static Sequence< OUString > aServiceNames( &aServiceName, 1 );
return aServiceNames;
}
OUString StringMirror_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::StringMirror" ) );
+ return OUString( "vcl::StringMirror" );
}
Reference< XInterface > SAL_CALL StringMirror_createInstance( const Reference< XMultiServiceFactory >& )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 9e5e99d..8d0a340 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -805,7 +805,7 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) :
bool NumericField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("digits")))
+ if (rKey == "digits")
SetDecimalDigits(rValue.toInt32());
else
return SpinField::set_property(rKey, rValue);
@@ -1721,12 +1721,12 @@ Size MetricField::CalcMinimumSize() const
bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("format")))
+ if (rKey == "format")
{
maCustomUnitText = rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8);
meUnit = FUNIT_CUSTOM;
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("digits")))
+ else if (rKey == "digits")
SetDecimalDigits(rValue.toInt32());
else
return SpinField::set_property(rKey, rValue);
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index cdc358a..4193b14 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2479,9 +2479,9 @@ sal_Bool TimeFormatter::ImplTimeReformat( const XubString& rStr, XubString& rOut
}
// Don't use LocaleDataWrapper, we want AM/PM
if ( aTempTime.GetHour() < 12 )
- rOutStr += String( RTL_CONSTASCII_USTRINGPARAM( "AM" ) ); // ImplGetLocaleDataWrapper().getTimeAM();
+ rOutStr += "AM"; // ImplGetLocaleDataWrapper().getTimeAM();
else
- rOutStr += String( RTL_CONSTASCII_USTRINGPARAM( "PM" ) ); // ImplGetLocaleDataWrapper().getTimePM();
+ rOutStr += "PM"; // ImplGetLocaleDataWrapper().getTimePM();
}
}
@@ -2777,9 +2777,9 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect
}
// Don't use LocaleDataWrapper, we want AM/PM
if ( aNewTime.GetHour() < 12 )
- aStr += String( RTL_CONSTASCII_USTRINGPARAM( "AM" ) ); // ImplGetLocaleDataWrapper().getTimeAM();
+ aStr += "AM"; // ImplGetLocaleDataWrapper().getTimeAM();
else
- aStr += String( RTL_CONSTASCII_USTRINGPARAM( "PM" ) ); // ImplGetLocaleDataWrapper().getTimePM();
+ aStr += "PM"; // ImplGetLocaleDataWrapper().getTimePM();
}
}
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 142631f..712ca1d 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -86,12 +86,12 @@ Throbber::~Throbber()
namespace
{
//..................................................................................................................
- ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL )
+ ::rtl::OUString lcl_getHighContrastURL( OUString const& i_imageURL )
{
INetURLObject aURL( i_imageURL );
if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
{
- OSL_VERIFY( aURL.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
+ OSL_VERIFY( aURL.insertName( "hicontrast", false, 0 ) );
return aURL.GetMainURL( INetURLObject::NO_DECODE );
}
// the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 5d32645..cf7fcc7 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -638,7 +638,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSeque
// if ( !xISC.is() )
{
uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.InputSequenceChecker" )) );
+ uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( "com.sun.star.i18n.InputSequenceChecker" ) );
if ( xI.is() )
{
Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
@@ -2625,12 +2625,12 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
}
else
{
- aText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "<P STYLE=\"margin-bottom: 0cm\">" ) );
+ aText.AssignAscii( "<P STYLE=\"margin-bottom: 0cm\">" );
if ( nStartPos == nEndPos )
{
- // Leerzeilen werden von Writer wegoptimiert
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "<BR>" ) );
+ // Empty lines will be removed by Writer
+ aText.AppendAscii( "<BR>" );
}
else
{
@@ -2649,19 +2649,19 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
nTmpEnd = Min( pAttr->GetEnd(), nEndPos );
// z.B. <A HREF="http://www.mopo.de/">Morgenpost</A>
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "<A HREF=\"" ) );
+ aText.AppendAscii( "<A HREF=\"" );
aText += ((const TextAttribHyperLink&) pAttr->GetAttr() ).GetURL();
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\">" ) );
+ aText.AppendAscii( "\">" );
nTmpStart = pAttr->GetStart();
aText += pNode->GetText().Copy( nTmpStart, nTmpEnd-nTmpStart );
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "</A>" ) );
+ aText.AppendAscii( "</A>" );
nTmpStart = pAttr->GetEnd();
}
} while ( nTmpEnd < nEndPos );
}
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "</P>" ) );
+ aText.AppendAscii( "</P>" );
}
rOutput.WriteLine(rtl::OUStringToOString(aText,
rOutput.GetStreamCharSet()));
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index d901df0..23109d6 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1567,7 +1567,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("cursor-visible")))
+ if (rKey == "cursor-visible")
EnableCursor(toBool(rValue));
else
return Edit::set_property(rKey, rValue);
commit 8cfc269842792b014ad53206706e7103b12e0b30
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sat Jan 12 09:54:32 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in vcl/source/window
Change-Id: I0210aa9984040dd8ecbe126097cf2de8d90d843d
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d76d359..ce98b75 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -478,9 +478,9 @@ Dialog::Dialog( WindowType nType )
ImplInitDialogData();
}
-#define BASEPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIConfig"))
-#define RELPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice.cfg"))
-#define SERVICENAME_PATHSETTINGS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings"))
+#define BASEPATH_SHARE_LAYER rtl::OUString("UIConfig")
+#define RELPATH_SHARE_LAYER rtl::OUString("soffice.cfg")
+#define SERVICENAME_PATHSETTINGS rtl::OUString("com.sun.star.util.PathSettings")
rtl::OUString VclBuilderContainer::getUIRootDir()
{
@@ -500,10 +500,10 @@ rtl::OUString VclBuilderContainer::getUIRootDir()
// Note: May be an user uses URLs without a final slash! Check it ...
nPos = sShareLayer.lastIndexOf('/');
if (nPos != sShareLayer.getLength()-1)
- sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ sShareLayer += "/";
sShareLayer += RELPATH_SHARE_LAYER; // folder
- sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ sShareLayer += "/";
/*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
return sShareLayer;
}
@@ -779,7 +779,7 @@ sal_Bool Dialog::ImplStartExecuteModal()
{
#ifdef DBG_UTIL
rtl::OStringBuffer aErrorStr;
- aErrorStr.append(RTL_CONSTASCII_STRINGPARAM("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): "));
+ aErrorStr.append("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): ");
aErrorStr.append(ImplGetDialogText(this));
OSL_FAIL(aErrorStr.getStr());
#endif
@@ -1228,7 +1228,7 @@ void Dialog::Resize()
bool Dialog::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("border-width")))
+ if (rKey == "border-width")
set_border_width(rValue.toInt32());
else
return SystemWindow::set_property(rKey, rValue);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f021fb8..7364b11 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -289,9 +289,9 @@ void VclBox::setAllocation(const Size &rAllocation)
bool VclBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("spacing")))
+ if (rKey == "spacing")
set_spacing(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("homogeneous")))
+ else if (rKey == "homogeneous")
set_homogeneous(toBool(rValue));
else
return VclContainer::set_property(rKey, rValue);
@@ -386,20 +386,20 @@ Size VclButtonBox::calculateRequisition() const
bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("layout-style")))
+ if (rKey == "layout-style")
{
VclButtonBoxStyle eStyle = VCL_BUTTONBOX_DEFAULT_STYLE;
- if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+ if (rValue == "start")
eStyle = VCL_BUTTONBOX_START;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("spread")))
+ else if (rValue == "spread")
eStyle = VCL_BUTTONBOX_SPREAD;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("edge")))
+ else if (rValue == "edge")
eStyle = VCL_BUTTONBOX_EDGE;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+ else if (rValue == "start")
eStyle = VCL_BUTTONBOX_START;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("end")))
+ else if (rValue == "end")
eStyle = VCL_BUTTONBOX_END;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("center")))
+ else if (rValue == "center")
eStyle = VCL_BUTTONBOX_CENTER;
else
{
@@ -407,7 +407,7 @@ bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rV
}
set_layout(eStyle);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("homogeneous")))
+ else if (rKey == "homogeneous")
m_bHomogeneousGroups = toBool(rValue);
else
return VclBox::set_property(rKey, rValue);
@@ -933,15 +933,15 @@ bool toBool(const rtl::OString &rValue)
bool VclGrid::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("row-spacing")))
+ if (rKey == "row-spacing")
set_row_spacing(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("column-spacing")))
+ else if (rKey == "column-spacing")
set_column_spacing(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("row-homogeneous")))
+ else if (rKey == "row-homogeneous")
set_row_homogeneous(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("column-homogeneous")))
+ else if (rKey == "column-homogeneous")
set_column_homogeneous(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("n-rows")))
+ else if (rKey == "n-rows")
/*nothing to do*/;
else
return VclContainer::set_property(rKey, rValue);
@@ -1096,21 +1096,21 @@ void VclAlignment::setAllocation(const Size &rAllocation)
bool VclAlignment::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("bottom-padding")))
+ if (rKey == "bottom-padding")
m_nBottomPadding = rValue.toInt32();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-padding")))
+ else if (rKey == "left-padding")
m_nLeftPadding = rValue.toInt32();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("right-padding")))
+ else if (rKey == "right-padding")
m_nRightPadding = rValue.toInt32();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-padding")))
+ else if (rKey == "top-padding")
m_nTopPadding = rValue.toInt32();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xalign")))
+ else if (rKey == "xalign")
m_fXAlign = rValue.toFloat();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xscale")))
+ else if (rKey == "xscale")
m_fXScale = rValue.toFloat();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yalign")))
+ else if (rKey == "yalign")
m_fYAlign = rValue.toFloat();
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yscale")))
+ else if (rKey == "yscale")
m_fYScale = rValue.toFloat();
else
return VclBin::set_property(rKey, rValue);
@@ -1221,9 +1221,9 @@ void VclExpander::setAllocation(const Size &rAllocation)
bool VclExpander::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("expanded")))
+ if (rKey == "expanded")
m_aDisclosureButton.Check(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("resize-toplevel")))
+ else if (rKey == "resize-toplevel")
m_bResizeTopLevel = toBool(rValue);
else
return VclBin::set_property(rKey, rValue);
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index fa827ec..ada63f7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -100,9 +100,8 @@ static sal_Bool ImplAccelDisabled()
{
rtl::OUString aStr =
vcl::SettingsConfigItem::get()->
- getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Menu" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuppressAccelerators" ) ) );
- nAccelDisabled = aStr.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+ getValue( "Menu", "SuppressAccelerators" );
+ nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0;
}
return (nAccelDisabled == 1) ? sal_True : sal_False;
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7005257..97614b2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -76,8 +76,8 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent )
maHorzDim.Show();
maVertDim.Show();
- maHorzDim.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "2.0in" ) ) );
- maVertDim.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "2.0in" ) ) );
+ maHorzDim.SetText( String( "2.0in" ) );
+ maVertDim.SetText( String( "2.0in" ) );
}
PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
@@ -498,7 +498,7 @@ void PrintDialog::JobTabPage::readFromSettings()
aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
rtl::OUString( "CollateBox" ) );
- if( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("alwaysoff")) )
+ if( aValue.equalsIgnoreAsciiCase("alwaysoff") )
{
mnCollateUIMode = 1;
mpCollateBox->Check( sal_False );
@@ -509,7 +509,7 @@ void PrintDialog::JobTabPage::readFromSettings()
mnCollateUIMode = 0;
aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
rtl::OUString( "Collate" ) );
- mpCollateBox->Check( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) );
+ mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") );
}
}
@@ -537,7 +537,7 @@ void PrintDialog::OutputOptPage::readFromSettings()
rtl::OUString aValue;
aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
rtl::OUString( "CollateSingleJobs" ) );
- if ( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+ if ( aValue.equalsIgnoreAsciiCase("true") )
{
mpCollateSingleJobsBox->Check( sal_True );
}
@@ -1122,7 +1122,7 @@ void PrintDialog::setupOptionalUI()
else
{
rtl::OStringBuffer sMessage;
- sMessage.append(RTL_CONSTASCII_STRINGPARAM("Unsupported UI option: \""));
+ sMessage.append("Unsupported UI option: \"");
sMessage.append(rtl::OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8));
sMessage.append('"');
OSL_FAIL( sMessage.getStr() );
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 5bd71f5..a107fc1 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -242,7 +242,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
try
{
::rtl::Reference< ::jvmaccess::VirtualMachine > xVM;
- uno::Reference< java::XJavaVM > xJavaVM( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), uno::UNO_QUERY );
+ uno::Reference< java::XJavaVM > xJavaVM( xFactory->createInstance( rtl::OUString("com.sun.star.java.JavaVirtualMachine") ), uno::UNO_QUERY );
uno::Sequence< sal_Int8 > aProcessID( 17 );
rtl_getGlobalProcessId( (sal_uInt8*) aProcessID.getArray() );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a7a4b64..4e926f9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4373,11 +4373,10 @@ Window::~Window()
if ( bError )
{
rtl::OStringBuffer aTempStr;
- aTempStr.append(RTL_CONSTASCII_STRINGPARAM("Window ("));
+ aTempStr.append("Window (");
aTempStr.append(rtl::OUStringToOString(GetText(),
RTL_TEXTENCODING_UTF8));
- aTempStr.append(RTL_CONSTASCII_STRINGPARAM(
- ") with living SystemWindow(s) destroyed: "));
+ aTempStr.append(") with living SystemWindow(s) destroyed: ");
aTempStr.append(aErrorStr.toString());
OSL_FAIL(aTempStr.getStr());
// abort in non-pro version, this must be fixed!
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 7c7f910..72d117d 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1807,13 +1807,13 @@ namespace
{
VclAlign eRet = VCL_ALIGN_FILL;
- if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("fill")))
+ if (rValue == "fill")
eRet = VCL_ALIGN_FILL;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+ else if (rValue == "start")
eRet = VCL_ALIGN_START;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("end")))
+ else if (rValue == "end")
eRet = VCL_ALIGN_END;
- else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("center")))
+ else if (rValue == "center")
eRet = VCL_ALIGN_CENTER;
return eRet;
}
@@ -1868,19 +1868,15 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
bool Window::set_property(const OString &rKey, const OString &rValue)
{
- if (
- (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("label"))) ||
- (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("title"))) ||
- (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("text")))
- )
+ if ((rKey == "label") || (rKey == "title") || (rKey == "text") )
{
SetText(OStringToOUString(VclBuilder::convertMnemonicMarkup(rValue), RTL_TEXTENCODING_UTF8));
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("visible")))
+ else if (rKey == "visible")
Show(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("sensitive")))
+ else if (rKey == "sensitive")
Enable(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("resizable")))
+ else if (rKey == "resizable")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_SIZEABLE);
@@ -1888,7 +1884,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
nBits |= WB_SIZEABLE;
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xalign")))
+ else if (rKey == "xalign")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_LEFT | WB_CENTER | WB_RIGHT);
@@ -1903,7 +1899,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yalign")))
+ else if (rKey == "yalign")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_TOP | WB_VCENTER | WB_BOTTOM);
@@ -1918,7 +1914,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("wrap")))
+ else if (rKey == "wrap")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_WORDBREAK);
@@ -1926,33 +1922,33 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
nBits |= WB_WORDBREAK;
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height-request")))
+ else if (rKey == "height-request")
set_height_request(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-request")))
+ else if (rKey == "width-request")
set_width_request(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hexpand")))
+ else if (rKey == "hexpand")
set_hexpand(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("vexpand")))
+ else if (rKey == "vexpand")
set_vexpand(toBool(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("halign")))
+ else if (rKey == "halign")
set_halign(toAlign(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("valign")))
+ else if (rKey == "valign")
set_valign(toAlign(rValue));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-markup")))
+ else if (rKey == "tooltip-markup")
SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-text")))
+ else if (rKey == "tooltip-text")
SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("border-width")))
+ else if (rKey == "border-width")
set_border_width(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-left")))
+ else if (rKey == "margin-left")
set_margin_left(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-right")))
+ else if (rKey == "margin-right")
set_margin_right(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-top")))
+ else if (rKey == "margin-top")
set_margin_top(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-bottom")))
+ else if (rKey == "margin-bottom")
set_margin_bottom(rValue.toInt32());
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hscrollbar-policy")))
+ else if (rKey == "hscrollbar-policy")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_AUTOHSCROLL|WB_HSCROLL);
@@ -1962,7 +1958,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
nBits |= WB_AUTOHSCROLL;
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("vscrollbar-policy")))
+ else if (rKey == "vscrollbar-policy")
{
WinBits nBits = GetStyle();
nBits &= ~(WB_AUTOVSCROLL|WB_VSCROLL);
@@ -1972,7 +1968,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
nBits |= WB_AUTOVSCROLL;
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("use-markup")))
+ else if (rKey == "use-markup")
{
//https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
SAL_WARN_IF(toBool(rValue), "vcl.layout", "Use pango attributes instead of mark-up");
commit 512e92b537b0b6aeacc83d08efb8ada8620f9f50
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sat Jan 12 09:53:51 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in vcl/source/gdi
Change-Id: If1697c5f6b2ee31959a37a20003321d5016bd63c
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e717d0b..465ea1c 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -94,8 +94,8 @@ BitmapEx::BitmapEx( const ResId& rResId ) :
if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this, true ) )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aErrorStr(RTL_CONSTASCII_STRINGPARAM(
- "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <"));
+ rtl::OStringBuffer aErrorStr(
+ "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <");
aErrorStr.append(rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>');
OSL_FAIL(aErrorStr.getStr());
#endif
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 900bdb7..e39be79 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -55,7 +55,7 @@ SettingsConfigItem* SettingsConfigItem::get()
SettingsConfigItem::SettingsConfigItem()
:
- ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( SETTINGS_CONFIGNODE ) ),
+ ConfigItem( OUString( SETTINGS_CONFIGNODE ),
CONFIG_MODE_DELAYED_UPDATE ),
m_aSettings( 0 )
{
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index ed15a45..ff812a0 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -2454,8 +2454,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
#ifdef DBG_UTIL
default:
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Missing implementation for Action#: "));
+ rtl::OStringBuffer aStr("Missing implementation for Action#: ");
aStr.append(static_cast<sal_Int32>(pAction->GetType()));
aStr.append('!');
OSL_FAIL(aStr.getStr());
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index cd17d51..cb2fb16 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -407,7 +407,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
{
MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
if( pAction->GetType() == META_COMMENT_ACTION &&
- pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("DELEGATE_PLUGGABLE_RENDERER")) )
+ pCommentAct->GetComment() == "DELEGATE_PLUGGABLE_RENDERER" )
{
ImplDelegate2PluggableRenderer(pCommentAct, pOut);
}
@@ -526,7 +526,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut )
{
- OSL_ASSERT( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("DELEGATE_PLUGGABLE_RENDERER")) );
+ OSL_ASSERT( pAct->GetComment() == "DELEGATE_PLUGGABLE_RENDERER" );
// read payload - string of service name, followed by raw render input
const sal_uInt8* pData = pAct->GetData();
@@ -1252,7 +1252,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
case( META_COMMENT_ACTION ):
{
MetaCommentAction* pCommentAct = (MetaCommentAction*) pAction;
- if( pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+ if( pCommentAct->GetComment() == "XGRAD_SEQ_BEGIN" )
{
int nBeginComments( 1 );
pAction = NextAction();
@@ -1273,7 +1273,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
else if( META_COMMENT_ACTION == nType)
{
MetaCommentAction* pAct = (MetaCommentAction*) pAction;
- if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
+ if( pAct->GetComment() == "XGRAD_SEQ_END" )
{
// handle nested blocks
--nBeginComments;
@@ -1282,7 +1282,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
if( !nBeginComments )
break;
}
- else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+ else if( pAct->GetComment() == "XGRAD_SEQ_BEGIN" )
{
// handle nested blocks
++nBeginComments;
@@ -1295,8 +1295,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
}
else
{
- sal_Bool bPathStroke = pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
- if ( bPathStroke || pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ sal_Bool bPathStroke = (pCommentAct->GetComment() == "XPATHSTROKE_SEQ_BEGIN");
+ if ( bPathStroke || pCommentAct->GetComment() == "XPATHFILL_SEQ_BEGIN" )
{
if ( pCommentAct->GetDataSize() )
{
@@ -1326,8 +1326,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
}
}
}
- else if ( pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"))
- || pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) )
+ else if ( pCommentAct->GetComment() == "XPATHSTROKE_SEQ_END"
+ || pCommentAct->GetComment() == "XPATHFILL_SEQ_END" )
{
pAction->Execute( &aMapVDev );
pAction->Duplicate();
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index c659274..b622c22 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -460,10 +460,10 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
uno::Reference< graphic::XGraphicProvider > xProv( graphic::GraphicProvider::create( xContext ) );
uno::Sequence< beans::PropertyValue > aLoadProps( 1 );
- ::rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "private:memorygraphic/" ) );
+ OUString aURL( "private:memorygraphic/" );
- aLoadProps[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- aLoadProps[ 0 ].Value <<= ( aURL += ::rtl::OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
+ aLoadProps[ 0 ].Name = OUString( "URL" );
+ aLoadProps[ 0 ].Value <<= ( aURL += OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
xRet = xProv->queryGraphic( aLoadProps );
}
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 79541e6..4e68ddd 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -97,7 +97,7 @@ void loadFromFile(
rtl::OUString const & path, BitmapEx & bitmap)
{
boost::shared_ptr< SvStream > s(wrapFile(file));
- if (path.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(".png")))
+ if (path.endsWith(".png"))
{
vcl::PNGReader aPNGReader( *s );
aPNGReader.SetIgnoreGammaChunk( sal_True );
@@ -134,7 +134,7 @@ void loadFromStream(
rtl::OUString const & path, BitmapEx & bitmap)
{
boost::shared_ptr< SvStream > s(wrapStream(stream));
- if (path.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(".png")))
+ if (path.endsWith(".png"))
{
vcl::PNGReader aPNGReader( *s );
aPNGReader.SetIgnoreGammaChunk( sal_True );
@@ -308,9 +308,9 @@ void ImplImageTree::resetPaths() {
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
rtl::OUStringBuffer b;
- b.appendAscii(RTL_CONSTASCII_STRINGPARAM("images_"));
+ b.appendAscii("images_");
b.append(m_style);
- b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand"));
+ b.appendAscii("_brand");
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
m_paths.push_back(
@@ -332,7 +332,7 @@ void ImplImageTree::resetPaths() {
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
rtl::OUStringBuffer b;
- b.appendAscii(RTL_CONSTASCII_STRINGPARAM("images_"));
+ b.appendAscii("images_");
b.append(m_style);
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index b1bc2bc..b63ca2d 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -4014,8 +4014,8 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
{
if ( mnDataSize && mpData )
{
- sal_Bool bPathStroke = maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
- if ( bPathStroke || maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ sal_Bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
+ if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
{
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
@@ -4057,8 +4057,8 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
{
if ( mnDataSize && mpData )
{
- sal_Bool bPathStroke = maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
- if ( bPathStroke || maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ sal_Bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
+ if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
{
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
@@ -4084,7 +4084,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
}
delete[] mpData;
ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
- } else if( maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ){
+ } else if( maComment == "EMF_PLUS_HEADER_INFO" ){
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index 7c23aea..ca0cc5c 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -87,7 +87,7 @@ int OldStylePrintAdaptor::getPageCount() const
Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage ) const
{
Sequence< PropertyValue > aRet( 1 );
- aRet[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageSize") );
+ aRet[0].Name = OUString( "PageSize" );
if( i_nPage < int(mpData->maPages.size() ) )
aRet[0].Value = makeAny( mpData->maPages[i_nPage].maPageSize );
else
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6d3b02e..fe3d652 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2012,7 +2012,7 @@ ImplDevFontListData* ImplDevFontList::FindDefaultFont() const
// try to find one of the default fonts of the
// UNICODE, SANSSERIF, SERIF or FIXED default font lists
const DefaultFontConfiguration& rDefaults = DefaultFontConfiguration::get();
- com::sun::star::lang::Locale aLocale( OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), OUString(), OUString() );
+ com::sun::star::lang::Locale aLocale( OUString( "en" ), OUString(), OUString() );
String aFontname = rDefaults.getDefaultFont( aLocale, DEFAULTFONT_SANS_UNICODE );
ImplDevFontListData* pFoundData = ImplFindByTokenNames( aFontname );
if( pFoundData )
@@ -2531,17 +2531,17 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
{
String aBoldName;
if( aSearchName.EqualsAscii( "hggothicb", 0, 9) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hggothice"));
+ aBoldName = String("hggothice");
else if( aSearchName.EqualsAscii( "hgpgothicb", 0, 10) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hgpgothice"));
+ aBoldName = String("hgpgothice");
else if( aSearchName.EqualsAscii( "hgminchol", 0, 9) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hgminchob"));
+ aBoldName = String("hgminchob");
else if( aSearchName.EqualsAscii( "hgpminchol", 0, 10) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hgpminchob"));
+ aBoldName = String("hgpminchob");
else if( aSearchName.EqualsAscii( "hgminchob" ) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hgminchoe"));
+ aBoldName = String("hgminchoe");
else if( aSearchName.EqualsAscii( "hgpminchob" ) )
- aBoldName = String(RTL_CONSTASCII_USTRINGPARAM("hgpminchoe"));
+ aBoldName = String("hgpminchoe");
if( aBoldName.Len() && ImplFindBySearchName( aBoldName ) )
{
@@ -2659,8 +2659,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
a korean bitmap font that is not suitable here. Use the font replacement table,
that automatically leads to the desired "HG Mincho Light J". Same story for
MS Gothic, there are thai and korean "Gothic" fonts, so we even prefer Andale */
- static String aMS_Mincho( RTL_CONSTASCII_USTRINGPARAM("msmincho") );
- static String aMS_Gothic( RTL_CONSTASCII_USTRINGPARAM("msgothic") );
+ static String aMS_Mincho( "msmincho" );
+ static String aMS_Gothic( "msgothic" );
if ((aSearchName != aMS_Mincho) && (aSearchName != aMS_Gothic))
// TODO: add heuristic to only throw out the fake ms* fonts
#endif
@@ -2695,7 +2695,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
// if a target symbol font is not available use a default symbol font
if( rFSD.IsSymbolFont() )
{
- com::sun::star::lang::Locale aDefaultLocale( OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), OUString(), OUString() );
+ com::sun::star::lang::Locale aDefaultLocale( OUString( "en" ), OUString(), OUString() );
aSearchName = DefaultFontConfiguration::get().getDefaultFont( aDefaultLocale, DEFAULTFONT_SYMBOL );
ImplDevFontListData* pFoundData = ImplFindByTokenNames( aSearchName );
if( pFoundData )
@@ -2826,7 +2826,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList,
//sufficient heavy-weight code that's likely to undo the value of the
//optimization
if (nFallbackLevel == 1)
- pFallbackData = pFontList->FindFontFamily(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EUDC")));
+ pFallbackData = pFontList->FindFontFamily(OUString("EUDC"));
if (!pFallbackData)
pFallbackData = pFontList->GetGlyphFallbackFont(rFontSelData, rMissingCodes, nFallbackLevel-1);
// escape when there are no font candidates
@@ -2995,7 +2995,7 @@ void OutputDevice::ImplInitFontList() const
}
if( meOutDevType == OUTDEV_WINDOW && ! mpFontList->Count() )
{
- String aError( RTL_CONSTASCII_USTRINGPARAM( "Application error: no fonts and no vcl resource found on your system" ) );
+ String aError( "Application error: no fonts and no vcl resource found on your system" );
ResMgr* pMgr = ImplGetResMgr();
if( pMgr )
{
@@ -7017,7 +7017,7 @@ String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, c
nLastContent--;
XubString aLastStr( aStr, nLastContent, aStr.Len() );
- XubString aTempLastStr1( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ XubString aTempLastStr1( "..." );
aTempLastStr1 += aLastStr;
if ( _rLayout.GetTextWidth( aTempLastStr1, 0, aTempLastStr1.Len() ) > nMaxWidth )
aStr = OutputDevice::ImplGetEllipsisString( rTargetDevice, aStr, nMaxWidth, nStyle | TEXT_DRAW_ENDELLIPSIS, _rLayout );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 83f5753..4f02f29 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -155,57 +155,57 @@ void doTestCode()
aWriter.SetLineColor( Color( COL_LIGHTGREEN ) );
aWriter.DrawRect( Rectangle( Point( 2000, 200 ), Size( 8000, 3000 ) ), 5000, 2000 );
- aWriter.SetFont( Font( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 500 ) ) );
+ aWriter.SetFont( Font( String( "Times" ), Size( 0, 500 ) ) );
aWriter.SetTextColor( Color( COL_BLACK ) );
aWriter.SetLineColor( Color( COL_BLACK ) );
aWriter.SetFillColor( Color( COL_LIGHTBLUE ) );
Rectangle aRect( Point( 5000, 5000 ), Size( 6000, 3000 ) );
aWriter.DrawRect( aRect );
- aWriter.DrawText( aRect, String( RTL_CONSTASCII_USTRINGPARAM( "Link annot 1" ) ) );
+ aWriter.DrawText( aRect, String( "Link annot 1" ) );
sal_Int32 nFirstLink = aWriter.CreateLink( aRect );
PDFNote aNote;
- aNote.Title = String( RTL_CONSTASCII_USTRINGPARAM( "A small test note" ) );
- aNote.Contents = String( RTL_CONSTASCII_USTRINGPARAM( "There is no business like show business like no business i know. Everything about it is appealing." ) );
+ aNote.Title = String( "A small test note" );
+ aNote.Contents = String( "There is no business like show business like no business i know. Everything about it is appealing." );
aWriter.CreateNote( Rectangle( Point( aRect.Right(), aRect.Top() ), Size( 6000, 3000 ) ), aNote );
Rectangle aTargetRect( Point( 3000, 23000 ), Size( 12000, 6000 ) );
aWriter.SetFillColor( Color( COL_LIGHTGREEN ) );
aWriter.DrawRect( aTargetRect );
- aWriter.DrawText( aTargetRect, String( RTL_CONSTASCII_USTRINGPARAM( "Dest second link" ) ) );
+ aWriter.DrawText( aTargetRect, String( "Dest second link" ) );
sal_Int32 nSecondDest = aWriter.CreateDest( aTargetRect );
aWriter.BeginStructureElement( PDFWriter::Section );
aWriter.BeginStructureElement( PDFWriter::Heading );
- aWriter.DrawText( Point(4500, 9000), String( RTL_CONSTASCII_USTRINGPARAM( "A small structure test" ) ) );
+ aWriter.DrawText( Point(4500, 9000), String( "A small structure test" ) );
aWriter.EndStructureElement();
aWriter.BeginStructureElement( PDFWriter::Paragraph );
aWriter.SetStructureAttribute( PDFWriter::WritingMode, PDFWriter::LrTb );
aWriter.SetStructureAttribute( PDFWriter::TextDecorationType, PDFWriter::Underline );
aWriter.DrawText( Rectangle( Point( 4500, 10000 ), Size( 12000, 6000 ) ),
- String( RTL_CONSTASCII_USTRINGPARAM( "It was the best of PDF, it was the worst of PDF ... or so. This is a pretty nonsensical text to denote a paragraph. I suggest you stop reading it. Because if you read on you might get bored. So continue on your on risk. Hey, you're still here ? Why do you continue to read this as it is of no use at all ? OK, it's your time, but still... . Woah, i even get bored writing this, so let's end this here and now." ) ),
+ String( "It was the best of PDF, it was the worst of PDF ... or so. This is a pretty nonsensical text to denote a paragraph. I suggest you stop reading it. Because if you read on you might get bored. So continue on your on risk. Hey, you're still here ? Why do you continue to read this as it is of no use at all ? OK, it's your time, but still... . Woah, i even get bored writing this, so let's end this here and now." ),
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK
);
- aWriter.SetActualText( String( RTL_CONSTASCII_USTRINGPARAM( "It was the best of PDF, it was the worst of PDF ... or so. This is a pretty nonsensical text to denote a paragraph. I suggest you stop reading it. Because if you read on you might get bored. So continue on your on risk. Hey, you're still here ? Why do you continue to read this as it is of no use at all ? OK, it's your time, but still... . Woah, i even get bored writing this, so let's end this here and now." ) ) );
- aWriter.SetAlternateText( String( RTL_CONSTASCII_USTRINGPARAM( "This paragraph contains some lengthy nonsense to test structural element emission of PDFWriter." ) ) );
+ aWriter.SetActualText( String( "It was the best of PDF, it was the worst of PDF ... or so. This is a pretty nonsensical text to denote a paragraph. I suggest you stop reading it. Because if you read on you might get bored. So continue on your on risk. Hey, you're still here ? Why do you continue to read this as it is of no use at all ? OK, it's your time, but still... . Woah, i even get bored writing this, so let's end this here and now." ) );
+ aWriter.SetAlternateText( String( "This paragraph contains some lengthy nonsense to test structural element emission of PDFWriter." ) );
aWriter.EndStructureElement();
aWriter.BeginStructureElement( PDFWriter::Paragraph );
aWriter.SetStructureAttribute( PDFWriter::WritingMode, PDFWriter::LrTb );
aWriter.DrawText( Rectangle( Point( 4500, 19000 ), Size( 12000, 1000 ) ),
- String( RTL_CONSTASCII_USTRINGPARAM( "This paragraph is nothing special either but ends on the next page structurewise" ) ),
+ String( "This paragraph is nothing special either but ends on the next page structurewise" ),
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK
);
aWriter.NewPage( 595, 842 );
// test AddStream interface
- aWriter.AddStream( String( RTL_CONSTASCII_USTRINGPARAM( "text/plain" ) ), new PDFTestOutputStream(), true );
+ aWriter.AddStream( String( "text/plain" ), new PDFTestOutputStream(), true );
// set transitional mode
aWriter.SetPageTransition( PDFWriter::WipeRightToLeft, 1500 );
aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
aWriter.SetTextColor( Color( COL_BLACK ) );
- aWriter.SetFont( Font( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 500 ) ) );
+ aWriter.SetFont( Font( String( "Times" ), Size( 0, 500 ) ) );
aWriter.DrawText( Rectangle( Point( 4500, 1500 ), Size( 12000, 3000 ) ),
- String( RTL_CONSTASCII_USTRINGPARAM( "Here's where all things come to an end ... well at least the paragaph from the last page." ) ),
+ String( "Here's where all things come to an end ... well at least the paragaph from the last page." ),
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK
);
aWriter.EndStructureElement();
@@ -215,13 +215,13 @@ void doTestCode()
aWriter.BeginStructureElement( PDFWriter::NonStructElement );
aWriter.DrawRect( aRect );
aWriter.BeginStructureElement( PDFWriter::Paragraph );
- aWriter.DrawText( aRect, String( RTL_CONSTASCII_USTRINGPARAM( "Link annot 2" ) ) );
+ aWriter.DrawText( aRect, String( "Link annot 2" ) );
sal_Int32 nSecondLink = aWriter.CreateLink( aRect );
aWriter.SetFillColor( Color( COL_LIGHTGREEN ) );
aWriter.BeginStructureElement( PDFWriter::ListItem );
aWriter.DrawRect( aTargetRect );
- aWriter.DrawText( aTargetRect, String( RTL_CONSTASCII_USTRINGPARAM( "Dest first link" ) ) );
+ aWriter.DrawText( aTargetRect, String( "Dest first link" ) );
sal_Int32 nFirstDest = aWriter.CreateDest( aTargetRect );
// enable structure
aWriter.EndStructureElement();
@@ -242,7 +242,7 @@ void doTestCode()
aWriter.EndStructureElement();
aWriter.BeginStructureElement( PDFWriter::Figure );
aWriter.BeginStructureElement( PDFWriter::Caption );
- aWriter.DrawText( Point( 4500, 9000 ), String( RTL_CONSTASCII_USTRINGPARAM( "Some drawing stuff inside the structure" ) ) );
+ aWriter.DrawText( Point( 4500, 9000 ), String( "Some drawing stuff inside the structure" ) );
aWriter.EndStructureElement();
// test clipping
@@ -274,7 +274,7 @@ void doTestCode()
aWriter.DrawEllipse( aTranspRect );
aWriter.SetTextColor( Color( COL_LIGHTBLUE ) );
aWriter.DrawText( aTranspRect,
- String( RTL_CONSTASCII_USTRINGPARAM( "Some transparent text" ) ),
+ String( "Some transparent text" ),
TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
aWriter.EndTransparencyGroup( aTranspRect, 50 );
@@ -298,7 +298,7 @@ void doTestCode()
aWriter.DrawEllipse( aTranspRect );
aWriter.SetTextColor( Color( COL_LIGHTBLUE ) );
aWriter.DrawText( aTranspRect,
- String( RTL_CONSTASCII_USTRINGPARAM( "Some transparent text" ) ),
+ String( "Some transparent text" ),
TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
aTranspRect = Rectangle( Point( 1500, 16500 ), Size( 4800, 3000 ) );
aWriter.SetFillColor( Color( COL_LIGHTRED ) );
@@ -379,13 +379,13 @@ void doTestCode()
aWriter.NewPage( 595, 842 );
aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
- aWriter.SetFont( Font( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 500 ) ) );
+ aWriter.SetFont( Font( String( "Times" ), Size( 0, 500 ) ) );
aWriter.SetTextColor( Color( COL_BLACK ) );
aRect = Rectangle( Point( 4500, 6000 ), Size( 6000, 1500 ) );
aWriter.DrawRect( aRect );
- aWriter.DrawText( aRect, String( RTL_CONSTASCII_USTRINGPARAM( "www.heise.de" ) ) );
+ aWriter.DrawText( aRect, String( "www.heise.de" ) );
sal_Int32 nURILink = aWriter.CreateLink( aRect );
- aWriter.SetLinkURL( nURILink, OUString( "http://www.heise.de" ) );
+ aWriter.SetLinkURL( nURILink, OUString( "http://www.heise.de" ) );
aWriter.SetLinkDest( nFirstLink, nFirstDest );
aWriter.SetLinkDest( nSecondLink, nSecondDest );
@@ -450,7 +450,7 @@ void doTestCode()
aRB1.BorderColor = Color( COL_LIGHTGREEN );
aRB1.BackgroundColor = Color( COL_LIGHTBLUE );
aRB1.TextColor = Color( COL_LIGHTRED );
- aRB1.TextFont = Font( String( RTL_CONSTASCII_USTRINGPARAM( "Courier" ) ), Size( 0, 800 ) );
+ aRB1.TextFont = Font( String( "Courier" ), Size( 0, 800 ) );
aWriter.CreateControl( aRB1 );
PDFWriter::RadioButtonWidget aRB2;
@@ -1811,7 +1811,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
m_aStructure[0].m_nParentElement = 0;
Font aFont;
- aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ) );
+ aFont.SetName( String( "Times" ) );
aFont.SetSize( Size( 0, 12 ) );
GraphicsState aState;
@@ -2537,7 +2537,7 @@ void PDFWriterImpl::endPage()
// reset the default font
Font aFont;
- aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ) );
+ aFont.SetName( String( "Times" ) );
aFont.SetSize( Size( 0, 12 ) );
m_aCurrentPDFState = m_aGraphicsStack.front();
@@ -4941,7 +4941,7 @@ void PDFWriterImpl::createDefaultPushButtonAppearance( PDFWidget& rButton, const
// (that is before endRedirect())
OStringBuffer aDA( 256 );
appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetButtonTextColor() ), aDA );
- Font aDummyFont( String( RTL_CONSTASCII_USTRINGPARAM( "Helvetica" ) ), aFont.GetSize() );
+ Font aDummyFont( String( "Helvetica" ), aFont.GetSize() );
sal_Int32 nDummyBuiltin = getBestBuiltinFont( aDummyFont );
aDA.append( ' ' );
aDA.append( m_aBuiltinFonts[nDummyBuiltin].getNameObject() );
@@ -5203,7 +5203,7 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
OStringBuffer aDA( 256 );
appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA );
- sal_Int32 nBest = getBestBuiltinFont( Font( String( RTL_CONSTASCII_USTRINGPARAM( "ZapfDingbats" ) ), aFont.GetSize() ) );
+ sal_Int32 nBest = getBestBuiltinFont( Font( String( "ZapfDingbats" ), aFont.GetSize() ) );
aDA.append( ' ' );
aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
aDA.append( " 0 Tf" );
@@ -5328,7 +5328,7 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
OStringBuffer aDA( 256 );
appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA );
- sal_Int32 nBest = getBestBuiltinFont( Font( String( RTL_CONSTASCII_USTRINGPARAM( "ZapfDingbats" ) ), aFont.GetSize() ) );
+ sal_Int32 nBest = getBestBuiltinFont( Font( String( "ZapfDingbats" ), aFont.GetSize() ) );
aDA.append( ' ' );
aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
aDA.append( " 0 Tf" );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index beee461..6d8da70 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -175,9 +175,9 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
sal_Int32 nColorMode = 0;
Sequence< PropertyValue > aFilterData( 2 );
- aFilterData[ 0 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) );
+ aFilterData[ 0 ].Name = OUString( "Quality" );
aFilterData[ 0 ].Value <<= sal_Int32(i_rContext.m_nJPEGQuality);
- aFilterData[ 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) );
+ aFilterData[ 1 ].Name = OUString( "ColorMode" );
aFilterData[ 1 ].Value <<= nColorMode;
try
@@ -188,13 +188,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
uno::Reference< graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(xContext) );
uno::Reference< graphic::XGraphic > xGraphic( aGraphic.GetXGraphic() );
uno::Reference < io::XOutputStream > xOut( xStream->getOutputStream() );
- rtl::OUString aMimeType(RTL_CONSTASCII_USTRINGPARAM("image/jpeg"));
+ OUString aMimeType("image/jpeg");
uno::Sequence< beans::PropertyValue > aOutMediaProperties( 3 );
- aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
+ aOutMediaProperties[0].Name = OUString("OutputStream");
aOutMediaProperties[0].Value <<= xOut;
- aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MimeType"));
+ aOutMediaProperties[1].Name = OUString("MimeType");
aOutMediaProperties[1].Value <<= aMimeType;
- aOutMediaProperties[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData"));
+ aOutMediaProperties[2].Name = OUString("FilterData");
aOutMediaProperties[2].Value <<= aFilterData;
xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
xOut->flush();
@@ -208,13 +208,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
xSeekable->seek( 0 );
Sequence< PropertyValue > aArgs( 1 );
- aArgs[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
+ aArgs[ 0 ].Name = OUString("InputStream");
aArgs[ 0 ].Value <<= xStream;
uno::Reference< XPropertySet > xPropSet( xGraphicProvider->queryGraphicDescriptor( aArgs ) );
if ( xPropSet.is() )
{
sal_Int16 nBitsPerPixel = 24;
- if ( xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BitsPerPixel")) ) >>= nBitsPerPixel )
+ if ( xPropSet->getPropertyValue( OUString("BitsPerPixel") ) >>= nBitsPerPixel )
{
bTrueColorJPG = nBitsPerPixel != 8;
}
@@ -510,7 +510,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
String aSkipComment;
- if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+ if( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN"))
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
@@ -522,7 +522,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END")) )
{
bDone = sal_True;
}
@@ -546,9 +546,9 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
sal_Bool bSkipSequence = sal_False;
rtl::OString sSeqEnd;
- if( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) )
+ if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" )
{
- sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"));
+ sSeqEnd = OString("XPATHSTROKE_SEQ_END");
SvtGraphicStroke aStroke;
aMemStm >> aStroke;
@@ -631,9 +631,9 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
}
}
}
- else if ( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ else if ( pA->GetComment() == "XPATHFILL_SEQ_BEGIN" )
{
- sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END"));
+ sSeqEnd = OString("XPATHFILL_SEQ_END");
SvtGraphicFill aFill;
aMemStm >> aFill;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 7037a1f..d5ff3de 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -128,17 +128,17 @@ PrinterOptions::~PrinterOptions()
{
}
-#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
-#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
-#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
-#define PROPERTYNAME_REDUCEBITMAPS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
-#define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency"))
-#define PROPERTYNAME_CONVERTTOGREYSCALES rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
-#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PDFAsStandardPrintJobFormat"))
+#define PROPERTYNAME_REDUCETRANSPARENCY OUString("ReduceTransparency")
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString("ReducedTransparencyMode")
+#define PROPERTYNAME_REDUCEGRADIENTS OUString("ReduceGradients")
+#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString("ReducedGradientMode")
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString("ReducedGradientStepCount")
+#define PROPERTYNAME_REDUCEBITMAPS OUString("ReduceBitmaps")
+#define PROPERTYNAME_REDUCEDBITMAPMODE OUString("ReducedBitmapMode")
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString("ReducedBitmapResolution")
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString("ReducedBitmapIncludesTransparency")
+#define PROPERTYNAME_CONVERTTOGREYSCALES OUString("ConvertToGreyscales")
+#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString("PDFAsStandardPrintJobFormat")
bool PrinterOptions::ReadFromConfig( bool i_bFile )
{
@@ -160,15 +160,15 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile )
Sequence< Any > aArgs(1);
PropertyValue aVal;
- aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
+ aVal.Name = rtl::OUString( "nodepath" );
if( i_bFile )
- aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Print/Option/File" ) );
+ aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/File" );
else
- aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Print/Option/Printer" ) );
+ aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/Printer" );
aArgs.getArray()[0] <<= aVal;
xConfigAccess = Reference< XNameAccess >(
xConfigProvider->createInstanceWithArguments(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )), aArgs ),
+ rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ),
UNO_QUERY );
if( xConfigAccess.is() )
{
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 01c930a..3dd424a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -222,7 +222,7 @@ static rtl::OUString queryFile( Printer* pPrinter )
aTempl.getArray()[0] <<= ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION;
uno::Reference< ui::dialogs::XFilePicker > xFilePicker(
xFactory->createInstanceWithArguments(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ),
+ ::rtl::OUString( "com.sun.star.ui.dialogs.FilePicker" ),
aTempl ), uno::UNO_QUERY );
DBG_ASSERT( xFilePicker.is(), "could not get FilePicker service" );
@@ -242,9 +242,9 @@ static rtl::OUString queryFile( Printer* pPrinter )
bPDF = false;
}
if( bPS )
- xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) );
+ xFilterMgr->appendFilter( OUString( "PostScript" ), OUString( "*.ps" ) );
if( bPDF )
- xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Portable Document Format" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.pdf" ) ) );
+ xFilterMgr->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) );
#elif defined WNT
(void)pPrinter;
xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) );
@@ -297,7 +297,7 @@ void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pControlle
)
{
sal_Bool bSynchronous = sal_False;
- beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Wait" ) ) );
+ beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( "Wait" ) );
if( pVal )
pVal->Value >>= bSynchronous;
@@ -326,7 +326,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
ErrorBox aBox( NULL, VclResId( SV_PRINT_NOPRINTERWARNING ) );
aBox.Execute();
}
- pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ),
+ pController->setValue( rtl::OUString( "IsDirect" ),
makeAny( sal_False ) );
}
@@ -355,12 +355,12 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
// "Pages" attribute from API is now equivalent to "PageRange"
// AND "PrintContent" = 1 except calc where it is "PrintRange" = 1
// Argh ! That sure needs cleaning up
- beans::PropertyValue* pContentVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ) );
+ beans::PropertyValue* pContentVal = i_pController->getValue( OUString( "PrintRange" ) );
if( ! pContentVal )
- pContentVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ) );
+ pContentVal = i_pController->getValue( OUString( "PrintContent" ) );
// case 1: UNO API has set "Pages"
- beans::PropertyValue* pPagesVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pages" ) ) );
+ beans::PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) );
if( pPagesVal )
{
rtl::OUString aPagesVal;
@@ -373,7 +373,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
if( pContentVal )
{
pContentVal->Value = makeAny( sal_Int32( 1 ) );
- i_pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), pPagesVal->Value );
+ i_pController->setValue( OUString( "PageRange" ), pPagesVal->Value );
}
}
}
@@ -386,7 +386,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
if( nContent == 0 )
{
// do not overwrite PageRange if it is already set
- beans::PropertyValue* pRangeVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ) );
+ beans::PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) );
rtl::OUString aRange;
if( pRangeVal )
pRangeVal->Value >>= aRange;
@@ -402,14 +402,14 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
aBuf.appendAscii( "-" );
aBuf.append( nPages );
}
- i_pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), makeAny( aBuf.makeStringAndClear() ) );
+ i_pController->setValue( OUString( "PageRange" ), makeAny( aBuf.makeStringAndClear() ) );
}
}
}
}
}
- beans::PropertyValue* pReverseVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ) );
+ beans::PropertyValue* pReverseVal = i_pController->getValue( OUString( "PrintReverse" ) );
if( pReverseVal )
{
sal_Bool bReverse = sal_False;
@@ -418,35 +418,35 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
}
// setup NUp printing from properties
- sal_Int32 nRows = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpRows" ) ), 1 );
- sal_Int32 nCols = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpColumns" ) ), 1 );
+ sal_Int32 nRows = i_pController->getIntProperty( rtl::OUString( "NUpRows" ), 1 );
+ sal_Int32 nCols = i_pController->getIntProperty( rtl::OUString( "NUpColumns" ), 1 );
if( nRows > 1 || nCols > 1 )
{
PrinterController::MultiPageSetup aMPS;
aMPS.nRows = nRows > 1 ? nRows : 1;
aMPS.nColumns = nCols > 1 ? nCols : 1;
- sal_Int32 nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginLeft" ) ), aMPS.nLeftMargin );
+ sal_Int32 nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin );
if( nValue >= 0 )
aMPS.nLeftMargin = nValue;
- nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginRight" ) ), aMPS.nRightMargin );
+ nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginRight" ), aMPS.nRightMargin );
if( nValue >= 0 )
aMPS.nRightMargin = nValue;
- nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginTop" ) ), aMPS.nTopMargin );
+ nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginTop" ), aMPS.nTopMargin );
if( nValue >= 0 )
aMPS.nTopMargin = nValue;
- nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginBottom" ) ), aMPS.nBottomMargin );
+ nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin );
if( nValue >= 0 )
aMPS.nBottomMargin = nValue;
- nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpHorizontalSpacing" ) ), aMPS.nHorizontalSpacing );
+ nValue = i_pController->getIntProperty( rtl::OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing );
if( nValue >= 0 )
aMPS.nHorizontalSpacing = nValue;
- nValue = i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpVerticalSpacing" ) ), aMPS.nVerticalSpacing );
+ nValue = i_pController->getIntProperty( rtl::OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing );
if( nValue >= 0 )
aMPS.nVerticalSpacing = nValue;
- aMPS.bDrawBorder = i_pController->getBoolProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpDrawBorder" ) ), aMPS.bDrawBorder );
- aMPS.nOrder = static_cast<PrinterController::NupOrderType>(i_pController->getIntProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpSubPageOrder" ) ), aMPS.nOrder ));
+ aMPS.bDrawBorder = i_pController->getBoolProperty( rtl::OUString( "NUpDrawBorder" ), aMPS.bDrawBorder );
+ aMPS.nOrder = static_cast<PrinterController::NupOrderType>(i_pController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder ));
aMPS.aPaperSize = i_pController->getPrinter()->PixelToLogic( i_pController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
- beans::PropertyValue* pPgSizeVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPaperSize" ) ) );
+ beans::PropertyValue* pPgSizeVal = i_pController->getValue( rtl::OUString( "NUpPaperSize" ) );
awt::Size aSizeVal;
if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) )
{
@@ -492,12 +492,12 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
i_pController->abortJob();
return;
}
- pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ),
+ pController->setValue( rtl::OUString( "LocalFileName" ),
makeAny( aFile ) );
}
else if( aDlg.isSingleJobs() )
{
- pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ),
+ pController->setValue( rtl::OUString( "PrintCollateAsSingleJobs" ),
makeAny( sal_True ) );
}
}
@@ -509,7 +509,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
pController->pushPropertiesToPrinter();
rtl::OUString aJobName;
- beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ) );
+ beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( "JobName" ) );
if( pJobNameVal )
pJobNameVal->Value >>= aJobName;
@@ -560,13 +560,13 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
return sal_False;
sal_Bool bSinglePrintJobs = sal_False;
- beans::PropertyValue* pSingleValue = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ) );
+ beans::PropertyValue* pSingleValue = i_pController->getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) );
if( pSingleValue )
{
pSingleValue->Value >>= bSinglePrintJobs;
}
- beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ) );
+ beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( "LocalFileName" ) );
if( pFileValue )
{
rtl::OUString aFile;
@@ -734,8 +734,8 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
if( i_pController->isShowDialogs() && ! i_pController->isDirectPrint() )
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinterUsed" ) ),
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "LastPrinterUsed" ),
GetName()
);
}
@@ -766,7 +766,7 @@ const boost::shared_ptr<Printer>& PrinterController::getPrinter() const
void PrinterController::setPrinter( const boost::shared_ptr<Printer>& i_rPrinter )
{
mpImplData->mpPrinter = i_rPrinter;
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
+ setValue( rtl::OUString( "Name" ),
makeAny( rtl::OUString( i_rPrinter->GetName() ) ) );
mpImplData->mnDefaultPaperBin = mpImplData->mpPrinter->GetPaperBin();
mpImplData->mnFixedPaperBin = -1;
@@ -804,7 +804,7 @@ bool PrinterController::setupPrinter( Window* i_pParent )
awt::Size aOverrideSize;
aOverrideSize.Width = aNewPaperSize.Width();
aOverrideSize.Height = aNewPaperSize.Height();
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OverridePageSize" ) ),
+ setValue( rtl::OUString( "OverridePageSize" ),
makeAny( aOverrideSize ) );
mpImplData->mnFixedPaperBin = nNewPaperBin;
}
@@ -1314,26 +1314,26 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P
aResult[nCur++] = mpImplData->maUIProperties[i];
}
// append IsFirstPage
- if( aMergeSet.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFirstPage" ) ) ) == aMergeSet.end() )
+ if( aMergeSet.find( rtl::OUString( "IsFirstPage" ) ) == aMergeSet.end() )
{
PropertyValue aVal;
- aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFirstPage" ) );
+ aVal.Name = rtl::OUString( "IsFirstPage" );
aVal.Value <<= mpImplData->mbFirstPage;
aResult[nCur++] = aVal;
}
// append IsLastPage
- if( aMergeSet.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsLastPage" ) ) ) == aMergeSet.end() )
+ if( aMergeSet.find( rtl::OUString( "IsLastPage" ) ) == aMergeSet.end() )
{
PropertyValue aVal;
- aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsLastPage" ) );
+ aVal.Name = rtl::OUString( "IsLastPage" );
aVal.Value <<= mpImplData->mbLastPage;
aResult[nCur++] = aVal;
}
// append IsPrinter
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list