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/filter/ww8/ww8par4.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/filter/ww8/ww8par4.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index ccabdcf8cac1..eef92f7148cf 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -35,12 +35,8 @@ #include "writerhelper.hxx" #include <com/sun/star/embed/XClassifiedObject.hpp> -#ifndef __SGI_STL_ALGORITHM #include <algorithm> -#endif -#ifndef __SGI_STL_FUNCTIONAL #include <functional> -#endif #include <osl/endian.h> #include <sot/storage.hxx> #include <com/sun/star/drawing/XShape.hpp> @@ -59,9 +55,7 @@ #include <frmfmt.hxx> #include <pam.hxx> #include <ndgrf.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> // fuer Ole-Node -#endif #include <mdiexp.hxx> // Progress #include <redline.hxx> #include <fltshell.hxx> @@ -296,7 +290,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf, if (!mbNewDoc) Reader::ResetFrmFmtAttrs( *pTempSet ); - SwFmtAnchor aAnchor( FLY_IN_CNTNT ); + SwFmtAnchor aAnchor( FLY_AS_CHAR ); aAnchor.SetAnchor( pPaM->GetPoint() ); pTempSet->Put( aAnchor ); |