diff options
Diffstat (limited to 'oox/source/helper')
| -rw-r--r-- | oox/source/helper/attributelist.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/graphichelper.cxx | 10 | ||||
| -rw-r--r-- | oox/source/helper/modelobjecthelper.cxx | 12 | ||||
| -rw-r--r-- | oox/source/helper/textinputstream.cxx | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 7a973975f3d2..488105d4eed1 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -357,7 +357,7 @@ util::DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const util::Dat std::vector<sal_Int32> AttributeList::getTokenList(sal_Int32 nAttrToken) const { std::vector<sal_Int32> aValues; - OUString sValue = getString(nAttrToken, ""); + OUString sValue = getString(nAttrToken, u""_ustr); sal_Int32 nIndex = 0; do { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index c4c2cff479ad..9986bfd9d3f7 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -233,17 +233,17 @@ Reference< XGraphic > GraphicHelper::importGraphic( const Reference< XInputStrea Reference< XGraphic > xGraphic; if( rxInStrm.is() && mxGraphicProvider.is() ) try { - Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue("InputStream", rxInStrm), - comphelper::makePropertyValue("LazyRead", bLazyLoad) }; + Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(u"InputStream"_ustr, rxInStrm), + comphelper::makePropertyValue(u"LazyRead"_ustr, bLazyLoad) }; if ( pExtHeader && pExtHeader->mapMode > 0 ) { aArgs.realloc( aArgs.getLength() + 1 ); auto pArgs = aArgs.getArray(); Sequence< PropertyValue > aFilterData{ - comphelper::makePropertyValue("ExternalWidth", pExtHeader->xExt), - comphelper::makePropertyValue("ExternalHeight", pExtHeader->yExt), - comphelper::makePropertyValue("ExternalMapMode", pExtHeader->mapMode) + comphelper::makePropertyValue(u"ExternalWidth"_ustr, pExtHeader->xExt), + comphelper::makePropertyValue(u"ExternalHeight"_ustr, pExtHeader->yExt), + comphelper::makePropertyValue(u"ExternalMapMode"_ustr, pExtHeader->mapMode) }; pArgs[ 2 ].Name = "FilterData"; pArgs[ 2 ].Value <<= aFilterData; diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx index e38a6ee207e2..5ea9fa94ef83 100644 --- a/oox/source/helper/modelobjecthelper.cxx +++ b/oox/source/helper/modelobjecthelper.cxx @@ -96,12 +96,12 @@ constexpr OUStringLiteral gaBitmapUrlNameBase( u"msFillBitmap " ); ///< Base constexpr OUStringLiteral gaHatchNameBase( u"msFillHatch " ); ///< Base name for all named fill hatches. ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) : - maMarkerContainer( rxModelFactory, "com.sun.star.drawing.MarkerTable" ), - maDashContainer( rxModelFactory, "com.sun.star.drawing.DashTable" ), - maGradientContainer( rxModelFactory, "com.sun.star.drawing.GradientTable" ), - maTransGradContainer( rxModelFactory, "com.sun.star.drawing.TransparencyGradientTable" ), - maBitmapUrlContainer( rxModelFactory, "com.sun.star.drawing.BitmapTable" ), - maHatchContainer( rxModelFactory, "com.sun.star.drawing.HatchTable" ) + maMarkerContainer( rxModelFactory, u"com.sun.star.drawing.MarkerTable"_ustr ), + maDashContainer( rxModelFactory, u"com.sun.star.drawing.DashTable"_ustr ), + maGradientContainer( rxModelFactory, u"com.sun.star.drawing.GradientTable"_ustr ), + maTransGradContainer( rxModelFactory, u"com.sun.star.drawing.TransparencyGradientTable"_ustr ), + maBitmapUrlContainer( rxModelFactory, u"com.sun.star.drawing.BitmapTable"_ustr ), + maHatchContainer( rxModelFactory, u"com.sun.star.drawing.HatchTable"_ustr ) { } diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index a48860c35481..a559dd5e9fd4 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -81,7 +81,7 @@ void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL UnoBinaryInputStream::available() { ensureConnected(); - throw RuntimeException( "Functionality not supported", Reference< XInputStream >() ); + throw RuntimeException( u"Functionality not supported"_ustr, Reference< XInputStream >() ); } void SAL_CALL UnoBinaryInputStream::closeInput() @@ -94,7 +94,7 @@ void SAL_CALL UnoBinaryInputStream::closeInput() void UnoBinaryInputStream::ensureConnected() const { if( !mpInStrm ) - throw NotConnectedException( "Stream closed" ); + throw NotConnectedException( u"Stream closed"_ustr ); } } // namespace |