diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:41 +0100 |
| commit | 733b831970204059b9d89eff203551d6d3bf4bbe (patch) | |
| tree | 4ba13335cba78b98026eedee44ebf47da129bfa9 /sw/source/ui/shells/textsh.cxx | |
| parent | c941bb6a756a79a5c0ae1d903cc50399d8200812 (diff) | |
swunolocking1: swtypes.hxx: rename frame anchor types
enum RndStdIds: rename frame anchor types (FLY_*) to be more intuitive.
[note the completely ridiculous number of files that care about anchor types]
Diffstat (limited to 'sw/source/ui/shells/textsh.cxx')
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 7e38c1297d0b..6dffd49dd8c3 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -39,9 +39,7 @@ #include <sfx2/objface.hxx> #include <sfx2/lnkbase.hxx> -#ifndef __RSC //autogen #include <tools/errinf.hxx> -#endif #include <svx/svdview.hxx> #include <svtools/ptitem.hxx> #include <svtools/stritem.hxx> @@ -82,9 +80,7 @@ #include <docsh.hxx> #include <doc.hxx> #include <uitool.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #ifndef _GLOBALS_HRC #include <globals.hrc> #endif @@ -112,9 +108,7 @@ #ifndef _POPUP_HRC #include <popup.hrc> #endif -#ifndef _SWERROR_H #include <swerror.h> -#endif #include <SwAppletImpl.hxx> #include <unochart.hxx> @@ -566,7 +560,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aCol.Init( nCols, aCol.GetGutterWidth(), aCol.GetWishWidth() ); aMgr.SetCol( aCol ); } - aMgr.InsertFlyFrm(FLY_AT_CNTNT, aStartPos, aSize); + aMgr.InsertFlyFrm(FLY_AT_PARA, aStartPos, aSize); GetShell().EndAllAction(); GetShell().UnlockPaint(); } @@ -600,7 +594,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) Size aSize(aMgr.GetSize()); aSize.Width() = GetShell().GetAnyCurRect(RECT_PAGE_PRT).Width(); Point aPos = aMgr.GetPos(); - RndStdIds eAnchor = FLY_AT_CNTNT; + RndStdIds eAnchor = FLY_AT_PARA; if(pArgs->GetItemState(nSlot, FALSE, &pItem) == SFX_ITEM_SET) eAnchor = (RndStdIds)((SfxUInt16Item *)pItem)->GetValue(); if(pArgs->GetItemState(FN_PARAM_1, FALSE, &pItem) == SFX_ITEM_SET) @@ -764,7 +758,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SwFlyFrmAttrMgr aFrmMgr( TRUE, &rSh, FRMMGR_TYPE_GRF ); // am FrmMgr muessen die richtigen Parameter eingestellt werden - aFrmMgr.SetAnchor(FLY_IN_CNTNT); + aFrmMgr.SetAnchor(FLY_AS_CHAR); rSh.SplitNode( FALSE, FALSE ); rSh.SplitNode( FALSE, FALSE ); |