diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-16 12:00:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-16 12:05:37 +0200 |
| commit | e9f405a0daf1dc47a46cb902f05fe24e095b837d (patch) | |
| tree | 7f0444270f67a35ed921ee4a899ebabfaa524a3d /include/svx/svdmodel.hxx | |
| parent | 6154e810836a7a4bc7f417cbe16d7c84584d49e9 (diff) | |
Clean up SdrModel::MigrateItemSet
* No need to support null pNewModel argument (the one call site that did pass in
null explicitly in sd/source/ui/func/fupate.cxx can just as well pass in
mpDoc, and all existing call sites are guaranteed to pass in a non-null
value).
* With that changed, SdrModel::MigrateItemSet can be static. (At least in
JunitTest_forms_unoapi it could happen that the call from
svx/source/sdr/properties/attributeproperites.cxx called MigrateItemSet on a
null GetSdrObject.GetModel(), which was undefined behavior even though it was
harmless.)
Change-Id: Idface48da7e889c6e5768d0e49bc67c88b4c3ec4
Diffstat (limited to 'include/svx/svdmodel.hxx')
| -rw-r--r-- | include/svx/svdmodel.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index ae322501912b..a97bf5d8934b 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -645,10 +645,8 @@ public: virtual SvxNumType GetPageNumType() const; /** copies the items from the source set to the destination set. Both sets must have - same ranges but can have different pools. If pNewModel is optional. If it is null, - this model is used. */ - - void MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ); + same ranges but can have different pools. */ + static void MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ); bool IsInDestruction() const { return mbInDestruction;} |