summaryrefslogtreecommitdiff
path: root/include/drawinglayer
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-13 10:04:18 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-13 10:04:18 +0000
commitdeecab601a0512c2f621dc070b0ef5f3d6905370 (patch)
tree98c16be7d8bdc5289edafe40eff6803a5c2e33cb /include/drawinglayer
parentc364fc1fc3555fc26dbcc04feaac2436cb8b6b7d (diff)
longparas: xub_StrLen->sal_Int32
Change-Id: I171caa791e1d2a0baa4444a460a7f20ad5428571
Diffstat (limited to 'include/drawinglayer')
-rw-r--r--include/drawinglayer/primitive2d/textbreakuphelper.hxx2
-rw-r--r--include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx9
-rw-r--r--include/drawinglayer/primitive2d/textprimitive2d.hxx12
3 files changed, 11 insertions, 12 deletions
diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index 4a3996353a93..2f5cfbfc7286 100644
--- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx
+++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
@@ -50,7 +50,7 @@ namespace drawinglayer
bool mbNoDXArray : 1;
/// create a portion from nIndex to nLength and append to rTempResult
- void breakupPortion(Primitive2DVector& rTempResult, sal_uInt32 nIndex, sal_uInt32 nLength, bool bWordLineMode);
+ void breakupPortion(Primitive2DVector& rTempResult, sal_Int32 nIndex, sal_Int32 nLength, bool bWordLineMode);
/// breakup complete primitive
void breakup(BreakupUnit aBreakupUnit);
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index e12b18608350..8a2d055ed4cd 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -73,8 +73,8 @@ namespace drawinglayer
std::vector< Primitive2DReference >& rTarget,
basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans,
const OUString& rText,
- xub_StrLen aTextPosition,
- xub_StrLen aTextLength,
+ sal_Int32 nTextPosition,
+ sal_Int32 nTextLength,
const ::std::vector< double >& rDXArray,
const attribute::FontAttribute& rFontAttribute) const;
@@ -85,12 +85,11 @@ namespace drawinglayer
public:
/// constructor
TextDecoratedPortionPrimitive2D(
-
/// TextSimplePortionPrimitive2D parameters
const basegfx::B2DHomMatrix& rNewTransform,
const OUString& rText,
- xub_StrLen aTextPosition,
- xub_StrLen aTextLength,
+ sal_Int32 nTextPosition,
+ sal_Int32 nTextLength,
const ::std::vector< double >& rDXArray,
const attribute::FontAttribute& rFontAttribute,
const ::com::sun::star::lang::Locale& rLocale,
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 06d9068cc0ee..2eda670f3529 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -100,10 +100,10 @@ namespace drawinglayer
OUString maText;
/// The index from where on maText is used
- xub_StrLen maTextPosition;
+ sal_Int32 mnTextPosition;
/// The length for maText usage, starting from maTextPosition
- xub_StrLen maTextLength;
+ sal_Int32 mnTextLength;
/// The DX array in logic units
::std::vector< double > maDXArray;
@@ -131,8 +131,8 @@ namespace drawinglayer
TextSimplePortionPrimitive2D(
const basegfx::B2DHomMatrix& rNewTransform,
const OUString& rText,
- xub_StrLen aTextPosition,
- xub_StrLen aTextLength,
+ sal_Int32 nTextPosition,
+ sal_Int32 nTextLength,
const ::std::vector< double >& rDXArray,
const attribute::FontAttribute& rFontAttribute,
const ::com::sun::star::lang::Locale& rLocale,
@@ -149,8 +149,8 @@ namespace drawinglayer
/// data read access
const basegfx::B2DHomMatrix& getTextTransform() const { return maTextTransform; }
const OUString& getText() const { return maText; }
- xub_StrLen getTextPosition() const { return maTextPosition; }
- xub_StrLen getTextLength() const { return maTextLength; }
+ sal_Int32 getTextPosition() const { return mnTextPosition; }
+ sal_Int32 getTextLength() const { return mnTextLength; }
const ::std::vector< double >& getDXArray() const { return maDXArray; }
const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; }
const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; }