diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-04 11:31:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-09 10:17:13 +0200 |
| commit | bcb41235deaf4b7ca90522bda3ba21a686819e6e (patch) | |
| tree | 29f397deeb5c776b290b782847a4f9ec8487adb2 /sw/source/ui/misc | |
| parent | b55b7a057f19521ad88fc6a274fcf071b798eb3e (diff) | |
convert SfxStyleFamily to scoped enum
and update the RSC compiler to accept such
In the process fix some confusion in SD where it was confusing
SfxStyleFamily and the index of the relevant family
(which other parts of the code in SVL use)
Change-Id: I1efc9f85fbed8ab76eafe8f6e1ada411753ae5f9
Diffstat (limited to 'sw/source/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/misc/linenum.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 5f32002007d0..8cea39999609 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -200,7 +200,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) // styles special regions // paragraph SfxStyleSheetBasePool* pStyleSheetPool = pSh->GetView().GetDocShell()->GetStyleSheetPool(); - pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SWSTYLEBIT_EXTRA); + pStyleSheetPool->SetSearchMask(SfxStyleFamily::Para, SWSTYLEBIT_EXTRA); SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); while(pStyle) { @@ -353,9 +353,9 @@ static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFo { SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool(); SfxStyleSheetBase* pBase; - pBase = pPool->Find(rCharFormatName, SFX_STYLE_FAMILY_CHAR); + pBase = pPool->Find(rCharFormatName, SfxStyleFamily::Char); if(!pBase) - pBase = &pPool->Make(rCharFormatName, SFX_STYLE_FAMILY_CHAR); + pBase = &pPool->Make(rCharFormatName, SfxStyleFamily::Char); pFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat(); } return pFormat; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 789904392edd..09c8bcebbd11 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -38,9 +38,9 @@ static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rName, SwWrtShell *pSh) { - sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA; + SfxStyleFamily nFamily = SfxStyleFamily::Para; SfxStyleSheetBasePool* pBase = pSh->GetView().GetDocShell()->GetStyleSheetPool(); - SfxStyleSheetBase* pStyle = pBase->Find(rName, (SfxStyleFamily)nFamily); + SfxStyleSheetBase* pStyle = pBase->Find(rName, nFamily); SAL_WARN_IF( !pStyle, "sw.ui", "Style not found" ); if(!pStyle) return nullptr; @@ -205,9 +205,9 @@ IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) { SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool(); SfxStyleSheetBase* pBase; - pBase = pPool->Find(sCharFormatName, SFX_STYLE_FAMILY_CHAR); + pBase = pPool->Find(sCharFormatName, SfxStyleFamily::Char); if(!pBase) - pBase = &pPool->Make(sCharFormatName, SFX_STYLE_FAMILY_CHAR); + pBase = &pPool->Make(sCharFormatName, SfxStyleFamily::Char); pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat(); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 10685ec4ce15..c676566e2e2d 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -720,9 +720,9 @@ IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) { SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool(); SfxStyleSheetBase* pBase; - pBase = pPool->Find(sEntry, SFX_STYLE_FAMILY_CHAR); + pBase = pPool->Find(sEntry, SfxStyleFamily::Char); if(!pBase) - pBase = &pPool->Make(sEntry, SFX_STYLE_FAMILY_PAGE); + pBase = &pPool->Make(sEntry, SfxStyleFamily::Page); pFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat(); } |