summaryrefslogtreecommitdiff
path: root/vcl/inc/textlayout.hxx
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-27 21:36:23 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-03-28 17:54:23 +0100
commit16b446937e026ff5edd097e99b8d9be6ba314562 (patch)
tree23e49c4c30cb1402cbfcae500e1325b2feb17490 /vcl/inc/textlayout.hxx
parentb7b3a90f5a3fc22247e4eb6b12b55f0366c74241 (diff)
Use OUString / sal_Int32 in vcl(outdev3.cxx,textlayout.cxx)
ImplGetTextLines(), GetCaretPositions(), ImplAddDevFontSubstitute(), AddFontSubstitute() ... https://gerrit.libreoffice.org/3099 Signed-off-by: Luboš Luňák <l.lunak@suse.cz> Change-Id: I781364da7a36afef65aac7a683c1b80fad61671e
Diffstat (limited to 'vcl/inc/textlayout.hxx')
-rw-r--r--vcl/inc/textlayout.hxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 5e95eabd5619..28f21ebaae2e 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -41,10 +41,10 @@ namespace vcl
{
public:
virtual long GetTextWidth( const XubString& _rText, xub_StrLen _nStartIndex, xub_StrLen _nLength ) const = 0;
- virtual void DrawText( const Point& _rStartPoint, const XubString& _rText, xub_StrLen _nStartIndex, xub_StrLen _nLength,
+ virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength,
MetricVector* _pVector, OUString* _pDisplayText ) = 0;
- virtual bool GetCaretPositions( const XubString& _rText, sal_Int32* _pCaretXArray, xub_StrLen _nStartIndex, xub_StrLen _nLength ) const = 0;
- virtual xub_StrLen GetTextBreak( const XubString& _rText, long _nMaxTextWidth, xub_StrLen _nStartIndex, xub_StrLen _nLength ) const = 0;
+ virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
+ virtual xub_StrLen GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual bool DecomposeTextRectAction() const = 0;
protected:
@@ -74,23 +74,23 @@ namespace vcl
) const;
virtual void DrawText(
const Point& _rStartPoint,
- const XubString& _rText,
- xub_StrLen _nStartIndex,
- xub_StrLen _nLength,
+ const OUString& _rText,
+ sal_Int32 _nStartIndex,
+ sal_Int32 _nLength,
MetricVector* _pVector,
OUString* _pDisplayText
);
virtual bool GetCaretPositions(
- const XubString& _rText,
+ const OUString& _rText,
sal_Int32* _pCaretXArray,
- xub_StrLen _nStartIndex,
- xub_StrLen _nLength
+ sal_Int32 _nStartIndex,
+ sal_Int32 _nLength
) const;
virtual xub_StrLen GetTextBreak(
- const XubString& _rText,
+ const OUString& _rText,
long _nMaxTextWidth,
- xub_StrLen _nStartIndex,
- xub_StrLen _nLength
+ sal_Int32 _nStartIndex,
+ sal_Int32 _nLength
) const;
virtual bool DecomposeTextRectAction() const;