rebase to m76

2 files changed, 27 insertions, 35 deletions

diff --git a/sw/inc/pch/precompiled_sw.cxx b/sw/inc/pch/precompiled_sw.cxx
index 458d9e2a21c6..04a4242b04f2 100644
--- a/sw/inc/pch/precompiled_sw.cxx
+++ b/sw/inc/pch/precompiled_sw.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: precompiled_sw.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index e8aadd472aa6..592725f78d63 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -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: precompiled_sw.hxx,v $
- * $Revision: 1.5.222.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -514,8 +511,8 @@
 
 #include "framework/interaction.hxx"
 
-#include "goodies/grfmgr.hxx"
-#include "goodies/mailenum.hxx"
+#include "svtools/grfmgr.hxx"
+#include "svl/mailenum.hxx"
 
 #include "i18npool/lang.h"
 #include "i18npool/mslangid.hxx"
@@ -596,7 +593,6 @@
 #include "sfx2/tabdlg.hxx"
 #include "sfx2/tbxctrl.hxx"
 #include "sfx2/templdlg.hxx"
-#include "sfx2/topfrm.hxx"
 #include "sfx2/tplpitem.hxx"
 #include "sfx2/viewfac.hxx"
 #include "sfx2/viewfrm.hxx"
@@ -710,11 +706,11 @@
 #include "svx/IAccessibleParent.hxx"
 #include "svx/IAccessibleViewForwarder.hxx"
 #include "svx/SpellDialogChildWindow.hxx"
-#include "svx/SpellPortions.hxx"
-#include "svx/UnoForbiddenCharsTable.hxx"
-#include "svx/acorrcfg.hxx"
+#include "editeng/SpellPortions.hxx"
+#include "editeng/UnoForbiddenCharsTable.hxx"
+#include "editeng/acorrcfg.hxx"
 #include "svx/anchorid.hxx"
-#include "svx/asiancfg.hxx"
+#include "svl/asiancfg.hxx"
 #include "svx/checklbx.hxx"
 #include "svx/clipboardctl.hxx"
 #include "svx/clipfmtitem.hxx"
@@ -724,18 +720,18 @@
 #include "svx/dialmgr.hxx"
 #include "svx/dialogs.hrc"
 #include "svx/dlgutil.hxx"
-#include "svx/editdata.hxx"
-#include "svx/editeng.hxx"
-#include "svx/editobj.hxx"
-#include "svx/editstat.hxx"
-#include "svx/editview.hxx"
-#include "svx/eeitem.hxx"
+#include "editeng/editdata.hxx"
+#include "editeng/editeng.hxx"
+#include "editeng/editobj.hxx"
+#include "editeng/editstat.hxx"
+#include "editeng/editview.hxx"
+#include "editeng/eeitem.hxx"
 #include "filter/msfilter/escherex.hxx"
 #include "svx/extrusionbar.hxx"
 #include "svx/extrusioncontrols.hxx"
 #include "svx/fillctrl.hxx"
 #include "svx/flagsdef.hxx"
-#include "svx/flstitem.hxx"
+#include "editeng/flstitem.hxx"
 #include "svx/fmdmod.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmobjfac.hxx"
@@ -744,42 +740,41 @@
 #include "svx/fontwork.hxx"
 #include "svx/fontworkbar.hxx"
 #include "svx/fontworkgallery.hxx"
-#include "svx/forbiddencharacterstable.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
 #include "svx/formatpaintbrushctrl.hxx"
-#include "svx/frmdir.hxx"
+#include "editeng/frmdir.hxx"
 #include "svx/galbrws.hxx"
 #include "svx/gallery.hxx"
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
-#include "svx/hangulhanja.hxx"
+#include "editeng/hangulhanja.hxx"
 #include "svx/hdft2.hxx"
-#include "svx/htmlcfg.hxx"
+#include "svtools/htmlcfg.hxx"
 #include "svx/htmlmode.hxx"
 #include "svx/hyperdlg.hxx"
 #include "svx/hyprlink.hxx"
 #include "svx/imapdlg.hxx"
-#include "svx/impgrf.hxx"
-#include "svx/itemtype.hxx"
+#include "editeng/itemtype.hxx"
 #include "svx/langbox.hxx"
 #include "svx/layctrl.hxx"
 #include "svx/lboxctrl.hxx"
 #include "svx/linectrl.hxx"
-#include "svx/linkmgr.hxx"
+#include "sfx2/linkmgr.hxx"
 #include "filter/msfilter/mscodec.hxx"
 #include "filter/msfilter/msdffimp.hxx"
 #include "filter/msfilter/msfiltertracer.hxx"
 #include "filter/msfilter/msocximex.hxx"
 #include "filter/msfilter/msoleexp.hxx"
-#include "svx/numitem.hxx"
+#include "editeng/numitem.hxx"
 #include "svx/numvset.hxx"
 #include "svx/objfac3d.hxx"
 #include "svx/ofaitem.hxx"
 #include "svx/optgenrl.hxx"
 #include "svx/optgrid.hxx"
-#include "svx/outliner.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/outliner.hxx"
+#include "editeng/outlobj.hxx"
 #include "svx/pagectrl.hxx"
-#include "svx/paperinf.hxx"
+#include "editeng/paperinf.hxx"
 #include "svx/paraprev.hxx"
 #include "svx/pfiledlg.hxx"
 #include "svx/prtqry.hxx"
@@ -788,7 +783,7 @@
 #include "svx/rubydialog.hxx"
 #include "svx/ruler.hxx"
 #include "svx/rulritem.hxx"
-#include "svx/scripttypeitem.hxx"
+#include "editeng/scripttypeitem.hxx"
 #include "svx/sdgcoitm.hxx"
 #include "svx/sdggaitm.hxx"
 #include "svx/sdginitm.hxx"
@@ -806,7 +801,7 @@
 #include "svx/sdtaitm.hxx"
 #include "svx/sdtakitm.hxx"
 #include "svx/simptabl.hxx"
-#include "svx/splwrap.hxx"
+#include "editeng/splwrap.hxx"
 #include "svx/srchdlg.hxx"
 #include "svx/stddlg.hxx"
 #include "svx/strarray.hxx"