From 4501272cd2fee3534ef34b07a85aa0d26b7cae68 Mon Sep 17 00:00:00 2001
From: Akshay Deep <akshaydeepiitr@gmail.com>
Date: Wed, 8 Jun 2016 05:45:51 +0530
Subject: Resolves: Default template is not loaded when starting with Template
 Selection

Change-Id: I378cc64da27a00fb6e2c4197e36864035d2b537a
Reviewed-on: https://gerrit.libreoffice.org/26041
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
---
 sd/source/ui/app/sdmod1.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 86285a436289..7ecdbe5c14fc 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -531,7 +531,8 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
         bool bStartWithTemplate = pOpt->IsStartWithTemplate();
 
         bool bNewDocDirect = rReq.GetSlot() == SID_NEWSD;
-        if( bNewDocDirect && !bStartWithTemplate )
+
+        if( bNewDocDirect )
         {
             //we start without wizard
 
@@ -550,11 +551,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                 pFrame = CreateEmptyDocument( xTargetFrame );
             }
         }
-        else
-        {
-            //create an empty document into frame
-            pFrame = CreateEmptyDocument( xTargetFrame );
 
+        if(bStartWithTemplate)
+        {
             //Launch TemplateSelectionDialog
             ScopedVclPtrInstance< SfxTemplateSelectionDlg > aTemplDlg( SfxGetpApp()->GetTopWindow());
             aTemplDlg->Execute();
-- 
cgit