convert SfxObjectCreateMode to scoped enum

and fix some dodgy usage in /sc in the process

Change-Id: Ia2bee267df31aba431fc8cb81195bb83e5b64deb

35 files changed, 80 insertions, 80 deletions

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 1193638f8a12..deea28ed1ab6 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -167,9 +167,9 @@ public:
     static OUString GetEventName( sal_Int32 nId );
 
     /// Doc is required for SO data exchange!
-    SwDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED );
+    SwDocShell( SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED );
     SwDocShell( const sal_uInt64 i_nSfxCreationFlags );
-    SwDocShell( SwDoc *pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD );
+    SwDocShell( SwDoc *pDoc, SfxObjectCreateMode eMode = SfxObjectCreateMode::STANDARD );
     virtual ~SwDocShell();
 
     /// OLE 2.0-notification.
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index d2a7452aeb85..256c9a3b455b 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -28,7 +28,7 @@ public:
     SFX_DECL_OBJECTFACTORY();
     TYPEINFO_OVERRIDE();
 
-    SwGlobalDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
+    SwGlobalDocShell(SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED);
     virtual ~SwGlobalDocShell();
 
     virtual void    FillClass( SvGlobalName * pClassName,
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index 21683ec8b89f..fc8bc2474085 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -36,7 +36,7 @@ private:
     static void InitInterface_Impl();
 
 public:
-    SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
+    SwWebDocShell(SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED);
     virtual ~SwWebDocShell();
 
     virtual void        FillClass( SvGlobalName * pClassName,
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 8257bcc0763f..26647c8139e6 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -330,7 +330,7 @@ void SwMacrosTest::testControlShapeGrouping()
 void SwMacrosTest::testFdo55289()
 {
     SwDoc *const pDoc = new SwDoc;
-    SwDocShellRef pDocShell = new SwDocShell(pDoc, SFX_CREATE_MODE_EMBEDDED);
+    SwDocShellRef pDocShell = new SwDocShell(pDoc, SfxObjectCreateMode::EMBEDDED);
     // this needs to run with no layout to tickle the bugs in the special
     // cases in SwXShape re-anchoring
     assert(!pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6b2bd193b256..b56d30859709 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1533,7 +1533,7 @@ void SwDocTest::setUp()
 
     SwGlobals::ensure();
     m_pDoc = new SwDoc;
-    m_xDocShRef = new SwDocShell(m_pDoc, SFX_CREATE_MODE_EMBEDDED);
+    m_xDocShRef = new SwDocShell(m_pDoc, SfxObjectCreateMode::EMBEDDED);
     m_xDocShRef->DoInitNew(0);
 }
 
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index ccd7b3cbd996..952b1f1490b5 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -207,10 +207,10 @@ void DocumentLinksAdministrationManager::UpdateLinks( bool bUI )
         sal_uInt16 nUpdateDocMode = m_rDoc.GetDocShell()->GetUpdateDocMode();
         if( (nLinkMode != NEVER ||  document::UpdateDocMode::FULL_UPDATE == nUpdateDocMode) &&
             !GetLinkManager().GetLinks().empty() &&
-            SFX_CREATE_MODE_INTERNAL !=
+            SfxObjectCreateMode::INTERNAL !=
                         ( eMode = m_rDoc.GetDocShell()->GetCreateMode()) &&
-            SFX_CREATE_MODE_ORGANIZER != eMode &&
-            SFX_CREATE_MODE_PREVIEW != eMode &&
+            SfxObjectCreateMode::ORGANIZER != eMode &&
+            SfxObjectCreateMode::PREVIEW != eMode &&
             !m_rDoc.GetDocShell()->IsPreview() )
         {
             bool bAskUpdate = nLinkMode == MANUAL;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 33a251d03902..0380e92b51f4 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -269,7 +269,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
             OUString sFileName;
             if( pStartNd->GetIndex() + 1 < aEndIdx.GetIndex() )
             {
-                SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
+                SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::INTERNAL ));
                 if( xDocSh->DoInitNew( 0 ) )
                 {
                     SwDoc* pDoc = static_cast<SwDocShell*>(&xDocSh)->GetDoc();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 3830d107c4e3..ec05f9aa8b13 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -860,7 +860,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
     // we have to use pointer here, since the callee has to decide whether
     // SfxObjectShellLock or SfxObjectShellRef should be used sometimes the
     // object will be returned with refcount set to 0 ( if no DoInitNew is done )
-    SfxObjectShell* pRetShell = new SwDocShell( pRet, SFX_CREATE_MODE_STANDARD );
+    SfxObjectShell* pRetShell = new SwDocShell( pRet, SfxObjectCreateMode::STANDARD );
     if( bCallInitNew )
     {
         // it could happen that DoInitNew creates model,
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2f129a3a35a2..0a771c29fdff 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6511,7 +6511,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
             // the global retouche color.
             if ( pSh->GetOut()->GetOutDevType() == OUTDEV_PRINTER ||
                  pSh->GetViewOptions()->IsPDFExport() ||
-                 ( pSh->GetDoc()->GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
+                 ( pSh->GetDoc()->GetDocShell()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
                    !pSh->GetDoc()->GetDocShell()->IsInPlaceActive()
                  )
                )
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d6bbe2e822ea..e04159bebe5c 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -266,7 +266,7 @@ bool SwOLENode::RestorePersistentData()
             // TODO/LATER: Isn't a EmbeddedObjectContainer sufficient here?
             // What happens to this document?
             OSL_ENSURE( false, "Why are we creating a DocShell here?" );
-            p = new SwDocShell( GetDoc(), SFX_CREATE_MODE_INTERNAL );
+            p = new SwDocShell( GetDoc(), SfxObjectCreateMode::INTERNAL );
             p->DoInitNew( NULL );
         }
 
@@ -425,7 +425,7 @@ SwCntntNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     {
         // TODO/LATER: is EmbeddedObjectContainer not enough?
         // the created document will be closed by pDoc ( should use SfxObjectShellLock )
-        pPersistShell = new SwDocShell( pDoc, SFX_CREATE_MODE_INTERNAL );
+        pPersistShell = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL );
         pDoc->SetTmpDocShell( pPersistShell );
         pPersistShell->DoInitNew( NULL );
     }
@@ -729,7 +729,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
             // TODO/LATER: Isn't a EmbeddedObjectContainer sufficient here?
             // What happens to the document?
             OSL_ENSURE( false, "Why are we creating a DocShell here??" );
-            p = new SwDocShell( pDoc, SFX_CREATE_MODE_INTERNAL );
+            p = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL );
             p->DoInitNew( NULL );
         }
 
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index f7a094a766f9..95c6b30f89b4 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -62,7 +62,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
     , nFlags(0)
     , nCurBlk(0)
 {
-    SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
+    SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )
         return;
     bReadOnly = true;
@@ -108,7 +108,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg
     , nFlags(0)
     , nCurBlk(0)
 {
-    SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
+    SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )
         return;
     bReadOnly = false;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 1d1554d4268a..13c9e321e060 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -816,7 +816,7 @@ SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc)
             // paste, there should be no data provider, so that own data is used
             // This should not happen during copy/paste, as this will unlink
             // charts using table data.
-            if (rDoc.GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED)
+            if (rDoc.GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED)
                 xRet = (cppu::OWeakObject*) rDoc.getIDocumentChartDataProviderAccess().GetChartDataProvider( true /* create - if not yet available */ );
             else
                 SAL_WARN("sw.uno",
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 01251df4e8d9..20044921164f 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -498,7 +498,7 @@ SwDoc* Reader::GetTemplateDoc()
                 if( aModuleOptions.IsWriter() )
                 {
                     SwDocShell *pDocSh =
-                        new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
+                        new SwDocShell ( SfxObjectCreateMode::INTERNAL );
                     SfxObjectShellLock xDocSh = pDocSh;
                     if( pDocSh->DoInitNew( 0 ) )
                     {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 5f59460e8672..57a51f1f0d94 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -432,7 +432,7 @@ SwHTMLParser::~SwHTMLParser()
         // Gelinkte Bereiche updaten
         sal_uInt16 nLinkMode = pDoc->getIDocumentSettingAccess().getLinkUpdateMode( true );
         if( nLinkMode != NEVER && bAsync &&
-            SFX_CREATE_MODE_INTERNAL!=pDoc->GetDocShell()->GetCreateMode() )
+            SfxObjectCreateMode::INTERNAL!=pDoc->GetDocShell()->GetCreateMode() )
             pDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL,
                                                    true, false );
 
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index a92c548eb61d..32ac0eaebc9d 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -206,7 +206,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
 
         if ( 0 != (nStrings = static_cast< sal_uInt16 >(aStrings.size())))
         {
-            SfxObjectShellLock xDocSh(new SwDocShell(SFX_CREATE_MODE_INTERNAL));
+            SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
             if (xDocSh->DoInitNew(0))
             {
                 SwDoc *pD =  static_cast<SwDocShell*>((&xDocSh))->GetDoc();
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 1e749490e3cc..bcdb63b16d0c 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -750,7 +750,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
 
     // TODO/LATER: separate links from usual embedded objects
     OUString StreamPath;
-    if( SFX_CREATE_MODE_EMBEDDED == rDoc.GetDocShell()->GetCreateMode() )
+    if( SfxObjectCreateMode::EMBEDDED == rDoc.GetDocShell()->GetCreateMode() )
     {
         if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() )
         {
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index fb0a57f9447c..7329a0e5823a 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -194,7 +194,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
     // Set base URI
     xInfoSet->setPropertyValue( "BaseURI", makeAny( GetBaseURL() ) );
 
-    if( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocShell()->GetCreateMode() )
+    if( SfxObjectCreateMode::EMBEDDED == pDoc->GetDocShell()->GetCreateMode() )
     {
         const OUString aName( !aDocHierarchicalName.isEmpty()
             ? aDocHierarchicalName
@@ -295,7 +295,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
         }
     }
 
-    bool bStoreMeta = ( SFX_CREATE_MODE_EMBEDDED != pDoc->GetDocShell()->GetCreateMode() );
+    bool bStoreMeta = ( SfxObjectCreateMode::EMBEDDED != pDoc->GetDocShell()->GetCreateMode() );
     if ( !bStoreMeta )
     {
         try
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index dfcdbba79a5b..eca4dd2376f5 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -711,7 +711,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
 
             //now extract a document from the target document
             // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here
-            SfxObjectShellLock xTempDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
+            SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
             xTempDocShell->DoInitNew( 0 );
             SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
             SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
@@ -1116,7 +1116,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
 
         //now extract a document from the target document
         // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here
-        SfxObjectShellLock xTempDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
+        SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
         xTempDocShell->DoInitNew( 0 );
         SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
         SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index feca3d5c8e3a..885ee5334844 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -158,7 +158,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
     pOldSh   = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
 
     // Create new document (don't show!)
-    SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
+    SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
     xDocSh->DoInitNew( 0 );
     pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
     pNewView = static_cast<SwView*>( pFrame->GetViewShell());
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index c77ae688ee98..bfa7c50143bc 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -149,7 +149,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
                 SwDocShell *pDocSh = static_cast<SwDocShell*>( SfxObjectShell::Current());
                 if ( bDisable ||
                     (pDocSh &&    (pDocSh->IsReadOnly() ||
-                                  pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)) )
+                                  pDocSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED)) )
                     rSet.DisableItem( nWhich );
 
             }
@@ -883,7 +883,7 @@ void NewXForms( SfxRequest& rReq )
     // copied & excerpted from SwModule::InsertLab(..)
 
     // create new document
-    SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD) );
+    SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD) );
     xDocSh->DoInitNew( 0 );
 
     // initialize XForms
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 21704cd79c36..3a30ca4db42c 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -190,7 +190,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
         aLabCfg.Commit();
 
         // Create new document
