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/uibase/utlui | |
| 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/uibase/utlui')
| -rw-r--r-- | sw/source/uibase/utlui/tmplctrl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index cb847c2243c5..6790276b5c57 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -104,7 +104,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) { SfxStyleSheetBasePool* pPool = pView->GetDocShell()-> GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE); + pPool->SetSearchMask(SfxStyleFamily::Page); if( pPool->Count() > 1 ) { sal_uInt16 nCount = 0; diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 476cef8be0b2..fe0d61b004c8 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -707,7 +707,7 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo { const sal_Int32 nOffset = rToFill.GetEntryCount() > 0 ? 1 : 0; SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR); + pPool->SetSearchMask(SfxStyleFamily::Char); SwDoc* pDoc = pDocSh->GetDoc(); const SfxStyleSheetBase* pBase = pPool->First(); OUString sStandard; |