diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/drwlayer.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/fuconcustomshape.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/notemark.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 10 |
4 files changed, 11 insertions, 16 deletions
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index f6cf3f90a0ff..078e49674f09 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -241,12 +241,9 @@ static ScRange lcl_getClipRangeFromClipDoc(ScDocument* pClipDoc, SCTAB nClipTab) } ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : - FmFormModel( !utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : OUString(), - nullptr, // SfxItemPool* Pool - pGlobalDrawPersist ? - pGlobalDrawPersist : - ( pDocument ? pDocument->GetDocumentShell() : nullptr ), - true ), // bUseExtColorTable (is set below) + FmFormModel( + nullptr, + pGlobalDrawPersist ? pGlobalDrawPersist : (pDocument ? pDocument->GetDocumentShell() : nullptr)), aName( rName ), pDoc( pDocument ), bRecording( false ), diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 3f8552101449..d59c93379ad1 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -162,8 +162,9 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) if ( aObjList[ i ].equalsIgnoreAsciiCase( aCustomShape ) ) { FmFormModel aFormModel; - SfxItemPool& rPool = aFormModel.GetItemPool(); + SfxItemPool& rPool(aFormModel.GetItemPool()); rPool.FreezeIdRanges(); + if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT, i, &aFormModel ) ) { const SdrObject* pSourceObj = aFormModel.GetPage( 0 )->GetObj( 0 ); diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 07a719d02273..af3a404401fb 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -22,7 +22,6 @@ #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <sfx2/printer.hxx> -#include <unotools/pathoptions.hxx> #include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -79,9 +78,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl, Timer *, void) { if (!m_bVisible) { - SvtPathOptions aPathOpt; - OUString aPath = aPathOpt.GetPalettePath(); - m_pModel = new SdrModel(aPath, nullptr, nullptr, false); + m_pModel = new SdrModel(); m_pModel->SetScaleUnit(MapUnit::Map100thMM); SfxItemPool& rPool = m_pModel->GetItemPool(); rPool.SetDefaultMetric(MapUnit::Map100thMM); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 72604ea4dfd3..7c6f710a7859 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -38,7 +38,6 @@ #include <sot/formats.hxx> #include <sot/filelist.hxx> #include <sot/storage.hxx> -#include <unotools/pathoptions.hxx> #include <svl/ptitem.hxx> #include <svl/stritem.hxx> #include <svtools/transfer.hxx> @@ -508,12 +507,13 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, { MakeDrawLayer(); // before loading model, so 3D factory has been created - SvtPathOptions aPathOpt; - OUString aPath = aPathOpt.GetPalettePath(); - ScDocShellRef aDragShellRef( new ScDocShell ); aDragShellRef->DoInitNew(); - std::unique_ptr<FmFormModel> pModel(new FmFormModel( aPath, nullptr, aDragShellRef.get() )); + + std::unique_ptr<FmFormModel> pModel( + new FmFormModel( + nullptr, + aDragShellRef.get())); pModel->GetItemPool().FreezeIdRanges(); xStm->Seek(0); |