diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-06-09 11:45:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-06-09 11:45:53 +0100 |
| commit | f4a6b02873cd8e18874880ccac572013869ac8d9 (patch) | |
| tree | 8e619058fc60a94bb13a019cecbd4347a5701a64 /sw/inc | |
| parent | d550cf5237fef341dc040f9c252fb9b5c6cc0ef4 (diff) | |
| parent | 3bd3fc177eebc1cc2779c5b77cbbe90014f9afe3 (diff) | |
cmcfixes75: merge with DEV300 m81
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/fesh.hxx | 6 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index b224d0c5ae24..216f902e4b6c 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -63,6 +63,11 @@ class SwFrmFmt; struct SwSortOptions; class SdrMarkList; +namespace svx +{ + class ISdrObjectFilter; +} + // return values for GetFrmType() und GetSelFrmType(). //! values can be combined via logival or @@ -464,6 +469,7 @@ public: BOOL GetObjAttr( SfxItemSet &rSet ) const; BOOL SetObjAttr( const SfxItemSet &rSet ); + const SdrObject* GetBestObject( BOOL bNext, USHORT eType = GOTOOBJ_DRAW_ANY, BOOL bFlat = TRUE, const ::svx::ISdrObjectFilter* pFilter = NULL ); BOOL GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); //Setzen vom DragMode (z.B. Rotate), tut nix bei Rahmenselektion. diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 592725f78d63..620fe0b00b63 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -728,7 +728,7 @@ #include "editeng/eeitem.hxx" #include "filter/msfilter/escherex.hxx" #include "svx/extrusionbar.hxx" -#include "svx/extrusioncontrols.hxx" +#include "svx/extrusioncolorcontrol.hxx" #include "svx/fillctrl.hxx" #include "svx/flagsdef.hxx" #include "editeng/flstitem.hxx" |