diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/uibase/config/viewopt.cxx | 25 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxvw.cxx | 2 |
2 files changed, 3 insertions, 24 deletions
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index c5e6f3e56b9e..54bbe0636274 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -98,12 +98,12 @@ bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const bool SwViewOption::IsShowOutlineContentVisibilityButton() const { - return static_cast<bool>(m_nCoreOptions & ViewOptFlags1::ShowOutlineContentVisibilityButton); + return m_nCoreOptions.bShowOutlineContentVisibilityButton; } bool SwViewOption::IsTreatSubOutlineLevelsAsContent() const { - return static_cast<bool>(m_nCoreOptions & ViewOptFlags1::TreatSubOutlineLevelsAsContent); + return m_nCoreOptions.bTreatSubOutlineLevelsAsContent; } void SwViewOption::DrawRect( OutputDevice *pOut, @@ -178,19 +178,6 @@ SwViewOption::SwViewOption() : m_eZoom( SvxZoomType::PERCENT ), m_nTableDestination(TBL_DEST_CELL) { - // Initialisation is a little simpler now - // all Bits to 0 - m_nCoreOptions = - ViewOptFlags1::HardBlank | - ViewOptFlags1::SoftHyph | - ViewOptFlags1::Ref | - ViewOptFlags1::Graphic | - ViewOptFlags1::Table | - ViewOptFlags1::Draw | - ViewOptFlags1::Control | - ViewOptFlags1::Pageback | - ViewOptFlags1::Postits; - m_nCore2Options = ViewOptCoreFlags2::BlackFont | ViewOptCoreFlags2::HiddenPara; @@ -334,14 +321,6 @@ bool SwViewOption::IsAutoCompleteWords() return rFlags.bAutoCmpltCollectWords; } -void SwViewOption::SetOnlineSpell(bool b) -{ - if (b) - m_nCoreOptions |= ViewOptFlags1::OnlineSpell; - else - m_nCoreOptions &= ~ViewOptFlags1::OnlineSpell; -} - AuthorCharAttr::AuthorCharAttr() : m_nItemId (SID_ATTR_CHAR_UNDERLINE), m_nAttr (LINESTYLE_SINGLE), diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 65401a8410e6..8b82e83285e8 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -812,7 +812,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue( const SwViewOption *pOpt = m_pView->GetWrtShell().GetViewOptions(); if (!pOpt) throw RuntimeException(); - aRet <<= bool(pOpt->GetCoreOptions() & ViewOptFlags1::OnlineSpell); + aRet <<= pOpt->IsOnlineSpell(); } break; default : |