summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml/xmltexti.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-01-05 16:37:41 +0100
committerMichael Stahl <mst@openoffice.org>2010-01-05 16:37:41 +0100
commit733b831970204059b9d89eff203551d6d3bf4bbe (patch)
tree4ba13335cba78b98026eedee44ebf47da129bfa9 /sw/source/filter/xml/xmltexti.cxx
parentc941bb6a756a79a5c0ae1d903cc50399d8200812 (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/xml/xmltexti.cxx')
-rw-r--r--sw/source/filter/xml/xmltexti.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 6953e065c82a..8c414cdeab0e 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -47,9 +47,7 @@
#include <xmloff/prstylei.hxx>
#include <xmloff/maptype.hxx>
#include <xmloff/xmlprmap.hxx>
-#ifndef _XMLOFF_TXTPRMAP_HXX
#include <xmloff/txtprmap.hxx>
-#endif
#include <xmloff/i18nmap.hxx>
#include "unocrsr.hxx"
#include "unoobj.hxx"
@@ -76,6 +74,7 @@
#include <svtools/embedhlp.hxx>
#include <svtools/urihelper.hxx>
+
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
@@ -126,7 +125,7 @@ static void lcl_putHeightAndWidth ( SfxItemSet &rItemSet,
rItemSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
}
- SwFmtAnchor aAnchor( FLY_AUTO_CNTNT );
+ SwFmtAnchor aAnchor( FLY_AT_CHAR );
rItemSet.Put( aAnchor );
if( pTwipWidth )