diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-17 14:24:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-17 15:20:43 +0200 |
| commit | c007829a67456ef01b82b8368f7ed3e5a3026c95 (patch) | |
| tree | 19d45ae0c9bcafed5d3788001dcb633839a85ef5 | |
| parent | 0b49aaf09becf8775411b7082b95e87086e8b5d7 (diff) | |
Clean up conversions from ScBreakType (aka sal_uInt8) to bool
...assuming these shall indeed all convert everything but BREAK_NONE to true?
Change-Id: Ib1c863bfbf9be58aa7867aa69c8347f6358f6550
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index c2b9637dad15..7fa734f82f7a 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -8871,7 +8871,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE ) { ScBreakType nBreak = rDoc.HasColBreak(nCol, nTab); - ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak != BREAK_NONE ); } else if ( pEntry->nWID == SC_WID_UNO_MANPAGE ) { @@ -9024,12 +9024,12 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE ) { ScBreakType nBreak = rDoc.HasRowBreak(nRow, nTab); - ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak != BREAK_NONE ); } else if ( pEntry->nWID == SC_WID_UNO_MANPAGE ) { ScBreakType nBreak = (rDoc.HasRowBreak(nRow, nTab) & BREAK_MANUAL); - ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak != BREAK_NONE ); } else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 20ffa3309d3b..6bbc54010a72 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3543,7 +3543,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty else if ( aNameString == SC_UNONAME_NEWPAGE ) { ScBreakType nBreak = rDoc.HasColBreak(nStartCol, nTab); - ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak ); + ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak != BREAK_NONE ); } else if ( aNameString == SC_UNONAME_MANPAGE ) { @@ -3820,7 +3820,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam else if ( aNameString == SC_UNONAME_NEWPAGE ) { ScBreakType nBreak = rDoc.HasRowBreak(nStartRow, nTab); - ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak ); + ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak != BREAK_NONE ); } else if ( aNameString == SC_UNONAME_MANPAGE ) { |