diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-11 15:04:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-18 14:23:49 +0200 |
| commit | 6970a4dc7734de2451abee5ae33339be2eef6963 (patch) | |
| tree | 55e2c89e82f4805e21a35664f4ca68a1dca1da10 /sw/source/ui/config | |
| parent | c3209608d155ccfe394964e3b59849e0ff579fc5 (diff) | |
convert DocumentSettingId to an enum class
Change-Id: Ia4f135c64e6b6b5bd7a522e4a1e9ca63738ff3ef
Diffstat (limited to 'sw/source/ui/config')
| -rw-r--r-- | sw/source/ui/config/optcomp.cxx | 22 | ||||
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 2006fd56f802..daa523e1b87f 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -371,17 +371,17 @@ sal_uLong SwCompatibilityOptPage::GetDocumentOptions() const { const IDocumentSettingAccess& rIDocumentSettingAccess = *m_pWrtShell->getIDocumentSettingAccess(); nRet = convertBools2Ulong_Impl( - !rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE), - rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX), - rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES), - !rIDocumentSettingAccess.get(IDocumentSettingAccess::TAB_COMPAT), - !rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_EXT_LEADING), - rIDocumentSettingAccess.get(IDocumentSettingAccess::OLD_LINE_SPACING), - rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS), - rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS), - rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING), - rIDocumentSettingAccess.get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION), - !rIDocumentSettingAccess.get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) ); + !rIDocumentSettingAccess.get(DocumentSettingId::USE_VIRTUAL_DEVICE), + rIDocumentSettingAccess.get(DocumentSettingId::PARA_SPACE_MAX), + rIDocumentSettingAccess.get(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES), + !rIDocumentSettingAccess.get(DocumentSettingId::TAB_COMPAT), + !rIDocumentSettingAccess.get(DocumentSettingId::ADD_EXT_LEADING), + rIDocumentSettingAccess.get(DocumentSettingId::OLD_LINE_SPACING), + rIDocumentSettingAccess.get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS), + rIDocumentSettingAccess.get(DocumentSettingId::USE_FORMER_OBJECT_POS), + rIDocumentSettingAccess.get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING), + rIDocumentSettingAccess.get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION), + !rIDocumentSettingAccess.get(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) ); } return nRet; } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index cd68cb6d88ec..2039c2f8cdf7 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1363,7 +1363,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet* rSet ) } if (m_pWrtShell) { - m_pWrtShell->GetDoc()->getIDocumentSettingAccess().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, + m_pWrtShell->GetDoc()->getIDocumentSettingAccess().set( DocumentSettingId::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); bRet |= m_pMathBaselineAlignmentCB->IsValueChangedFromSaved(); } @@ -1414,7 +1414,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet* rSet ) m_pFillSpaceRB->Check( FILL_SPACE == eMode ); if (m_pWrtShell) { - m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->getIDocumentSettingAccess().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ); + m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->getIDocumentSettingAccess().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT ) ); m_pMathBaselineAlignmentCB->SaveValue(); } else { m_pMathBaselineAlignmentCB->Hide(); |