diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-09 14:41:17 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-09 14:41:17 +0100 |
| commit | 4b2be0beb412d9ebeaa33aea07265c3581e70eff (patch) | |
| tree | 0f27a923d7cac592def1ee6dc52e7ad19cccfb2a /sw/source/ui/docvw | |
| parent | 8e5ce7a3a0703fb3af27da7ffea023830a340b04 (diff) | |
| parent | b36241988ea99ba2a9d290ec838a3557d0333d63 (diff) | |
cbosdo02: merging changesets up to DEV300_m71
Diffstat (limited to 'sw/source/ui/docvw')
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index def25a3fc9b9..e251db85da52 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -50,16 +50,12 @@ #include <sot/storage.hxx> #include <svl/macitem.hxx> #include <unotools/securityoptions.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <svl/ctloptions.hxx> #include <basic/sbx.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#ifndef _SFX_CLIENTSH_HXX #include <sfx2/ipclient.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> #include <sfx2/bindings.hxx> @@ -69,9 +65,6 @@ #include <svx/langitem.hxx> #include <svx/htmlmode.hxx> #include <svx/svdview.hxx> -//#ifndef _SVDVMARK_HXX //autogen -//#include <svx/svdvmark.hxx> -//#endif #include <svx/svdhdl.hxx> #include <svx/svdoutl.hxx> #include <svx/editeng.hxx> @@ -128,12 +121,8 @@ #include <breakit.hxx> #include <checkit.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #ifndef _DOCVW_HRC #include <docvw.hrc> #endif @@ -1021,7 +1010,7 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb ) default: ASSERT( TRUE, "ChangeFly: Unknown direction." ); } BOOL bSet = FALSE; - if( FLY_IN_CNTNT == eAnchorId && ( nDir % 2 ) ) + if ((FLY_AS_CHAR == eAnchorId) && ( nDir % 2 )) { long aDiff = aTmp.Top() - aRefPoint.Y(); if( aDiff > 0 ) @@ -1066,7 +1055,8 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb ) aSet.Put( aVert ); bSet = TRUE; } - if( bWeb && FLY_AT_CNTNT == eAnchorId && ( nDir==MOVE_LEFT_SMALL || nDir==MOVE_RIGHT_BIG ) ) + if (bWeb && (FLY_AT_PARA == eAnchorId) + && ( nDir==MOVE_LEFT_SMALL || nDir==MOVE_RIGHT_BIG )) { SwFmtHoriOrient aHori( (SwFmtHoriOrient&)aSet.Get(RES_HORI_ORIENT) ); sal_Int16 eNew; @@ -1187,7 +1177,8 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) BOOL bDummy; const bool bVertAnchor = rSh.IsFrmVertical( TRUE, bDummy ); const bool bHoriMove = !bVertAnchor == !( nDir % 2 ); - const bool bMoveAllowed = !bHoriMove || rSh.GetAnchorId() != FLY_IN_CNTNT; + const bool bMoveAllowed = + !bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR); if ( bMoveAllowed ) { // <-- |