Kaydet (Commit) 4501272c authored tarafından Akshay Deep's avatar Akshay Deep Kaydeden (comit) Samuel Mehrbrodt

Resolves: Default template is not loaded when starting with Template Selection

Change-Id: I378cc64da27a00fb6e2c4197e36864035d2b537a
Reviewed-on: https://gerrit.libreoffice.org/26041Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst f9a6d825
...@@ -531,7 +531,8 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) ...@@ -531,7 +531,8 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
bool bStartWithTemplate = pOpt->IsStartWithTemplate(); bool bStartWithTemplate = pOpt->IsStartWithTemplate();
bool bNewDocDirect = rReq.GetSlot() == SID_NEWSD; bool bNewDocDirect = rReq.GetSlot() == SID_NEWSD;
if( bNewDocDirect && !bStartWithTemplate )
if( bNewDocDirect )
{ {
//we start without wizard //we start without wizard
...@@ -550,11 +551,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) ...@@ -550,11 +551,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
pFrame = CreateEmptyDocument( xTargetFrame ); pFrame = CreateEmptyDocument( xTargetFrame );
} }
} }
else
{
//create an empty document into frame
pFrame = CreateEmptyDocument( xTargetFrame );
if(bStartWithTemplate)
{
//Launch TemplateSelectionDialog //Launch TemplateSelectionDialog
ScopedVclPtrInstance< SfxTemplateSelectionDlg > aTemplDlg( SfxGetpApp()->GetTopWindow()); ScopedVclPtrInstance< SfxTemplateSelectionDlg > aTemplDlg( SfxGetpApp()->GetTopWindow());
aTemplDlg->Execute(); aTemplDlg->Execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment