summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-10-21 00:18:03 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2020-11-02 13:14:35 +0100
commitd4892e5452bff155da6c34063ffe8c331284d8e9 (patch)
treef8662290bd0d59463905db822918fc78b1c354e2 /sfx2
parent42899e8b4e1dfc872924f3488ff6e2070c93c06e (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 'sfx2')
-rw-r--r--sfx2/source/view/frmload.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index f69706de1b04..bb9c3218da21 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -612,7 +612,8 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
const bool bIsFactoryURL = sURL.startsWith( "private:factory/" );
bool bInitNewModel = bIsFactoryURL;
const bool bIsDefault = bIsFactoryURL && !bExternalModel;
- aDescriptor.put("Replaceable", bIsDefault);
+ if (!aDescriptor.has("Replaceable"))
+ aDescriptor.put("Replaceable", bIsDefault);
if (bIsDefault)
{
const OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 );