[Libreoffice-commits] .: 6 commits - filter/source mysqlc/source sdext/source sd/source vcl/generic vcl/headless vcl/source vcl/test vcl/unx vcl/workben writerfilter/qa
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 12:24:15 PDT 2012
filter/source/config/cache/filterfactory.cxx | 38 ++--
filter/source/msfilter/escherex.cxx | 124 +++++++--------
filter/source/msfilter/eschesdo.cxx | 22 +-
filter/source/msfilter/msocximex.cxx | 2
filter/source/xmlfilterdetect/filterdetect.cxx | 6
mysqlc/source/mysqlc_connection.cxx | 12 -
mysqlc/source/mysqlc_driver.cxx | 36 ++--
sd/source/filter/html/buttonset.cxx | 6
sd/source/filter/ppt/pptin.cxx | 4
sd/source/filter/sdpptwrp.cxx | 2
sdext/source/minimizer/graphiccollector.cxx | 12 -
sdext/source/minimizer/impoptimizer.cxx | 30 +--
sdext/source/minimizer/optimizerdialog.cxx | 12 -
sdext/source/minimizer/optimizerdialogcontrols.cxx | 24 +-
sdext/source/minimizer/pppoptimizerdialog.cxx | 8
sdext/source/pdfimport/test/tests.cxx | 6
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 6
sdext/source/pdfimport/tree/imagecontainer.cxx | 2
sdext/source/pdfimport/wrapper/wrapper.cxx | 38 ++--
sdext/source/presenter/PresenterAccessibility.cxx | 8
sdext/source/presenter/PresenterButton.cxx | 7
sdext/source/presenter/PresenterController.cxx | 9 -
sdext/source/presenter/PresenterHelpView.cxx | 7
sdext/source/presenter/PresenterHelper.cxx | 30 +--
sdext/source/presenter/PresenterPane.cxx | 2
sdext/source/presenter/PresenterPaneBase.cxx | 19 +-
sdext/source/presenter/PresenterPaneBorderManager.cxx | 13 -
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 12 -
sdext/source/presenter/PresenterPaneContainer.cxx | 2
sdext/source/presenter/PresenterPaneFactory.cxx | 19 +-
sdext/source/presenter/PresenterScreen.cxx | 44 ++---
sdext/source/presenter/PresenterScrollBar.cxx | 6
sdext/source/presenter/PresenterSlidePreview.cxx | 13 -
sdext/source/presenter/PresenterSlideShowView.cxx | 10 -
sdext/source/presenter/PresenterSlideSorter.cxx | 16 -
sdext/source/presenter/PresenterSpritePane.cxx | 2
sdext/source/presenter/PresenterTheme.cxx | 10 -
sdext/source/presenter/PresenterToolBar.cxx | 7
sdext/source/presenter/PresenterWindowManager.cxx | 9 -
vcl/generic/print/printerjob.cxx | 18 --
vcl/headless/svpprn.cxx | 4
vcl/source/app/brand.cxx | 16 -
vcl/source/app/settings.cxx | 54 +++---
vcl/source/app/svdata.cxx | 10 -
vcl/source/app/unohelp.cxx | 16 -
vcl/source/components/dtranscomp.cxx | 34 ++--
vcl/source/control/edit.cxx | 16 -
vcl/source/gdi/bmpconv.cxx | 4
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/impgraph.cxx | 8
vcl/source/gdi/impimagetree.cxx | 22 --
vcl/source/gdi/pdfwriter_impl.cxx | 148 +++++++++---------
vcl/source/helper/canvasbitmap.cxx | 4
vcl/source/window/abstdlg.cxx | 4
vcl/source/window/printdlg.cxx | 74 ++++-----
vcl/source/window/toolbox2.cxx | 8
vcl/source/window/window.cxx | 57 +++---
vcl/test/canvasbitmaptest.cxx | 6
vcl/test/dndtest.cxx | 12 -
vcl/unx/generic/dtrans/X11_clipboard.cxx | 8
vcl/unx/generic/dtrans/X11_droptarget.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 66 ++++----
vcl/unx/generic/dtrans/X11_service.cxx | 8
vcl/unx/generic/dtrans/X11_transferable.cxx | 8
vcl/unx/generic/printer/cupsmgr.cxx | 8
vcl/workben/outdevgrind.cxx | 8
vcl/workben/svpclient.cxx | 4
writerfilter/qa/cppunittests/doctok/testdoctok.cxx | 4
68 files changed, 616 insertions(+), 652 deletions(-)
New commits:
commit 61345105ff0d11da9c6f5e5149cc2977b33ec36e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 14:18:49 2012 -0500
targeted string re-work
Change-Id: Ie65e17698cc11301873e964868c4c8f4d8dc953c
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 8d89d1f..b819e30 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -100,7 +100,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
if( xInputStream.is() && xGraphicProvider.is() ) try
{
Sequence< PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) );
+ aMediaProperties[0].Name = ::rtl::OUString("InputStream" );
aMediaProperties[0].Value <<= xInputStream;
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) );
@@ -160,7 +160,7 @@ public:
ButtonSetImpl::ButtonSetImpl()
{
- const OUString sSubPath( RTL_CONSTASCII_USTRINGPARAM( "/wizard/web/buttons" ) );
+ const OUString sSubPath( "/wizard/web/buttons" );
OUString sSharePath( SvtPathOptions().GetConfigPath() );
sSharePath += sSubPath;
@@ -266,7 +266,7 @@ Reference< XGraphicProvider > ButtonSetImpl::getGraphicProvider()
{
Reference< XGraphicProvider > xGraphProvider(
xServiceManager->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ) ), UNO_QUERY_THROW );
+ ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY_THROW );
mxGraphicProvider = xGraphProvider;
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index d7cd210..e456a4e 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -116,7 +116,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
sal_uInt32 nImportFlags = 0;
#ifdef DBG_UTIL
- PropRead* pSummaryInformation = new PropRead( rStorage, String( RTL_CONSTASCII_USTRINGPARAM( "\005SummaryInformation" ) ) );
+ PropRead* pSummaryInformation = new PropRead( rStorage, String( "\005SummaryInformation" ) );
if ( pSummaryInformation->IsValid() )
{
pSummaryInformation->Read();
@@ -132,7 +132,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
{
String aComment;
aPropItem.Read( aComment );
- if ( aComment.Search( String( RTL_CONSTASCII_USTRINGPARAM( "Applixware" ) ), 0 ) != STRING_NOTFOUND )
+ if ( aComment.Search( String( "Applixware" ), 0 ) != STRING_NOTFOUND )
{
nImportFlags |= PPT_IMPORTFLAGS_NO_TEXT_ASSERT;
}
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 052cf61..6be40e8 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -86,7 +86,7 @@ sal_Bool SdPPTFilter::Import()
/* check if there is a dualstorage, then the
document is propably a PPT95 containing PPT97 */
SvStorageRef xDualStorage;
- String sDualStorage( RTL_CONSTASCII_USTRINGPARAM( "PP97_DUALSTORAGE" ) );
+ String sDualStorage( "PP97_DUALSTORAGE" );
if ( pStorage->IsContained( sDualStorage ) )
{
xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ );
commit 5f2c6bcfd1c826fc86c12ef4bf966bead92338b5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 14:13:20 2012 -0500
targeted string re-work
Change-Id: Ic1fb9f4ec0f37d4efcf43c58b903388478d52173
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index f961e1e..afbc240 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -113,7 +113,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(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL;
+ aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL;
pFile = new osl::File (aFileURL);
nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
@@ -335,7 +335,7 @@ PrinterJob::StartJob (
maSpoolDirName = createSpoolDir ();
maJobTitle = rJobName;
- rtl::OUString aExt(RTL_CONSTASCII_USTRINGPARAM (".ps"));
+ rtl::OUString aExt(".ps");
mpJobHeader = CreateSpoolFile (rtl::OUString("psp_head"), aExt);
mpJobTrailer = CreateSpoolFile (rtl::OUString("psp_tail"), aExt);
if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor
@@ -601,12 +601,10 @@ 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(RTL_CONSTASCII_USTRINGPARAM (".ps"));
+ rtl::OUString aExt = aPageNo + rtl::OUString(".ps");
- osl::File* pPageHeader = CreateSpoolFile (
- rtl::OUString("psp_pghead"), aExt);
- osl::File* pPageBody = CreateSpoolFile (
- rtl::OUString("psp_pgbody"), aExt);
+ osl::File* pPageHeader = CreateSpoolFile ( rtl::OUString("psp_pghead"), aExt);
+ osl::File* pPageBody = CreateSpoolFile ( rtl::OUString("psp_pgbody"), aExt);
maHeaderList.push_back (pPageHeader);
maPageList.push_back (pPageBody);
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index ae925a2..f1c27ac 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -86,9 +86,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
rtl::OLocale aLoc( pLoc );
rtl::OUString aName = aBaseName + aPng;
- rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) +
+ rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") +
aLoc.getLanguage() +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) +
+ rtl::OUString("_") +
aLoc.getCountry() + aPng );
return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) ||
@@ -108,9 +108,9 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG (const char* pName)
rtl::OLocale aLoc( pLoc );
rtl::OUString aName = aBaseName + aSvg;
- rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) +
+ rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") +
aLoc.getLanguage() +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) +
+ rtl::OUString("_") +
aLoc.getCountry() + aSvg );
vcl::RenderGraphicRasterizer aRasterizer = loadSvg ("$BRAND_BASE_DIR/program/edition", aLocaleName);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 3f953ff..f30ce5c 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -350,7 +350,7 @@ void ImplStyleData::SetStandardStyles()
Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
aStdFont.SetCharSet( osl_getThreadTextEncoding() );
aStdFont.SetWeight( WEIGHT_NORMAL );
- aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
+ aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( "en" ), rtl::OUString(), rtl::OUString() ) ) );
maAppFont = aStdFont;
maHelpFont = aStdFont;
maMenuFont = aStdFont;
@@ -498,38 +498,38 @@ void StyleSettings::Set3DColors( const Color& rColor )
{
switch ( nStyle )
{
- case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
- case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast"));
- case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")); // industrial is dead
- case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal"));
- case STYLE_SYMBOLS_TANGO: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango"));
- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen"));
- case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic"));
- case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human"));
+ case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString("default");
+ case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString("hicontrast");
+ case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString("tango"); // industrial is dead
+ case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString("crystal");
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString("tango");
+ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen");
+ case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic");
+ case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human");
}
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto"));
+ return ::rtl::OUString("auto");
}
// -----------------------------------------------------------------------
sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
{
- if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) )
+ if ( rName == ::rtl::OUString("default") )
return STYLE_SYMBOLS_DEFAULT;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hicontrast")) )
+ else if ( rName == ::rtl::OUString("hicontrast") )
return STYLE_SYMBOLS_HICONTRAST;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("industrial")) )
+ else if ( rName == ::rtl::OUString("industrial") )
return STYLE_SYMBOLS_TANGO; // industrial is dead
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("crystal")) )
+ else if ( rName == ::rtl::OUString("crystal") )
return STYLE_SYMBOLS_CRYSTAL;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango")) )
+ else if ( rName == ::rtl::OUString("tango") )
return STYLE_SYMBOLS_TANGO;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen")) )
+ else if ( rName == ::rtl::OUString("oxygen") )
return STYLE_SYMBOLS_OXYGEN;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")) )
+ else if ( rName == ::rtl::OUString("classic") )
return STYLE_SYMBOLS_CLASSIC;
- else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human")) )
+ else if ( rName == ::rtl::OUString("human") )
return STYLE_SYMBOLS_HUMAN;
return STYLE_SYMBOLS_AUTO;
@@ -957,8 +957,8 @@ sal_Bool MiscSettings::GetDisablePrinting() const
{
rtl::OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ) );
+ getValue( rtl::OUString( "DesktopManagement" ),
+ rtl::OUString( "DisablePrinting" ) );
mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
}
@@ -1013,8 +1013,8 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
{
rtl::OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ) );
+ getValue( rtl::OUString( "Accessibility" ),
+ rtl::OUString( "EnableATToolSupport" ) );
mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
}
else
@@ -1072,9 +1072,9 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
}
vcl::SettingsConfigItem::get()->
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ),
- bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) );
+ setValue( rtl::OUString( "Accessibility" ),
+ rtl::OUString( "EnableATToolSupport" ),
+ bEnable ? rtl::OUString("true") : rtl::OUString("false" ) );
mpData->mnEnableATT = bEnable ? 1 : 0;
}
}
@@ -1506,11 +1506,11 @@ bool AllSettings::GetLayoutRTL() const
nUIMirroring = 0; // ask configuration only once
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
vcl::unohelper::GetMultiServiceFactory(),
- OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/I18N/CTL")) ); // note: case sensisitive !
+ OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensisitive !
if ( aNode.isValid() )
{
sal_Bool bTmp = sal_Bool();
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("UIMirroring")) );
+ ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") );
if( aValue >>= bTmp )
{
// found true or false; if it was nil, nothing is changed
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 797159e..c115975 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -122,17 +122,17 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun:
void doTestCode()
{
static const char* pHome = getenv( "HOME" );
- rtl::OUString aTestFile( RTL_CONSTASCII_USTRINGPARAM( "file://" ) );
+ rtl::OUString aTestFile( "file://" );
aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 );
- aTestFile += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/pdf_export_test.pdf" ) );
+ aTestFile += rtl::OUString( "/pdf_export_test.pdf" );
PDFWriter::PDFWriterContext aContext;
aContext.URL = aTestFile;
aContext.Version = PDFWriter::PDF_1_4;
aContext.Tagged = true;
aContext.InitialPage = 2;
- aContext.DocumentInfo.Title = OUString( RTL_CONSTASCII_USTRINGPARAM( "PDF export test document" ) );
- aContext.DocumentInfo.Producer = OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL" ) );
+ aContext.DocumentInfo.Title = OUString( "PDF export test document" );
+ aContext.DocumentInfo.Producer = OUString( "VCL" );
PDFWriter aWriter( aContext );
aWriter.NewPage( 595, 842 );
@@ -358,53 +358,53 @@ void doTestCode()
aWriter.DrawRect( aRect );
aWriter.DrawText( aRect, String( RTL_CONSTASCII_USTRINGPARAM( "www.heise.de" ) ) );
sal_Int32 nURILink = aWriter.CreateLink( aRect );
- aWriter.SetLinkURL( nURILink, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.heise.de" ) ) );
+ aWriter.SetLinkURL( nURILink, OUString( "http://www.heise.de" ) );
aWriter.SetLinkDest( nFirstLink, nFirstDest );
aWriter.SetLinkDest( nSecondLink, nSecondDest );
// include a button
PDFWriter::PushButtonWidget aBtn;
- aBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testButton" ) );
- aBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test button" ) );
- aBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "hit me" ) );
+ aBtn.Name = OUString( "testButton" );
+ aBtn.Description = OUString( "A test button" );
+ aBtn.Text = OUString( "hit me" );
aBtn.Location = Rectangle( Point( 4500, 9000 ), Size( 4500, 3000 ) );
aBtn.Border = aBtn.Background = true;
aWriter.CreateControl( aBtn );
// include a uri button
PDFWriter::PushButtonWidget aUriBtn;
- aUriBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "wwwButton" ) );
- aUriBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A URI button" ) );
- aUriBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "to www" ) );
+ aUriBtn.Name = OUString( "wwwButton" );
+ aUriBtn.Description = OUString( "A URI button" );
+ aUriBtn.Text = OUString( "to www" );
aUriBtn.Location = Rectangle( Point( 9500, 9000 ), Size( 4500, 3000 ) );
aUriBtn.Border = aUriBtn.Background = true;
- aUriBtn.URL = OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.heise.de" ) );
+ aUriBtn.URL = OUString( "http://www.heise.de" );
aWriter.CreateControl( aUriBtn );
// include a dest button
PDFWriter::PushButtonWidget aDstBtn;
- aDstBtn.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "destButton" ) );
- aDstBtn.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A Dest button" ) );
- aDstBtn.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "to paragraph" ) );
+ aDstBtn.Name = OUString( "destButton" );
+ aDstBtn.Description = OUString( "A Dest button" );
+ aDstBtn.Text = OUString( "to paragraph" );
aDstBtn.Location = Rectangle( Point( 14500, 9000 ), Size( 4500, 3000 ) );
aDstBtn.Border = aDstBtn.Background = true;
aDstBtn.Dest = nFirstDest;
aWriter.CreateControl( aDstBtn );
PDFWriter::CheckBoxWidget aCBox;
- aCBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "textCheckBox" ) );
- aCBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test check box" ) );
- aCBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "check me" ) );
+ aCBox.Name = OUString( "textCheckBox" );
+ aCBox.Description = OUString( "A test check box" );
+ aCBox.Text = OUString( "check me" );
aCBox.Location = Rectangle( Point( 4500, 13500 ), Size( 3000, 750 ) );
aCBox.Checked = true;
aCBox.Border = aCBox.Background = false;
aWriter.CreateControl( aCBox );
PDFWriter::CheckBoxWidget aCBox2;
- aCBox2.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "textCheckBox2" ) );
- aCBox2.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "Another test check box" ) );
- aCBox2.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "check me right" ) );
+ aCBox2.Name = OUString( "textCheckBox2" );
+ aCBox2.Description = OUString( "Another test check box" );
+ aCBox2.Text = OUString( "check me right" );
aCBox2.Location = Rectangle( Point( 4500, 14250 ), Size( 3000, 750 ) );
aCBox2.Checked = true;
aCBox2.Border = aCBox2.Background = false;
@@ -412,9 +412,9 @@ void doTestCode()
aWriter.CreateControl( aCBox2 );
PDFWriter::RadioButtonWidget aRB1;
- aRB1.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb1_1" ) );
- aRB1.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 1 button 1" ) );
- aRB1.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Despair" ) );
+ aRB1.Name = OUString( "rb1_1" );
+ aRB1.Description = OUString( "radio 1 button 1" );
+ aRB1.Text = OUString( "Despair" );
aRB1.Location = Rectangle( Point( 4500, 15000 ), Size( 6000, 1000 ) );
aRB1.Selected = true;
aRB1.RadioGroup = 1;
@@ -427,27 +427,27 @@ void doTestCode()
aWriter.CreateControl( aRB1 );
PDFWriter::RadioButtonWidget aRB2;
- aRB2.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb2_1" ) );
- aRB2.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 2 button 1" ) );
- aRB2.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Joy" ) );
+ aRB2.Name = OUString( "rb2_1" );
+ aRB2.Description = OUString( "radio 2 button 1" );
+ aRB2.Text = OUString( "Joy" );
aRB2.Location = Rectangle( Point( 10500, 15000 ), Size( 3000, 1000 ) );
aRB2.Selected = true;
aRB2.RadioGroup = 2;
aWriter.CreateControl( aRB2 );
PDFWriter::RadioButtonWidget aRB3;
- aRB3.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "rb1_2" ) );
- aRB3.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "radio 1 button 2" ) );
- aRB3.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "Desperation" ) );
+ aRB3.Name = OUString( "rb1_2" );
+ aRB3.Description = OUString( "radio 1 button 2" );
+ aRB3.Text = OUString( "Desperation" );
aRB3.Location = Rectangle( Point( 4500, 16000 ), Size( 3000, 1000 ) );
aRB3.Selected = true;
aRB3.RadioGroup = 1;
aWriter.CreateControl( aRB3 );
PDFWriter::EditWidget aEditBox;
- aEditBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testEdit" ) );
- aEditBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "A test edit field" ) );
- aEditBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "A little test text" ) );
+ aEditBox.Name = OUString( "testEdit" );
+ aEditBox.Description = OUString( "A test edit field" );
+ aEditBox.Text = OUString( "A little test text" );
aEditBox.TextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER;
aEditBox.Location = Rectangle( Point( 10000, 18000 ), Size( 5000, 1500 ) );
aEditBox.MaxLen = 100;
@@ -457,48 +457,48 @@ void doTestCode()
// normal list box
PDFWriter::ListBoxWidget aLstBox;
- aLstBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testListBox" ) );
- aLstBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "One" ) );
- aLstBox.Description = OUString( RTL_CONSTASCII_USTRINGPARAM( "select me" ) );
+ aLstBox.Name = OUString( "testListBox" );
+ aLstBox.Text = OUString( "One" );
+ aLstBox.Description = OUString( "select me" );
aLstBox.Location = Rectangle( Point( 4500, 18000 ), Size( 3000, 1500 ) );
aLstBox.Sort = true;
aLstBox.MultiSelect = true;
aLstBox.Border = aLstBox.Background = true;
aLstBox.BorderColor = Color( COL_BLACK );
- aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "One" ) ) );
- aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Two" ) ) );
- aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Three" ) ) );
- aLstBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Four" ) ) );
+ aLstBox.Entries.push_back( OUString( "One" ) );
+ aLstBox.Entries.push_back( OUString( "Two" ) );
+ aLstBox.Entries.push_back( OUString( "Three" ) );
+ aLstBox.Entries.push_back( OUString( "Four" ) );
aLstBox.SelectedEntries.push_back( 1 );
aLstBox.SelectedEntries.push_back( 2 );
aWriter.CreateControl( aLstBox );
// dropdown list box
- aLstBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testDropDownListBox" ) );
+ aLstBox.Name = OUString( "testDropDownListBox" );
aLstBox.DropDown = true;
aLstBox.Location = Rectangle( Point( 4500, 19500 ), Size( 3000, 500 ) );
aWriter.CreateControl( aLstBox );
// combo box
PDFWriter::ComboBoxWidget aComboBox;
- aComboBox.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "testComboBox" ) );
- aComboBox.Text = OUString( RTL_CONSTASCII_USTRINGPARAM( "test a combobox" ) );
- aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Larry" ) ) );
- aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Curly" ) ) );
- aComboBox.Entries.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "Moe" ) ) );
+ aComboBox.Name = OUString( "testComboBox" );
+ aComboBox.Text = OUString( "test a combobox" );
+ aComboBox.Entries.push_back( OUString( "Larry" ) );
+ aComboBox.Entries.push_back( OUString( "Curly" ) );
+ aComboBox.Entries.push_back( OUString( "Moe" ) );
aComboBox.Location = Rectangle( Point( 4500, 20000 ), Size( 3000, 500 ) );
aWriter.CreateControl( aComboBox );
// test outlines
sal_Int32 nPage1OL = aWriter.CreateOutlineItem();
- aWriter.SetOutlineItemText( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Page 1" ) ) );
+ aWriter.SetOutlineItemText( nPage1OL, OUString( "Page 1" ) );
aWriter.SetOutlineItemDest( nPage1OL, nSecondDest );
- aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2" ) ), nSecondDest );
- aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2 revisited" ) ), nSecondDest );
- aWriter.CreateOutlineItem( nPage1OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 2 again" ) ), nSecondDest );
+ aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2" ), nSecondDest );
+ aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2 revisited" ), nSecondDest );
+ aWriter.CreateOutlineItem( nPage1OL, OUString( "Dest 2 again" ), nSecondDest );
sal_Int32 nPage2OL = aWriter.CreateOutlineItem();
- aWriter.SetOutlineItemText( nPage2OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Page 2" ) ) );
- aWriter.CreateOutlineItem( nPage2OL, OUString( RTL_CONSTASCII_USTRINGPARAM( "Dest 1" ) ), nFirstDest );
+ aWriter.SetOutlineItemText( nPage2OL, OUString( "Page 2" ) );
+ aWriter.CreateOutlineItem( nPage2OL, OUString( "Dest 1" ), nFirstDest );
aWriter.EndStructureElement(); // close document
aWriter.Emit();
@@ -4628,21 +4628,21 @@ we check in the following sequence:
{
sal_Int32 bChangeFileExtensionToPDF = false;
//examine the file type (.odm .odt. .odp, odg, ods)
- if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odm" ) ) ) )
+ if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) )
bChangeFileExtensionToPDF = true;
- if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odt" ) ) ) )
+ if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odp" ) ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "odg" ) ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ods" ) ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) )
bChangeFileExtensionToPDF = true;
if( bChangeFileExtensionToPDF )
- aTargetURL.setExtension(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ) );
+ aTargetURL.setExtension(rtl::OUString( "pdf" ) );
}
//check if extension is pdf, see if GoToR should be forced
- bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ) );
+ bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) );
if( m_aContext.ForcePDFAction && bTargetHasPDFExtension )
nSetGoToRMode++;
}
@@ -4835,13 +4835,13 @@ sal_Int32 PDFWriterImpl::getBestBuiltinFont( const Font& rFont )
OUString aFontName( rFont.GetName() );
aFontName = aFontName.toAsciiLowerCase();
- if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "times" ) ) ) != -1 )
+ if( aFontName.indexOf( OUString( "times" ) ) != -1 )
nBest = 8;
- else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "courier" ) ) ) != -1 )
+ else if( aFontName.indexOf( OUString( "courier" ) ) != -1 )
nBest = 0;
- else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "dingbats" ) ) ) != -1 )
+ else if( aFontName.indexOf( OUString( "dingbats" ) ) != -1 )
nBest = 13;
- else if( aFontName.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( "symbol" ) ) ) != -1 )
+ else if( aFontName.indexOf( OUString( "symbol" ) ) != -1 )
nBest = 12;
if( nBest < 12 )
{
@@ -6100,7 +6100,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations()
// need to set the name of the destination the same way it will be encoded
// in an Internet link
INetURLObject aLocalURL(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "http://ahost.ax" ) ) ); //dummy location, won't be used
+ OUString( "http://ahost.ax" ) ); //dummy location, won't be used
aLocalURL.SetMark( rDest.m_aDestName );
const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as
@@ -6231,7 +6231,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
aLine.append( " 0 obj\n"
"<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier");
- rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "sRGB IEC61966-2.1" ) );
+ rtl::OUString aComment( "sRGB IEC61966-2.1" );
appendLiteralStringEncrypt( aComment ,nOIObject, aLine );
aLine.append("/DestOutputProfile ");
aLine.append( nICCObject );
@@ -6251,19 +6251,19 @@ static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue)
switch( *pUni )
{
case sal_Unicode('&'):
- rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "&" ) );
+ rValue += rtl::OUString( "&" );
break;
case sal_Unicode('<'):
- rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<" ) );
+ rValue += rtl::OUString( "<" );
break;
case sal_Unicode('>'):
- rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ">" ) );
+ rValue += rtl::OUString( ">" );
break;
case sal_Unicode('\''):
- rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" ) );
+ rValue += rtl::OUString( "'" );
break;
case sal_Unicode('"'):
- rValue += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( """ ) );
+ rValue += rtl::OUString( """ );
break;
default:
rValue += rtl::OUString( *pUni );
@@ -10556,7 +10556,7 @@ sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
if( xFact.is() )
{
m_xTrans = uno::Reference < util::XURLTransformer >(
- xFact->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ) ), uno::UNO_QUERY );
+ xFact->createInstance( OUString( "com.sun.star.util.URLTransformer" ) ), uno::UNO_QUERY );
}
}
@@ -11606,7 +11606,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
rRadioButton.m_aKidsIndex.push_back( nNewWidget );
rNewWidget.m_nParent = rRadioButton.m_nObject;
- rNewWidget.m_aValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "Off" ) );
+ rNewWidget.m_aValue = OUString( "Off" );
rNewWidget.m_aOnValue = rBtn.OnValue;
if( rRadioButton.m_aValue.isEmpty() && rBtn.Selected )
{
@@ -11627,7 +11627,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 = rBox.Checked ? OUString(RTL_CONSTASCII_USTRINGPARAM("Yes")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Off" ));
+ rNewWidget.m_aValue = rBox.Checked ? OUString("Yes") : OUString("Off" );
// create default appearance before m_aRect gets transformed
createDefaultCheckBoxAppearance( rNewWidget, rBox );
}
@@ -11722,7 +11722,7 @@ void PDFWriterImpl::addStream( const String& rMimeType, PDFOutputStream* pStream
PDFAddStream& rStream = m_aAdditionalStreams.back();
rStream.m_aMimeType = rMimeType.Len()
? OUString( rMimeType )
- : OUString( RTL_CONSTASCII_USTRINGPARAM( "application/octet-stream" ) );
+ : OUString( "application/octet-stream" );
rStream.m_pStream = pStream;
rStream.m_bCompress = bCompress;
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index f338610..d9aa5dd 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -626,8 +626,8 @@ void PrintDialog::JobTabPage::readFromSettings()
SettingsConfigItem* pItem = SettingsConfigItem::get();
rtl::OUString aValue;
- aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateBox" ) ) );
+ aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "CollateBox" ) );
if( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("alwaysoff")) )
{
mnCollateUIMode = 1;
@@ -637,8 +637,8 @@ void PrintDialog::JobTabPage::readFromSettings()
else
{
mnCollateUIMode = 0;
- aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) );
+ aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "Collate" ) );
maCollateBox.Check( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) );
}
Resize();
@@ -647,13 +647,13 @@ void PrintDialog::JobTabPage::readFromSettings()
void PrintDialog::JobTabPage::storeToSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ),
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "CopyCount" ),
maCopyCountField.GetText() );
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
- maCollateBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "Collate" ),
+ maCollateBox.IsChecked() ? rtl::OUString("true") :
+ rtl::OUString("false") );
}
PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rResId )
@@ -690,8 +690,8 @@ void PrintDialog::OutputOptPage::readFromSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
rtl::OUString aValue;
- aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateSingleJobs" ) ) );
+ aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "CollateSingleJobs" ) );
if ( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
{
maCollateSingleJobsBox.Check( sal_True );
@@ -706,14 +706,14 @@ void PrintDialog::OutputOptPage::readFromSettings()
void PrintDialog::OutputOptPage::storeToSettings()
{
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ),
- maToFileBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))
- : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateSingleJobs" ) ),
- maCollateSingleJobsBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "ToFile" ),
+ maToFileBox.IsChecked() ? rtl::OUString("true")
+ : rtl::OUString("false") );
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "CollateSingleJobs" ),
+ maCollateSingleJobsBox.IsChecked() ? rtl::OUString("true") :
+ rtl::OUString("false") );
}
PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController )
@@ -780,8 +780,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
{
// fall back to last printer
SettingsConfigItem* pItem = SettingsConfigItem::get();
- String aValue( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ) ) );
+ String aValue( pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "LastPrinter" ) ) );
if( maJobPage.maPrinters.GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND )
{
maJobPage.maPrinters.SelectEntry( aValue );
@@ -974,8 +974,8 @@ void PrintDialog::readFromSettings()
// read last selected tab page; if it exists, actiavte it
SettingsConfigItem* pItem = SettingsConfigItem::get();
- rtl::OUString aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ) );
+ rtl::OUString aValue = pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "LastPage" ) );
sal_uInt16 nCount = maTabCtrl.GetPageCount();
for( sal_uInt16 i = 0; i < nCount; i++ )
{
@@ -989,8 +989,8 @@ void PrintDialog::readFromSettings()
maOKButton.SetText( maOptionsPage.maToFileBox.IsChecked() ? maPrintToFileText : maPrintText );
// persistent window state
- rtl::OUString aWinState( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WindowState" ) ) ) );
+ rtl::OUString aWinState( pItem->getValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "WindowState" ) ) );
if( !aWinState.isEmpty() )
SetWindowState( rtl::OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) );
@@ -1009,15 +1009,15 @@ void PrintDialog::storeToSettings()
// store last selected printer
SettingsConfigItem* pItem = SettingsConfigItem::get();
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ),
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "LastPrinter" ),
maJobPage.maPrinters.GetSelectEntry() );
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ),
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "LastPage" ),
maTabCtrl.GetPageText( maTabCtrl.GetCurPageId() ) );
- pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WindowState" ) ),
+ pItem->setValue( rtl::OUString( "PrintDialog" ),
+ rtl::OUString( "WindowState" ),
rtl::OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 )
);
pItem->Commit();
@@ -2042,7 +2042,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
Help* pHelp = Application::GetHelp();
if( pHelp )
{
- pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:OK" ) ), &maOKButton );
+ pHelp->Start( rtl::OUString( ".HelpID:vcl:PrintDialog:OK" ), &maOKButton );
}
}
else if( pButton == &maForwardBtn )
@@ -2119,7 +2119,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
}
else if( pButton == &maJobPage.maCollateBox )
{
- maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
+ maPController->setValue( rtl::OUString( "Collate" ),
makeAny( sal_Bool(isCollate()) ) );
checkControlDependencies();
}
@@ -2127,7 +2127,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
{
sal_Bool bChecked = maJobPage.maReverseOrderBox.IsChecked();
maPController->setReversePrint( bChecked );
- maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ),
+ maPController->setValue( rtl::OUString( "PrintReverse" ),
makeAny( bChecked ) );
preparePreview( true, true );
}
@@ -2163,9 +2163,9 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit )
}
else if( pEdit == &maJobPage.maCopyCountField )
{
- maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ),
+ maPController->setValue( rtl::OUString( "CopyCount" ),
makeAny( sal_Int32(maJobPage.maCopyCountField.GetValue()) ) );
- maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
+ maPController->setValue( rtl::OUString( "Collate" ),
makeAny( sal_Bool(isCollate()) ) );
}
return 0;
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index ac71dbf..a6e6968 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -202,7 +202,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
OUString DropTarget::getImplementationName() throw()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_DROPTARGET_IMPLEMENTATION_NAME));
+ return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME);
}
// ------------------------------------------------------------------------
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index ede6fa8..6321b1c 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -384,38 +384,38 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
XSynchronize( m_pDisplay, True );
#endif
// clipboard selection
- m_nCLIPBOARDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) );
+ m_nCLIPBOARDAtom = getAtom( OUString("CLIPBOARD") );
// special targets
- m_nTARGETSAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TARGETS")) );
- m_nTIMESTAMPAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")) );
- m_nTEXTAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("TEXT")) );
- m_nINCRAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("INCR")) );
- m_nCOMPOUNDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("COMPOUND_TEXT")) );
- m_nMULTIPLEAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("MULTIPLE")) );
- m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("ISO10646-1")) );
- m_nImageBmpAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("image/bmp")) );
+ m_nTARGETSAtom = getAtom( OUString("TARGETS") );
+ m_nTIMESTAMPAtom = getAtom( OUString("TIMESTAMP") );
+ m_nTEXTAtom = getAtom( OUString("TEXT") );
+ m_nINCRAtom = getAtom( OUString("INCR") );
+ m_nCOMPOUNDAtom = getAtom( OUString("COMPOUND_TEXT") );
+ m_nMULTIPLEAtom = getAtom( OUString("MULTIPLE") );
+ m_nUTF16Atom = getAtom( OUString("ISO10646-1") );
+ m_nImageBmpAtom = getAtom( OUString("image/bmp") );
// Atoms for Xdnd protocol
- m_nXdndAware = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndAware")) );
- m_nXdndEnter = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndEnter")) );
- m_nXdndLeave = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndLeave")) );
- m_nXdndPosition = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndPosition")) );
- m_nXdndStatus = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndStatus")) );
- m_nXdndDrop = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndDrop")) );
- m_nXdndFinished = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndFinished")) );
- m_nXdndSelection = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndSelection")) );
- m_nXdndTypeList = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndTypeList")) );
- m_nXdndProxy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndProxy")) );
- m_nXdndActionCopy = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionCopy")) );
- m_nXdndActionMove = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionMove")) );
- m_nXdndActionLink = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionLink")) );
- m_nXdndActionAsk = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionAsk")) );
- m_nXdndActionPrivate= getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("XdndActionPrivate")) );
+ m_nXdndAware = getAtom( OUString("XdndAware") );
+ m_nXdndEnter = getAtom( OUString("XdndEnter") );
+ m_nXdndLeave = getAtom( OUString("XdndLeave") );
+ m_nXdndPosition = getAtom( OUString("XdndPosition") );
+ m_nXdndStatus = getAtom( OUString("XdndStatus") );
+ m_nXdndDrop = getAtom( OUString("XdndDrop") );
+ m_nXdndFinished = getAtom( OUString("XdndFinished") );
+ m_nXdndSelection = getAtom( OUString("XdndSelection") );
+ m_nXdndTypeList = getAtom( OUString("XdndTypeList") );
+ m_nXdndProxy = getAtom( OUString("XdndProxy") );
+ m_nXdndActionCopy = getAtom( OUString("XdndActionCopy") );
+ m_nXdndActionMove = getAtom( OUString("XdndActionMove") );
+ m_nXdndActionLink = getAtom( OUString("XdndActionLink") );
+ m_nXdndActionAsk = getAtom( OUString("XdndActionAsk") );
+ m_nXdndActionPrivate= getAtom( OUString("XdndActionPrivate") );
// initialize map with member none
- m_aAtomToString[ 0 ]= OUString(RTL_CONSTASCII_USTRINGPARAM("None"));
- m_aAtomToString[ XA_PRIMARY ] = OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY"));
+ m_aAtomToString[ 0 ]= OUString("None");
+ m_aAtomToString[ XA_PRIMARY ] = OUString("PRIMARY");
// create a (invisible) message window
m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ),
@@ -677,7 +677,7 @@ bool SelectionManager::convertData(
aEncoding = getTextPlainEncoding( aFlavor.MimeType );
if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
{
- aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
+ aFlavor.MimeType = OUString("text/plain;charset=utf-16");
aFlavor.DataType = getCppuType( (OUString *) 0 );
if( xTransferable->isDataFlavorSupported( aFlavor ) )
{
@@ -869,7 +869,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes,
rOutTypeList.push_front( XA_STRING );
rOutTypeList.push_front( m_nCOMPOUNDAtom );
}
- convertTypeToNative( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-8")), targetselection, nFormat, rOutTypeList, true );
+ convertTypeToNative( OUString("text/plain;charset=utf-8"), targetselection, nFormat, rOutTypeList, true );
}
if( targetselection != m_nXdndSelection )
rOutTypeList.push_back( m_nMULTIPLEAtom );
@@ -1402,7 +1402,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
Sequence< DataFlavor > aTemp( nNewFlavors );
for( i = 0; i < nNewFlavors-1; i++ )
aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
- aTemp.getArray()[0].MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
+ aTemp.getArray()[0].MimeType = OUString("text/plain;charset=utf-16");
aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 );
rTypes = aTemp;
@@ -1522,7 +1522,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
try
{
Any aResult =
- m_xBitmapConverter->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")),
+ m_xBitmapConverter->invoke( OUString("convert-bitmap-depth"),
aArgs, aOutIndex, aOutArgs );
if( aResult >>= xBM )
aData = xBM->getDIB();
@@ -2071,7 +2071,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
// notification about success/failure of one of our conversion requests
#if OSL_DEBUG_LEVEL > 1
OUString aSelection( getString( rNotify.selection ) );
- OUString aProperty(RTL_CONSTASCII_USTRINGPARAM("None"));
+ OUString aProperty("None");
if( rNotify.property )
aProperty = getString( rNotify.property );
fprintf( stderr, "handleSelectionNotify for selection %s and property %s (0x%lx)\n",
@@ -3764,7 +3764,7 @@ void SelectionManager::run( void* pThis )
css::uno::Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() );
if( xFact.is() )
{
- This->m_xDesktop.set(xFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY);
+ This->m_xDesktop.set(xFact->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") ), UNO_QUERY);
if (This->m_xDesktop.is())
This->m_xDesktop->addTerminateListener(This);
}
@@ -4163,7 +4163,7 @@ void SelectionManagerHolder::startDrag(
OUString SelectionManagerHolder::getImplementationName() throw()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_IMPLEMENTATION_NAME));
+ return OUString(XDND_IMPLEMENTATION_NAME);
}
// ------------------------------------------------------------------------
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 0f45b46..858cf2a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -172,11 +172,11 @@ CUPSWrapper::CUPSWrapper()
: m_pLib( NULL ),
m_bPPDThreadRunning( false )
{
- OUString aLib( RTL_CONSTASCII_USTRINGPARAM( CUPS_LIB_NAME ) );
+ OUString aLib( CUPS_LIB_NAME );
m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
if( ! m_pLib )
{
- aLib = OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "cups" ) ) );
+ aLib = OUString( SAL_MODULENAME( "cups" ) );
m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
}
@@ -1100,11 +1100,11 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
{
const char* pRet = NULL;
- OUString aLib(RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ));
+ OUString aLib(_XSALSET_LIBNAME );
oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
if( pLib )
{
- OUString aSym( RTL_CONSTASCII_USTRINGPARAM( "Sal_authenticateQuery" ) );
+ OUString aSym( "Sal_authenticateQuery" );
bool (*getpw)( const OString& rServer, OString& rUser, OString& rPw) =
(bool(*)(const OString&,OString&,OString&))osl_getFunctionSymbol( pLib, aSym.pData );
if( getpw )
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index dc0717c..a059735 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -106,8 +106,8 @@ SAL_IMPLEMENT_MAIN()
* Create UCB.
*/
Sequence< Any > aArgs( 2 );
- aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= OUString(UCB_CONFIGURATION_KEY2_OFFICE );
#if OSL_DEBUG_LEVEL > 1
sal_Bool bSuccess =
#endif
commit 3fa3bf038dd7ded2274b9cc63d73667f5e6f7d2f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 13:55:39 2012 -0500
targeted string re-work
Change-Id: Ie5a8469620650ba67bab8c875e0bc136bd103866
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 0468c1d..0b17f2c 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -60,9 +60,9 @@ public:
uno::Sequence<uno::Any> aUcbInitSequence(2);
aUcbInitSequence[0] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ rtl::OUString("Local");
aUcbInitSequence[1] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory>
xServiceFactory(xFactory, uno::UNO_QUERY);
commit 695e793619c7bcb851cf434f722e4668638056ab
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 13:53:22 2012 -0500
targeted string re-work
Change-Id: I2ee4fbb1e166a926b36b100c47e6da4cf39d51b4
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index fb24a65..8292405 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -82,17 +82,17 @@ namespace css = ::com::sun::star;
#define SEPERATOR_QUERYPARAM ((sal_Unicode)':')
#define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
-#define QUERYPARAM_IFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" ))
-#define QUERYPARAM_EFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" ))
-#define QUERYPARAM_SORT_PROP ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" ))
+#define QUERYPARAM_IFLAGS ::rtl::OUString( "iflags" )
+#define QUERYPARAM_EFLAGS ::rtl::OUString( "eflags" )
+#define QUERYPARAM_SORT_PROP ::rtl::OUString( "sort_prop" )
-#define QUERYPARAM_DESCENDING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" ))
-#define QUERYPARAM_USE_ORDER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" ))
-#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" ))
-#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" ))
+#define QUERYPARAM_DESCENDING ::rtl::OUString( "descending" )
+#define QUERYPARAM_USE_ORDER ::rtl::OUString( "use_order" )
+#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( "default_first" )
+#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( "case_sensitive" )
-#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" ))
-#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" ))
+#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( "name" )
+#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( "uiname" )
@@ -241,7 +241,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
// convert "_query_xxx:..." to "getByDocService=xxx:..."
::rtl::OUString sNewQuery(sQuery);
- sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0);
+ sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( "_query_" ),0);
if (pos != -1)
{
OSL_FAIL("DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'");
@@ -306,43 +306,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
if ( sDocumentService == "writer" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" );
}
else
if ( sDocumentService == "web" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" );
}
else
if ( sDocumentService == "global" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" );
}
else
if ( sDocumentService == "calc" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" );
}
else
if ( sDocumentService == "draw" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" );
}
else
if ( sDocumentService == "impress" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" );
}
else
if ( sDocumentService == "math" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
+ sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" );
}
#endif
@@ -645,7 +645,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
::rtl::OUString FilterFactory::impl_getImplementationName()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" ));
+ return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" );
}
@@ -653,7 +653,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
- lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ));
+ lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" );
return lServiceNames;
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index a324987..16459e5 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2033,7 +2033,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
if ( pCustoShape )
{
uno::Sequence< rtl::OUString > sEquationSource;
- const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
+ const rtl::OUString sEquations( "Equations" );
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)
pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
const uno::Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations );
@@ -2163,19 +2163,19 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( aXPropSet.is() )
{
SdrObjCustomShape* pCustoShape = (SdrObjCustomShape*)GetSdrObjectFromXShape( rXShape );
- const rtl::OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) );
+ const rtl::OUString sCustomShapeGeometry( "CustomShapeGeometry" );
uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry );
uno::Sequence< beans::PropertyValue > aGeoPropSeq;
if ( aGeoPropSet >>= aGeoPropSeq )
{
- const rtl::OUString sViewBox ( RTL_CONSTASCII_USTRINGPARAM( "ViewBox" ) );
- const rtl::OUString sTextRotateAngle ( RTL_CONSTASCII_USTRINGPARAM( "TextRotateAngle" ) );
- const rtl::OUString sExtrusion ( RTL_CONSTASCII_USTRINGPARAM( "Extrusion" ) );
- const rtl::OUString sEquations ( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
- const rtl::OUString sPath ( RTL_CONSTASCII_USTRINGPARAM( "Path" ) );
- const rtl::OUString sTextPath ( RTL_CONSTASCII_USTRINGPARAM( "TextPath" ) );
- const rtl::OUString sHandles ( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
- const rtl::OUString sAdjustmentValues ( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
+ const rtl::OUString sViewBox ( "ViewBox" );
+ const rtl::OUString sTextRotateAngle ( "TextRotateAngle" );
+ const rtl::OUString sExtrusion ( "Extrusion" );
+ const rtl::OUString sEquations ( "Equations" );
+ const rtl::OUString sPath ( "Path" );
+ const rtl::OUString sTextPath ( "TextPath" );
+ const rtl::OUString sHandles ( "Handles" );
+ const rtl::OUString sAdjustmentValues ( "AdjustmentValues" );
const beans::PropertyValue* pAdjustmentValuesProp = NULL;
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
@@ -2240,28 +2240,28 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
for ( r = 0; r < nrCount; r++ )
{
const beans::PropertyValue& rrProp = aExtrusionPropSeq[ r ];
- const rtl::OUString sExtrusionBrightness ( RTL_CONSTASCII_USTRINGPARAM( "Brightness" ) );
- const rtl::OUString sExtrusionDepth ( RTL_CONSTASCII_USTRINGPARAM( "Depth" ) );
- const rtl::OUString sExtrusionDiffusion ( RTL_CONSTASCII_USTRINGPARAM( "Diffusion" ) );
- const rtl::OUString sExtrusionNumberOfLineSegments ( RTL_CONSTASCII_USTRINGPARAM( "NumberOfLineSegments" ) );
- const rtl::OUString sExtrusionLightFace ( RTL_CONSTASCII_USTRINGPARAM( "LightFace" ) );
- const rtl::OUString sExtrusionFirstLightHarsh ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightHarsh" ) );
- const rtl::OUString sExtrusionSecondLightHarsh ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightHarsh" ) );
- const rtl::OUString sExtrusionFirstLightLevel ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightLevel" ) );
- const rtl::OUString sExtrusionSecondLightLevel ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightLevel" ) );
- const rtl::OUString sExtrusionFirstLightDirection ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightDirection" ) );
- const rtl::OUString sExtrusionSecondLightDirection ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightDirection" ) );
- const rtl::OUString sExtrusionMetal ( RTL_CONSTASCII_USTRINGPARAM( "Metal" ) );
- const rtl::OUString sExtrusionShadeMode ( RTL_CONSTASCII_USTRINGPARAM( "ShadeMode" ) );
- const rtl::OUString sExtrusionRotateAngle ( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) );
- const rtl::OUString sExtrusionRotationCenter ( RTL_CONSTASCII_USTRINGPARAM( "RotationCenter" ) );
- const rtl::OUString sExtrusionShininess ( RTL_CONSTASCII_USTRINGPARAM( "Shininess" ) );
- const rtl::OUString sExtrusionSkew ( RTL_CONSTASCII_USTRINGPARAM( "Skew" ) );
- const rtl::OUString sExtrusionSpecularity ( RTL_CONSTASCII_USTRINGPARAM( "Specularity" ) );
- const rtl::OUString sExtrusionProjectionMode ( RTL_CONSTASCII_USTRINGPARAM( "ProjectionMode" ) );
- const rtl::OUString sExtrusionViewPoint ( RTL_CONSTASCII_USTRINGPARAM( "ViewPoint" ) );
- const rtl::OUString sExtrusionOrigin ( RTL_CONSTASCII_USTRINGPARAM( "Origin" ) );
- const rtl::OUString sExtrusionColor ( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
+ const rtl::OUString sExtrusionBrightness ( "Brightness" );
+ const rtl::OUString sExtrusionDepth ( "Depth" );
+ const rtl::OUString sExtrusionDiffusion ( "Diffusion" );
+ const rtl::OUString sExtrusionNumberOfLineSegments ( "NumberOfLineSegments" );
+ const rtl::OUString sExtrusionLightFace ( "LightFace" );
+ const rtl::OUString sExtrusionFirstLightHarsh ( "FirstLightHarsh" );
+ const rtl::OUString sExtrusionSecondLightHarsh ( "SecondLightHarsh" );
+ const rtl::OUString sExtrusionFirstLightLevel ( "FirstLightLevel" );
+ const rtl::OUString sExtrusionSecondLightLevel ( "SecondLightLevel" );
+ const rtl::OUString sExtrusionFirstLightDirection ( "FirstLightDirection" );
+ const rtl::OUString sExtrusionSecondLightDirection ( "SecondLightDirection" );
+ const rtl::OUString sExtrusionMetal ( "Metal" );
+ const rtl::OUString sExtrusionShadeMode ( "ShadeMode" );
+ const rtl::OUString sExtrusionRotateAngle ( "RotateAngle" );
+ const rtl::OUString sExtrusionRotationCenter ( "RotationCenter" );
+ const rtl::OUString sExtrusionShininess ( "Shininess" );
+ const rtl::OUString sExtrusionSkew ( "Skew" );
+ const rtl::OUString sExtrusionSpecularity ( "Specularity" );
+ const rtl::OUString sExtrusionProjectionMode ( "ProjectionMode" );
+ const rtl::OUString sExtrusionViewPoint ( "ViewPoint" );
+ const rtl::OUString sExtrusionOrigin ( "Origin" );
+ const rtl::OUString sExtrusionColor ( "Color" );
if ( rrProp.Name.equals( sExtrusion ) )
{
@@ -2576,16 +2576,16 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
for ( r = 0; r < nrCount; r++ )
{
const beans::PropertyValue& rrProp = aPathPropSeq[ r ];
- const rtl::OUString sPathExtrusionAllowed ( RTL_CONSTASCII_USTRINGPARAM( "ExtrusionAllowed" ) );
- const rtl::OUString sPathConcentricGradientFillAllowed ( RTL_CONSTASCII_USTRINGPARAM( "ConcentricGradientFillAllowed" ) );
- const rtl::OUString sPathTextPathAllowed ( RTL_CONSTASCII_USTRINGPARAM( "TextPathAllowed" ) );
- const rtl::OUString sPathCoordinates ( RTL_CONSTASCII_USTRINGPARAM( "Coordinates" ) );
- const rtl::OUString sPathGluePoints ( RTL_CONSTASCII_USTRINGPARAM( "GluePoints" ) );
- const rtl::OUString sPathGluePointType ( RTL_CONSTASCII_USTRINGPARAM( "GluePointType" ) );
- const rtl::OUString sPathSegments ( RTL_CONSTASCII_USTRINGPARAM( "Segments" ) );
- const rtl::OUString sPathStretchX ( RTL_CONSTASCII_USTRINGPARAM( "StretchX" ) );
- const rtl::OUString sPathStretchY ( RTL_CONSTASCII_USTRINGPARAM( "StretchY" ) );
- const rtl::OUString sPathTextFrames ( RTL_CONSTASCII_USTRINGPARAM( "TextFrames" ) );
+ const rtl::OUString sPathExtrusionAllowed ( "ExtrusionAllowed" );
+ const rtl::OUString sPathConcentricGradientFillAllowed ( "ConcentricGradientFillAllowed" );
+ const rtl::OUString sPathTextPathAllowed ( "TextPathAllowed" );
+ const rtl::OUString sPathCoordinates ( "Coordinates" );
+ const rtl::OUString sPathGluePoints ( "GluePoints" );
+ const rtl::OUString sPathGluePointType ( "GluePointType" );
+ const rtl::OUString sPathSegments ( "Segments" );
+ const rtl::OUString sPathStretchX ( "StretchX" );
+ const rtl::OUString sPathStretchY ( "StretchY" );
+ const rtl::OUString sPathTextFrames ( "TextFrames" );
if ( rrProp.Name.equals( sPathExtrusionAllowed ) )
{
@@ -2893,9 +2893,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
for ( r = 0; r < nrCount; r++ )
{
const beans::PropertyValue& rrProp = aTextPathPropSeq[ r ];
- const rtl::OUString sTextPathMode ( RTL_CONSTASCII_USTRINGPARAM( "TextPathMode" ) );
- const rtl::OUString sTextPathScaleX ( RTL_CONSTASCII_USTRINGPARAM( "ScaleX" ) );
- const rtl::OUString sSameLetterHeights ( RTL_CONSTASCII_USTRINGPARAM( "SameLetterHeights" ) );
+ const rtl::OUString sTextPathMode ( "TextPathMode" );
+ const rtl::OUString sTextPathScaleX ( "ScaleX" );
+ const rtl::OUString sSameLetterHeights ( "SameLetterHeights" );
if ( rrProp.Name.equals( sTextPath ) )
{
@@ -2962,16 +2962,16 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( xText.is() )
aText = xText->getString();
if ( aText.isEmpty() )
- aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "your text" )); // todo: moving into a resource
+ aText = ::rtl::OUString( "your text" ); // todo: moving into a resource
AddOpt( DFF_Prop_gtextUNICODE, aText );
// FontWork Font
rtl::OUString aFontName;
- const rtl::OUString sCharFontName ( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) );
+ const rtl::OUString sCharFontName ( "CharFontName" );
uno::Any aAny = aXPropSet->getPropertyValue( sCharFontName );
aAny >>= aFontName;
if ( aFontName.isEmpty() )
- aFontName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Arial Black" ));
+ aFontName = ::rtl::OUString( "Arial Black" );
AddOpt( DFF_Prop_gtextFont, aFontName );
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" ) ), sal_True ) )
@@ -3061,17 +3061,17 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
const beans::PropertyValue& rPropVal = rPropSeq[ j ];
- const rtl::OUString sPosition ( RTL_CONSTASCII_USTRINGPARAM( "Position" ) );
- const rtl::OUString sMirroredX ( RTL_CONSTASCII_USTRINGPARAM( "MirroredX" ) );
- const rtl::OUString sMirroredY ( RTL_CONSTASCII_USTRINGPARAM( "MirroredY" ) );
- const rtl::OUString sSwitched ( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
- const rtl::OUString sPolar ( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
- const rtl::OUString sRadiusRangeMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMinimum" ) );
- const rtl::OUString sRadiusRangeMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMaximum" ) );
- const rtl::OUString sRangeXMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMinimum" ) );
- const rtl::OUString sRangeXMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMaximum" ) );
- const rtl::OUString sRangeYMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMinimum" ) );
- const rtl::OUString sRangeYMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMaximum" ) );
+ const rtl::OUString sPosition ( "Position" );
+ const rtl::OUString sMirroredX ( "MirroredX" );
+ const rtl::OUString sMirroredY ( "MirroredY" );
+ const rtl::OUString sSwitched ( "Switched" );
+ const rtl::OUString sPolar ( "Polar" );
+ const rtl::OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" );
+ const rtl::OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" );
+ const rtl::OUString sRangeXMinimum ( "RangeXMinimum" );
+ const rtl::OUString sRangeXMaximum ( "RangeXMaximum" );
+ const rtl::OUString sRangeYMinimum ( "RangeYMinimum" );
+ const rtl::OUString sRangeYMaximum ( "RangeYMaximum" );
if ( rPropVal.Name.equals( sPosition ) )
{
@@ -4052,9 +4052,9 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)
pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
- const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM( "Path" ) );
- const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
- const rtl::OUString sGluePointType( RTL_CONSTASCII_USTRINGPARAM( "GluePointType" ) );
+ const rtl::OUString sPath( "Path" );
+ const rtl::OUString sType( "Type" );
+ const rtl::OUString sGluePointType( "GluePointType" );
rtl::OUString sShapeType;
uno::Any* pType = rGeometryItem.GetPropertyValueByName( sType );
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index ebb7367..bbd63d5 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -204,9 +204,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
}
break;
}
- rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )) ));
+ rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ) ));
- if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" )) ) &&
+ if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( "IsFontwork" ) ) &&
::cppu::any2bool( rObj.GetUsrAny() ) ) ||
rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
{
@@ -287,7 +287,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
{
mpEscherEx->OpenContainer( ESCHER_SpContainer );
sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" )));
+ ::rtl::OUString( "CornerRadius" ));
if( nRadius )
{
nRadius = ImplMapSize( Size( nRadius, 0 )).Width();
@@ -316,7 +316,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
{
CircleKind eCircleKind = CircleKind_FULL;
PolyStyle ePolyKind = PolyStyle();
- if ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )) ) )
+ if ( rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleKind" ) ) )
{
eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() );
switch ( eCircleKind )
@@ -351,10 +351,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
else
{
sal_Int32 nStartAngle, nEndAngle;
- if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )) ) )
+ if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleStartAngle" ) ) )
break;
nStartAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() );
- if( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )) ) )
+ if( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleEndAngle" ) ) )
break;
nEndAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() );
@@ -605,7 +605,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
'D' == rObj.GetType().GetChar( 9 ) ) // drawing.3D
{
// SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
- if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )) ) )
+ if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "Bitmap" ) ) )
break;
mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -629,7 +629,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
aPropOpt.CreateShadowProperties( rObj.mXPropSet );
if( USHRT_MAX != mpEscherEx->GetHellLayerId() &&
- rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayerID" )) ) &&
+ rObj.ImplGetPropertyValue( ::rtl::OUString( "LayerID" ) ) &&
(*((sal_uInt16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() )
{
aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
@@ -690,7 +690,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
if ( !mpPicStrm )
mpPicStrm = mpEscherEx->QueryPictureStream();
EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm );
- rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ))));
+ rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" )));
sal_Int32 nAngle = rObj.GetAngle();
if( rObj.GetType().EqualsAscii( "drawing.Line" ))
{
@@ -1042,8 +1042,8 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
xub_StrLen nPos = mType.SearchAscii( "Shape" );
mType.Erase( nPos, 5 );
- static const OUString sPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ));
- static const OUString sEmptyPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ));
+ static const OUString sPresStr("IsPresentationObject" );
+ static const OUString sEmptyPresStr("IsEmptyPresentationObject" );
if( ImplGetPropertyValue( sPresStr ) )
mbPresObj = ::cppu::any2bool( mAny );
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 4b1def1..e2f1c0d 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -39,7 +39,7 @@
using namespace ::com::sun::star;
using namespace ::rtl;
-#define C2U(cChar) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
+#define C2U(cChar) rtl::OUString(cChar)
static char sWW8_form[] = "WW-Standard";
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 6d0abe1..0e79ca4 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -124,7 +124,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
::rtl::OUString supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType)
{
::rtl::OUString sTypeName;
- if ( clipBoardFormat.match(OUString(RTL_CONSTASCII_USTRINGPARAM("doctype:"))) )
+ if ( clipBoardFormat.match(OUString("doctype:")) )
{
::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr();
if (resultString.indexOf(tryStr) >= 0)
@@ -189,7 +189,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
return ::rtl::OUString();
// test typedetect code
- Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ))),UNO_QUERY);
+ Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( "com.sun.star.document.TypeDetection" )),UNO_QUERY);
Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames();
nLength = myTypes.getLength();
@@ -224,7 +224,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
if (location == aArguments.getLength())
{
aArguments.realloc(nLength+1);
- aArguments[location].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeName" ));
+ aArguments[location].Name = ::rtl::OUString( "TypeName" );
}
aArguments[location].Value <<=sTypeName;
}
commit 0188ebf354cb2776f9d846a5f03b07f8bedf348e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 13:45:57 2012 -0500
targeted string re-work
Change-Id: I88cdf9d4c3faab75a80ff72e4268748296a09e50
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 9d9f1cc..5a54eb6 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -120,7 +120,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
sal_Int32 nIndex;
sal_Bool bEmbedded = sal_False;
OUString token;
- OUString aHostName(RTL_CONSTASCII_USTRINGPARAM("localhost"));
+ OUString aHostName("localhost");
sal_Int32 nPort = 3306;
OUString aDbName;
@@ -130,7 +130,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
// parse url. Url has the following format:
// external server: sdbc:mysqlc:[hostname]:[port]/[dbname]
- if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) {
+ if (!url.compareTo(OUString(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) {
nIndex = 12;
} else {
bEmbedded = sal_True;
@@ -202,7 +202,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
}
#ifndef SYSTEM_MYSQL
- ::rtl::OUString sMySQLClientLib( RTL_CONSTASCII_USTRINGPARAM( MYSQL_LIB ) );
+ ::rtl::OUString sMySQLClientLib( MYSQL_LIB );
::rtl::OUString moduleBase;
OSL_VERIFY( ::osl::Module::getUrlFromAddress( &thisModule, moduleBase ) );
@@ -250,7 +250,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
// Check if the server is 4.1 or above
if (this->getMysqlVersion() < 40100) {
throw SQLException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ) ),
+ ::rtl::OUString( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ),
*this,
::rtl::OUString(),
0,
@@ -764,9 +764,9 @@ sal_Int32 OConnection::getMysqlVersion()
try {
Sequence< Any > aArgs(1);
Reference< XConnection> xCon = this;
- aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny(xCon));
+ aArgs[0] <<= NamedValue(::rtl::OUString("ActiveConnection"), makeAny(xCon));
- m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")),aArgs),UNO_QUERY);
+ m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY);
} catch(const Exception&) {}
}
if ( m_xParameterSubstitution.is() ) {
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 289b4c8..676c6c6 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -83,7 +83,7 @@ OUString MysqlCDriver::getImplementationName_Static()
throw(RuntimeException)
{
OSL_TRACE("MysqlCDriver::getImplementationName_Static");
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ) );
+ return ::rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" );
}
/* }}} */
@@ -96,7 +96,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static()
// which service is supported
// for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS(1);
- aSNS[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+ aSNS[0] = OUString("com.sun.star.sdbc.Driver");
return aSNS;
}
/* }}} */
@@ -146,7 +146,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
#else
if ( !m_bAttemptedLoadCppConn )
{
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB ));
+ const ::rtl::OUString sModuleName(CPPCONN_LIB );
m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
m_bAttemptedLoadCppConn = true;
}
@@ -156,16 +156,16 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
{
OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
throw SQLException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ),
+ ::rtl::OUString( "Unable to load the " CPPCONN_LIB " library." ),
*this,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ ::rtl::OUString( "08001" ), // "unable to connect"
0,
Any()
);
}
// find the factory symbol
- const ::rtl::OUString sSymbolName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sql_mysql_get_driver_instance" ) );
+ const ::rtl::OUString sSymbolName = ::rtl::OUString( "sql_mysql_get_driver_instance" );
typedef void* (* FGetMySQLDriver)();
const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
@@ -173,9 +173,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
{
OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
throw SQLException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ),
+ ::rtl::OUString( CPPCONN_LIB " is invalid: missing the driver factory function." ),
*this,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ ::rtl::OUString( "08001" ), // "unable to connect"
0,
Any()
);
@@ -186,9 +186,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
if ( !cppDriver )
{
throw SQLException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain the MySQL_Driver instance from Connector/C++." ) ),
+ ::rtl::OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++." ),
*this,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ ::rtl::OUString( "08001" ), // "unable to connect"
0,
Any()
);
@@ -211,7 +211,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
impl_initCppConn_lck_throw();
OSL_POSTCOND( cppDriver, "MySQLCDriver::connect: internal error." );
if ( !cppDriver )
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQLCDriver::connect: internal error." ) ), *this );
+ throw RuntimeException( ::rtl::OUString( "MySQLCDriver::connect: internal error." ), *this );
}
Reference< XConnection > xConn;
@@ -237,7 +237,7 @@ sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url)
throw(SQLException, RuntimeException)
{
OSL_TRACE("MysqlCDriver::acceptsURL");
- return (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysqlc:")), sizeof("sdbc:mysqlc:")-1));
+ return (!url.compareTo(OUString("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1));
}
/* }}} */
@@ -251,17 +251,17 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt
::std::vector< DriverPropertyInfo > aDriverInfo;
aDriverInfo.push_back(DriverPropertyInfo(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname"))
- ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host"))
+ OUString("Hostname")
+ ,OUString("Name of host")
,sal_True
- ,OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))
+ ,OUString("localhost")
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
- ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
+ OUString("Port")
+ ,OUString("Port")
,sal_True
- ,OUString(RTL_CONSTASCII_USTRINGPARAM("3306"))
+ ,OUString("3306")
,Sequence< OUString >())
);
return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index 58a73d4..0c9f75a 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -56,7 +56,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo
try
{
Reference< XFramesSupplier > xDesktop( rxFact->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), rxFact ), UNO_QUERY_THROW );
+ OUString( "com.sun.star.frame.Desktop" ), rxFact ), UNO_QUERY_THROW );
Reference< XFrame > xFrame( xDesktop->getActiveFrame() );
Reference< XWindow > xWindow( xFrame->getContainerWindow() );
Reference< XDevice > xDevice( xWindow, UNO_QUERY_THROW );
@@ -72,7 +72,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo
void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
{
const rtl::OUString aGraphicURL( rUser.maGraphicURL );
- const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.GraphicObject:") );
+ const rtl::OUString sPackageURL( "vnd.sun.star.GraphicObject:" );
if ( rGraphicSettings.mbEmbedLinkedGraphics || (aGraphicURL.isEmpty() || aGraphicURL.match( sPackageURL, 0 ) ) )
{
@@ -231,8 +231,8 @@ void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMSF, cons
{
try
{
- const OUString sGraphicObjectShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) );
- const OUString sGroupShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) );
+ const OUString sGraphicObjectShape( "com.sun.star.drawing.GraphicObjectShape" );
+ const OUString sGroupShape( "com.sun.star.drawing.GroupShape" );
Reference< XShape > xShape( rxShapes->getByIndex( i ), UNO_QUERY_THROW );
const OUString sShapeType( xShape->getShapeType() );
if ( sShapeType == sGroupShape )
@@ -356,8 +356,8 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const
{
try
{
- const OUString sGraphicObjectShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) );
- const OUString sGroupShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) );
+ const OUString sGraphicObjectShape( "com.sun.star.drawing.GraphicObjectShape" );
+ const OUString sGroupShape( "com.sun.star.drawing.GroupShape" );
Reference< XShape > xShape( rxShapes->getByIndex( i ), UNO_QUERY_THROW );
const OUString sShapeType( xShape->getShapeType() );
if ( sShapeType == sGroupShape )
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 7de6afb..befea53 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -132,7 +132,7 @@ void ImpDeleteHiddenSlides( const Reference< XModel >& rxModel )
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
sal_Bool bVisible = sal_True;
- const OUString sVisible( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) );
+ const OUString sVisible( "Visible" );
if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
{
if (!bVisible )
@@ -163,7 +163,7 @@ void ImpDeleteNotesPages( const Reference< XModel >& rxModel )
while( xShapes->getCount() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list