-        SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD));
+        SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD));
         xDocSh->DoInitNew( 0 );
 
         // Printer
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 75f8fcb57f33..a6883f8bb3e0 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -241,7 +241,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
 
         // Suppress SfxProgress, when we are Embedded
     SW_MOD()->SetEmbeddedLoadSave(
-                            SFX_CREATE_MODE_EMBEDDED == GetCreateMode() );
+                            SfxObjectCreateMode::EMBEDDED == GetCreateMode() );
 
     pRdr->GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, ISA(SwWebDocShell));
 
@@ -259,7 +259,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
         AddLink();
 
         if (!m_xBasePool.is())
-            m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
+            m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() );
     }
 
     UpdateFontList();
@@ -305,11 +305,11 @@ bool SwDocShell::Save()
     {
         switch( GetCreateMode() )
         {
-        case SFX_CREATE_MODE_INTERNAL:
+        case SfxObjectCreateMode::INTERNAL:
             nErr = 0;
             break;
 
-        case SFX_CREATE_MODE_ORGANIZER:
+        case SfxObjectCreateMode::ORGANIZER:
             {
                 WriterRef xWrt;
                 ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
@@ -320,13 +320,13 @@ bool SwDocShell::Save()
             }
             break;
 
-        case SFX_CREATE_MODE_EMBEDDED:
+        case SfxObjectCreateMode::EMBEDDED:
             // Suppress SfxProgress, if we are Embedded
             SW_MOD()->SetEmbeddedLoadSave( true );
             // no break;
 
-        case SFX_CREATE_MODE_STANDARD:
-        case SFX_CREATE_MODE_PREVIEW:
+        case SfxObjectCreateMode::STANDARD:
+        case SfxObjectCreateMode::PREVIEW:
         default:
             {
                 if (m_pDoc->ContainsMSVBasic())
@@ -435,7 +435,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
             SvGlobalName aClassName;
             // The document is closed explicitly, but using SfxObjectShellLock is still more correct here
             SfxObjectShellLock xDocSh =
-                new SwGlobalDocShell( SFX_CREATE_MODE_INTERNAL );
+                new SwGlobalDocShell( SfxObjectCreateMode::INTERNAL );
             // the global document can not be a template
             xDocSh->SetupStorage( xStor, SotStorage::GetVersion( xStor ), false );
             xDocSh->DoClose();
@@ -461,7 +461,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
 
             // Suppress SfxProgress when we are Embedded
         SW_MOD()->SetEmbeddedLoadSave(
-                            SFX_CREATE_MODE_EMBEDDED == GetCreateMode() );
+                            SfxObjectCreateMode::EMBEDDED == GetCreateMode() );
 
         WriterRef xWrt;
         ::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt );
@@ -687,7 +687,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 
         // Suppress SfxProgress when we are Embedded
     SW_MOD()->SetEmbeddedLoadSave(
-                            SFX_CREATE_MODE_EMBEDDED == GetCreateMode());
+                            SfxObjectCreateMode::EMBEDDED == GetCreateMode());
 
     // Span Context in order to suppress the Selection's View
     sal_uLong nErrno;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index f9fba49adc50..91b8e4104f7c 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -704,7 +704,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 sal_uInt8 nLevel = pDlg->GetLevel();
                 sal_uInt8 nPara = pDlg->GetPara();
                 SwDoc* pSmryDoc = new SwDoc();
