diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-09-10 23:42:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-11 10:54:24 +0100 |
| commit | 3e635c3368c23608bac471970f18d1d64684a147 (patch) | |
| tree | bcd3c3896b079b16fd26ef826d44c9a93dde41bc /vcl | |
| parent | c0c7fb66985a9a3e8f9b7a796c1e0489e407879b (diff) | |
XubString->rtl::OUString
Change-Id: If7e5d015c95f8f173750ca32e061d69f56e2d93e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index b65c75a38403..e1721e9ef4f4 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -638,7 +638,7 @@ public: const XubString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK, TextRectInfo* pInfo = NULL, const ::vcl::ITextLayout* _pTextLayout = NULL ) const; - XubString GetEllipsisString( const XubString& rStr, long nMaxWidth, + OUString GetEllipsisString( const XubString& rStr, long nMaxWidth, sal_uInt16 nStyle = TEXT_DRAW_ENDELLIPSIS ) const; void DrawCtrlText( const Point& rPos, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 049b13eddcb3..d0428a72a8b0 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -6966,7 +6966,7 @@ static sal_Bool ImplIsCharIn( xub_Unicode c, const sal_Char* pStr ) // ----------------------------------------------------------------------- -String OutputDevice::GetEllipsisString( const String& rOrigStr, long nMaxWidth, +OUString OutputDevice::GetEllipsisString( const String& rOrigStr, long nMaxWidth, sal_uInt16 nStyle ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); |