diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-10 13:49:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-10 14:15:13 +0100 |
| commit | 4e6194fe8357efc5afa8d094e209ea94335b5923 (patch) | |
| tree | 09e2d9c31460c1b12912ab4fb5897a5ad0fc3875 /sw/source/uibase/shells | |
| parent | a5aab0cce45309afae81b3ec0be8ace1ca0ca17d (diff) | |
GetCurFrameFormat->GetSelectedFrameFormat
Change-Id: I2f1eb4567b6e073991d95dbcecdc79b24010f2c1
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/frmsh.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/shells/grfsh.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index e3eec1c26230..66a50728f047 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2284,7 +2284,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) if((nsSelectionType::SEL_FRM & nSelType) || (nsSelectionType::SEL_GRF & nSelType)) { // Template autoupdate - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if(pFormat && pFormat->IsAutoUpdateFormat()) { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index c6c43910dc9e..6757697335f3 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -176,7 +176,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) aCol.Init(nCols, nGutterWidth, aCol.GetWishWidth()); aSet.Put(aCol); // Template AutoUpdate - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if(pFormat && pFormat->IsAutoUpdateFormat()) { rSh.AutoUpdateFrame(pFormat, aSet); @@ -498,7 +498,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) rSh.SetObjTitle(static_cast<const SfxStringItem*>(pItem)->GetValue()); } // Template AutoUpdate - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if(pFormat && pFormat->IsAutoUpdateFormat()) { rSh.AutoUpdateFrame(pFormat, *pOutSet); @@ -644,7 +644,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) } if ( bUpdateMgr ) { - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if ( bCopyToFormat && pFormat && pFormat->IsAutoUpdateFormat() ) { rSh.AutoUpdateFrame(pFormat, aMgr.GetAttrSet()); @@ -1111,7 +1111,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) } aFrameSet.Put( aBoxItem ); // Template AutoUpdate - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if(pFormat && pFormat->IsAutoUpdateFormat()) { rSh.AutoUpdateFrame(pFormat, aFrameSet); diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 5ac6ca9ba2bf..32aa477038c7 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -380,7 +380,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } // Templates AutoUpdate - SwFrameFormat* pFormat = rSh.GetCurFrameFormat(); + SwFrameFormat* pFormat = rSh.GetSelectedFrameFormat(); if(pFormat && pFormat->IsAutoUpdateFormat()) { pFormat->SetFormatAttr(*pSet); |