[Libreoffice-commits] core.git: 2 commits - basic/source chart2/source connectivity/source dbaccess/source filter/source icon-themes/README jvmfwk/plugins oox/source sc/source sdext/source sd/source sfx2/source svtools/source svx/source sw/source ucb/source unotest/source vcl/android writerfilter/source xmlhelp/source xmloff/source xmlsecurity/qa
Thomas Arnhold
thomas at arnhold.org
Sat Jun 29 07:23:57 PDT 2013
basic/source/classes/sbunoobj.cxx | 6 -
basic/source/sbx/sbxform.cxx | 4
chart2/source/controller/main/ChartDropTargetHelper.cxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 6 -
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx | 2
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 4
dbaccess/source/ui/dlg/generalpage.cxx | 2
filter/source/svg/svgfilter.hxx | 2
filter/source/svg/svgwriter.cxx | 12 +-
filter/source/xsltdialog/typedetectionexport.cxx | 14 --
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 31 ++---
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 28 ++---
icon-themes/README | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2
oox/source/vml/vmldrawing.cxx | 12 +-
sc/source/core/data/dptabres.cxx | 2
sc/source/core/data/dputil.cxx | 2
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/xcl97/xcl97esc.cxx | 4
sc/source/ui/vba/vbaname.cxx | 2
sd/source/ui/sidebar/PanelFactory.cxx | 3
sdext/source/presenter/PresenterButton.cxx | 2
sdext/source/presenter/PresenterTheme.cxx | 2
sfx2/source/appl/appuno.cxx | 2
svtools/source/misc/transfer.cxx | 4
svtools/source/table/cellvalueconversion.cxx | 2
svtools/source/table/tablecontrol.cxx | 9 -
svx/source/gengal/gengal.cxx | 2
svx/source/svdraw/charthelper.cxx | 2
sw/source/core/inc/wrong.hxx | 4
sw/source/core/unocore/unotext.cxx | 6 -
sw/source/ui/lingu/olmenu.cxx | 2
ucb/source/ucp/cmis/cmis_repo_content.cxx | 2
unotest/source/cpp/bootstrapfixturebase.cxx | 6 -
vcl/android/androidinst.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmloff/source/core/xmlimp.cxx | 3
xmloff/source/draw/xexptran.cxx | 58 +++++------
xmloff/source/style/XMLFontAutoStylePool.cxx | 2
xmloff/source/transform/StyleOOoTContext.cxx | 4
xmlsecurity/qa/certext/SanCertExt.cxx | 10 -
45 files changed, 131 insertions(+), 157 deletions(-)
New commits:
commit 955ebe83a8e57a776044b7f7749b4701ba82b8f4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jun 29 16:15:08 2013 +0200
String to OUString and cleanup
Change-Id: Idc18c1a6a64edea3399c8747ec0f096a2f964b68
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 001df2a..619a9c9 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 e09c298..c15b9d2 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 d9041f9..194a06d 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 a7593c2..37e1243 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 4f4469a..b9f89e0 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 0490c3f..b5c8290 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 d76eefe..2e4eb46 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 127004d..06adb8a 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 1f56d66..e02d62f 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 5432f85..a56827e 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 );
}
commit 318f2b64cc32038b2ab1b18b4a13e3f41e1e35ff
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jun 29 14:42:54 2013 +0200
remove some createFromAscii usage
there are a lot more of them:
git grep 'createFromAscii[^)]*"'
Change-Id: Ibc2e9cae208d8b9c91667bb3b177c6bd6d3a9424
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 3a3d5bf..e289108 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -960,9 +960,7 @@ OUString SbxBasicFormater::BasicFormatNull( OUString sFormatStrg )
{
return sNullFormatStrg;
}
- OUString aRetStr;
- aRetStr = OUString::createFromAscii( "null" );
- return aRetStr;
+ return OUString("null");
}
OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg )
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index eededed..61760a4 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -107,7 +107,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
SAL_INFO("connectivity.mork", "TableName: " << aTableName);
aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name
- aRow.push_back( new ORowSetValueDecorator( OUString::createFromAscii("TABLE") ) ); // Table type
+ aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) ); // Table type
aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // Remarks
aRows.push_back(aRow);
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 0b52ff7..c5eca28 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -149,7 +149,7 @@ static sal_Int32 readLogLevelFromConfiguration()
osl_getModuleURLFromAddress(
(void*) readLogLevelFromConfiguration, (rtl_uString **) &fileName );
fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 );
- fileName += OUString::createFromAscii( "postgresql-sdbc.ini" );
+ fileName += "postgresql-sdbc.ini";
rtl::Bootstrap bootstrapHandle( fileName );
OUString str;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index bcee91b..3054e18 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -516,7 +516,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
if ( !sDatabaseName.isEmpty() )
{
- sNewUrl += OUString::createFromAscii("/") + sDatabaseName;
+ sNewUrl += "/" + sDatabaseName;
}
}
break;
@@ -533,7 +533,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
sDatabaseName = pCollection->cutPrefix( pUrlItem->GetValue() );
if ( !sDatabaseName.isEmpty() )
{
- sNewUrl += OUString::createFromAscii(":") + sDatabaseName;
+ sNewUrl += ":" + sDatabaseName;
}
}
else
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 574d180..2e5f7bf 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -335,7 +335,7 @@ void ODbaseIndexDialog::Init()
OTableInfo& rTabInfo = m_aTableInfoList.back();
// open the INF file
- aURL.setExtension(OUString::createFromAscii("inf"));
+ aURL.setExtension("inf");
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
aInfFile.SetGroup( aGroupIdent );
@@ -439,7 +439,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
}
aURL.SetSmartURL(aDsn);
aURL.Append(aTableName);
- aURL.setExtension(OUString::createFromAscii("inf"));
+ aURL.setExtension("inf");
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 7179adc..daad454 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -609,7 +609,7 @@ namespace dbaui
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0, OUString::createFromAscii("sdatabase") );
+ 0, OUString("sdatabase") );
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index b0a6546..2873bc5 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -99,7 +99,7 @@ using namespace ::std;
// Placeholder tag used into the ImplWriteActions method to filter text placeholder fields
-static const OUString sPlaceholderTag = OUString::createFromAscii( "<[:isPlaceholder:]>" );
+static const OUString sPlaceholderTag( "<[:isPlaceholder:]>" );
class SVGExport : public SvXMLExport
{
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f48cdde..99c9e25 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1918,17 +1918,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
{
// miter is Svg default, so no need to write until the exporter might write styles.
// If this happens, activate here
- // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("miter"));
+ // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter");
break;
}
case basegfx::B2DLINEJOIN_BEVEL:
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("bevel"));
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel");
break;
}
case basegfx::B2DLINEJOIN_ROUND:
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("round"));
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round");
break;
}
}
@@ -1940,17 +1940,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
{
// butt is Svg default, so no need to write until the exporter might write styles.
// If this happens, activate here
- // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("butt"));
+ // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt");
break;
}
case com::sun::star::drawing::LineCap_ROUND:
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("round"));
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round");
break;
}
case com::sun::star::drawing::LineCap_SQUARE:
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("square"));
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square");
break;
}
}
diff --git a/icon-themes/README b/icon-themes/README
index 84f3f85..7d40cf9 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -43,9 +43,9 @@ How to add a new image set:
and
sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
both in vcl/source/app/settings.cxx, e.g.
- case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( "new_set" );
+ case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString( "new_set" );
and
- else if ( rName == ::rtl::OUString::createFromAscii( "new_set" ) )
+ else if ( rName == "new_set" )
return STYLE_SYMBOLS_NEW_SET;
- Add localized item names to 'ListBox LB_ICONSTYLE' to
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 38279a6..d1c2620 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -469,7 +469,7 @@ bool getJavaProps(const OUString & exePath,
OUString sHomeProperty("java.home");
if(sHomeProperty.equals(sKey))
{
- sVal = homePath + OUString::createFromAscii("/jre");
+ sVal = homePath + "/jre";
}
#endif
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 8a68bd7..8997285 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -225,12 +225,12 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService,
else
{
Reference< XPropertySet > xPropSet( xShape, UNO_QUERY_THROW );
- xPropSet->setPropertyValue( OUString::createFromAscii( "HoriOrient" ), makeAny( HoriOrientation::NONE ) );
- xPropSet->setPropertyValue( OUString::createFromAscii( "VertOrient" ), makeAny( VertOrientation::NONE ) );
- xPropSet->setPropertyValue( OUString::createFromAscii( "HoriOrientPosition" ), makeAny( rShapeRect.X ) );
- xPropSet->setPropertyValue( OUString::createFromAscii( "VertOrientPosition" ), makeAny( rShapeRect.Y ) );
- xPropSet->setPropertyValue( OUString::createFromAscii( "HoriOrientRelation" ), makeAny( RelOrientation::FRAME ) );
- xPropSet->setPropertyValue( OUString::createFromAscii( "VertOrientRelation" ), makeAny( RelOrientation::FRAME ) );
+ xPropSet->setPropertyValue( "HoriOrient", makeAny( HoriOrientation::NONE ) );
+ xPropSet->setPropertyValue( "VertOrient", makeAny( VertOrientation::NONE ) );
+ xPropSet->setPropertyValue( "HoriOrientPosition", makeAny( rShapeRect.X ) );
+ xPropSet->setPropertyValue( "VertOrientPosition", makeAny( rShapeRect.Y ) );
+ xPropSet->setPropertyValue( "HoriOrientRelation", makeAny( RelOrientation::FRAME ) );
+ xPropSet->setPropertyValue( "VertOrientRelation", makeAny( RelOrientation::FRAME ) );
}
xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 7cc25bc..21e1486 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -883,7 +883,7 @@ OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const
if ( nMeasure < 0 )
{
OSL_FAIL("GetMeasureDimensionName: negative");
- return OUString::createFromAscii("***");
+ return OUString("***");
}
return mrSource.GetDataDimName(nMeasure);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 896d13e..d7bf56f 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -132,7 +132,7 @@ OUString ScDPUtil::getDateGroupName(
OSL_FAIL("invalid date part");
}
- return OUString::createFromAscii("FIXME: unhandled value");
+ return OUString("FIXME: unhandled value");
}
double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo)
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 83f73a9..7acb546 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -846,7 +846,7 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin
{
try
{
- OUString aString = OUString::createFromAscii("\"");
+ OUString aString("\"");
xDataSeq = xDataProv->createDataSequenceByRangeRepresentation( aString + mxString->GetText() + aString );
// set sequence role
ScfPropertySet aSeqProp( xDataSeq );
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 89d3840..06f0cd6 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -485,7 +485,7 @@ SdrObject* XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, con
{
Reference< XControlModel > xCtrlModel = pSdrUnoObj->GetUnoControlModel();
Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY);
- const static rtl::OUString sPropertyName = rtl::OUString::createFromAscii("ControlTypeinMSO");
+ const static rtl::OUString sPropertyName("ControlTypeinMSO");
enum { eCreateFromOffice = 0, eCreateFromMSTBXControl, eCreateFromMSOCXControl };
@@ -507,7 +507,7 @@ SdrObject* XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, con
if( mnObjType == 8 )//OCX
{
//Need summary type for export
- const static rtl::OUString sObjIdPropertyName = rtl::OUString::createFromAscii("ObjIDinMSO");
+ const static rtl::OUString sObjIdPropertyName("ObjIDinMSO");
const XclImpPictureObj* const pObj = dynamic_cast< const XclImpPictureObj* const >(this);
if( pObj != NULL && pObj->IsOcxControl() )
{
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 8e380d4..70c8a10 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -250,7 +250,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
Any aAny;
try
{
- aAny = xPropSet->getPropertyValue(rtl::OUString::createFromAscii("ControlTypeinMSO"));
+ aAny = xPropSet->getPropertyValue("ControlTypeinMSO");
aAny >>= nMsCtlType;
}
catch(const Exception&)
@@ -332,7 +332,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
Any aAny;
try
{
- aAny = xPropSet->getPropertyValue(rtl::OUString::createFromAscii("ObjIDinMSO"));
+ aAny = xPropSet->getPropertyValue("ObjIDinMSO");
}
catch(const Exception&)
{
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 9721b73..f7ce253 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -108,7 +108,7 @@ OUString ScVbaName::getContent( const formula::FormulaGrammar::Grammar eGrammar,
if ( bPrependEquals )
{
if (aContent.indexOf('=') != 0)
- aContent = OUString::createFromAscii("=") + aContent;
+ aContent = "=" + aContent;
}
return aContent;
}
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index e58ce5d..cba8657 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -98,8 +98,7 @@ Reference<XInterface> SAL_CALL PanelFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.PanelFactory"));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PanelFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 0326735..14c477f 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -498,7 +498,7 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
UNO_QUERY),
::boost::bind(&PresenterConfigurationAccess::IsStringPropertyEqual,
rsConfgurationName,
- OUString::createFromAscii("Name"),
+ OUString("Name"),
_2)),
UNO_QUERY);
}
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 5a37c1e..ec1ab4d 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -385,7 +385,7 @@ bool PresenterTheme::ConvertToColor (
pConfiguration->GoToChild(
::boost::bind(&PresenterConfigurationAccess::IsStringPropertyEqual,
rsStyleName,
- OUString::createFromAscii("StyleName"),
+ OUString("StyleName"),
_2));
}
return pConfiguration;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7f65d0f..fe22b78 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2029,7 +2029,7 @@ css::uno::Sequence< OUString > SfxAppDispatchProvider::impl_getStaticSupportedSe
/* Helper for XServiceInfo */
OUString SfxAppDispatchProvider::impl_getStaticImplementationName()
{
- return OUString::createFromAscii( "com.sun.star.comp.sfx2.AppDispatchProvider" );
+ return OUString( "com.sun.star.comp.sfx2.AppDispatchProvider" );
}
/* Helper for registry */
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0f9c540..a2ff668 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -775,7 +775,7 @@ sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataF
{
SvMemoryStream aMemStm( 65535, 65535 );
- if(rFlavor.MimeType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("image/png")))
+ if(rFlavor.MimeType.equalsIgnoreAsciiCase("image/png"))
{
// write a PNG
::vcl::PNGWriter aPNGWriter(rBitmapEx);
@@ -1733,7 +1733,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapE
if(bRet)
{
- if(rFlavor.MimeType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("image/png")))
+ if(rFlavor.MimeType.equalsIgnoreAsciiCase("image/png"))
{
// it's a PNG, import to BitmapEx
::vcl::PNGReader aPNGReader(*xStm);
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index d753b52..06cb075 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -334,7 +334,7 @@ namespace svt
// ensure a NullDate we will assume later on
UnoDate const aNullDate( 1, 1, 1900 );
Reference< XPropertySet > const xFormatSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
- xFormatSettings->setPropertyValue( OUString::createFromAscii( "NullDate" ), makeAny( aNullDate ) );
+ xFormatSettings->setPropertyValue( "NullDate", makeAny( aNullDate ) );
// knit
xFormatter->attachNumberFormatsSupplier( xSupplier );
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 877f32d..6f86f92 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -311,13 +311,11 @@ namespace svt { namespace table
//if the name is equal to cell content, it'll be read twice
if(GetModel()->hasColumnHeaders())
{
- aRetText = GetColumnName(_nCol);
- aRetText += OUString::createFromAscii(" , ");
+ aRetText = GetColumnName(_nCol) + " , ";
}
if(GetModel()->hasRowHeaders())
{
- aRetText += GetRowName(_nRow);
- aRetText += OUString::createFromAscii(" , ");
+ aRetText += GetRowName(_nRow) + " , ";
}
//aRetText = GetAccessibleCellText(_nRow, _nCol);
break;
@@ -356,8 +354,7 @@ namespace svt { namespace table
// if the name is equal to cell content, it'll be read twice
if ( GetModel()->hasColumnHeaders() )
{
- aRetText = GetColumnName( GetCurrentColumn() );
- aRetText += OUString::createFromAscii( " , " );
+ aRetText = GetColumnName( GetCurrentColumn() ) + " , ";
}
if ( GetModel()->hasRowHeaders() )
{
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 9a888af..cbfb1cf 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -182,7 +182,7 @@ void GalApp::Init()
lastSlash = fileName.lastIndexOf( '\\' );
#endif
OUString baseBinDir = fileName.copy( 0, lastSlash );
- OUString installPrefix = baseBinDir + OUString::createFromAscii( "/../.." );
+ OUString installPrefix = baseBinDir + "/../..";
OUString envVar( "OOO_INSTALL_PREFIX");
osl_setEnvironment(envVar.pData, installPrefix.pData);
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index 0676f96..6273aa8 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -66,7 +66,7 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent
try
{
const uno::Reference< lang::XMultiServiceFactory > xChartFact(rXModel, uno::UNO_QUERY_THROW);
- const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW);
+ const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance("com.sun.star.chart2.ChartView"), uno::UNO_QUERY_THROW);
const uno::Reference< util::XUpdatable > xUpdatable(xChartView, uno::UNO_QUERY_THROW);
if(xUpdatable.is())
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 37f56bf..77a78f0 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -87,7 +87,7 @@ private:
{
if (xPropertyBag.is())
{
- const ::rtl::OUString colorKey = ::rtl::OUString::createFromAscii ("LineColor");
+ const ::rtl::OUString colorKey("LineColor");
com::sun::star::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< com::sun::star::uno::Any>();
com::sun::star::util::Color lineColor = 0;
@@ -113,7 +113,7 @@ private:
{
if (xPropertyBag.is())
{
- const ::rtl::OUString typeKey = ::rtl::OUString::createFromAscii ("LineType");
+ const ::rtl::OUString typeKey("LineType");
com::sun::star::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< com::sun::star::uno::Any>();
::sal_Int16 lineType = 0;
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 2817842..07b6003 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1850,7 +1850,7 @@ void SwXText::Impl::ConvertCell(
if (rCell.getLength() != 2)
{
throw lang::IllegalArgumentException(
- OUString::createFromAscii( "rCell needs to contain 2 elements" ),
+ "rCell needs to contain 2 elements",
uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) );
}
const uno::Reference<text::XTextRange> xStartRange = rCell[0];
@@ -1865,7 +1865,7 @@ void SwXText::Impl::ConvertCell(
!::sw::XTextRangeToSwPaM(aEndCellPam, xEndRange))
{
throw lang::IllegalArgumentException(
- OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ),
+ "Start or End range cannot be resolved to a SwPaM",
uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) );
}
@@ -2558,7 +2558,7 @@ throw (uno::RuntimeException)
}
if(!aRef.is())
{
- throw uno::RuntimeException( OUString::createFromAscii( "End of content node doesn't have the proper start node" ),
+ throw uno::RuntimeException( "End of content node doesn't have the proper start node",
uno::Reference< uno::XInterface >( *this ) );
}
return aRef;
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index e640794..43398e1 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -795,7 +795,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
- aErrorBox.SetText( OUString::createFromAscii( "Explanations" ) );
+ aErrorBox.SetText( "Explanations" );
aErrorBox.Execute();
}
}
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index bc15d00..4e311e4 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -158,7 +158,7 @@ namespace cmis
ucb::IOErrorCode_ABORT,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- OUString::createFromAscii( "Authentication cancelled" ) );
+ OUString( "Authentication cancelled" ) );
}
}
}
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 337a930..2192b79 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -35,15 +35,15 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
#ifdef WNT
if (pSrcRoot[1] == ':')
{
- m_aSrcRootURL += OUString::createFromAscii( "/" );
+ m_aSrcRootURL += "/";
}
if (pSolverRoot[1] == ':')
{
- m_aSolverRootURL += OUString::createFromAscii( "/" );
+ m_aSolverRootURL += "/";
}
if (pWorkdirRoot[1] == ':')
{
- m_aWorkdirRootURL += OUString::createFromAscii( "/" );
+ m_aWorkdirRootURL += "/";
}
#endif
#else
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 991499f..51da080 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -302,7 +302,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
OUString aError( rErrorText );
if( aError.isEmpty() )
- aError = OUString::createFromAscii("Unknown application error");
+ aError = "Unknown application error";
LOGI("%s", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
LOGI("SalAbort: '%s'",
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4195dac..f408346 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3176,16 +3176,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
break;
case RTF_TRRH:
{
- OUString hRule = OUString::createFromAscii("auto");
+ OUString hRule("auto");
if ( nParam < 0 )
{
RTFValue::Pointer_t pAbsValue(new RTFValue(-nParam));
pIntValue.swap( pAbsValue );
- hRule = OUString::createFromAscii("exact");
+ hRule = "exact";
}
else if ( nParam > 0 )
- hRule = OUString::createFromAscii("atLeast");
+ hRule = "atLeast";
lcl_putNestedAttribute(m_aStates.top().aTableRowSprms,
NS_ooxml::LN_CT_TrPrBase_trHeight, NS_ooxml::LN_CT_Height_val, pIntValue);
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 447d1e0..9305dd5 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -877,7 +877,7 @@ KeywordInfo* Databases::getKeyword( const OUString& Database,
{
OUString fileNameHDFHelp( fileURL );
if( bExtension )
- fileNameHDFHelp += OUString::createFromAscii( "_" );
+ fileNameHDFHelp += "_";
if( m_xSFA->exists( fileNameHDFHelp ) )
{
helpdatafileproxy::Hdf aHdf( fileNameHDFHelp, m_xSFA );
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index 04ed64f..f5e182b 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -179,7 +179,7 @@ namespace {
::com::sun::star::beans::NamedValue otherNameProp;
if (altNames[n].Value >>= otherNameProp)
{
- CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("1.2.3.4"), otherNameProp.Name);
+ CPPUNIT_ASSERT_EQUAL( OUString("1.2.3.4"), otherNameProp.Name);
uno::Sequence< sal_Int8 > ipAddress;
otherNameProp.Value >>= ipAddress;
CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( ipAddress.getLength() > 0 ) );
@@ -196,7 +196,7 @@ namespace {
{
OUString value;
altNames[n].Value >>= value;
- CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("my at other.address"), value);
+ CPPUNIT_ASSERT_EQUAL( OUString("my at other.address"), value);
}
}
}
@@ -209,7 +209,7 @@ namespace {
{
OUString value;
altNames[n].Value >>= value;
- CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("alt.openoffice.org"), value);
+ CPPUNIT_ASSERT_EQUAL( OUString("alt.openoffice.org"), value);
}
}
}
@@ -226,7 +226,7 @@ namespace {
{
OUString value;
altNames[n].Value >>= value;
- CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("http://my.url.here/"), value);
+ CPPUNIT_ASSERT_EQUAL( OUString("http://my.url.here/"), value);
}
}
}
@@ -253,7 +253,7 @@ namespace {
{
OUString value;
altNames[n].Value >>= value;
- CPPUNIT_ASSERT( OUString::createFromAscii("1.2.3.4").equals(value));
+ CPPUNIT_ASSERT( OUString("1.2.3.4").equals(value));
}
}
}
More information about the Libreoffice-commits
mailing list