diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-02-04 17:59:58 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-02-04 17:59:58 +0100 |
| commit | b08e1a88dfe23d31df932f442fd2a15cfccb608f (patch) | |
| tree | 21b7ebc81bb3eb4632294364ec984e43b47fea00 /sw/source/ui/utlui | |
| parent | 324b2e274c8638e9129695cf7e1bbb4caca892c5 (diff) | |
| parent | b36241988ea99ba2a9d290ec838a3557d0333d63 (diff) | |
CWS svxsplit: merge with m71
Diffstat (limited to 'sw/source/ui/utlui')
| -rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/utlui/swrenamexnameddlg.cxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/utlui/unotools.cxx | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 94ae4026b349..e83fdc88a613 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -53,9 +53,7 @@ #include <fmturl.hxx> #include <fmthdft.hxx> #include <fmtcnct.hxx> -#ifndef _FMTLINE_HXX #include <fmtline.hxx> -#endif #include <tgrditem.hxx> #include <hfspacingitem.hxx> #include <fmtruby.hxx> @@ -687,13 +685,13 @@ SfxItemPresentation SwFmtAnchor::GetPresentation USHORT nId = 0; switch ( GetAnchorId() ) { - case FLY_AT_CNTNT: //Absatzgebundener Rahmen + case FLY_AT_PARA: nId = STR_FLY_AT_CNTNT; break; - case FLY_IN_CNTNT: //Zeichengebundener Rahmen + case FLY_AS_CHAR: nId = STR_FLY_IN_CNTNT; break; - case FLY_PAGE: //Seitengebundener Rahmen + case FLY_AT_PAGE: nId = STR_FLY_PAGE; break; default:;//prevent warning diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 283da9eaa129..6c07cef2b6c0 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -63,7 +63,6 @@ #include <view.hxx> #include <wrtsh.hxx> #include <swmodule.hxx> -#include <unoobj.hxx> #include <unocrsr.hxx> #include "swrenamexnameddlg.hxx" diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index a7d06416b443..c5d8e4b24409 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -59,12 +59,13 @@ #include <view.hxx> #include <wrtsh.hxx> #include <swmodule.hxx> -#include <unoobj.hxx> +#include <TextCursorHelper.hxx> #include <unocrsr.hxx> #include <doc.hxx> #include <unomid.h> + using namespace ::com::sun::star; using ::rtl::OUString; |