String to OUString and cleanup

Change-Id: Idc18c1a6a64edea3399c8747ec0f096a2f964b68

10 files changed, 67 insertions, 87 deletions

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 001df2aa0b58..619a9c968266 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1731,15 +1731,15 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass )
             which matches the interface names 'ooo.vba.excel.XWorkbooks' or
             'ooo.vba.msforms.XLabel'.
          */
-        OUString aClassName( sal_Unicode( '.' ) );
+        OUString aClassName( "." );
         sal_Int32 nClassNameDot = rClass.lastIndexOf( '.' );
         if( nClassNameDot >= 0 )
         {
-            aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( sal_Unicode( 'X' ) ) + rClass.copy( nClassNameDot + 1 );
+            aClassName += rClass.copy( 0, nClassNameDot + 1 ) + "X" + rClass.copy( nClassNameDot + 1 );
         }
         else
         {
-            aClassName += OUString( sal_Unicode( 'X' ) ) + rClass;
+            aClassName += "X" + rClass;
         }
         Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
         const Type* pTypeArray = aTypeSeq.getConstArray();
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index e09c298ddfa0..c15b9d2b6014 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -152,7 +152,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
                                         {
                                             // @todo: using implcit knowledge that ranges can be
                                             // merged with ";". This should be done more general
-                                            pCellRange->Value <<= (aOldRange + OUString( sal_Unicode(';')) + aRangeString );
+                                            pCellRange->Value <<= (aOldRange + ";" + aRangeString );
                                         }
                                         // move means replace range
                                         else
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index d9041f9503db..194a06defb51 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -477,7 +477,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
         }
         //prepare text
         OUStringBuffer aText;
