summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/engine3d/float3d.cxx4
-rw-r--r--svx/source/form/fmmodel.cxx31
-rw-r--r--svx/source/svdraw/svdmodel.cxx53
-rw-r--r--svx/source/toolbars/fontworkbar.cxx3
-rw-r--r--svx/source/unogallery/unogalitem.cxx2
6 files changed, 27 insertions, 68 deletions
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 45fd6f18d107..91073760eaa3 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -128,7 +128,7 @@ void GraphCtrl::InitSdrModel()
delete pModel;
// Creating a Model
- pModel = new SdrModel;
+ pModel = new SdrModel();
pModel->GetItemPool().FreezeIdRanges();
pModel->SetScaleUnit( aMap100.GetMapUnit() );
pModel->SetScaleFraction( Fraction( 1, 1 ) );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 98f9fb485df3..615957ada6a4 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2786,8 +2786,10 @@ void Svx3DWin::LBSelectColor( SvxColorListBox* pLb, const Color& rColor )
void Svx3DWin::UpdatePreview()
{
- if( pModel == nullptr )
+ if(nullptr == pModel)
+ {
pModel = new FmFormModel();
+ }
// Get Itemset
SfxItemSet aSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{});
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index ef5f56e09c41..decabb6cb5e6 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -49,31 +49,12 @@ struct FmFormModelImplData
}
};
-FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
- : SdrModel(pPool, pPers)
- , m_pImpl(nullptr)
- , m_pObjShell(nullptr)
- , m_bOpenInDesignMode(false)
- , m_bAutoControlFocus(false)
-{
- m_pImpl.reset( new FmFormModelImplData );
- m_pImpl->mxUndoEnv = new FmXUndoEnvironment(*this);
-}
-
-FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers)
- : SdrModel(rPath, pPool, pPers, false)
- , m_pImpl(nullptr)
- , m_pObjShell(nullptr)
- , m_bOpenInDesignMode(false)
- , m_bAutoControlFocus(false)
-{
- m_pImpl.reset( new FmFormModelImplData );
- m_pImpl->mxUndoEnv = new FmXUndoEnvironment(*this);
-}
-
-FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
- bool bUseExtColorTable)
- : SdrModel(rPath, pPool, pPers, bUseExtColorTable)
+FmFormModel::FmFormModel(
+ SfxItemPool* pPool,
+ SfxObjectShell* pPers)
+: SdrModel(
+ pPool,
+ pPers)
, m_pImpl(nullptr)
, m_pObjShell(nullptr)
, m_bOpenInDesignMode(false)
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bde671498fd1..b28b6f8c734e 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -17,22 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/svdmodel.hxx>
-
#include <cassert>
#include <math.h>
-
#include <osl/endian.h>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
-
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-
#include <unotools/configmgr.hxx>
-
+#include <unotools/pathoptions.hxx>
#include <svl/whiter.hxx>
#include <svl/asiancfg.hxx>
#include <svx/xit.hxx>
@@ -43,12 +38,9 @@
#include <svx/xflftrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xlnstit.hxx>
-
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
-
#include <svx/xtable.hxx>
-
#include <svx/svditer.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdpage.hxx>
@@ -64,10 +56,8 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svdoutlinercache.hxx>
-
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
-
#include <officecfg/Office/Common.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/colritem.hxx>
@@ -80,10 +70,8 @@
#include <svl/zforlist.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/storagehelper.hxx>
-
#include <tools/tenccvt.hxx>
#include <unotools/syslocale.hxx>
-
#include <svx/sdr/properties/properties.hxx>
#include <editeng/eeitem.hxx>
#include <svl/itemset.hxx>
@@ -111,8 +99,9 @@ struct SdrModelImpl
};
-void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper,
- bool bUseExtColorTable)
+void SdrModel::ImpCtor(
+ SfxItemPool* pPool,
+ ::comphelper::IEmbeddedHelper* _pEmbeddedHelper)
{
mpImpl.reset(new SdrModelImpl);
mpImpl->mpUndoManager=nullptr;
@@ -168,8 +157,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
else
mnCharCompressType = CharCompressType::NONE;
- bExtColorTable=bUseExtColorTable;
-
if ( pPool == nullptr )
{
pItemPool=new SdrItemPool(nullptr);
@@ -216,26 +203,13 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
ImpCreateTables();
}
-SdrModel::SdrModel():
- maMaPag(),
+SdrModel::SdrModel(
+ SfxItemPool* pPool,
+ ::comphelper::IEmbeddedHelper* pPers)
+: maMaPag(),
maPages()
{
- ImpCtor(nullptr, nullptr, false);
-}
-
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers):
- maMaPag(),
- maPages()
-{
- ImpCtor(pPool,pPers,false/*bUseExtColorTable*/);
-}
-
-SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable):
- maMaPag(),
- maPages(),
- aTablePath(rPath)
-{
- ImpCtor(pPool,pPers,bUseExtColorTable);
+ ImpCtor(pPool,pPers);
}
SdrModel::~SdrModel()
@@ -616,11 +590,12 @@ bool SdrModel::IsUndoEnabled() const
void SdrModel::ImpCreateTables()
{
+ // use standard path for initial construction
+ const OUString aTablePath(!utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : "");
+
for( auto i : o3tl::enumrange<XPropertyListType>() )
{
- if( !bExtColorTable || i != XPropertyListType::Color )
- maProperties[i] = XPropertyList::CreatePropertyList (
- i, aTablePath, ""/*TODO?*/ );
+ maProperties[i] = XPropertyList::CreatePropertyList(i, aTablePath, ""/*TODO?*/ );
}
}
@@ -655,7 +630,7 @@ void SdrModel::ClearModel(bool bCalledFromDestructor)
SdrModel* SdrModel::AllocModel() const
{
- SdrModel* pModel=new SdrModel;
+ SdrModel* pModel=new SdrModel();
pModel->SetScaleUnit(eObjUnit,aObjUnit);
return pModel;
}
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 338907dc1096..cdfc32236443 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -354,8 +354,9 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const
if ( aObjList[ i ].equalsIgnoreAsciiCase( rCustomShape ) )
{
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/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 6f1bbfecfc7f..361edc2f9a55 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -322,7 +322,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
if( gallery::GalleryItemType::DRAWING == getType() )
{
::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
- FmFormModel* pModel = new FmFormModel;
+ FmFormModel* pModel = new FmFormModel();
pModel->GetItemPool().FreezeIdRanges();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 05:55:27 +0000