diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 20:37:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:05 +0100 |
| commit | 7700d10eee335256815763d4f8d4fb91ddab9cd2 (patch) | |
| tree | 52ec388dafd13eb214e3a23bd91fae0a834db021 /cui/source/tabpages | |
| parent | d8bbe0ede2d5f07a92772dfa04ace97751128005 (diff) | |
bool improvements
Change-Id: Idc397c918980ba4bb47fb73fbd0e6dd11fb6d0b7
Diffstat (limited to 'cui/source/tabpages')
| -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 |
3 files changed, 8 insertions, 6 deletions
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) |