From 93b8ccb4ade28815e50cd0ce9fd8d48114a619ed Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 17 Jan 2013 11:10:24 -0500 Subject: String cleanup. Change-Id: I3ae62993a1b753927af236b3a7923eacbb4c8cc0 --- svtools/inc/svtools/embedhlp.hxx | 4 ++-- svtools/source/misc/embedhlp.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx index 87910d1a810f..cd4f759940ef 100644 --- a/svtools/inc/svtools/embedhlp.hxx +++ b/svtools/inc/svtools/embedhlp.hxx @@ -36,7 +36,7 @@ namespace comphelper class Rectangle; class OutputDevice; -class String; + namespace svt { struct EmbeddedObjectRef_Impl; @@ -55,7 +55,7 @@ namespace svt const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& operator ->() const { return mxObj; } const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& GetObject() const { return mxObj; } - static void DrawPaintReplacement( const Rectangle &rRect, const String &rText, OutputDevice *pOut ); + static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut ); static void DrawShading( const Rectangle &rRect, OutputDevice *pOut ); static sal_Bool TryRunningState( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 5d6ac82e78e0..2fa75fdde9c0 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -595,7 +595,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( sal_Bool bUpdate ) const return NULL; } -void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const String &rText, OutputDevice *pOut ) +void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut ) { MapMode aMM( MAP_APPFONT ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL ); -- cgit