diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:53:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:53:53 +0000 |
| commit | d037ba23018d770cb2ae53d1972036cc287d0c87 (patch) | |
| tree | 648dcf714e69e9b93cc009cb019cf85888fdfff2 /sw | |
| parent | 50f68bc8b476dfccadcdc54559839faec6f67f8f (diff) | |
INTEGRATION: CWS writercorehandoff (1.66.92); FILE MERGED
2006/07/27 14:50:34 fme 1.66.92.8: RESYNC: (1.69-1.71); FILE MERGED
2006/03/17 08:17:01 tra 1.66.92.7: RESYNC: (1.68-1.69); FILE MERGED
2005/10/25 08:38:07 tra 1.66.92.6: RESYNC: (1.67-1.68); FILE MERGED
2005/10/24 16:01:25 tra 1.66.92.5: #50348#
2005/09/28 14:01:19 tra 1.66.92.4: #i50348#
2005/09/13 14:57:10 tra 1.66.92.3: RESYNC: (1.66-1.67); FILE MERGED
2005/06/07 14:14:37 fme 1.66.92.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:28:22 tra 1.66.92.1: Unnecessary includes removed #i50348#
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index b0546861041a..17c44e53bf67 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unodraw.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: rt $ $Date: 2006-07-25 12:36:46 $ + * last change: $Author: hr $ $Date: 2006-08-14 16:53:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +32,6 @@ * MA 02111-1307 USA * ************************************************************************/ - #pragma hdrstop #include <swtypes.hxx> @@ -54,9 +53,6 @@ #ifndef _SVX_UNOPRNMS_HXX #include <svx/unoprnms.hxx> #endif -#ifndef _UNOOBJ_HXX -#include <unoobj.hxx> -#endif #ifndef _DOC_HXX //autogen #include <doc.hxx> #endif @@ -137,10 +133,6 @@ #ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESUPPLIER_HPP_ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #endif -// --> OD 2004-07-23 #i31698# -#ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX3_HPP_ -#include <com/sun/star/drawing/HomogenMatrix3.hpp> -#endif #ifndef _COM_SUN_STAR_TEXT_HORIORIENTATION_HPP_ #include <com/sun/star/text/HoriOrientation.hpp> #endif @@ -150,12 +142,6 @@ #ifndef _BGFX_NUMERIC_FTOOLS_HXX #include <basegfx/numeric/ftools.hxx> #endif -// <-- -// --> OD 2004-08-06 #i28749# -#ifndef _COM_SUN_STAR_TEXT_POSITIONLAYOUTDIR_HPP_ -#include <com/sun/star/text/PositionLayoutDir.hpp> -#endif -// <-- // OD 2004-05-05 #i28701# #ifndef _FMTWRAPINFLUENCEONOBJPOS_HXX #include <fmtwrapinfluenceonobjpos.hxx> @@ -798,7 +784,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) if ( !pTemp ) pTemp = pPam; UnoActionContext aAction(pDoc); - pDoc->Insert( *pTemp, *pObj, &aSet ); + pDoc->Insert( *pTemp, *pObj, &aSet, NULL ); SwFrmFmt* pFmt = ::FindFrmFmt( pObj ); if(pFmt) pFmt->Add(pShape); @@ -849,7 +835,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< if( !bFlyInCnt ) { UnoActionContext aContext(pDoc); - pDoc->StartUndo( UNDO_START ); + pDoc->StartUndo( UNDO_START, NULL ); SwDrawContact* pContact = pDoc->GroupSelection( *pPage->GetDrawView() ); pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(), FLY_AT_CNTNT/*int eAnchorId*/, @@ -861,7 +847,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< uno::Reference< uno::XInterface > xInt = pPage->GetInterface( pContact->GetMaster() ); xRet = uno::Reference< drawing::XShapeGroup >(xInt, uno::UNO_QUERY); } - pDoc->EndUndo( UNDO_END ); + pDoc->EndUndo( UNDO_END, NULL ); } } pPage->RemovePageView(); @@ -884,12 +870,12 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG { pPage->PreUnGroup(xShapeGroup); UnoActionContext aContext(pDoc); - pDoc->StartUndo( UNDO_START ); + pDoc->StartUndo( UNDO_START, NULL ); pDoc->UnGroupSelection( *pPage->GetDrawView() ); pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(), FLY_AT_CNTNT/*int eAnchorId*/, sal_True, sal_False ); - pDoc->EndUndo( UNDO_END ); + pDoc->EndUndo( UNDO_END, NULL ); } pPage->RemovePageView(); } |