inline some defines

which don't add any value anymore

Change-Id: I45977d972d4d02926630b749d3ec736416138cf5

5 files changed, 15 insertions, 15 deletions

diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index b9b52738a0b1..1377429ed056 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -479,7 +479,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
         OUString aName(SdResId(STR_POOLSHEET_MEASURE));
         SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>( pPage->GetModel()->
                                      GetStyleSheetPool()->
-                                     Find(aName, SD_STYLE_FAMILY_GRAPHICS));
+                                     Find(aName, SfxStyleFamily::Para));
         DBG_ASSERT(pSheet, "StyleSheet missing");
 
         if (pSheet)
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index dc005c0e968d..8f376fb3d72a 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -320,7 +320,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
         aName = aName.copy(0, n) + STR_LAYOUT_BACKGROUNDOBJECTS;
         SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
                                                 GetStyleSheetPool()->
-                                                Find(aName, SD_STYLE_FAMILY_MASTERPAGE));
+                                                Find(aName, SfxStyleFamily::Page));
         DBG_ASSERT(pSheet, "StyleSheet missing");
         if (pSheet)
         {
@@ -350,7 +350,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
             OUString aName(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
             SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
                                          GetStyleSheetPool()->
-                                         Find(aName, SD_STYLE_FAMILY_GRAPHICS));
+                                         Find(aName, SfxStyleFamily::Para));
             DBG_ASSERT(pSheet, "Stylesheet missing");
             if (pSheet)
             {
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 46dc6495a489..2da671bafa29 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -329,7 +329,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
             if(bOutliner)
             {
                 SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
-                SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE " 1", SD_STYLE_FAMILY_PSEUDO);
+                SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE " 1", SfxStyleFamily::Pseudo);
                 if( pFirstStyleSheet )
                     pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
             }
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 8f18c041790e..7d27ee9c07fa 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -128,7 +128,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
         }
 
         SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool();
-        SfxStyleSheetBase* pStyleSheet = pStyleSheetPool->Find( aStyleName, SD_STYLE_FAMILY_MASTERPAGE );
+        SfxStyleSheetBase* pStyleSheet = pStyleSheetPool->Find( aStyleName, SfxStyleFamily::Page );
         DBG_ASSERT(pStyleSheet, "StyleSheet missing");
 
         if( pStyleSheet )
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index a7f8412d5d82..89c798af391d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -114,9 +114,9 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
     {
         OUString sFamily = static_cast<const SfxStringItem &>( pArgs->Get( SID_STYLE_FAMILYNAME ) ).GetValue();
         if (sFamily == "graphics")
-            nFamily = SD_STYLE_FAMILY_GRAPHICS;
+            nFamily = SfxStyleFamily::Para;
         else
-            nFamily = SD_STYLE_FAMILY_PSEUDO;
+            nFamily = SfxStyleFamily::Pseudo;
     }
 
     OUString aStyleName;
@@ -226,7 +226,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
             pStyleSheet = pSSPool->Find( aStyleName, nFamily);
 
             // do not set presentation styles, they will be set implicit
-            if ( pStyleSheet && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_PSEUDO )
+            if ( pStyleSheet && pStyleSheet->GetFamily() != SfxStyleFamily::Pseudo )
             {
                 SfxStyleSheet* pOldStyleSheet = mpView->GetStyleSheet();
                 OUString aStr;
@@ -238,10 +238,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() ||
 
                     // allow if old was background objects and new is graphics
-                    (pStyleSheet->GetFamily() == SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
+                    (pStyleSheet->GetFamily() == SfxStyleFamily::Para && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
 
                     // allow if old was presentation and we are a drawing document
-                    (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DocumentType::Draw) )
+                    (pOldStyleSheet->GetFamily() == SfxStyleFamily::Page && mpDoc->GetDocumentType() == DocumentType::Draw) )
                 {
                     mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
                     mpDoc->SetChanged();
@@ -261,7 +261,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     pStyleSheet = pSSPool->Find( aStyleName, nFamily);
                 }
                 // no presentation object templates, they are only allowed implicitly
-                if( pStyleSheet && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_PSEUDO )
+                if( pStyleSheet && pStyleSheet->GetFamily() != SfxStyleFamily::Pseudo )
                 {
                     static_cast<SdStyleSheetPool*>( pSSPool )->SetActualStyleSheet( pStyleSheet );
 
@@ -302,11 +302,11 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 
                 SfxStyleFamily eFamily = pStyleSheet->GetFamily();
 
-                if (eFamily == SD_STYLE_FAMILY_GRAPHICS)
+                if (eFamily == SfxStyleFamily::Para)
                 {
                     pStdDlg.disposeAndReset(pFact ? pFact->CreateSdTabTemplateDlg(mpViewShell->GetActiveWindow(), mpDoc->GetDocSh(), *pStyleSheet, mpDoc, mpView) : nullptr);
                 }
-                else if (eFamily == SD_STYLE_FAMILY_PSEUDO)
+                else if (eFamily == SfxStyleFamily::Pseudo)
                 {
                     OUString aName(pStyleSheet->GetName());
                     bool bBackground = false;
@@ -385,7 +385,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     {
                         nRetMask = pStyleSheet->GetMask();
 
-                        if (eFamily == SD_STYLE_FAMILY_PSEUDO)
+                        if (eFamily == SfxStyleFamily::Pseudo)
                         {
                             SfxItemSet aTempSet(*pOutSet);
                             /* Extract SvxBrushItem out of set and insert SvxBackgroundColorItem */
@@ -413,7 +413,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                                     SvxNumRule aRule(*aTempSet.GetItem<SvxNumBulletItem>(EE_PARA_NUMBULLET)->GetNumRule());
 
                                     OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
-                                    SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( sStyleName, SD_STYLE_FAMILY_PSEUDO);
+                                    SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( sStyleName, SfxStyleFamily::Pseudo);
 
                                     if(pFirstStyleSheet)
                                     {