New template manager out of experimental features

Change-Id: Ieb6b590060b1ca7a497049e974909c9661f1cc14

1 files changed, 8 insertions, 29 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e7c0f6da1e62..6e11151071ae 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -566,37 +566,16 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
         sal_Bool bNewWin = sal_False;
         Window* pTopWin = GetTopWindow();
 
-        SvtMiscOptions aMiscOptions;
-        if ( !aMiscOptions.IsExperimentalMode() )
+        SfxTemplateManagerDlg aTemplDlg(NULL);
+        int nRet = aTemplDlg.Execute();
+        if ( nRet == RET_OK )
         {
-            SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( NULL );
-            int nRet = pDocTemplDlg->Execute();
-            if ( nRet == RET_OK )
+            rReq.Done();
+            if ( pTopWin != GetTopWindow() )
             {
-                rReq.Done();
-                if ( pTopWin != GetTopWindow() )
-                {
-                    // the dialogue opens a document -> a new TopWindow appears
-                    pTopWin = GetTopWindow();
-                    bNewWin = sal_True;
-                }
-            }
-
-            delete pDocTemplDlg;
-        }
-        else
-        {
-            SfxTemplateManagerDlg aTemplDlg(NULL);
-            int nRet = aTemplDlg.Execute();
-            if ( nRet == RET_OK )
-            {
-                rReq.Done();
-                if ( pTopWin != GetTopWindow() )
-                {
-                    // the dialogue opens a document -> a new TopWindow appears
-                    pTopWin = GetTopWindow();
-                    bNewWin = sal_True;
-                }
+                // the dialogue opens a document -> a new TopWindow appears
+                pTopWin = GetTopWindow();
+                bNewWin = sal_True;
             }
         }