summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--canvas/qa/cppunit/canvastest.cxx4
-rw-r--r--canvas/source/cairo/cairo_canvas.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx4
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx4
-rw-r--r--canvas/source/factory/cf_service.cxx34
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx4
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx12
-rw-r--r--canvas/source/opengl/ogl_textlayout.cxx2
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx2
-rw-r--r--canvas/source/tools/canvastools.cxx2
-rw-r--r--canvas/source/tools/parametricpolypolygon.cxx6
-rw-r--r--canvas/source/vcl/canvas.cxx2
-rw-r--r--canvas/source/vcl/spritecanvas.cxx6
-rw-r--r--canvas/source/vcl/windowoutdevholder.cxx2
-rw-r--r--canvas/workben/canvasdemo.cxx4
-rw-r--r--include/canvas/canvastools.hxx2
16 files changed, 46 insertions, 46 deletions
diff --git a/canvas/qa/cppunit/canvastest.cxx b/canvas/qa/cppunit/canvastest.cxx
index 922888b4894a..b65b983f4039 100644
--- a/canvas/qa/cppunit/canvastest.cxx
+++ b/canvas/qa/cppunit/canvastest.cxx
@@ -93,7 +93,7 @@ public:
setupCanvas(Size(10, 10));
mCanvas->drawLine(geometry::RealPoint2D(1, 1), geometry::RealPoint2D(9, 1), mViewState,
mRenderState);
- exportDevice("test-draw-line.png", mVclDevice);
+ exportDevice(u"test-draw-line.png"_ustr, mVclDevice);
Bitmap bitmap = mVclDevice->GetBitmap(Point(), mVclDevice->GetOutputSizePixel());
BitmapScopedReadAccess access(bitmap);
// Canvas uses AA, which blurs the line, and it cannot be turned off,
@@ -128,7 +128,7 @@ public:
mCanvas->strokePolyPolygon(polygon, mViewState, mRenderState, strokeAttributes);
- exportDevice("test-tdf134053.png", mVclDevice);
+ exportDevice(u"test-tdf134053.png"_ustr, mVclDevice);
Bitmap bitmap = mVclDevice->GetBitmap(Point(), mVclDevice->GetOutputSizePixel());
BitmapScopedReadAccess access(bitmap);
struct Check
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 100ee51c0aa2..b170c4f7e4d8 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -79,7 +79,7 @@ namespace cairocanvas
const SystemGraphicsData* pSysData=reinterpret_cast<const SystemGraphicsData*>(aSeq.getConstArray());
if( !pSysData || !pSysData->nSize )
- throw lang::NoSupportException( "Passed SystemGraphicsData invalid!" );
+ throw lang::NoSupportException( u"Passed SystemGraphicsData invalid!"_ustr );
bool bHasCairo = pOutDev->SupportsCairo();
ENSURE_ARG_OR_THROW(bHasCairo, "SpriteCanvas::SpriteCanvas: No Cairo capability");
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index be26b17774d7..fcbaa4186138 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -75,7 +75,7 @@ namespace cairocanvas
VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
- "Parent window not VCL window, or canvas out-of-process!", nullptr);
+ u"Parent window not VCL window, or canvas out-of-process!"_ustr, nullptr);
bool bHasCairo = pParentWindow->GetOutDev()->SupportsCairo();
ENSURE_ARG_OR_THROW(bHasCairo,
@@ -133,7 +133,7 @@ namespace cairocanvas
OUString SAL_CALL SpriteCanvas::getServiceName( )
{
- return "com.sun.star.rendering.SpriteCanvas.Cairo";
+ return u"com.sun.star.rendering.SpriteCanvas.Cairo"_ustr;
}
// XServiceInfo
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index e033040d01b2..8dd2587dc11e 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -125,7 +125,7 @@ namespace cairocanvas
if( aAdvancements.getLength() != maText.Length )
{
SAL_WARN("canvas.cairo", "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
- throw lang::IllegalArgumentException("mismatching number of advancements", getXWeak(), 1);
+ throw lang::IllegalArgumentException(u"mismatching number of advancements"_ustr, getXWeak(), 1);
}
maLogicalAdvancements = aAdvancements;
@@ -145,7 +145,7 @@ namespace cairocanvas
if( aPositions.hasElements() && aPositions.getLength() != maText.Length )
{
SAL_WARN("canvas.cairo", "TextLayout::applyKashidaPositions(): mismatching number of positions" );
- throw lang::IllegalArgumentException("mismatching number of positions", getXWeak(), 1);
+ throw lang::IllegalArgumentException(u"mismatching number of positions"_ustr, getXWeak(), 1);
}
maKashidaPositions = aPositions;
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 10d05379e8e9..88f07fc56f06 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -123,21 +123,21 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
uno::Sequence<uno::Any> aArgs(comphelper::InitAnyPropertySequence(
{
- {"nodepath", uno::Any(OUString("/org.openoffice.Office.Canvas"))}
+ {"nodepath", uno::Any(u"/org.openoffice.Office.Canvas"_ustr)}
}));
m_xCanvasConfigNameAccess.set(
xConfigProvider->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess",
+ u"com.sun.star.configuration.ConfigurationAccess"_ustr,
aArgs ),
UNO_QUERY_THROW );
uno::Sequence<uno::Any> aArgs2(comphelper::InitAnyPropertySequence(
{
- {"nodepath", uno::Any(OUString("/org.openoffice.Office.Canvas/CanvasServiceList"))}
+ {"nodepath", uno::Any(u"/org.openoffice.Office.Canvas/CanvasServiceList"_ustr)}
}));
Reference<container::XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess",
+ u"com.sun.star.configuration.ConfigurationAccess"_ustr,
aArgs2 ), UNO_QUERY_THROW );
Reference<container::XHierarchicalNameAccess> xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
@@ -151,15 +151,15 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
if( xEntryNameAccess.is() )
{
Sequence<OUString> implementationList;
- if( xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList )
+ if( xEntryNameAccess->getByName(u"PreferredImplementations"_ustr) >>= implementationList )
{
m_aAvailableImplementations.emplace_back(serviceName, implementationList);
}
- if( xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList )
+ if( xEntryNameAccess->getByName(u"AcceleratedImplementations"_ustr) >>= implementationList )
{
m_aAcceleratedImplementations.emplace_back(serviceName, implementationList);
}
- if( xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList )
+ if( xEntryNameAccess->getByName(u"AntialiasingImplementations"_ustr) >>= implementationList )
{
m_aAAImplementations.emplace_back(serviceName, implementationList);
}
@@ -179,11 +179,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
{
// Ugh. Looks like configuration is borked. Fake minimal
// setup.
- m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.Canvas"),
- Sequence<OUString>{ "com.sun.star.comp.rendering.Canvas.VCL" } );
+ m_aAvailableImplementations.emplace_back(u"com.sun.star.rendering.Canvas"_ustr,
+ Sequence<OUString>{ u"com.sun.star.comp.rendering.Canvas.VCL"_ustr } );
- m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.SpriteCanvas"),
- Sequence<OUString>{ "com.sun.star.comp.rendering.SpriteCanvas.VCL" } );
+ m_aAvailableImplementations.emplace_back(u"com.sun.star.rendering.SpriteCanvas"_ustr,
+ Sequence<OUString>{ u"com.sun.star.comp.rendering.SpriteCanvas.VCL"_ustr } );
}
}
@@ -195,7 +195,7 @@ CanvasFactory::~CanvasFactory()
// XServiceInfo
OUString CanvasFactory::getImplementationName()
{
- return "com.sun.star.comp.rendering.CanvasFactory";
+ return u"com.sun.star.comp.rendering.CanvasFactory"_ustr;
}
sal_Bool CanvasFactory::supportsService( OUString const & serviceName )
@@ -205,7 +205,7 @@ sal_Bool CanvasFactory::supportsService( OUString const & serviceName )
Sequence<OUString> CanvasFactory::getSupportedServiceNames()
{
- return { "com.sun.star.rendering.CanvasFactory" };
+ return { u"com.sun.star.rendering.CanvasFactory"_ustr };
}
// XMultiComponentFactory
@@ -280,19 +280,19 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
bool bForceLastEntry(false);
checkConfigFlag( bForceLastEntry,
m_bCacheHasForcedLastImpl,
- "ForceSafeServiceImpl" );
+ u"ForceSafeServiceImpl"_ustr );
// use anti-aliasing canvas, if config flag set (or not existing)
bool bUseAAEntry(true);
checkConfigFlag( bUseAAEntry,
m_bCacheHasUseAAEntry,
- "UseAntialiasingCanvas" );
+ u"UseAntialiasingCanvas"_ustr );
// use accelerated canvas, if config flag set (or not existing)
bool bUseAcceleratedEntry(true);
checkConfigFlag( bUseAcceleratedEntry,
m_bCacheHasUseAcceleratedEntry,
- "UseAcceleratedCanvas" );
+ u"UseAcceleratedCanvas"_ustr );
// try to reuse last working implementation for given service name
const CacheVector::iterator aEnd(m_aCachedImplementations.end());
@@ -424,7 +424,7 @@ Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext(
{
Reference<lang::XServiceName> xServiceName(xCanvas, uno::UNO_QUERY);
SAL_INFO("canvas", "using " << (xServiceName.is() ? xServiceName->getServiceName()
- : OUString("(unknown)")));
+ : u"(unknown)"_ustr));
}
return xCanvas;
}
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 2b9588667517..9bec462f96e2 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -54,7 +54,7 @@ namespace oglcanvas
VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
- "Parent window not VCL window, or canvas out-of-process!", nullptr);
+ u"Parent window not VCL window, or canvas out-of-process!"_ustr, nullptr);
awt::Rectangle aRect;
maArguments[1] >>= aRect;
@@ -129,7 +129,7 @@ namespace oglcanvas
OUString SAL_CALL SpriteCanvas::getServiceName( )
{
- return "com.sun.star.rendering.SpriteCanvas.OGL";
+ return u"com.sun.star.rendering.SpriteCanvas.OGL"_ustr;
}
void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 8cb0a6934f66..7c0088e5b992 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -104,22 +104,22 @@ namespace oglcanvas
initContext();
mnLinearMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "linearMultiColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"linearMultiColorGradientFragmentShader"_ustr);
mnLinearTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "linearTwoColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"linearTwoColorGradientFragmentShader"_ustr);
mnRadialMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "radialMultiColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"radialMultiColorGradientFragmentShader"_ustr);
mnRadialTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "radialTwoColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"radialTwoColorGradientFragmentShader"_ustr);
mnRectangularMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "rectangularMultiColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"rectangularMultiColorGradientFragmentShader"_ustr);
mnRectangularTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader", "rectangularTwoColorGradientFragmentShader");
+ OpenGLHelper::LoadShaders(u"dummyVertexShader"_ustr, u"rectangularTwoColorGradientFragmentShader"_ustr);
mxContext->makeCurrent();
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index a87365275436..5baf7eb794cb 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -87,7 +87,7 @@ namespace oglcanvas
if( aPositions.hasElements() && aPositions.getLength() != maText.Length )
{
SAL_WARN("canvas.ogl", "TextLayout::applyKashidaPositions(): mismatching number of positions" );
- throw lang::IllegalArgumentException("mismatching number of positions", getXWeak(), 1);
+ throw lang::IllegalArgumentException(u"mismatching number of positions"_ustr, getXWeak(), 1);
}
maKashidaPositions = aPositions;
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index db1377e419b1..83b497bdd3cd 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -160,7 +160,7 @@ namespace
// Ifc XServiceName
virtual OUString SAL_CALL getServiceName( ) override
{
- return "com.sun.star.rendering.SimpleCanvas";
+ return u"com.sun.star.rendering.SimpleCanvas"_ustr;
}
// Ifc XSimpleCanvas
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 51d84d849fcb..4326847570d8 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1017,7 +1017,7 @@ namespace canvas::tools
uno::UNO_QUERY_THROW );
o_rxParams = { uno::Any(xServiceInfo->getImplementationName()),
- xPropSet->getPropertyValue( "DeviceHandle" ) };
+ xPropSet->getPropertyValue( u"DeviceHandle"_ustr ) };
}
catch( const uno::Exception& )
{
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index ca42d7fe36f7..d4d0a524e0e3 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -35,9 +35,9 @@ namespace canvas
{
uno::Sequence<OUString> ParametricPolyPolygon::getAvailableServiceNames()
{
- return {"LinearGradient",
- "EllipticalGradient",
- "RectangularGradient"};
+ return {u"LinearGradient"_ustr,
+ u"EllipticalGradient"_ustr,
+ u"RectangularGradient"_ustr};
}
rtl::Reference<ParametricPolyPolygon> ParametricPolyPolygon::create(
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 4a3b6f8d766b..b66b9751bb38 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -65,7 +65,7 @@ namespace vclcanvas
OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
if( !pOutDev )
- throw lang::NoSupportException("Passed OutDev invalid!", nullptr);
+ throw lang::NoSupportException(u"Passed OutDev invalid!"_ustr, nullptr);
OutDevProviderSharedPtr pOutdevProvider = std::make_shared<OutDevHolder>(*pOutDev);
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index cbe0fa8dc791..a4e46476ce78 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -82,7 +82,7 @@ namespace vclcanvas
OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
if( !pOutDev )
- throw lang::NoSupportException("Passed OutDev invalid!", nullptr);
+ throw lang::NoSupportException(u"Passed OutDev invalid!"_ustr, nullptr);
uno::Reference< awt::XWindow > xParentWindow;
maArguments[3] >>= xParentWindow;
@@ -144,7 +144,7 @@ namespace vclcanvas
OUString SAL_CALL SpriteCanvas::getServiceName( )
{
- return "com.sun.star.rendering.SpriteCanvas.VCL";
+ return u"com.sun.star.rendering.SpriteCanvas.VCL"_ustr;
}
// XServiceInfo
@@ -154,7 +154,7 @@ namespace vclcanvas
}
OUString SpriteCanvas::getImplementationName()
{
- return "com.sun.star.comp.rendering.SpriteCanvas.VCL";
+ return u"com.sun.star.comp.rendering.SpriteCanvas.VCL"_ustr;
}
sal_Bool SpriteCanvas::supportsService(const OUString& sServiceName)
{
diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx
index 4776ee554878..4cd91ee4a4e3 100644
--- a/canvas/source/vcl/windowoutdevholder.cxx
+++ b/canvas/source/vcl/windowoutdevholder.cxx
@@ -35,7 +35,7 @@ namespace vclcanvas
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(xWin);
if( !pWindow )
throw lang::NoSupportException(
- "Parent window not VCL window, or canvas out-of-process!",
+ u"Parent window not VCL window, or canvas out-of-process!"_ustr,
nullptr);
return *pWindow;
}
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 3ec7a3d6df75..175a11222b2b 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -59,7 +59,7 @@ class TestWindow : public WorkWindow
public:
TestWindow() : WorkWindow(nullptr, WB_APP | WB_STDWORK)
{
- SetText("Canvas test");
+ SetText(u"Canvas test"_ustr);
SetSizePixel( Size( 600, 450 ) );
EnablePaint( true );
Show();
@@ -643,7 +643,7 @@ void DemoApp::Init()
uno::Reference<lang::XMultiServiceFactory> xMSF;
xMSF.set(xComponentContext->getServiceManager(), uno::UNO_QUERY);
if(!xMSF.is())
- Application::Abort("Bootstrap failure - no service manager");
+ Application::Abort(u"Bootstrap failure - no service manager"_ustr);
::comphelper::setProcessServiceFactory(xMSF);
}
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 0f3b6e81ea7f..8d0c4ed7e0e3 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -377,7 +377,7 @@ namespace canvas
SAL_WARN("canvas", "numeric_cast detected data loss");
#endif
throw css::uno::RuntimeException(
- "numeric_cast detected data loss",
+ u"numeric_cast detected data loss"_ustr,
nullptr );
}