diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-01-27 15:02:23 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-01-27 15:02:23 +0100 |
| commit | b36241988ea99ba2a9d290ec838a3557d0333d63 (patch) | |
| tree | aa12b665ef23f5ea193d109d8af56c1149d6db50 /sw/source/ui/dbui | |
| parent | da877b6a3bd9be2bf4ee15224008d73b87aca06f (diff) | |
| parent | dd19343634909cc3ee030087f1d0e84731853d68 (diff) | |
CWS-TOOLING: integrate CWS swunolocking1
Notes
Notes:
split repo tag: writer_ooo/DEV300_m71
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 958b9497a08a..6b802ad12797 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -42,9 +42,7 @@ #include <unotools/tempfile.hxx> #include <uitool.hxx> #include <svx/dlgutil.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swundo.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> @@ -56,9 +54,7 @@ #include <fldbas.hxx> #include <poolfmt.hxx> #include <unotxdoc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <doc.hxx> #include <wrtsh.hxx> #include <fmtsrnd.hxx> @@ -325,7 +321,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( RES_FRM_SIZE, RES_FRM_SIZE, RES_SURROUND, RES_SURROUND, 0 ); - aSet.Put(SwFmtAnchor(FLY_PAGE, 1)); + aSet.Put(SwFmtAnchor(FLY_AT_PAGE, 1)); if(bAlignLeft) aSet.Put(SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA )); else |