diff options
35 files changed, 64 insertions, 70 deletions
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index 3a3d5bfe73db..e2891085ad6c 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 eededed803e6..61760a4382e2 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 0b52ff7808dc..c5eca28f922d 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 bcee91b604bc..3054e182617a 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 574d18063247..2e5f7bfc3ed5 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 7179adcadaae..daad4541f57b 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 b0a6546af601..2873bc5d36c9 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 f48cdde36ae9..99c9e25bf679 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 84f3f8560b80..7d40cf9b0798 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 38279a653ee6..d1c26205d690 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 8a68bd744709..89972853dd4f 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 7cc25bc3073b..21e1486bf55c 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 896d13e07012..d7bf56fee780 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 83f73a9b4cc3..7acb546a1a32 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 89d384013602..06f0cd6810b0 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 8e380d4e3098..70c8a10520f0 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 9721b73ed5d2..f7ce25376d3f 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 e58ce5d5b2de..cba8657a6831 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 0326735277f9..14c477f8a143 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 5a37c1e281ea..ec1ab4db0bb3 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 7f65d0febbed..fe22b78f3873 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 0f9c540935ba..a2ff668f2d96 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 d753b5293090..06cb0759ec24 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 877f32d12e3f..6f86f92264c5 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 9a888affe4fa..cbfb1cf93537 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 0676f964d33f..6273aa842577 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 37f56bf3d2b1..77a78f0bb96a 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 28178421a87e..07b60035c1aa 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 e640794dbaee..43398e11e8ee 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 bc15d00bb595..4e311e4feb13 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 337a930ee4e1..2192b79ff024 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 991499fb06f0..51da080f22cc 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 4195dac647cc..f408346be01e 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 447d1e0f8615..9305dd50d958 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 04ed64fd564e..f5e182b2748a 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@other.address"), value); + CPPUNIT_ASSERT_EQUAL( OUString("my@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)); } } } |