-                SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SFX_CREATE_MODE_STANDARD));
+                SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SfxObjectCreateMode::STANDARD));
                 xDocSh->DoInitNew( 0 );
 
                 bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich;
@@ -1571,7 +1571,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
             pMed->SetFilter( pSfxFlt );
 
             // If the new shell is created, SfxObjectShellLock should be used to let it be closed later for sure
-            SwDocShell *const pNew(new SwDocShell(SFX_CREATE_MODE_INTERNAL));
+            SwDocShell *const pNew(new SwDocShell(SfxObjectCreateMode::INTERNAL));
             xLockRef = pNew;
             xDocSh = (SfxObjectShell*)xLockRef;
             if( xDocSh->DoLoad( pMed ) )
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 7d9020455da9..a02f78742856 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -111,7 +111,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
         else if( ISA( SwGlobalDocShell ) )
             GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::GLOBAL_DOCUMENT, true);       // Globaldokument
 
-        if ( GetCreateMode() ==  SFX_CREATE_MODE_EMBEDDED )
+        if ( GetCreateMode() ==  SfxObjectCreateMode::EMBEDDED )
             SwTransferable::InitOle( this, *m_pDoc );
 
         // set forbidden characters if necessary
@@ -490,8 +490,8 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
         // Loading
         // for MD
         OSL_ENSURE( !m_xBasePool.is(), "who hasn't destroyed their Pool?" );
