diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:25:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:25:33 +0000 |
| commit | 1330d4def71b6baa110b57137a61fd17709343fb (patch) | |
| tree | be102d2e75c2d983d2a1d26d85724c1a496e7da7 /sw/source/ui/shells/grfsh.cxx | |
| parent | ecab8b8f4ac3234d48fa6ba53956146744398310 (diff) | |
INTEGRATION: CWS swnewlistlevelattrs_DEV300 (1.29.18); FILE MERGED
2008/02/06 12:51:15 od 1.29.18.1: #i85348# minor correction
Diffstat (limited to 'sw/source/ui/shells/grfsh.cxx')
| -rw-r--r-- | sw/source/ui/shells/grfsh.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 86cd460b18c7..1e62f12b48b7 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: grfsh.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2008-01-29 09:25:30 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:25:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -290,7 +290,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) SfxItemSet aTmpSet( rSh.GetAttrPool(), RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF ); - rSh.GetAttr( aTmpSet ); + rSh.GetCurAttr( aTmpSet ); aSet.Put( aTmpSet ); } @@ -419,7 +419,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) case FN_GRAPHIC_MIRROR_ON_EVEN_PAGES: { SfxItemSet aSet(rSh.GetAttrPool(), RES_GRFATR_MIRRORGRF, RES_GRFATR_MIRRORGRF); - rSh.GetAttr( aSet ); + rSh.GetCurAttr( aSet ); SwMirrorGrf aGrf((const SwMirrorGrf &)aSet.Get(RES_GRFATR_MIRRORGRF)); aGrf.SetGrfToggle(!aGrf.IsGrfToggle()); rSh.SetAttr(aGrf); @@ -453,7 +453,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) case FN_FLIP_VERT_GRAFIC: case FN_FLIP_HORZ_GRAFIC: { - GetShell().GetAttr( aGrfSet ); + GetShell().GetCurAttr( aGrfSet ); SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get( RES_GRFATR_MIRRORGRF ) ); USHORT nMirror = aMirror.GetValue(); @@ -584,7 +584,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) { SwWrtShell &rSh = GetShell(); SfxItemSet aCoreSet( GetPool(), aNoTxtNodeSetRange ); - rSh.GetAttr( aCoreSet ); + rSh.GetCurAttr( aCoreSet ); BOOL bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ); BOOL bIsGrfCntnt = CNT_GRF == GetShell().GetCntType(); // --> OD 2006-11-03 #i59688# |