diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
| commit | 5879e44bafec55e5a9b76cb38c992645948ec607 (patch) | |
| tree | fb4b3eb2b43104421a8cb979ea9b082290cac49b /sw/source/ui/docvw/AnnotationWin.cxx | |
| parent | a00760d9c1a79cb4e54c6e7c55772b81caf3dce7 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master
Diffstat (limited to 'sw/source/ui/docvw/AnnotationWin.cxx')
| -rw-r--r-- | sw/source/ui/docvw/AnnotationWin.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index 492cf1600298..91ea1e13b077 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -42,18 +42,18 @@ #include <vcl/menu.hxx> -#include <svtools/undo.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/languageoptions.hxx> - -#include <svx/postitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/langitem.hxx> - -#include <svx/editview.hxx> -#include <svx/outliner.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> +#include <svl/undo.hxx> +#include <unotools/syslocale.hxx> +#include <svl/languageoptions.hxx> + +#include <editeng/postitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/langitem.hxx> + +#include <editeng/editview.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> #include <docufld.hxx> // SwPostItField #include <txtfld.hxx> |