[Libreoffice-commits] core.git: 4 commits - vcl/aqua vcl/qa vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/source
Noel Grandin
noel at peralex.com
Thu Nov 7 12:24:01 CET 2013
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 -
writerfilter/source/filter/ImportFilter.cxx | 4
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 50 +++++-------
xmlhelp/source/cxxhelp/provider/provider.cxx | 6 -
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 4
xmlhelp/source/treeview/tvread.cxx | 18 ++--
xmloff/source/chart/SchXMLExport.cxx | 10 +-
xmloff/source/core/xmlexp.cxx | 18 ++--
xmloff/source/draw/sdxmlexp.cxx | 6 -
xmloff/source/meta/xmlmetai.cxx | 4
xmloff/source/style/numehelp.cxx | 2
xmloff/source/style/prstylei.cxx | 4
xmloff/source/text/txtstyli.cxx | 8 -
30 files changed, 195 insertions(+), 201 deletions(-)
New commits:
commit c980158a8286d5f583bd9d844aed2018bea310ea
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 13:48:17 2013 +0200
remove unnecessary use of OUString constructor in VCL module
Change-Id: Ie2b9aca5c3db46b43c53f72699fe828b28daeaa1
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 0e73a75..09dc2ac 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 c6051c3..4bc18902 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 cb4b6b2..fed5316 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 651a881..6229a77 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 aac5659..99d2029 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 0e4b22c..7dfc333 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 a79f5ca..1a2416a 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 113cfff..377736c 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 66e8ab1..2737159 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 fa35683..f6e823a 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 at example.com" );
+ aContext.SignLocation = "Burdur";
+ aContext.SignReason = "Some valid reason to sign";
+ aContext.SignContact = "signer at 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 7089abc..121f23d 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 91d7906..be193a8 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<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->hWnd) ) );
aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(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<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(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 11560fa..9b9ac19 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 d99347b..644e88d 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 4a28fcd..85404f1 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<beans::PropertyValue> 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<beans::PropertyValue> 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 08d8fdb..86df48b 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -68,12 +68,12 @@ namespace
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> 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 6d44754..6688c6d 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -89,9 +89,9 @@ namespace
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> 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;
}
}
commit 8bfbd27f8da5bfcc40e3bc53afdc153156d2f874
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 13:28:34 2013 +0200
remove unnecessary use of OUString constructor in WRITERFILTER module
Change-Id: Iba6fd6e2bb9b2a9e937149f3e3465b0817208a58
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 2cbf834..36bbbc7 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -126,7 +126,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
{
uno::Reference<beans::XPropertySetInfo> xPropsInfo = xDocProps->getPropertySetInfo();
- const OUString& aGrabBagPropName = OUString("InteropGrabBag");
+ const OUString aGrabBagPropName = "InteropGrabBag";
if( xPropsInfo.is() && xPropsInfo->hasPropertyByName( aGrabBagPropName ) )
{
uno::Sequence<beans::PropertyValue> aGrabBag;
@@ -139,7 +139,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
uno::Reference<xml::dom::XDocument> aThemeDom = pDocument->getThemeDom();
beans::PropertyValue* pValue = aGrabBag.getArray();
- pValue[length].Name = OUString("OOXTheme");
+ pValue[length].Name = "OOXTheme";
pValue[length].Value = uno::makeAny( aThemeDom );
xDocProps->setPropertyValue( aGrabBagPropName, uno::Any( aGrabBag ) );
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f00ee13..2535339 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -361,12 +361,12 @@ void RTFDocumentImpl::resolveSubstream(sal_uInt32 nPos, Id nId, OUString& rIgnor
if (!m_aAuthor.isEmpty())
{
pImpl->setAuthor(m_aAuthor);
- m_aAuthor = OUString();
+ m_aAuthor = "";
}
if (!m_aAuthorInitials.isEmpty())
{
pImpl->setAuthorInitials(m_aAuthorInitials);
- m_aAuthorInitials = OUString();
+ m_aAuthorInitials = "";
}
pImpl->seek(nPos);
SAL_INFO("writerfilter", "substream start");
@@ -1126,7 +1126,7 @@ void RTFDocumentImpl::text(OUString& rString)
if (!m_aIgnoreFirst.isEmpty() && m_aIgnoreFirst.equals(rString))
{
- m_aIgnoreFirst = OUString();
+ m_aIgnoreFirst = "";
return;
}
@@ -2676,7 +2676,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_DOBYPARA:
{
beans::PropertyValue aPropertyValue;
- aPropertyValue.Name = OUString("VertOrientRelation");
+ aPropertyValue.Name = "VertOrientRelation";
aPropertyValue.Value <<= text::RelOrientation::FRAME;
m_aStates.top().aDrawingObject.aPendingProperties.push_back(aPropertyValue);
}
commit 58fa3d50aa43102cea8690fd6bf51fb80c007955
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 13:17:17 2013 +0200
remove unnecessary use of OUString constructor in XMLHELP module
Change-Id: I033bcf9cddc58f605fe8d65731f8b312410da7e5
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 1b252f5..1ff125c 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -221,9 +221,9 @@ static bool impl_getZipFile(
OUString aFileName = pPathArray[ i ];
if ( !aFileName.isEmpty() )
{
- if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
+ if ( !aFileName.endsWith("/") )
{
- aFileName += OUString( "/" );
+ aFileName += "/";
}
aFileName += rZipName;
// the icons are not read when the URL is a symlink
@@ -249,7 +249,7 @@ OString Databases::getImagesZipFileURL()
// set root path
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = OUString("nodepath");
+ aParam.Name = "nodepath";
aParam.Value <<= OUString("org.openoffice.Office.Common");
lParams[0] = uno::makeAny(aParam);
@@ -285,9 +285,7 @@ OString Databases::getImagesZipFileURL()
else
aSymbolsStyleName = "tango";
}
- OUString aZipName = OUString( "images_" );
- aZipName += aSymbolsStyleName;
- aZipName += OUString( ".zip" );
+ OUString aZipName = "images_" + aSymbolsStyleName + ".zip";
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
@@ -296,7 +294,7 @@ OString Databases::getImagesZipFileURL()
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
if ( ! bFound )
- aImageZip = OUString();
+ aImageZip = "";
m_aImagesZipFileURL = OUStringToOString(
rtl::Uri::encode(
@@ -601,7 +599,7 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
OUString fileNameHDFHelp( fileURL );
//Extensions always use the new format
if( pExtensionPath != NULL )
- fileNameHDFHelp += OUString( "_" );
+ fileNameHDFHelp += "_";
//SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but
//fails for example when using long path names on Windows (starting with \\?\)
if( m_xSFA->exists( fileNameHDFHelp ) )
@@ -636,21 +634,21 @@ Databases::getCollator( const OUString& Language,
if( countryStr.isEmpty() )
{
if( langStr.compareToAscii("de") == 0 )
- countryStr = OUString("DE");
+ countryStr = "DE";
else if( langStr.compareToAscii("en") == 0 )
- countryStr = OUString("US");
+ countryStr = "US";
else if( langStr.compareToAscii("es") == 0 )
- countryStr = OUString("ES");
+ countryStr = "ES";
else if( langStr.compareToAscii("it") == 0 )
- countryStr = OUString("IT");
+ countryStr = "IT";
else if( langStr.compareToAscii("fr") == 0 )
- countryStr = OUString("FR");
+ countryStr = "FR";
else if( langStr.compareToAscii("sv") == 0 )
- countryStr = OUString("SE");
+ countryStr = "SE";
else if( langStr.compareToAscii("ja") == 0 )
- countryStr = OUString("JP");
+ countryStr = "JP";
else if( langStr.compareToAscii("ko") == 0 )
- countryStr = OUString("KR");
+ countryStr = "KR";
}
/* FIXME-BCP47: all this does not look right for language tag context,
* also check processLang() and country() methods */
@@ -961,7 +959,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar,
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = OUString( "StorageFormat" );
+ aArg.Name = "StorageFormat";
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
@@ -1081,7 +1079,7 @@ void Databases::cascadingStylesheet( const OUString& Language,
uno::Any aHCMode = xVclWindowPeer->getProperty( OUString( "HighContrastMode" ) );
if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
{
- aCSS = OUString( "highcontrastblack" );
+ aCSS = "highcontrastblack";
#ifdef WNT
HKEY hKey = NULL;
LONG lResult = RegOpenKeyExA( HKEY_CURRENT_USER, "Control Panel\\Accessibility\\HighContrast", 0, KEY_QUERY_VALUE, &hKey );
@@ -1094,11 +1092,11 @@ void Databases::cascadingStylesheet( const OUString& Language,
{
szBuffer[nSize] = '\0';
if ( strncmp( szBuffer, "High Contrast #1", strlen("High Contrast #1") ) == 0 )
- aCSS = OUString( "highcontrast1" );
+ aCSS = "highcontrast1";
if ( strncmp( szBuffer, "High Contrast #2", strlen("High Contrast #2") ) == 0 )
- aCSS = OUString( "highcontrast2" );
+ aCSS = "highcontrast2";
if ( strncmp( szBuffer, "High Contrast White", strlen("High Contrast White") ) == 0 )
- aCSS = OUString( "highcontrastwhite" );
+ aCSS = "highcontrastwhite";
}
RegCloseKey( hKey );
}
@@ -1147,7 +1145,7 @@ void Databases::cascadingStylesheet( const OUString& Language,
if ( !retry && error && bHighContrastMode )
{
// fall back to default css
- aCSS = OUString( "default" );
+ aCSS = "default";
retry = 2;
bHighContrastMode = sal_False;
}
@@ -1235,8 +1233,8 @@ void Databases::setInstallPath( const OUString& aInstDir )
osl::FileBase::getFileURLFromSystemPath( aInstDir,m_aInstallDirectory );
//TODO: check returned error code
- if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
- m_aInstallDirectory += OUString( "/" );
+ if( m_aInstallDirectory.endsWith( "/" ) )
+ m_aInstallDirectory += "/";
}
// class ExtensionIteratorBase
@@ -1760,7 +1758,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = OUString( "StorageFormat" );
+ aArg.Name = "StorageFormat";
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
@@ -1912,7 +1910,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
if( nLastSlash != -1 )
aLang = aLangURL.copy( nLastSlash + 1 );
else
- aLang = OUString( "en" );
+ aLang = "en";
OUString aMod("help");
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 72e4efd..371760c 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -224,7 +224,7 @@ void ContentProvider::init()
OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() )
// try to determine path from default
- instPath = OUString( "$(instpath)/" LIBO_SHARE_HELP_FOLDER );
+ instPath = "$(instpath)/" LIBO_SHARE_HELP_FOLDER;
// replace anything like $(instpath);
subst( instPath );
@@ -260,7 +260,7 @@ void ContentProvider::init()
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = OUString("nodepath");
+ aParam.Name = "nodepath";
aParam.Value <<= OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam);
@@ -290,7 +290,7 @@ void ContentProvider::init()
subst( aPath );
aImagesZipPaths[ 0 ] = aPath;
- aPath = OUString("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config");
+ aPath = "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config";
rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 6ea5304..9ac95e6 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -167,7 +167,7 @@ OUString URLParameter::get_title()
m_aTitle = inf->get_title();
}
else // This must be the root
- m_aTitle = OUString("root");
+ m_aTitle = "root";
return m_aTitle;
}
@@ -610,7 +610,7 @@ bool URLParameter::query()
if( delimIdx == -1 )
{
value = query_.copy( equalIdx + 1 ).trim();
- query_ = OUString();
+ query_ = "";
}
else
{
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index c0c62fc..722784c 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -329,9 +329,9 @@ TVRead::getElementNames( )
{
Sequence< OUString > seq( 3 );
- seq[0] = OUString( "Title" );
- seq[1] = OUString( "TargetURL" );
- seq[2] = OUString( "Children" );
+ seq[0] = "Title";
+ seq[1] = "TargetURL";
+ seq[2] = "Children";
return seq;
}
@@ -669,7 +669,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() )
// try to determine path from default
- instPath = OUString( "$(instpath)/help" );
+ instPath = "$(instpath)/help";
// replace anything like $(instpath);
subst( instPath );
@@ -690,7 +690,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = OUString("nodepath");
+ aParam.Name = "nodepath";
aParam.Value <<= OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam);
@@ -718,7 +718,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
if( errFile != osl::FileBase::E_None ) return configData;
if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 )
- url += OUString( "/" );
+ url += "/";
OUString ret;
sal_Int32 idx;
osl::DirectoryItem aDirItem;
@@ -731,8 +731,8 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
ret = locale.copy( 0,idx );
else
{
- locale = OUString( "en-US" );
- ret = OUString("en");
+ locale = "en-US";
+ ret = "en";
}
url = url + ret;
@@ -1229,7 +1229,7 @@ OUString TreeFileIterator::implGetTreeFileFromPackage
if( m_xSFA->exists( aRetFile ) )
rnFileSize = m_xSFA->getSize( aRetFile );
else
- aRetFile = OUString();
+ aRetFile = "";
return aRetFile;
}
commit c87a8fc6488dcbb2378acbfa921ec2d7ced0a73a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 13:10:08 2013 +0200
remove unnecessary use of OUString constructor in XMLOFF module
Change-Id: I3bb704d2b1063cd8c2c903cbfa237a7723c321d2
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 533c873..cf3f377 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1049,7 +1049,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
mbRowSourceColumns( sal_True ),
msCLSID( OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()))
{
- msTableName = OUString( "local-table" );
+ msTableName = "local-table";
// create property set mapper
mxPropertySetMapper = new XMLChartPropertySetMapper;
@@ -1227,12 +1227,12 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
{
OUString aDataProviderURL( ".." );
if( xNewDoc->hasInternalDataProvider() )
- aDataProviderURL = OUString( "." );
+ aDataProviderURL = ".";
else //special handling for data base data provider necessary
{
Reference< chart2::data::XDatabaseDataProvider > xDBDataProvider( xNewDoc->getDataProvider(), uno::UNO_QUERY );
if( xDBDataProvider.is() )
- aDataProviderURL = OUString( "." );
+ aDataProviderURL = ".";
}
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aDataProviderURL );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
@@ -2473,7 +2473,7 @@ void SchXMLExportHelper_Impl::exportAxes(
}
}
exportAxis( XML_X, XML_PRIMARY_X, xAxisProps, xNewAxis, aCategoriesRange, bHasXAxisTitle, bHasXAxisMajorGrid, bHasXAxisMinorGrid, bExportContent );
- aCategoriesRange = OUString();
+ aCategoriesRange = "";
}
// secondary x axis
@@ -2740,7 +2740,7 @@ void SchXMLExportHelper_Impl::exportSeries(
if ( nSeriesIdx == 0 && aRange.compareToAscii("label 1") == 0)
modifyLabelRange = true;
if (modifyLabelRange)
- aRange = OUString("label ") + OUString::number(aRange.copy( OUString("label").getLength()).toInt32() - 1);
+ aRange = "label " + OUString::number(aRange.copy( OUString("label").getLength()).toInt32() - 1);
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS,
lcl_ConvertRange(
aRange,
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 0c28b7c..4041196 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -395,8 +395,8 @@ void SvXMLExport::_InitCtor()
mxAttrList = (xml::sax::XAttributeList*)mpAttrList;
- msGraphicObjectProtocol = OUString( "vnd.sun.star.GraphicObject:" );
- msEmbeddedObjectProtocol = OUString( "vnd.sun.star.EmbeddedObject:" );
+ msGraphicObjectProtocol = "vnd.sun.star.GraphicObject:";
+ msEmbeddedObjectProtocol = "vnd.sun.star.EmbeddedObject:";
if (mxModel.is() && !mxEventListener.is())
{
@@ -738,14 +738,14 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
mpImpl->SetSchemeOf( msOrigFileName );
}
OUString sRelPath;
- sPropName = OUString( "StreamRelPath" );
+ sPropName = "StreamRelPath";
if( xPropertySetInfo->hasPropertyByName(sPropName) )
{
uno::Any aAny = mxExportInfo->getPropertyValue(sPropName);
aAny >>= sRelPath;
}
OUString sName;
- sPropName = OUString( "StreamName" );
+ sPropName = "StreamName";
if( xPropertySetInfo->hasPropertyByName(sPropName) )
{
uno::Any aAny = mxExportInfo->getPropertyValue(sPropName);
@@ -874,8 +874,8 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( )
throw(uno::RuntimeException)
{
uno::Sequence<OUString> aSeq(2);
- aSeq[0] = OUString( "com.sun.star.document.ExportFilter");
- aSeq[1] = OUString( "com.sun.star.xml.XMLExportFilter");
+ aSeq[0] = "com.sun.star.document.ExportFilter";
+ aSeq[1] = "com.sun.star.xml.XMLExportFilter";
return aSeq;
}
@@ -1546,7 +1546,7 @@ void SvXMLExport::_ExportScripts()
if ( mnExportFlags & EXPORT_EMBEDDED )
{
OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) );
- aValue += OUString( ":Basic" );
+ aValue += ":Basic";
AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue );
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True );
@@ -1852,7 +1852,7 @@ void SvXMLExport::GetViewSettingsAndViews(uno::Sequence<beans::PropertyValue>& r
sal_Int32 nOldLength(rProps.getLength());
rProps.realloc(nOldLength + 1);
beans::PropertyValue aProp;
- aProp.Name = OUString("Views");
+ aProp.Name = "Views";
aProp.Value <<= xIndexAccess;
rProps[nOldLength] = aProp;
}
@@ -1921,7 +1921,7 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR
if( (getExportFlags() & EXPORT_EMBEDDED) == 0 )
sRet = mxGraphicResolver->resolveGraphicObjectURL( rGraphicObjectURL );
else
- sRet = OUString();
+ sRet = "";
}
else
sRet = GetRelativeReference( sRet );
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 092c5a0..58cd938 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -750,7 +750,7 @@ void SdXMLExport::ImpPrepAutoLayoutInfos()
sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
{
- rName = OUString();
+ rName = "";
sal_Bool bRetval(sal_False);
Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY);
@@ -1831,9 +1831,7 @@ void SdXMLExport::_ExportContent()
OUString aFileName( aBookmarkURL.copy( 0, nIndex ) );
OUString aBookmarkName( aBookmarkURL.copy( nIndex+1 ) );
- aBookmarkURL = GetRelativeReference( aFileName );
- aBookmarkURL += OUString(static_cast<sal_Unicode>('#'));
- aBookmarkURL += aBookmarkName;
+ aBookmarkURL = GetRelativeReference( aFileName ) + "#" + aBookmarkName;
}
AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, aBookmarkURL);
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 9f0c193..9952fb2 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -258,11 +258,11 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno:
|| i_rBuildId.startsWith("StarSuite 7")
|| i_rBuildId.startsWith("OpenOffice.org 1"))
{
- sBuildId = OUString("645$8687");
+ sBuildId = "645$8687";
}
else if (i_rBuildId.startsWith("NeoOffice/2"))
{
- sBuildId = OUString("680$9134"); // fake NeoOffice as OpenOffice.org 2.2 release
+ sBuildId = "680$9134"; // fake NeoOffice as OpenOffice.org 2.2 release
}
}
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 33396f1..01128fd 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -337,7 +337,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
else
{
if ( rCurrencySymbol.getLength() == 1 && rCurrencySymbol.toChar() == NfCurrencyEntry::GetEuroSymbol() )
- rCurrencySymbol = OUString("EUR");
+ rCurrencySymbol = "EUR";
}
}
return sal_True;
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index dcdb0ed..b7a0e6e 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -194,7 +194,7 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
aValues.realloc( nLen + 2 );
PropertyValue *pProps = aValues.getArray() + nLen;
- pProps->Name = OUString("ParaStyleName");
+ pProps->Name = "ParaStyleName";
OUString sParent( GetParentName() );
if( !sParent.isEmpty() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
@@ -202,7 +202,7 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
sParent = OUString("Standard");
pProps->Value <<= sParent;
++pProps;
- pProps->Name = OUString("ParaConditionalStyleName");
+ pProps->Name = "ParaConditionalStyleName";
pProps->Value <<= sParent;
}
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index d0b03e4..b9a0503 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -515,13 +515,11 @@ void XMLTextStyleContext::FillPropertySet(
rAny >>= sFontName;
if ( !sFontName.isEmpty() )
{
- OUString sStarBats( "StarBats" );
- OUString sStarMath( "StarMath" );
- if ( sFontName.equalsIgnoreAsciiCase( sStarBats ) ||
- sFontName.equalsIgnoreAsciiCase( sStarMath ) )
+ if ( sFontName.equalsIgnoreAsciiCase( "StarBats" ) ||
+ sFontName.equalsIgnoreAsciiCase( "StarMath" ) )
{
// construct new value
- sFontName = OUString("StarSymbol");
+ sFontName = "StarSymbol";
Any aAny( rAny );
aAny <<= sFontName;
More information about the Libreoffice-commits
mailing list