diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-10-21 00:18:03 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-11-02 13:14:35 +0100 |
| commit | d4892e5452bff155da6c34063ffe8c331284d8e9 (patch) | |
| tree | f8662290bd0d59463905db822918fc78b1c354e2 /sd/source/ui | |
| parent | 42899e8b4e1dfc872924f3488ff6e2070c93c06e (diff) | |
tdf#126700 handle Impress default documents
Impress has a two stage load, eventually because of the optional
template manager. Since I don't know, what the 2nd load URL
"private:object" is used for otherwise in LO, this just marks the
empty and default documents as replaceable in Impress.
Regressed-by: 61e1e0413296928d929f99c0f006c6cbbcf4ac40
Change-Id: Ief8d9eeaa65e8fb40400e64c16768d37ca343893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104581
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 4ec1e83b190d..35bf5ebfb5ea 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -30,6 +30,7 @@ #include <editeng/langitem.hxx> #include <vcl/weld.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/docfile.hxx> #include <sfx2/request.hxx> #include <sfx2/templatedlg.hxx> #include <editeng/eeitem.hxx> @@ -411,7 +412,8 @@ IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, voi } -SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Reference< XFrame >& i_rFrame ) +SfxFrame* SdModule::CreateFromTemplate(const OUString& rTemplatePath, const Reference<XFrame>& i_rFrame, + const bool bReplaceable) { SfxFrame* pFrame = nullptr; @@ -430,6 +432,8 @@ SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Ref } else if( pDocShell ) { + if (pDocShell->GetMedium() && pDocShell->GetMedium()->GetItemSet()) + pDocShell->GetMedium()->GetItemSet()->Put(SfxBoolItem(SID_REPLACEABLE, bReplaceable)); SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pDocShell, i_rFrame ); OSL_ENSURE( pViewFrame, "SdModule::CreateFromTemplate: no view frame - was the document really loaded?" ); pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr; @@ -464,7 +468,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest const & rReq ) if( !aStandardTemplate.isEmpty() ) { //load a template document - pFrame = CreateFromTemplate( aStandardTemplate, xTargetFrame ); + pFrame = CreateFromTemplate(aStandardTemplate, xTargetFrame, true); } else { @@ -485,7 +489,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest const & rReq ) //pFrame is loaded with the desired template if (!aTemplDlg.getTemplatePath().isEmpty()) - pFrame = CreateFromTemplate(aTemplDlg.getTemplatePath(), xTargetFrame); + pFrame = CreateFromTemplate(aTemplDlg.getTemplatePath(), xTargetFrame, false); } } @@ -506,6 +510,8 @@ SfxFrame* SdModule::CreateEmptyDocument( const Reference< XFrame >& i_rFrame ) pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); } + if (pNewDocSh->GetMedium() && pNewDocSh->GetMedium()->GetItemSet()) + pNewDocSh->GetMedium()->GetItemSet()->Put(SfxBoolItem(SID_REPLACEABLE, true)); SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pNewDocSh, i_rFrame ); OSL_ENSURE( pViewFrame, "SdModule::CreateEmptyDocument: no view frame - was the document really loaded?" ); |