diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:02:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:02:47 +0000 |
| commit | 05d4962e6d7a89c1ac10c87101276e6b13ee17b6 (patch) | |
| tree | 4bd23c263d6d683a99e7218bb2a6adfcd4147eda /svx/source/tbxctrls/grafctrl.cxx | |
| parent | 1b687754e35a3c54c0caa071ae541148038ce061 (diff) | |
INTEGRATION: CWS aw003 (1.12.42); FILE MERGED
2003/06/06 12:59:50 aw 1.12.42.1: #109820#
2nd run of changes for ItemSet isolation
Diffstat (limited to 'svx/source/tbxctrls/grafctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index b16d698ff969..ad8188b0d3b5 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: grafctrl.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:04:56 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:02:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1043,7 +1043,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const MapMode aMap100( MAP_100TH_MM ); const MapMode aMapTwip( MAP_TWIP ); - aGrfAttr.Put(pObj->GetItemSet()); + aGrfAttr.Put(pObj->GetMergedItemSet()); rPool.SetDefaultMetric( SFX_MAPUNIT_TWIP ); SfxItemSet aCropDlgAttr( rPool, |