summaryrefslogtreecommitdiff
path: root/sw/source/ui/config/viewopt.cxx
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-02-26 08:13:29 +0100
committerThomas Lange [tl] <tl@openoffice.org>2010-02-26 08:13:29 +0100
commitdde2e41414ae1179b4f5d568c2cbd03a1c911fae (patch)
tree4fab97ec89f02e9c4b6b5b8129662a6d2c60521b /sw/source/ui/config/viewopt.cxx
parente54a20bf1a45c1c0d2abfe2a7a19bbf2c0bd6bee (diff)
parent7e12418df527339d4a78416596ea12ed3cd6133a (diff)
cws tl74: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/config/viewopt.cxx')
-rw-r--r--sw/source/ui/config/viewopt.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index fe4195178361..13cec2b93bb5 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewopt.cxx,v $
- * $Revision: 1.34 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,13 +30,13 @@
#include <svx/htmlmode.hxx>
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
#endif
-#include <svx/svxenum.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/svxacorr.hxx>
#include <unotools/localedatawrapper.hxx>
#ifndef _REGION_HXX //autogen
#include <vcl/region.hxx>
@@ -60,7 +57,7 @@
#include <svtools/accessibilityoptions.hxx>
#include <unotools/syslocale.hxx>
-#include <svx/acorrcfg.hxx>
+#include <editeng/acorrcfg.hxx>
#ifdef DBG_UTIL
BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading