diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 17:59:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:10 +0200 |
| commit | 532911eb2b838a7b52514b636322cf327d3c4a58 (patch) | |
| tree | 422a9cc7ce941a5dd7f391c837d539f8b3a7f270 | |
| parent | 930b60d9a16e2111d3c35371241a753193168936 (diff) | |
SvxRTFParser::ReadBorder/BackgroundAttr bTableDef param wants to be bool
Change-Id: I78c34a539a62ed129309305ce6e37a8feb19b1fd
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 4 | ||||
| -rw-r--r-- | include/editeng/svxrtf.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/rtf/rtfparse.cxx | 4 | ||||
| -rw-r--r-- | svx/source/table/tablertfimporter.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index ac62e58a9690..fdfda0726f7f 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1388,7 +1388,7 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem, } void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, - int bTableDef ) + bool bTableDef ) { // then read the border attribute SvxBoxItem aAttr( aPardMap.nBox ); @@ -1577,7 +1577,7 @@ inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uIn } void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, - int bTableDef ) + bool bTableDef ) { // then read the border attribute bool bContinue = true; diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 857e18c9edc7..39290ec9f376 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -328,8 +328,8 @@ public: RTFPardAttrMapIds& GetPardMap() { return aPardMap; } RTFPlainAttrMapIds& GetPlainMap() { return aPlainMap; } // to be able to assign them from the outside as for example table cells - void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False ); - void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False ); + void ReadBorderAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false ); + void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false ); // for asynchronous read from the SvStream virtual void Continue( int nToken ) SAL_OVERRIDE; diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index ef818cedf1f2..31065f0800a9 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -392,11 +392,11 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) { case RTF_SHADINGDEF: static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBackgroundAttr( - pInfo->nToken, pInsDefault->aItemSet, sal_True ); + pInfo->nToken, pInsDefault->aItemSet, true ); break; case RTF_BRDRDEF: static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr( - pInfo->nToken, pInsDefault->aItemSet, sal_True ); + pInfo->nToken, pInsDefault->aItemSet, true ); break; } } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index caf0570e2306..a241d615c8e0 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -415,7 +415,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo ) // ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); break; case RTF_BRDRDEF: - static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); + static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, true ); break; } } |