diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-24 16:30:20 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-26 12:45:36 +0000 |
| commit | ffb837eed2c6f843f12f9368ed2183660a0036a1 (patch) | |
| tree | fa809cbec969f0f94d593ce7ee46661b9cdd4f52 /vcl/inc | |
| parent | a89fda4b7f09856ba136f0a4df7929f7ee3f796b (diff) | |
Use OUString and sal_Int32 in GetTextArray() and ImplLayout()
Change-Id: I2c1e5b7d53c0d78f2ccf9ac317a7ff40298cd68d
Reviewed-on: https://gerrit.libreoffice.org/2967
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/vcl/outdev.hxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 5f0075787a30..44a5979ff21f 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -378,10 +378,9 @@ public: SAL_DLLPRIVATE bool ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL ); SAL_DLLPRIVATE void ImplSetClipRegion( const Region* pRegion ); - SAL_DLLPRIVATE SalLayout* ImplLayout( const String&, xub_StrLen nIndex, - xub_StrLen nLen, const Point& rLogicPos = Point(0,0), - long nLogicWidth=0, const sal_Int32* pLogicDXArray=NULL, - bool bFilter = false ) const; + SAL_DLLPRIVATE SalLayout* ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, + const Point& rLogicPos = Point(0,0), long nLogicWidth=0, + const sal_Int32* pLogicDXArray=NULL, bool bFilter = false ) const; SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen, long nPixelWidth, const sal_Int32* pPixelDXArray ) const; SAL_DLLPRIVATE SalLayout* ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const; @@ -583,9 +582,8 @@ public: const sal_Int32* pDXAry = NULL, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); - long GetTextArray( const XubString& rStr, sal_Int32* pDXAry = NULL, - xub_StrLen nIndex = 0, - xub_StrLen nLen = STRING_LEN ) const; + long GetTextArray( const OUString& rStr, sal_Int32* pDXAry = NULL, + sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const; bool GetCaretPositions( const XubString&, sal_Int32* pCaretXArray, xub_StrLen nIndex, xub_StrLen nLen, sal_Int32* pDXAry = NULL, long nWidth = 0, |