diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-05-03 23:25:52 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-05-03 23:31:53 +0200 |
| commit | 98436c4b53639d86f261ac630c46d32e3c7b8e28 (patch) | |
| tree | be3be3fb1cdd44ad92c8a171ef72e00a96815be2 /sw/inc/doc.hxx | |
| parent | bc9d02b0ca6244b46c9e2c59b7cc3618eb0f0148 (diff) | |
tdf#89783: Adjust to new GetPos retval (size_t vs. sal_uInt16)
Some of the usages of GetPos were just misusing it to find out
whether a vector contains given element -- use Contains() in those
cases
This patch is partially based on work of Christoph Lutz
Conflicts:
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8num.cxx
Change-Id: I40bedba905e7577ba23f69acee178e0ea7cc1521
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index c935ede87074..2dab95b69ce9 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -826,7 +826,7 @@ public: SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom, bool bBroadcast = false, bool bAuto = true ); - void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false); + void DelCharFmt(size_t nFmt, bool bBroadcast = false); void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false); SwCharFmt* FindCharFmtByName( const OUString& rName ) const { return static_cast<SwCharFmt*>(FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName )); } @@ -844,7 +844,7 @@ public: SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName, SwTxtFmtColl *pDerivedFrom, bool bBroadcast = false); - void DelTxtFmtColl(sal_uInt16 nFmt, bool bBroadcast = false); + void DelTxtFmtColl(size_t nFmt, bool bBroadcast = false); void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false ); /** Add 4th optional parameter <bResetListAttrs>. 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard |