summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/textsh.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-02-06 16:24:47 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-02-06 16:24:47 +0000
commit7c48d701b3d2a3a374e8b7804b5885226d45ccb2 (patch)
tree19d7795e88212b19e7a702aae5cb52d94381511c /sw/source/ui/shells/textsh.cxx
parentc8321d96bc454de4ea21f311de098f5dc3ac669d (diff)
INTEGRATION: CWS swqbf51 (1.46.78); FILE MERGED
2006/01/30 11:25:11 tl 1.46.78.1: #125842# moving InsertGraphicDlg to SwView
Diffstat (limited to 'sw/source/ui/shells/textsh.cxx')
-rw-r--r--sw/source/ui/shells/textsh.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 3dcc6f068128..47d7bfeb6685 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: textsh.cxx,v $
*
- * $Revision: 1.47 $
+ * $Revision: 1.48 $
*
- * last change: $Author: kz $ $Date: 2006-02-01 18:52:07 $
+ * last change: $Author: rt $ $Date: 2006-02-06 17:24:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -906,21 +906,19 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
else if(sPath.Len())
{
- if (!pFrmMgr)
- pFrmMgr = new SwFlyFrmAttrMgr( TRUE, &rSh, FRMMGR_TYPE_GRF );
+ SwFlyFrmAttrMgr aFrmMgr( TRUE, &rSh, FRMMGR_TYPE_GRF );
// am FrmMgr muessen die richtigen Parameter eingestellt werden
- pFrmMgr->SetAnchor(FLY_IN_CNTNT);
+ aFrmMgr.SetAnchor(FLY_IN_CNTNT);
rSh.SplitNode( FALSE, FALSE );
rSh.SplitNode( FALSE, FALSE );
rSh.Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE );
rSh.SetAttr(SvxAdjustItem(SVX_ADJUST_CENTER,RES_PARATR_ADJUST ));
- if(GRFILTER_OK == InsertGraphic(sPath, aEmptyStr, TRUE, 0, 0 ))
+ if(GRFILTER_OK == GetView().InsertGraphic(sPath, aEmptyStr, TRUE, 0, 0 ))
bRet = TRUE;
rSh.EnterStdMode();
rSh.Right(CRSR_SKIP_CHARS, FALSE, 1, FALSE );
- DELETEZ(pFrmMgr);
}
rSh.EndAllAction();
rSh.EndUndo(UIUNDO_INSERT_RULER);