diff options
| -rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/swpossizetabpage.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 8 | ||||
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 0e945e4cde4e..1605aaa52536 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -78,7 +78,7 @@ struct SpellErrorDescription sRuleId = *pRuleId; }; - int operator==( const SpellErrorDescription& rDesc ) const + bool operator==( const SpellErrorDescription& rDesc ) const { return bIsGrammarError == rDesc.bIsGrammarError && sErrorText.equals( rDesc.sErrorText ) && diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 2463bd7b1194..29289ca011e9 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -88,7 +88,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage short m_nOldVRel; double m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button - sal_uInt16 m_nHtmlMode; bool m_bHtmlMode; bool m_bAtHoriPosModified; bool m_bAtVertPosModified; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index e1e598ddb6a6..526d1e5b89f5 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1034,9 +1034,9 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe // Bitmap-treatment: SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - int bBitmapChanged = ( ( eNewPos != eOldPos ) || + bool bBitmapChanged = ( ( eNewPos != eOldPos ) || ( rOldItem.GetGraphicLink() != aBgdGraphicPath ) ); - int bBrushChanged = ( rOldItem.GetColor() != aBgdColor ); + bool bBrushChanged = ( rOldItem.GetColor() != aBgdColor ); if( bBitmapChanged || bBrushChanged ) { bModified = sal_True; diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 69d97bfbc6dd..3fb49101039b 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -511,7 +511,6 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInA , m_nOldV(VertOrientation::TOP) , m_nOldVRel(RelOrientation::PRINT_AREA) , m_fWidthHeightRatio(1.0) - , m_nHtmlMode(0) , m_bHtmlMode(false) , m_bAtHoriPosModified(false) , m_bAtVertPosModified(false) @@ -944,8 +943,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) pItem = GetItem( rSet, SID_HTML_MODE ); if(pItem) - m_nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); - m_bHtmlMode = 0 != (m_bHtmlMode & HTMLMODE_ON); + { + m_bHtmlMode = + (static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON) + != 0; + } pItem = GetItem( rSet, SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ); if(pItem && static_cast<const SfxBoolItem*>(pItem)->GetValue()) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index c677ee3fcfe3..2942c836e74a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -87,7 +87,7 @@ void SvxColorTabPage::SetEmbed( bool bEmbed ) bool SvxColorTabPage::GetEmbed() { XPropertyListRef pList = GetList(); - return pList.is() ? pList->IsEmbedInDocument() : 0; + return pList.is() && pList->IsEmbedInDocument(); } IMPL_LINK_NOARG(SvxColorTabPage, EmbedToggleHdl_Impl) |