diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-02-20 21:13:29 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-02-21 16:57:58 +0100 |
commit | a620cfd83eaca1ef550811f99fbbc3d7fe3dbd70 (patch) | |
tree | 53c51097ad1596e8c68aa8604275ad363ad46261 /sw | |
parent | 95f454e25501d1f221c5ee460a82c1e9feb8b6de (diff) |
sw: clean up LONG_MAX/WW8_CP_MAX confusion
Change-Id: I5e9d595b851db231863e3e02866149a7af01883b
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0f98f30e84d2..821252a23a1c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4773,10 +4773,10 @@ WW8PLCFMan::~WW8PLCFMan() // 0. which attr class, // 1. if it's a attr start, // 2. CP, where is next attr change -sal_uInt16 WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const +sal_uInt16 WW8PLCFMan::WhereIdx(bool *const pbStart, WW8_CP *const pPos) const { OSL_ENSURE(m_nPLCF,"What the hell"); - long nNext = LONG_MAX; // search order: + WW8_CP nNext = WW8_CP_MAX; // search order: sal_uInt16 nNextIdx = m_nPLCF;// first ending found ( CHP, PAP, ( SEP ) ), bool bStart = true; // now find beginnings ( ( SEP ), PAP, CHP ) const WW8PLCFxDesc* pD; @@ -4817,7 +4817,7 @@ sal_uInt16 WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const // gives the CP pos of the next attr change WW8_CP WW8PLCFMan::Where() const { - long l; + WW8_CP l; WhereIdx(nullptr, &l); return l; } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index d5a0ff7f8396..8ad343a8467b 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -932,7 +932,7 @@ private: const WW8Fib* m_pWwFib; - sal_uInt16 WhereIdx(bool* pbStart, long* pPos=nullptr) const; + sal_uInt16 WhereIdx(bool* pbStart, WW8_CP * pPos=nullptr) const; void AdjustEnds(WW8PLCFxDesc& rDesc); void GetNewSprms(WW8PLCFxDesc& rDesc); static void GetNewNoSprms(WW8PLCFxDesc& rDesc); |