From c980158a8286d5f583bd9d844aed2018bea310ea Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 31 Oct 2013 13:48:17 +0200 Subject: remove unnecessary use of OUString constructor in VCL module Change-Id: Ie2b9aca5c3db46b43c53f72699fe828b28daeaa1 --- vcl/aqua/source/window/salmenu.cxx | 4 +- vcl/qa/cppunit/dndtest.cxx | 2 +- vcl/source/components/dtranscomp.cxx | 6 +- vcl/source/filter/graphicfilter.cxx | 58 ++++++++++---------- vcl/source/filter/igif/gifread.cxx | 2 +- vcl/source/filter/ixbm/xbmread.cxx | 2 +- vcl/source/filter/jpeg/JpegReader.cxx | 2 +- vcl/source/filter/sgvtext.cxx | 2 +- vcl/source/gdi/outdev3.cxx | 16 +++--- vcl/source/gdi/pdfwriter_impl.cxx | 94 ++++++++++++++++---------------- vcl/source/gdi/pdfwriter_impl2.cxx | 12 ++-- vcl/source/window/window.cxx | 12 ++-- vcl/unx/generic/dtrans/X11_selection.cxx | 8 +-- vcl/unx/generic/dtrans/X11_service.cxx | 6 +- vcl/unx/gtk/gdi/salprn-gtk.cxx | 14 ++--- vcl/unx/kde/UnxFilePicker.cxx | 8 +-- vcl/unx/kde4/KDE4FilePicker.cxx | 6 +- 17 files changed, 127 insertions(+), 127 deletions(-) diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 0e73a7571cb5..09dc2ac9410a 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -64,9 +64,9 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; { OUString aDialog; if( nDialog == SHOWDIALOG_ID_ABOUT ) - aDialog = OUString("ABOUT"); + aDialog = "ABOUT"; else if( nDialog == SHOWDIALOG_ID_PREFERENCES ) - aDialog = OUString("PREFERENCES"); + aDialog = "PREFERENCES"; const ApplicationEvent* pAppEvent = new ApplicationEvent( ApplicationEvent::TYPE_SHOWDIALOG, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx index c6051c3f30e5..4bc18902e05d 100644 --- a/vcl/qa/cppunit/dndtest.cxx +++ b/vcl/qa/cppunit/dndtest.cxx @@ -118,7 +118,7 @@ public: { DataFlavor df; - df.MimeType = OUString("text/plain;charset=utf-16"); + df.MimeType = "text/plain;charset=utf-16"; df.DataType = getCppuType( static_cast < OUString * > ( 0 ) ); m_aFlavorList[0] = df; diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index cb4b6b2c7e3f..fed5316fef91 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -131,7 +131,7 @@ OUString GenericClipboard::getImplementationName_static() Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"); + aRet[0] = "com.sun.star.datatransfer.clipboard.SystemClipboard"; return aRet; } @@ -305,7 +305,7 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); - aRet[0] = OUString("com.sun.star.datatransfer.dnd.GenericDragSource"); + aRet[0] = "com.sun.star.datatransfer.dnd.GenericDragSource"; return aRet; } @@ -416,7 +416,7 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); - aRet[0] = OUString("com.sun.star.datatransfer.dnd.GenericDropTarget"); + aRet[0] = "com.sun.star.datatransfer.dnd.GenericDropTarget"; return aRet; } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 651a881774d2..6229a77d56f5 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -331,7 +331,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, } rStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); if (bOK && !rStream.GetError()) { - rFormatExtension = OUString("MET"); + rFormatExtension = "MET"; return true; } } @@ -366,7 +366,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, sFirstBytes[14+nOffs] == 0x28 || sFirstBytes[14+nOffs] == 0x0c ) { - rFormatExtension = OUString("BMP"); + rFormatExtension = "BMP"; return true; } } @@ -382,13 +382,13 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if ( nFirstLong==0xd7cdc69a || nFirstLong==0x01000900 ) { - rFormatExtension = OUString("WMF"); + rFormatExtension = "WMF"; return true; } else if( nFirstLong == 0x01000000 && sFirstBytes[ 40 ] == 0x20 && sFirstBytes[ 41 ] == 0x45 && sFirstBytes[ 42 ] == 0x4d && sFirstBytes[ 43 ] == 0x46 ) { - rFormatExtension = OUString("EMF"); + rFormatExtension = "EMF"; return true; } } @@ -403,7 +403,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, sal_uInt8 nEncoding=sFirstBytes[2]; if( ( nVersion==0 || nVersion==2 || nVersion==3 || nVersion==5 ) && nEncoding<=1 ) { - rFormatExtension = OUString("PCX"); + rFormatExtension = "PCX"; return true; } } @@ -415,7 +415,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if ( nFirstLong==0x49492a00 || nFirstLong==0x4d4d002a ) { - rFormatExtension = OUString("TIF"); + rFormatExtension = "TIF"; return true; } } @@ -426,7 +426,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if ( nFirstLong==0x47494638 && (sFirstBytes[4]==0x37 || sFirstBytes[4]==0x39) && sFirstBytes[5]==0x61 ) { - rFormatExtension = OUString("GIF"); + rFormatExtension = "GIF"; return true; } } @@ -437,7 +437,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if (nFirstLong==0x89504e47 && nSecondLong==0x0d0a1a0a) { - rFormatExtension = OUString("PNG"); + rFormatExtension = "PNG"; return true; } } @@ -449,7 +449,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if ( ( nFirstLong==0xffd8ffe0 && sFirstBytes[6]==0x4a && sFirstBytes[7]==0x46 && sFirstBytes[8]==0x49 && sFirstBytes[9]==0x46 ) || ( nFirstLong==0xffd8fffe ) || ( 0xffd8ff00 == ( nFirstLong & 0xffffff00 ) ) ) { - rFormatExtension = OUString("JPG"); + rFormatExtension = "JPG"; return true; } } @@ -460,13 +460,13 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if( nFirstLong==0x53564744 && sFirstBytes[4]==0x49 ) { - rFormatExtension = OUString("SVM"); + rFormatExtension = "SVM"; return true; } else if( sFirstBytes[0]==0x56 && sFirstBytes[1]==0x43 && sFirstBytes[2]==0x4C && sFirstBytes[3]==0x4D && sFirstBytes[4]==0x54 && sFirstBytes[5]==0x46 ) { - rFormatExtension = OUString("SVM"); + rFormatExtension = "SVM"; return true; } } @@ -481,9 +481,9 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, rStream.Seek( nStreamPos + 2048 ); rStream.Read( sBuf, 7 ); - if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 ) + if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 ) { - rFormatExtension = OUString("PCD"); + rFormatExtension = "PCD"; return true; } } @@ -495,7 +495,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested = true; if ( ( nFirstLong == 0x38425053 ) && ( (nSecondLong >> 16 ) == 1 ) ) { - rFormatExtension = OUString("PSD"); + rFormatExtension = "PSD"; return true; } } @@ -507,7 +507,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 ) && ImplSearchEntry( &sFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) ) { - rFormatExtension = OUString("EPS"); + rFormatExtension = "EPS"; return true; } } @@ -518,7 +518,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, // Binary DXF File Format if( strncmp( (const char*) sFirstBytes, "AutoCAD Binary DXF", 18 ) == 0 ) { - rFormatExtension = OUString("DXF"); + rFormatExtension = "DXF"; return true; } @@ -540,7 +540,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if (i+7<256 && (strncmp((const char*)(sFirstBytes+i),"SECTION",7)==0)) { - rFormatExtension = OUString("DXF"); + rFormatExtension = "DXF"; return true; } } @@ -553,7 +553,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested = true; if (isPCT(rStream, nStreamPos, nStreamLen)) { - rFormatExtension = OUString("PCT"); + rFormatExtension = "PCT"; return true; } } @@ -571,17 +571,17 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, { case '1' : case '4' : - rFormatExtension = OUString("PBM"); + rFormatExtension = "PBM"; return true; case '2' : case '5' : - rFormatExtension = OUString("PGM"); + rFormatExtension = "PGM"; return true; case '3' : case '6' : - rFormatExtension = OUString("PPM"); + rFormatExtension = "PPM"; return true; } } @@ -593,7 +593,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if( nFirstLong == 0x59a66a95 ) { - rFormatExtension = OUString("RAS"); + rFormatExtension = "RAS"; return true; } } @@ -604,7 +604,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested = true; if( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"/* XPM */", 256, 9 ) ) { - rFormatExtension = OUString("XPM"); + rFormatExtension = "XPM"; return true; } } @@ -628,7 +628,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, { if( ImplSearchEntry( pPtr, (sal_uInt8*)"_width", pBuf + nSize - pPtr, 6 ) ) { - rFormatExtension = OUString("XBM"); + rFormatExtension = "XBM"; delete[] pBuf; return true; } @@ -685,7 +685,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if(bIsSvg) { - rFormatExtension = OUString( "SVG" ); + rFormatExtension = "SVG"; return true; } } @@ -723,7 +723,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, if(bIsSvg) { - rFormatExtension = OUString( "SVG" ); + rFormatExtension = "SVG"; return true; } } @@ -760,7 +760,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, bSomethingTested=true; if( sFirstBytes[ 0 ] == 'J' && sFirstBytes[ 1 ] == 'J' ) { - rFormatExtension = OUString("SGF"); + rFormatExtension = "SGF"; return true; } } @@ -925,11 +925,11 @@ static OUString ImpCreateFullFilterPath( const OUString& rPath, const OUString& OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); - aPathURL += OUString( '/' ); + aPathURL += "/"; OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); - aSystemPath += OUString( rFilterName ); + aSystemPath += rFilterName; return OUString( aSystemPath ); } diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index aac5659baf21..99d202961004 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -45,7 +45,7 @@ GIFReader::GIFReader( SvStream& rStm ) : bGCTransparent ( false ), bImGraphicReady ( false ) { - maUpperName = OUString("SVIGIF"); + maUpperName = "SVIGIF"; pSrcBuf = new sal_uInt8[ 256 ]; ClearImageExtensions(); } diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 0e4b22c51885..7dfc3334143a 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -36,7 +36,7 @@ XBMReader::XBMReader( SvStream& rStm ) : bStatus ( true ) { pHexTable = new short[ 256 ]; - maUpperName = OUString("SVIXBM"); + maUpperName = "SVIXBM"; InitTable(); } diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index a79f5ca12a02..1a2416a8ddd6 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -195,7 +195,7 @@ JPEGReader::JPEGReader( SvStream& rStream, void* /*pCallData*/, bool bSetLogSize mnLastLines ( 0 ), mbSetLogSize ( bSetLogSize ) { - maUpperName = OUString("SVIJPEG"); + maUpperName = "SVIJPEG"; mnFormerPos = mnLastPos; } diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 113cfff9eb93..377736cfabdd 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -567,7 +567,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u aFont.SetFamily(FAMILY_ROMAN); aFont.SetPitch(PITCH_FIXED); } break; - default: FNam = OUString("Helvetica"); + default: FNam = "Helvetica"; } aFont.SetName(FNam); //aFont.SetCharSet(CHARSET_SYSTEM); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 66e8ab173cfa..2737159a7259 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -1320,7 +1320,7 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r // apply outdev3.cxx specific fontname normalization GetEnglishSearchFontName( rFontSelData.maSearchName ); else - rFontSelData.maSearchName = OUString(); + rFontSelData.maSearchName = ""; // See fdo#32665 for an example. FreeSerif that has glyphs in normal // font, but not in the italic or bold version @@ -2390,17 +2390,17 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, { OUString aBoldName; if( aSearchName.startsWithIgnoreAsciiCase( "hggothicb" ) ) - aBoldName = OUString("hggothice"); + aBoldName = "hggothice"; else if( aSearchName.startsWithIgnoreAsciiCase( "hgpgothicb" ) ) - aBoldName = OUString("hgpgothice"); + aBoldName = "hgpgothice"; else if( aSearchName.startsWithIgnoreAsciiCase( "hgminchol" ) ) - aBoldName = OUString("hgminchob"); + aBoldName = "hgminchob"; else if( aSearchName.startsWithIgnoreAsciiCase( "hgpminchol" ) ) - aBoldName = OUString("hgpminchob"); + aBoldName = "hgpminchob"; else if( aSearchName.equalsIgnoreAsciiCase( "hgminchob" ) ) - aBoldName = OUString("hgminchoe"); + aBoldName = "hgminchoe"; else if( aSearchName.equalsIgnoreAsciiCase( "hgpminchob" ) ) - aBoldName = OUString("hgpminchoe"); + aBoldName = "hgpminchoe"; if( !aBoldName.isEmpty() && ImplFindBySearchName( aBoldName ) ) { @@ -2690,7 +2690,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, // override the font name rFontSelData.SetFamilyName( pFallbackData->GetFamilyName() ); // clear the cached normalized name - rFontSelData.maSearchName = OUString(); + rFontSelData.maSearchName = ""; } // get device font without doing device specific substitutions diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index fa35683904b1..f6e823a26f0f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -125,20 +125,20 @@ void doTestCode() static const char* pHome = getenv( "HOME" ); OUString aTestFile( "file://" ); aTestFile += OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); - aTestFile += OUString( "/pdf_export_test.pdf" ); + aTestFile += "/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( "PDF export test document" ); - aContext.DocumentInfo.Producer = OUString( "VCL" ); + aContext.DocumentInfo.Title = "PDF export test document"; + aContext.DocumentInfo.Producer = "VCL"; aContext.SignPDF = true; - aContext.SignLocation = OUString( "Burdur" ); - aContext.SignReason = OUString( "Some valid reason to sign" ); - aContext.SignContact = OUString( "signer@example.com" ); + aContext.SignLocation = "Burdur"; + aContext.SignReason = "Some valid reason to sign"; + aContext.SignContact = "signer@example.com"; com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > xEnc; PDFWriter aWriter( aContext, xEnc ); @@ -339,46 +339,46 @@ void doTestCode() // include a button PDFWriter::PushButtonWidget aBtn; - aBtn.Name = OUString( "testButton" ); - aBtn.Description = OUString( "A test button" ); - aBtn.Text = OUString( "hit me" ); + aBtn.Name = "testButton"; + aBtn.Description = "A test button"; + aBtn.Text = "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( "wwwButton" ); - aUriBtn.Description = OUString( "A URI button" ); - aUriBtn.Text = OUString( "to www" ); + aUriBtn.Name = "wwwButton"; + aUriBtn.Description = "A URI button"; + aUriBtn.Text = "to www"; aUriBtn.Location = Rectangle( Point( 9500, 9000 ), Size( 4500, 3000 ) ); aUriBtn.Border = aUriBtn.Background = true; - aUriBtn.URL = OUString( "http://www.heise.de" ); + aUriBtn.URL = "http://www.heise.de"; aWriter.CreateControl( aUriBtn ); // include a dest button PDFWriter::PushButtonWidget aDstBtn; - aDstBtn.Name = OUString( "destButton" ); - aDstBtn.Description = OUString( "A Dest button" ); - aDstBtn.Text = OUString( "to paragraph" ); + aDstBtn.Name = "destButton"; + aDstBtn.Description = "A Dest button"; + aDstBtn.Text = "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( "textCheckBox" ); - aCBox.Description = OUString( "A test check box" ); - aCBox.Text = OUString( "check me" ); + aCBox.Name = "textCheckBox"; + aCBox.Description = "A test check box"; + aCBox.Text = "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( "textCheckBox2" ); - aCBox2.Description = OUString( "Another test check box" ); - aCBox2.Text = OUString( "check me right" ); + aCBox2.Name = "textCheckBox2"; + aCBox2.Description = "Another test check box"; + aCBox2.Text = "check me right"; aCBox2.Location = Rectangle( Point( 4500, 14250 ), Size( 3000, 750 ) ); aCBox2.Checked = true; aCBox2.Border = aCBox2.Background = false; @@ -386,9 +386,9 @@ void doTestCode() aWriter.CreateControl( aCBox2 ); PDFWriter::RadioButtonWidget aRB1; - aRB1.Name = OUString( "rb1_1" ); - aRB1.Description = OUString( "radio 1 button 1" ); - aRB1.Text = OUString( "Despair" ); + aRB1.Name = "rb1_1"; + aRB1.Description = "radio 1 button 1"; + aRB1.Text = "Despair"; aRB1.Location = Rectangle( Point( 4500, 15000 ), Size( 6000, 1000 ) ); aRB1.Selected = true; aRB1.RadioGroup = 1; @@ -401,27 +401,27 @@ void doTestCode() aWriter.CreateControl( aRB1 ); PDFWriter::RadioButtonWidget aRB2; - aRB2.Name = OUString( "rb2_1" ); - aRB2.Description = OUString( "radio 2 button 1" ); - aRB2.Text = OUString( "Joy" ); + aRB2.Name = "rb2_1"; + aRB2.Description = "radio 2 button 1"; + aRB2.Text = "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( "rb1_2" ); - aRB3.Description = OUString( "radio 1 button 2" ); - aRB3.Text = OUString( "Desperation" ); + aRB3.Name = "rb1_2"; + aRB3.Description = "radio 1 button 2"; + aRB3.Text = "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( "testEdit" ); - aEditBox.Description = OUString( "A test edit field" ); - aEditBox.Text = OUString( "A little test text" ); + aEditBox.Name = "testEdit"; + aEditBox.Description = "A test edit field"; + aEditBox.Text = "A little test text"; aEditBox.TextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER; aEditBox.Location = Rectangle( Point( 10000, 18000 ), Size( 5000, 1500 ) ); aEditBox.MaxLen = 100; @@ -431,9 +431,9 @@ void doTestCode() // normal list box PDFWriter::ListBoxWidget aLstBox; - aLstBox.Name = OUString( "testListBox" ); - aLstBox.Text = OUString( "One" ); - aLstBox.Description = OUString( "select me" ); + aLstBox.Name = "testListBox"; + aLstBox.Text = "One"; + aLstBox.Description = "select me"; aLstBox.Location = Rectangle( Point( 4500, 18000 ), Size( 3000, 1500 ) ); aLstBox.Sort = true; aLstBox.MultiSelect = true; @@ -448,15 +448,15 @@ void doTestCode() aWriter.CreateControl( aLstBox ); // dropdown list box - aLstBox.Name = OUString( "testDropDownListBox" ); + aLstBox.Name = "testDropDownListBox"; aLstBox.DropDown = true; aLstBox.Location = Rectangle( Point( 4500, 19500 ), Size( 3000, 500 ) ); aWriter.CreateControl( aLstBox ); // combo box PDFWriter::ComboBoxWidget aComboBox; - aComboBox.Name = OUString( "testComboBox" ); - aComboBox.Text = OUString( "test a combobox" ); + aComboBox.Name = "testComboBox"; + aComboBox.Text = "test a combobox"; aComboBox.Entries.push_back( OUString( "Larry" ) ); aComboBox.Entries.push_back( OUString( "Curly" ) ); aComboBox.Entries.push_back( OUString( "Moe" ) ); @@ -6389,19 +6389,19 @@ static void escapeStringXML( const OUString& rStr, OUString &rValue) switch( *pUni ) { case sal_Unicode('&'): - rValue += OUString( "&" ); + rValue += "&"; break; case sal_Unicode('<'): - rValue += OUString( "<" ); + rValue += "<"; break; case sal_Unicode('>'): - rValue += OUString( ">" ); + rValue += ">"; break; case sal_Unicode('\''): - rValue += OUString( "'" ); + rValue += "'"; break; case sal_Unicode('"'): - rValue += OUString( """ ); + rValue += """; break; default: rValue += OUString( *pUni ); @@ -6926,7 +6926,7 @@ bool PDFWriterImpl::emit() { // sign the document PDFWriter::SignatureWidget aSignature; - aSignature.Name = OUString("Signature1"); + aSignature.Name = "Signature1"; createControl( aSignature, 0 ); } #endif @@ -11882,7 +11882,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( "Off" ); + rNewWidget.m_aValue = "Off"; rNewWidget.m_aOnValue = rBtn.OnValue; if( rRadioButton.m_aValue.isEmpty() && rBtn.Selected ) { diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 7089abccd057..121f23def198 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -181,9 +181,9 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz sal_Int32 nColorMode = 0; Sequence< PropertyValue > aFilterData( 2 ); - aFilterData[ 0 ].Name = OUString( "Quality" ); + aFilterData[ 0 ].Name = "Quality"; aFilterData[ 0 ].Value <<= sal_Int32(i_rContext.m_nJPEGQuality); - aFilterData[ 1 ].Name = OUString( "ColorMode" ); + aFilterData[ 1 ].Name = "ColorMode"; aFilterData[ 1 ].Value <<= nColorMode; try @@ -196,11 +196,11 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz uno::Reference < io::XOutputStream > xOut( xStream->getOutputStream() ); OUString aMimeType("image/jpeg"); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 3 ); - aOutMediaProperties[0].Name = OUString("OutputStream"); + aOutMediaProperties[0].Name = "OutputStream"; aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = OUString("MimeType"); + aOutMediaProperties[1].Name = "MimeType"; aOutMediaProperties[1].Value <<= aMimeType; - aOutMediaProperties[2].Name = OUString("FilterData"); + aOutMediaProperties[2].Name = "FilterData"; aOutMediaProperties[2].Value <<= aFilterData; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); xOut->flush(); @@ -214,7 +214,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz xSeekable->seek( 0 ); Sequence< PropertyValue > aArgs( 1 ); - aArgs[ 0 ].Name = OUString("InputStream"); + aArgs[ 0 ].Name = "InputStream"; aArgs[ 0 ].Value <<= xStream; uno::Reference< XPropertySet > xPropSet( xGraphicProvider->queryGraphicDescriptor( aArgs ) ); if ( xPropSet.is() ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 91d790650c55..be193a8a940c 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8407,20 +8407,20 @@ uno::Reference< XDragSource > Window::GetDragSource() Sequence< Any > aDragSourceAL( 2 ), aDropTargetAL( 2 ); OUString aDragSourceSN, aDropTargetSN; #if defined WNT - aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource"); - aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget"); + aDragSourceSN = "com.sun.star.datatransfer.dnd.OleDragSource"; + aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget"; aDragSourceAL[ 1 ] = makeAny( static_cast( reinterpret_cast(pEnvData->hWnd) ) ); aDropTargetAL[ 0 ] = makeAny( static_cast( reinterpret_cast(pEnvData->hWnd) ) ); #elif defined MACOSX /* FIXME: Mac OS X specific dnd interface does not exist! * * Using Windows based dnd as a temporary solution */ - aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource"); - aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget"); + aDragSourceSN = "com.sun.star.datatransfer.dnd.OleDragSource"; + aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget"; aDragSourceAL[ 1 ] = makeAny( static_cast( reinterpret_cast(pEnvData->pView) ) ); aDropTargetAL[ 0 ] = makeAny( static_cast( reinterpret_cast(pEnvData->pView) ) ); #elif HAVE_FEATURE_X11 - aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.X11DragSource"); - aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.X11DropTarget"); + aDragSourceSN = "com.sun.star.datatransfer.dnd.X11DragSource"; + aDropTargetSN = "com.sun.star.datatransfer.dnd.X11DropTarget"; aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() ); aDropTargetAL[ 0 ] = makeAny( Application::GetDisplayConnection() ); diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 11560fa3d596..9b9ac19cda6c 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -393,8 +393,8 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c m_nXdndActionPrivate= getAtom( OUString("XdndActionPrivate") ); // initialize map with member none - m_aAtomToString[ 0 ]= OUString("None"); - m_aAtomToString[ XA_PRIMARY ] = OUString("PRIMARY"); + m_aAtomToString[ 0 ]= "None"; + m_aAtomToString[ XA_PRIMARY ] = "PRIMARY"; // create a (invisible) message window m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ), @@ -663,7 +663,7 @@ bool SelectionManager::convertData( aEncoding = getTextPlainEncoding( aFlavor.MimeType ); if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText ) { - aFlavor.MimeType = OUString("text/plain;charset=utf-16"); + aFlavor.MimeType = "text/plain;charset=utf-16"; aFlavor.DataType = getCppuType( (OUString *) 0 ); if( xTransferable->isDataFlavorSupported( aFlavor ) ) { @@ -1387,7 +1387,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("text/plain;charset=utf-16"); + aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16"; aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 ); rTypes = aTemp; diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index d99347b9d9ca..644e88db036f 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -39,21 +39,21 @@ using namespace x11; Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"); + aRet[0] = "com.sun.star.datatransfer.clipboard.SystemClipboard"; return aRet; } Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.datatransfer.dnd.X11DragSource"); + aRet[0] = "com.sun.star.datatransfer.dnd.X11DragSource"; return aRet; } Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.datatransfer.dnd.X11DropTarget"); + aRet[0] = "com.sun.star.datatransfer.dnd.X11DropTarget"; return aRet; } diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 4a28fcd7d23f..85404f1e6fb9 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -946,9 +946,9 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); uno::Sequence aFilterData(2); - aFilterData[0].Name = OUString("PageLayout"); + aFilterData[0].Name = "PageLayout"; aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = OUString("FirstPageOnLeft"); + aFilterData[1].Name = "FirstPageOnLeft"; aFilterData[1].Value <<= sal_False; @@ -971,7 +971,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aRangeText.AppendAscii(","); } aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Name = "PageRange"; aFilterData[aFilterData.getLength()-1].Value <<= OUString(aRangeText); } else if (pStr && !strcmp(pStr, "current")) @@ -1011,7 +1011,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe if (i < xSheets->getCount()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Name = "PageRange"; aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1)); } } @@ -1037,15 +1037,15 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe if (aSelection.hasValue()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = OUString("Selection"); + aFilterData[aFilterData.getLength()-1].Name = "Selection"; aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } #endif uno::Sequence aArgs(2); - aArgs[0].Name = OUString("FilterData"); + aArgs[0].Name = "FilterData"; aArgs[0].Value <<= aFilterData; - aArgs[1].Name = OUString("OutputStream"); + aArgs[1].Name = "OutputStream"; aArgs[1].Value <<= xOStm; xFilter->filter(aArgs); } diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 08d8fdb61ea5..86df48b65739 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -68,12 +68,12 @@ namespace uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence aRet(3); - aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; + aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker"; #if ENABLE_TDE - aRet[2] = OUString("com.sun.star.ui.dialogs.TDEFilePicker"); + aRet[2] = "com.sun.star.ui.dialogs.TDEFilePicker"; #else // ENABLE_TDE - aRet[2] = OUString("com.sun.star.ui.dialogs.KDEFilePicker"); + aRet[2] = "com.sun.star.ui.dialogs.KDEFilePicker"; #endif // ENABLE_TDE return aRet; } diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 6d4475474a15..6688c6d6cc6f 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -89,9 +89,9 @@ namespace uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence aRet(3); - aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); - aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); + aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; + aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker"; + aRet[2] = "com.sun.star.ui.dialogs.KDE4FilePicker"; return aRet; } } -- cgit