-        m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
-        if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
+        m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() );
+        if(GetCreateMode() != SfxObjectCreateMode::ORGANIZER)
         {
             SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false);
             m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE;
@@ -501,7 +501,7 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
         sal_uInt32 nErr = ERR_SWG_READ_ERROR;
         switch( GetCreateMode() )
         {
-            case SFX_CREATE_MODE_ORGANIZER:
+            case SfxObjectCreateMode::ORGANIZER:
                 {
                     if( ReadXML )
                     {
@@ -513,8 +513,8 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
                 }
                 break;
 
-            case SFX_CREATE_MODE_INTERNAL:
-            case SFX_CREATE_MODE_EMBEDDED:
+            case SfxObjectCreateMode::INTERNAL:
+            case SfxObjectCreateMode::EMBEDDED:
                 {
                     SwTransferable::InitOle( this, *m_pDoc );
                 }
@@ -522,8 +522,8 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
                 SW_MOD()->SetEmbeddedLoadSave( true );
                 // no break;
 
-            case SFX_CREATE_MODE_STANDARD:
-            case SFX_CREATE_MODE_PREVIEW:
+            case SfxObjectCreateMode::STANDARD:
+            case SfxObjectCreateMode::PREVIEW:
                 {
                     Reader *pReader = ReadXML;
                     if( pReader )
@@ -562,7 +562,7 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
         bRet = !IsError( nErr );
 
         if (bRet && !m_pDoc->IsInLoadAsynchron() &&
-            GetCreateMode() == SFX_CREATE_MODE_STANDARD)
+            GetCreateMode() == SfxObjectCreateMode::STANDARD)
         {
             LoadingFinished();
         }
@@ -592,7 +592,7 @@ bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
             SwWait aWait( *this, true );
             {
                 OSL_ENSURE( !m_xBasePool.is(), "who hasn't destroyed their Pool?" );
-                m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
+                m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() );
                 if( ReadXML )
                 {
                     ReadXML->SetOrganizerMode( true );
@@ -620,7 +620,7 @@ bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
 void SwDocShell::SubInitNew()
 {
     OSL_ENSURE( !m_xBasePool.is(), "who hasn't destroyed their Pool?" );
-    m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
+    m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() );
     UpdateFontList();
     InitDrawModelAndDocShell(this, m_pDoc ? m_pDoc->getIDocumentDrawModelAccess().GetDrawModel() : 0);
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 45230c1d9e74..3f15fd3f89e5 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -965,7 +965,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
             if(bCreateSingleFile)
             {
                 // create a target docshell to put the merged document into
-                xTargetDocShell = new SwDocShell( SFX_CREATE_MODE_STANDARD );
+                xTargetDocShell = new SwDocShell( SfxObjectCreateMode::STANDARD );
                 xTargetDocShell->DoInitNew( 0 );
                 if (nMaxDumpDocs)
                     lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
@@ -2723,7 +2723,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
             {
                 // the shell will be explicitly closed, but it is more safe to use SfxObjectShellLock here
                 // especially for the case that the loading has failed
-                SfxObjectShellLock xWorkDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
+                SfxObjectShellLock xWorkDocSh( new SwDocShell( SfxObjectCreateMode::INTERNAL ));
                 SfxMedium* pWorkMed = new SfxMedium( sTempURL, STREAM_STD_READ );
                 pWorkMed->SetFilter( pSfxFlt );
                 if( xWorkDocSh->DoLoad(pWorkMed) )
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 1df19b765208..2ba22e414c66 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -594,7 +594,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
             {
                 SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
                 SwDocShell* pNewDocSh = new SwDocShell( pDoc,
-                                         SFX_CREATE_MODE_EMBEDDED );
+                                         SfxObjectCreateMode::EMBEDDED );
                 aDocShellRef = pNewDocSh;
                 aDocShellRef->DoInitNew( NULL );
                 SwTransferable::InitOle( aDocShellRef, *pDoc );
@@ -824,7 +824,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
     {
         pClpDocFac = new SwDocFac;
         SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
-        aDocShellRef = new SwDocShell( pDoc, SFX_CREATE_MODE_EMBEDDED);
+        aDocShellRef = new SwDocShell( pDoc, SfxObjectCreateMode::EMBEDDED);
         aDocShellRef->DoInitNew( NULL );
         pWrtShell->Copy( pDoc );
 
@@ -969,7 +969,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         SwDocShell* pDShell;
         if( !bIsCut && bDDELink &&
             0 != ( pDShell = pWrtShell->GetDoc()->GetDocShell()) &&
-            SFX_CREATE_MODE_STANDARD == pDShell->GetCreateMode() )
+            SfxObjectCreateMode::STANDARD == pDShell->GetCreateMode() )
         {
             AddFormat( SotClipboardFormatId::LINK );
             refDdeLink = new SwTrnsfrDdeLink( *this, *pWrtShell );
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index fbbfd851d60b..f973411b850f 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -133,7 +133,7 @@ static bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
 
 SwGlosDocShell::SwGlosDocShell(bool bNewShow)
     : SwDocShell( (bNewShow)
-            ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL )
+            ? SfxObjectCreateMode::STANDARD : SfxObjectCreateMode::INTERNAL )
 {
     SetHelpId(SW_GLOSDOCSHELL);
 }
@@ -169,7 +169,7 @@ bool SwGlosDocShell::Save()
 }
 
 SwWebGlosDocShell::SwWebGlosDocShell()
-    : SwWebDocShell( SFX_CREATE_MODE_STANDARD )
+    : SwWebDocShell( SfxObjectCreateMode::STANDARD )
 {
     SetHelpId(SW_WEBGLOSDOCSHELL);
 }
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index afcd73fd55db..912ce34066a0 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -704,7 +704,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
         case SID_INSERT_VIDEO:
             if ( GetShell().IsSelFrmMode()
                  || GetShell().CrsrInsideInputFld()
-                 || SFX_CREATE_MODE_EMBEDDED == eCreateMode
+                 || SfxObjectCreateMode::EMBEDDED == eCreateMode
                  || bCrsrInHidden )
             {
                 rSet.DisableItem( nWhich );
@@ -714,7 +714,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
         case SID_INSERT_DIAGRAM:
             if( !aMOpt.IsChart()
                 || GetShell().CrsrInsideInputFld()
-                || eCreateMode == SFX_CREATE_MODE_EMBEDDED
+                || eCreateMode == SfxObjectCreateMode::EMBEDDED
                 || bCrsrInHidden )
             {
                 rSet.DisableItem( nWhich );
@@ -723,7 +723,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 
             case FN_INSERT_SMA:
                 if( !aMOpt.IsMath()
-                    || eCreateMode == SFX_CREATE_MODE_EMBEDDED
+                    || eCreateMode == SfxObjectCreateMode::EMBEDDED
                     || bCrsrInHidden
                     || rSh.CrsrInsideInputFld() )
                 {
@@ -735,7 +735,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
             case SID_INSERT_OBJECT:
             case SID_INSERT_PLUGIN:
                 {
-                    if( eCreateMode == SFX_CREATE_MODE_EMBEDDED || bCrsrInHidden )
+                    if( eCreateMode == SfxObjectCreateMode::EMBEDDED || bCrsrInHidden )
                     {
                         rSet.DisableItem( nWhich );
                     }
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 2f83e176ca96..bc929053961c 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -865,7 +865,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
 
     // no margin for OLE!
     Size aBrwsBorder;
-    if( SFX_CREATE_MODE_EMBEDDED != pDocSh->GetCreateMode() )
+    if( SfxObjectCreateMode::EMBEDDED != pDocSh->GetCreateMode() )
         aBrwsBorder = GetMargin();
 
     m_pWrtShell->SetBrowseBorder( aBrwsBorder );
@@ -916,7 +916,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         // Set AttrChangedNotify link
     m_pWrtShell->SetChgLnk(LINK(this, SwView, AttrChangedNotify));
 
-    if( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
+    if( pDocSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
         !pDocSh->GetVisArea(ASPECT_CONTENT).IsEmpty() )
         SetVisArea( pDocSh->GetVisArea(ASPECT_CONTENT),false);
 
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 19530171d8fd..ed126fe56f74 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1394,7 +1394,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
             break;
             case SID_ATTR_ZOOM:
             {
-                if ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
+                if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
                 {
                     const SwViewOption* pVOpt = rShell.GetViewOptions();
                     SvxZoomType eZoom = (SvxZoomType) pVOpt->GetZoomType();
@@ -1417,7 +1417,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
             break;
             case SID_ATTR_VIEWLAYOUT:
             {
-                if ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
+                if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
                 {
                     const SwViewOption* pVOpt = rShell.GetViewOptions();
                     const sal_uInt16 nColumns  = pVOpt->GetViewLayoutColumns();
@@ -1431,7 +1431,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
             break;
             case SID_ATTR_ZOOMSLIDER:
             {
-                if ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
+                if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
                 {
                     const SwViewOption* pVOpt = rShell.GetViewOptions();
                     const sal_uInt16 nCurrentZoom = pVOpt->GetZoom();
@@ -1674,7 +1674,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
         break;
         case SID_ATTR_ZOOM:
         {
-            if ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
+            if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
             {
                 const SfxItemSet *pSet = 0;
                 boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
@@ -1742,7 +1742,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
         case SID_ATTR_VIEWLAYOUT:
         {
             if ( pArgs && !rSh.getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
-                ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
+                ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
             {
                 if ( SfxItemState::SET == pArgs->GetItemState(SID_ATTR_VIEWLAYOUT, true, &pItem ))
                 {
@@ -1764,7 +1764,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 
         case SID_ATTR_ZOOMSLIDER:
         {
-            if ( pArgs && ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
+            if ( pArgs && ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
             {
                 if ( SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ))
                 {
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 04773149ddce..bcdca2d8e6df 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -62,7 +62,7 @@ static sal_uInt16 nPgNum = 0;
 
 bool SwView::IsDocumentBorder()
 {
-    if (GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
+    if (GetDocShell()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED)
         return true;
 
     if (!m_pWrtShell)
@@ -282,7 +282,7 @@ void SwView::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
         // TODO/LATER: why casting?!
         GetDocShell()->SfxObjectShell::SetVisArea( aVis );
         /*
-        if ( GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
+        if ( GetDocShell()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
             GetDocShell()->SfxInPlaceObject::SetVisArea( aVis );
         else
             GetDocShell()->SvEmbeddedObject::SetVisArea( aVis );*/
@@ -1100,7 +1100,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
         //Thus also in the outplace editing the page width will be adjusted immediately.
         //TODO/LATER: is that still necessary?!
         /*
-        if ( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
+        if ( pDocSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
             pDocSh->SetVisArea(
                             pDocSh->SfxInPlaceObject::GetVisArea() );*/
         if ( m_pWrtShell->GetViewOptions()->GetZoomType() != SvxZoomType::PERCENT &&
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 990c20a25f98..c323f7261694 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -383,7 +383,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
             OUString sPrinterName;
             if( rValue >>= sPrinterName  )
             {
-                if( !mpPrinter && !sPrinterName.isEmpty() && mpDocSh->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
+                if( !mpPrinter && !sPrinterName.isEmpty() && mpDocSh->GetCreateMode() != SfxObjectCreateMode::EMBEDDED )
                 {
                     SfxPrinter* pPrinter = mpDoc->getIDocumentDeviceAccess().getPrinter( true );
                     if ( OUString ( pPrinter->GetName()) != sPrinterName )
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index a3b3d7c888a8..c2782f62db81 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -63,7 +63,7 @@ com_sun_star_comp_Writer_WebDocument_get_implementation(::com::sun::star::uno::X
 {
     SolarMutexGuard aGuard;
     SwGlobals::ensure();
-    SfxObjectShell* pShell = new SwWebDocShell( SFX_CREATE_MODE_STANDARD );
+    SfxObjectShell* pShell = new SwWebDocShell( SfxObjectCreateMode::STANDARD );
     uno::Reference< uno::XInterface > model( pShell->GetModel() );
     model->acquire();
     return model.get();
@@ -76,7 +76,7 @@ com_sun_star_comp_Writer_GlobalDocument_get_implementation(::com::sun::star::uno
 {
     SolarMutexGuard aGuard;
     SwGlobals::ensure();
-    SfxObjectShell* pShell = new SwGlobalDocShell( SFX_CREATE_MODE_STANDARD );
+    SfxObjectShell* pShell = new SwGlobalDocShell( SfxObjectCreateMode::STANDARD );
     uno::Reference< uno::XInterface > model( pShell->GetModel() );
     model->acquire();
     return model.get();
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 626c374aa9a9..31cbc114cdf9 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -385,7 +385,7 @@ SwXMailMerge::SwXMailMerge() :
 {
     // create empty document
     // like in: SwModule::InsertEnv (appenv.cxx)
-    xDocSh = new SwDocShell( SFX_CREATE_MODE_STANDARD );
+    xDocSh = new SwDocShell( SfxObjectCreateMode::STANDARD );
     xDocSh->DoInitNew( 0 );
     SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
     SwView *pView = static_cast<SwView*>( pFrame->GetViewShell() );
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index f4eaa51a37bc..d29561e12ba9 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -648,7 +648,7 @@ SfxObjectShellLock SwXTextView::BuildTmpSelectionDoc()
     SwWrtShell& rOldSh = m_pView->GetWrtShell();
     SfxPrinter *pPrt = rOldSh.getIDocumentDeviceAccess()->getPrinter( false );
     SwDocShell* pDocSh;
-    SfxObjectShellLock xDocSh( pDocSh = new SwDocShell( /*pPrtDoc, */SFX_CREATE_MODE_STANDARD ) );
+    SfxObjectShellLock xDocSh( pDocSh = new SwDocShell( /*pPrtDoc, */SfxObjectCreateMode::STANDARD ) );
     xDocSh->DoInitNew( 0 );
     SwDoc *const pTempDoc( pDocSh->GetDoc() );
     // #i103634#, #i112425#: do not expand numbering and fields on PDF export