-        OUString aSeparator(sal_Unicode(' '));
+        OUString aSeparator(" ");
         double fRotationDegrees = 0.0;
         try
         {
@@ -1080,7 +1080,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
 
     bool bShowEquation = false;
     bool bShowCorrCoeff = false;
-    OUString aSep( sal_Unicode('\n'));
+    OUString aSep( "\n" );
     if(( xEquationProperties->getPropertyValue( "ShowEquation") >>= bShowEquation ) &&
        ( xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCorrCoeff ))
     {
@@ -1111,7 +1111,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
         }
         if( bShowCorrCoeff )
         {
-            aFormula.append( sal_Unicode( 'R' ));
+            aFormula.append( "R" );
             aFormula.append( sal_Unicode( 0x00b2 ));
             aFormula.append( " = ");
             double fR( xRegressionCurveCalculator->getCorrelationCoefficient());
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index a7593c2ff918..37e1243f9e20 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -53,7 +53,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString&
         OUString aName( aURL.GetName() );
         if( aName.isEmpty() )
         {
-            sal_Int32 nPos = rURL.lastIndexOf( sal_Unicode( '/' ) );
+            sal_Int32 nPos = rURL.lastIndexOf( '/' );
             if( nPos == -1 )
             {
                 aName = rURL;
@@ -64,11 +64,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString&
             }
         }
 
-        OUString aRelURL( "vnd.sun.star.Package:" );
-        aRelURL += rFilterName;
-        aRelURL += OUString( sal_Unicode( '/' ) );
-        aRelURL += aName;
-        return aRelURL;
+        return OUString( "vnd.sun.star.Package:" + rFilterName + "/" + aName );
     }
     else
     {
@@ -125,7 +121,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
                 pAttrList->AddAttribute( sName, sCdataAttribute, pFilter->maType );
                 xHandler->ignorableWhitespace ( sWhiteSpace );
                 xHandler->startElement( sNode, xAttrList );
-                OUString sValue( sal_Unicode('0') );
+                OUString sValue("0");
                 sValue += sComma;
                 sValue += sComma;
                 if( !pFilter->maDocType.isEmpty() )
@@ -170,7 +166,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
                 xHandler->startElement( sNode, xAttrList );
                 addLocaleProperty( xHandler, sUIName, pFilter->maInterfaceName );
 
-                OUString sValue( sal_Unicode('0') );
+                OUString sValue("0");
                 sValue += sComma;
                 sValue += pFilter->maType;
                 sValue += sComma,
@@ -199,7 +195,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
                 sValue += sDelim;
                 sValue += pFilter->maComment;
                 sValue += sComma;
-                sValue += OUString( sal_Unicode('0') );
+                sValue += "0";
                 sValue += sComma;
                 sValue += createRelativeURL( pFilter->maFilterName, pFilter->maImportTemplate );
                 addProperty( xHandler, sData, sValue );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4f4469a4e045..b9f89e046c21 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -301,7 +301,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension
 
     for( i = 0; i < nExtensions; i++ )
     {
-        nLastIndex = rExtensions.indexOf( sal_Unicode( ';' ), nLastIndex );
+        nLastIndex = rExtensions.indexOf( ';', nLastIndex );
 
         if( nLastIndex == -1 )
         {
@@ -326,7 +326,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension
 OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilterName )
 {
     OUString aFilterName( rFilterName );
-    OUString aSpace( sal_Unicode( ' ' ) );
+    OUString aSpace(" ");
 
     sal_Int32 nId = 2;
 
@@ -347,7 +347,7 @@ OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilte
 OUString XMLFilterSettingsDialog::createUniqueTypeName( const OUString& rTypeName )
 {
     OUString aTypeName( rTypeName );
-    OUString aSpace( sal_Unicode( ' ' ) );
+    OUString aSpace(" ");
 
     sal_Int32 nId = 2;
 
@@ -415,8 +415,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
     OUString aInterfaceName( rInterfaceName );
     if( nDefaultNumber )
     {
-        aInterfaceName += OUString( sal_Unicode( ' ' ) );
-        aInterfaceName += OUString::number( nDefaultNumber );
+        aInterfaceName += " " + OUString::number( nDefaultNumber );
     }
 
     return aInterfaceName;
@@ -486,8 +485,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
             if( !aSourceURL.GetName().isEmpty() )
             {
                 OUString aDestURL( m_sTemplatePath );
-                aDestURL += pFilterEntry->maFilterName;
-                aDestURL += OUString( sal_Unicode('/') );
+                aDestURL += pFilterEntry->maFilterName + "/";
                 if( createDirectory( aDestURL ) )
                 {
                     aDestURL += aSourceURL.GetName();
@@ -900,9 +898,7 @@ void XMLFilterSettingsDialog::onSave()
 
     OUString aExtensions( "*.jar" );
     OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
-    aFilterName += " (";
-    aFilterName += aExtensions;
-    aFilterName += OUString( sal_Unicode( ')' ) );
+    aFilterName += " (" + aExtensions + ")";
 
     aDlg.AddFilter( aFilterName, aExtensions );
 
@@ -946,9 +942,7 @@ void XMLFilterSettingsDialog::onOpen()
 
     OUString aExtensions( "*.jar" );
     OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
-    aFilterName += " (";
-    aFilterName += aExtensions;
-    aFilterName += OUString( sal_Unicode( ')' ) );
+    aFilterName += " (" + aExtensions + ")";
 
     aDlg.AddFilter( aFilterName, aExtensions );
 
@@ -1182,7 +1176,7 @@ void XMLFilterSettingsDialog::initFilterList()
                                         for( n = 0; n < nCount3; n++ )
                                         {
                                             if( n > 0 )
-                                                pTempFilter->maExtension += OUString( sal_Unicode(';') );
+                                                pTempFilter->maExtension += ";";
                                             pTempFilter->maExtension += (*pExtensions++);
                                         }
                                     }
@@ -1512,15 +1506,12 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo )
 
 OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const
 {
-    OUString aEntryStr( pInfo->maFilterName );
-    aEntryStr += OUString( sal_Unicode( '\t' ) );
+    OUString aEntryStr( pInfo->maFilterName + "\t");
     if ( !pInfo->maExportService.isEmpty() )
         aEntryStr += OUString( getApplicationUIName( pInfo->maExportService ) );
     else
         aEntryStr += OUString( getApplicationUIName( pInfo->maImportService ) );
-    aEntryStr += OUString( sal_Unicode( ' ' ) );
-    aEntryStr += OUString( sal_Unicode( '-' ) );
-    aEntryStr += OUString( sal_Unicode( ' ' ) );
+    aEntryStr += " - ";
 
     if( pInfo->maFlags & 1 )
     {
@@ -1706,7 +1697,7 @@ bool createDirectory( OUString& rURL )
     sal_Int32 nLastIndex = sizeof( "file:///" ) - 2;
     while( nLastIndex != -1 )
     {
-        nLastIndex = rURL.indexOf( sal_Unicode('/'), nLastIndex + 1);
+        nLastIndex = rURL.indexOf( '/', nLastIndex + 1);
         if( nLastIndex != -1 )
         {
             OUString aDirURL( rURL.copy( 0, nLastIndex ) );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 0490c3fded1b..b5c82909b07e 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -369,7 +369,7 @@ void XMLFilterTestDialog::onExportBrowse()
                                         for( n = 0; n < nCount; n++ )
                                         {
                                             if( n > 0 )
-                                                aExtension += OUString( sal_Unicode(';') );
+                                                aExtension += ";";
                                             aExtension += "*.";
                                             aExtension += (*pExtensions++);
                                         }
@@ -377,13 +377,9 @@ void XMLFilterTestDialog::onExportBrowse()
                                 }
                             }
 
-                            String aExtensions( aExtension );
-                            String aFilterName( aInterfaceName );
-                            aFilterName += String( RTL_CONSTASCII_USTRINGPARAM(" (") );
-                            aFilterName += aExtensions;
-                            aFilterName += sal_Unicode(')');
+                            OUString aFilterName( aInterfaceName + " (" + aExtension + ")" );
 
-                            aDlg.AddFilter( aFilterName, aExtensions );
+                            aDlg.AddFilter( aFilterName, aExtension );
 
                             if( (nFlags & 0x100) == 0x100 )
                                 aDlg.SetCurrentFilter( aFilterName );
@@ -533,36 +529,34 @@ void XMLFilterTestDialog::onImportBrowse()
     // Open Fileopen-Dialog
        ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
-    String aFilterName( m_pFilterInfo->maInterfaceName );
-    String aExtensions;
+    OUString aFilterName( m_pFilterInfo->maInterfaceName );
+    OUString aExtensions;
 
     int nLastIndex = 0;
     int nCurrentIndex = 0;
     for( int i = 0; nLastIndex != -1; i++ )
     {
-        nLastIndex = m_pFilterInfo->maExtension.indexOf( sal_Unicode( ';' ), nLastIndex );
+        nLastIndex = m_pFilterInfo->maExtension.indexOf( ';', nLastIndex );
 
         if( i > 0 )
-            aExtensions += ';';
+            aExtensions += ";";
 
-        aExtensions += String( RTL_CONSTASCII_USTRINGPARAM("*.") );
+        aExtensions += "*.";
 
         if( nLastIndex == -1 )
         {
 
-            aExtensions += String( m_pFilterInfo->maExtension.copy( nCurrentIndex ) );
+            aExtensions += m_pFilterInfo->maExtension.copy( nCurrentIndex );
         }
         else
         {
-            aExtensions += String( m_pFilterInfo->maExtension.copy( nCurrentIndex, nLastIndex - nCurrentIndex ) );
+            aExtensions += m_pFilterInfo->maExtension.copy( nCurrentIndex, nLastIndex - nCurrentIndex );
             nCurrentIndex = nLastIndex + 1;
             nLastIndex = nCurrentIndex;
         }
     }
 
-    aFilterName += String( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
-    aFilterName += aExtensions;
-    aFilterName += sal_Unicode(')');
+    aFilterName += " (" + aExtensions + ")";
 
     aDlg.AddFilter( aFilterName, aExtensions );
     aDlg.SetDisplayDirectory( m_sImportRecentFile );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d76eefe95d0d..2e4eb46a33c4 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1283,8 +1283,7 @@ OUString SvXMLImport::ResolveEmbeddedObjectURL(
             OUString sURL( rURL );
             if( !rClassId.isEmpty() )
             {
-                sURL += OUString( sal_Unicode('!') );
-                sURL += rClassId;
+                sURL += "!" + rClassId;
             }
             sRet = mxEmbeddedResolver->resolveEmbeddedObjectURL( sURL );
         }
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 127004d0a8de..06adb8a84951 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -397,8 +397,8 @@ void SdXMLImExTransform2D::AddSkewX(double fNew)
 const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& rConv)
 {
     OUString aNewString;
-    OUString aClosingBrace(sal_Unicode(')'));
-    OUString aEmptySpace(sal_Unicode(' '));
+    OUString aClosingBrace(")");
+    OUString aEmptySpace(" ");
 
     const sal_uInt32 nCount = maList.size();
     for(sal_uInt32 a(0L); a < nCount; a++)
@@ -836,8 +836,8 @@ void SdXMLImExTransform3D::AddHomogenMatrix(const drawing::HomogenMatrix& xHomMa
 const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& rConv)
 {
     OUString aNewString;
-    OUString aClosingBrace(sal_Unicode(')'));
-    OUString aEmptySpace(sal_Unicode(' '));
+    OUString aClosingBrace(")");
+    OUString aEmptySpace(" ");
 
     const sal_uInt32 nCount = maList.size();
     for(sal_uInt32 a(0L); a < nCount; a++)
@@ -1275,7 +1275,7 @@ SdXMLImExViewBox::SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverte
 const OUString& SdXMLImExViewBox::GetExportString()
 {
     OUString aNewString;
-    OUString aEmptySpace(sal_Unicode(' '));
+    OUString aEmptySpace(" ");
 
     Imp_PutNumberChar(aNewString, mnX);
     aNewString += aEmptySpace;
@@ -1346,12 +1346,12 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
 
             // X and comma
             Imp_PutNumberChar(aNewString, nX);
-            aNewString += OUString(static_cast<sal_Unicode>(','));
+            aNewString += ",";
 
             // Y and space (not for last)
             Imp_PutNumberChar(aNewString, nY);
             if(a + 1 != nCnt)
-                aNewString += OUString(static_cast<sal_Unicode>(' '));
+                aNewString += " ";
 
             // next point
             pArray++;
@@ -1725,7 +1725,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 if(mbRelative)
                                                 {
                                                     if(aLastCommand != sal_Unicode('t'))
-                                                        aNewString += OUString(sal_Unicode('t'));
+                                                        aNewString += "t";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY);
@@ -1735,7 +1735,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 else
                                                 {
                                                     if(aLastCommand != sal_Unicode('T'))
-                                                        aNewString += OUString(sal_Unicode('T'));
+                                                        aNewString += "T";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY);
@@ -1755,7 +1755,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 if(mbRelative)
                                                 {
                                                     if(aLastCommand != sal_Unicode('q'))
-                                                        aNewString += OUString(sal_Unicode('q'));
+                                                        aNewString += "q";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY);
@@ -1767,7 +1767,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 else
                                                 {
                                                     if(aLastCommand != sal_Unicode('Q'))
-                                                        aNewString += OUString(sal_Unicode('Q'));
+                                                        aNewString += "Q";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX1);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY1);
@@ -1817,7 +1817,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 if(mbRelative)
                                                 {
                                                     if(aLastCommand != sal_Unicode('t'))
-                                                        aNewString += OUString(static_cast<sal_Unicode>('t'));
+                                                        aNewString += "t";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY);
@@ -1827,7 +1827,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 else
                                                 {
                                                     if(aLastCommand != sal_Unicode('T'))
-                                                        aNewString += OUString(static_cast<sal_Unicode>('T'));
+                                                        aNewString += "T";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY);
@@ -1847,7 +1847,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 if(mbRelative)
                                                 {
                                                     if(aLastCommand != sal_Unicode('q'))
-                                                        aNewString += OUString(static_cast<sal_Unicode>('q'));
+                                                        aNewString += "q";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY);
@@ -1859,7 +1859,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                                 else
                                                 {
                                                     if(aLastCommand != sal_Unicode('Q'))
-                                                        aNewString += OUString(static_cast<sal_Unicode>('Q'));
+                                                        aNewString += "Q";
 
                                                     Imp_PutNumberCharWithSpace(aNewString, nX1);
                                                     Imp_PutNumberCharWithSpace(aNewString, nY1);
@@ -1906,7 +1906,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                             if(mbRelative)
                                             {
                                                 if(aLastCommand != sal_Unicode('s'))
-                                                    aNewString += OUString(static_cast<sal_Unicode>('s'));
+                                                    aNewString += "s";
 
                                                 Imp_PutNumberCharWithSpace(aNewString, nX2 - mnLastX);
                                                 Imp_PutNumberCharWithSpace(aNewString, nY2 - mnLastY);
@@ -1918,7 +1918,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                             else
                                             {
                                                 if(aLastCommand != sal_Unicode('S'))
-                                                    aNewString += OUString(static_cast<sal_Unicode>('S'));
+                                                    aNewString += "S";
 
                                                 Imp_PutNumberCharWithSpace(aNewString, nX2);
                                                 Imp_PutNumberCharWithSpace(aNewString, nY2);
@@ -1940,7 +1940,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                             if(mbRelative)
                                             {
                                                 if(aLastCommand != sal_Unicode('c'))
-                                                    aNewString += OUString(static_cast<sal_Unicode>('c'));
+                                                    aNewString += "c";
 
                                                 Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX);
                                                 Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY);
@@ -1954,7 +1954,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                                             else
                                             {
                                                 if(aLastCommand != sal_Unicode('C'))
-                                                    aNewString += OUString(static_cast<sal_Unicode>('C'));
+                                                    aNewString += "C";
 
                                                 Imp_PutNumberCharWithSpace(aNewString, nX1);
                                                 Imp_PutNumberCharWithSpace(aNewString, nY1);
@@ -1996,7 +1996,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             if(mbRelative)
                             {
                                 if(aLastCommand != sal_Unicode('v'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('v'));
+                                    aNewString += "v";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY);
 
@@ -2005,7 +2005,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             else
                             {
                                 if(aLastCommand != sal_Unicode('V'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('V'));
+                                    aNewString += "V";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nY);
 
@@ -2017,7 +2017,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             if(mbRelative)
                             {
                                 if(aLastCommand != sal_Unicode('h'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('h'));
+                                    aNewString += "h";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX);
 
@@ -2026,7 +2026,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             else
                             {
                                 if(aLastCommand != sal_Unicode('H'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('H'));
+                                    aNewString += "H";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nX);
 
@@ -2038,7 +2038,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             if(mbRelative)
                             {
                                 if(aLastCommand != sal_Unicode('l'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('l'));
+                                    aNewString += "l";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX);
                                 Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY);
@@ -2048,7 +2048,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                             else
                             {
                                 if(aLastCommand != sal_Unicode('L'))
-                                    aNewString += OUString(static_cast<sal_Unicode>('L'));
+                                    aNewString += "L";
 
                                 Imp_PutNumberCharWithSpace(aNewString, nX);
                                 Imp_PutNumberCharWithSpace(aNewString, nY);
@@ -2062,7 +2062,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                         // write as start point
                         if(mbRelative)
                         {
-                            aNewString += OUString(static_cast<sal_Unicode>('m'));
+                            aNewString += "m";
 
                             Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX);
                             Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY);
@@ -2071,7 +2071,7 @@ void SdXMLImExSvgDElement::AddPolygon(
                         }
                         else
                         {
-                            aNewString += OUString(static_cast<sal_Unicode>('M'));
+                            aNewString += "M";
 
                             Imp_PutNumberCharWithSpace(aNewString, nX);
                             Imp_PutNumberCharWithSpace(aNewString, nY);
@@ -2099,9 +2099,9 @@ void SdXMLImExSvgDElement::AddPolygon(
         if(bClosed)
         {
             if(mbRelative)
-                aNewString += OUString(static_cast<sal_Unicode>('z'));
+                aNewString += "z";
             else
-                aNewString += OUString(static_cast<sal_Unicode>('Z'));
+                aNewString += "Z";
 
             // update current point - we're back at the start
             if( bDidWriteStart )
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 1f56d66dfa2f..e02d62f94603 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -162,7 +162,7 @@ OUString XMLFontAutoStylePool::Add(
     else
     {
         OUString sName;
-        sal_Int32 nLen = rFamilyName.indexOf( sal_Unicode(';'), 0 );
+        sal_Int32 nLen = rFamilyName.indexOf( ';', 0 );
         if( -1 == nLen )
         {
             sName = rFamilyName;
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 5432f85e5d61..a56827e82ab3 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -867,7 +867,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         case XML_ATACTION_CAPTION_ESCAPE_OOO:
             {
                 OUString aAttrValue( sAttrValue );
-                if( aAttrValue.indexOf( sal_Unicode('%') ) != -1 )
+                if( aAttrValue.indexOf( '%' ) != -1 )
                 {
                     sal_Int32 nValue = 0;
                     ::sax::Converter::convertPercent( nValue, sAttrValue );
@@ -952,7 +952,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         case XML_ATACTION_OPACITY_FIX:
             {
                 sal_Int32 nValue;
-                if( sAttrValue.indexOf( sal_Unicode('%') ) != -1 )
+                if( sAttrValue.indexOf( '%' ) != -1 )
                 {
                     ::sax::Converter::convertPercent( nValue, sAttrValue );
                 }