summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/inc/cppcanvas/canvas.hxx2
-rw-r--r--cppcanvas/inc/cppcanvas/font.hxx2
-rw-r--r--cppcanvas/inc/cppcanvas/renderer.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx18
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx8
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx34
-rw-r--r--cppcanvas/source/wrapper/implcanvas.cxx2
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implfont.cxx4
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx4
10 files changed, 39 insertions, 39 deletions
diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx
index a6f05dadc53b..c377417a115d 100644
--- a/cppcanvas/inc/cppcanvas/canvas.hxx
+++ b/cppcanvas/inc/cppcanvas/canvas.hxx
@@ -89,7 +89,7 @@ namespace cppcanvas
*/
virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0;
- virtual FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const = 0;
+ virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const = 0;
virtual ColorSharedPtr createColor() const = 0;
diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx
index 922dd301bd91..9f36f9e19dda 100644
--- a/cppcanvas/inc/cppcanvas/font.hxx
+++ b/cppcanvas/inc/cppcanvas/font.hxx
@@ -44,7 +44,7 @@ namespace cppcanvas
public:
virtual ~Font() {}
- virtual ::rtl::OUString getName() const = 0;
+ virtual OUString getName() const = 0;
virtual double getCellSize() const = 0;
virtual ::com::sun::star::uno::Reference<
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index edb38d0a9dd5..e260e9400248 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.hxx
@@ -110,7 +110,7 @@ namespace cppcanvas
::boost::optional< Color::IntSRGBA > maTextColor;
/// Optionally forces the given fontname for all text actions
- ::boost::optional< ::rtl::OUString > maFontName;
+ ::boost::optional< OUString > maFontName;
/** Optionally transforms all text output actions with the
given matrix (in addition to the overall canvas
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2592ffbc5448..17ec217130c0 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -749,9 +749,9 @@ namespace cppcanvas
EMFP_DEBUG(
mfStream.Seek(0);
static int emfp_debug_stream_number = 0;
- rtl::OUString emfp_debug_filename("/tmp/emf-embedded-stream");
- emfp_debug_filename += rtl::OUString::valueOf(emfp_debug_stream_number++);
- emfp_debug_filename += rtl::OUString(".emf");
+ OUString emfp_debug_filename("/tmp/emf-embedded-stream");
+ emfp_debug_filename += OUString::valueOf(emfp_debug_stream_number++);
+ emfp_debug_filename += OUString(".emf");
SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC );
@@ -769,7 +769,7 @@ namespace cppcanvas
float emSize;
sal_uInt32 sizeUnit;
sal_Int32 fontFlags;
- rtl::OUString family;
+ OUString family;
void Read (SvMemoryStream &s)
{
@@ -790,8 +790,8 @@ namespace cppcanvas
for( sal_uInt32 i = 0; i < length; i++ )
s >> chars[ i ];
- family = ::rtl::OUString( chars, length );
- EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
+ family = OUString( chars, length );
+ EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
}
}
};
@@ -965,7 +965,7 @@ namespace cppcanvas
aTexture.Alpha = 1.0;
basegfx::ODFGradientInfo aGradInfo;
- rtl::OUString aGradientService;
+ OUString aGradientService;
const uno::Sequence< double > aStartColor(
::vcl::unotools::colorToDoubleSequence( brush->solidColor,
@@ -1632,7 +1632,7 @@ namespace cppcanvas
EMFP_DEBUG (printf ("EMF+ DrawString layoutRect: %f,%f - %fx%f\n", lx, ly, lw, lh));
- rtl::OUString text = read_uInt16s_ToOUString(rMF, stringLength);
+ OUString text = read_uInt16s_ToOUString(rMF, stringLength);
double cellSize = setFont (flags & 0xff, rFactoryParms, rState);
SET_TEXT_COLOR( brushId );
@@ -1858,7 +1858,7 @@ namespace cppcanvas
float *charsPosX = new float[glyphsCount];
float *charsPosY = new float[glyphsCount];
- rtl::OUString text = read_uInt16s_ToOUString(rMF, glyphsCount);
+ OUString text = read_uInt16s_ToOUString(rMF, glyphsCount);
for( sal_uInt32 i=0; i<glyphsCount; i++) {
rMF >> charsPosX[i] >> charsPosY[i];
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 3ab4ba55be20..6d355a81aebb 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -679,7 +679,7 @@ namespace cppcanvas
aRot90.rotate(M_PI_2);
basegfx::ODFGradientInfo aGradInfo;
- rtl::OUString aGradientService;
+ OUString aGradientService;
switch( rGradient.GetStyle() )
{
case GradientStyle_LINEAR:
@@ -1055,7 +1055,7 @@ namespace cppcanvas
pChars[3]=pChars[2]=pChars[1]=pChars[0];
long nStrikeoutWidth = (rParms.mrVDev.GetTextWidth(
- rtl::OUString(pChars, SAL_N_ELEMENTS(pChars))) + 2) / 4;
+ OUString(pChars, SAL_N_ELEMENTS(pChars))) + 2) / 4;
if( nStrikeoutWidth <= 0 )
nStrikeoutWidth = 1;
@@ -3086,7 +3086,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
- OSL_FAIL( rtl::OUStringToOString(
+ OSL_FAIL( OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -3147,7 +3147,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
- OSL_FAIL( rtl::OUStringToOString(
+ OSL_FAIL( OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index ab9478e1469f..3feeaa19e814 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -239,7 +239,7 @@ namespace cppcanvas
void initArrayAction( rendering::RenderState& o_rRenderState,
uno::Reference< rendering::XTextLayout >& o_rTextLayout,
const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -620,14 +620,14 @@ namespace cppcanvas
{
public:
TextAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
TextAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const CanvasSharedPtr& rCanvas,
@@ -660,7 +660,7 @@ namespace cppcanvas
};
TextAction::TextAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const CanvasSharedPtr& rCanvas,
@@ -680,7 +680,7 @@ namespace cppcanvas
}
TextAction::TextAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const CanvasSharedPtr& rCanvas,
@@ -780,7 +780,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
VirtualDevice& rVDev,
@@ -792,7 +792,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
VirtualDevice& rVDev,
@@ -841,7 +841,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
VirtualDevice& rVDev,
@@ -880,7 +880,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
VirtualDevice& rVDev,
@@ -1014,7 +1014,7 @@ namespace cppcanvas
{
public:
TextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1022,7 +1022,7 @@ namespace cppcanvas
const OutDevState& rState );
TextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1054,7 +1054,7 @@ namespace cppcanvas
};
TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1076,7 +1076,7 @@ namespace cppcanvas
}
TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
- const ::rtl::OUString& rString,
+ const OUString& rString,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1199,7 +1199,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1211,7 +1211,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1258,7 +1258,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
@@ -1298,7 +1298,7 @@ namespace cppcanvas
const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
const uno::Sequence< double >& rOffsets,
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index 29b75d213e0b..70a4c3f24f42 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -84,7 +84,7 @@ namespace cppcanvas
return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon);
}
- FontSharedPtr ImplCanvas::createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const
+ FontSharedPtr ImplCanvas::createFont( const OUString& rFontName, const double& rCellSize ) const
{
return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) );
}
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 5217d61f3558..29e5b82b55d6 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -65,7 +65,7 @@ namespace cppcanvas
virtual void setClip();
virtual ::basegfx::B2DPolyPolygon const* getClip() const;
- virtual FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const;
+ virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const;
virtual ColorSharedPtr createColor() const;
diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index f3a3652c20cc..e62cfa543227 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.cxx
@@ -32,7 +32,7 @@ namespace cppcanvas
{
ImplFont::ImplFont( const uno::Reference< rendering::XCanvas >& rCanvas,
- const ::rtl::OUString& rFontName,
+ const OUString& rFontName,
const double& rCellSize ) :
mxCanvas( rCanvas ),
mxFont( NULL )
@@ -56,7 +56,7 @@ namespace cppcanvas
{
}
- ::rtl::OUString ImplFont::getName() const
+ OUString ImplFont::getName() const
{
OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" );
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 141bed96c782..cda7a50fb867 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -50,12 +50,12 @@ namespace cppcanvas
public:
ImplFont( const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvas >& rCanvas,
- const ::rtl::OUString& rFontName,
+ const OUString& rFontName,
const double& rCellSize );
virtual ~ImplFont();
- virtual ::rtl::OUString getName() const;
+ virtual OUString getName() const;
virtual double getCellSize() const;
virtual ::com::sun::star::uno::Reference<