[PATCH] Remove pass-through header files sd/inc/eetext.hxx and sd/in...

Michael Dunphy (via Code Review) gerrit at gerrit.libreoffice.org
Fri Apr 19 13:15:29 PDT 2013 

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3487

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3487/1

Remove pass-through header files sd/inc/eetext.hxx and sd/inc/app.hxx

Change-Id: Iaccc7c9d81b55ef3a039cb90c4e089ebfc7fe337
---
D sd/inc/app.hxx
D sd/inc/eetext.hxx
M sd/source/core/drawdoc.cxx
M sd/source/core/drawdoc2.cxx
M sd/source/core/drawdoc4.cxx
M sd/source/core/sdobjfac.cxx
M sd/source/core/sdpage.cxx
M sd/source/core/stlpool.cxx
M sd/source/core/stlsheet.cxx
M sd/source/core/typemap.cxx
M sd/source/ui/app/optsitem.cxx
M sd/source/ui/app/sddll2.cxx
M sd/source/ui/app/tbxww.cxx
M sd/source/ui/dlg/LayerTabBar.cxx
M sd/source/ui/dlg/custsdlg.cxx
M sd/source/ui/dlg/paragr.cxx
M sd/source/ui/dlg/prltempl.cxx
M sd/source/ui/docshell/docshel3.cxx
M sd/source/ui/docshell/docshel4.cxx
M sd/source/ui/docshell/docshell.cxx
M sd/source/ui/func/fudraw.cxx
M sd/source/ui/func/fuinsert.cxx
M sd/source/ui/func/fuprlout.cxx
M sd/source/ui/func/fusearch.cxx
M sd/source/ui/func/fusel.cxx
M sd/source/ui/func/futempl.cxx
M sd/source/ui/func/futhes.cxx
M sd/source/ui/view/Outliner.cxx
M sd/source/ui/view/drtxtob.cxx
M sd/source/ui/view/drtxtob1.cxx
M sd/source/ui/view/drviews1.cxx
M sd/source/ui/view/drviews3.cxx
M sd/source/ui/view/drviews4.cxx
M sd/source/ui/view/drviews5.cxx
M sd/source/ui/view/drviews6.cxx
M sd/source/ui/view/drviewsb.cxx
M sd/source/ui/view/drviewsf.cxx
M sd/source/ui/view/frmview.cxx
M sd/source/ui/view/outlview.cxx
M sd/source/ui/view/sdview.cxx
M sd/source/ui/view/tabcontr.cxx
41 files changed, 40 insertions(+), 89 deletions(-)



diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx
deleted file mode 100644
index 13eab06..0000000
--- a/sd/inc/app.hxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "sdmod.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx
deleted file mode 100644
index f623b38..0000000
--- a/sd/inc/eetext.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _EETEXT_HXX
-#define _EETEXT_HXX
-
-#include <editeng/outliner.hxx>
-
-#endif  // EETEXT_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 6a283d4..2d294eb 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "Outliner.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include <editeng/editstat.hxx>
 #include <editeng/fontitem.hxx>
 #include <svl/flagitem.hxx>
@@ -63,7 +63,7 @@
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "pglink.hxx"
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 9e4adb2..033f18d 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -41,7 +41,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>                  // SVX_RESSTR
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <svtools/imapobj.hxx>
 
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index abbd02b..52dc471 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -30,7 +30,6 @@
 #include "../ui/inc/DrawDocShell.hxx"
 #include <editeng/eeitem.hxx>
 #include <vcl/svapp.hxx>
-#include <eetext.hxx>
 
 #include <editeng/autokernitem.hxx>
 
diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx
index 198fcc8..1d3fac5 100644
--- a/sd/source/core/sdobjfac.cxx
+++ b/sd/source/core/sdobjfac.cxx
@@ -19,7 +19,7 @@
 
 #include <basic/sbx.hxx>
 
-#include <app.hxx>
+#include "sdmod.hxx"
 #include "sdpage.hxx"
 #include "sdobjfac.hxx"
 #include "glob.hxx"
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 0411ef9..b9bf6da 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -23,7 +23,7 @@
 #include <comphelper/classids.hxx>
 
 #include <vcl/svapp.hxx>
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editdata.hxx>
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 4f4fb64..488e6f5 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -44,7 +44,7 @@
 #include <editeng/autokernitem.hxx>
 
 #include <svx/svdattr.hxx>
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <svx/xtable.hxx>           // for RGB_Color
 #include <editeng/bulletitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index da5a606..1e23fd9 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -27,7 +27,7 @@
 #include <comphelper/serviceinfohelper.hxx>
 #include <boost/bind.hpp>
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svx/svdoattr.hxx>
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 446be74..bb7cad7 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index c97b657..9fe08cc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -23,7 +23,7 @@
 #include <tools/helpers.hxx>
 #include <unotools/syslocale.hxx>
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "optsitem.hxx"
 #include "cfgids.hxx"
 #include "FrameView.hxx"
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index bc175b4..dbd6d3d 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <editeng/editdata.hxx>
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/eeitem.hxx>
 
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 99ba867..74a268a 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -31,7 +31,7 @@
 
 #include <vcl/toolbox.hxx>
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "app.hrc"
 #include "res_bmp.hrc"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 2587f2a..26ba6f5 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -26,7 +26,7 @@
 
 
 #include "sdattr.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "helpids.h"
 #include "app.hrc"
 #include "glob.hrc"
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 4b2ba46..31f6140 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -26,7 +26,7 @@
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "cusshow.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "customshowlist.hxx"
 #include <vcl/msgbox.hxx>
 #include "svtools/treelistentry.hxx"
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 9c36397..b9ebdf5 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -28,7 +28,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/flagsdef.hxx>
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include "paragr.hxx"
 #include "sdresid.hxx"
 #include "glob.hrc"
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 708a949..37e7954 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 
 #include <svx/dialogs.hrc>
 #include <editeng/flstitem.hxx>
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 70ef8e5..1cf4784 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -44,7 +44,7 @@
 #include "glob.hrc"
 #include "res_bmp.hrc"
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 64f24c6..2d1db9b 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -59,7 +59,7 @@
 #include "sdattr.hxx"
 #include "drawdoc.hxx"
 #include "ViewShell.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "View.hxx"
 #include "sdpage.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index b2ae452..830879b 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/fcontnr.hxx>
 
 #include "app.hrc"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "strmname.h"
 #include "stlpool.hxx"
 #include "strings.hrc"
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index bb952019..f5cf920 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -46,7 +46,7 @@
 #include "strings.hrc"
 #include "res_bmp.hrc"
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "GraphicDocShell.hxx"
 #include "fudraw.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 4809358..72a6f6a 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -67,7 +67,7 @@
 #include "app.hrc"
 #include "sdresid.hxx"
 #include "View.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "Window.hxx"
 #include "drawview.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 2d33d0a..9df2ef1 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -48,7 +48,7 @@
 #include "sdattr.hxx"
 #include "sdresid.hxx"
 #include "drawview.hxx"
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <editeng/editdata.hxx>
 #include "sdabstdlg.hxx"
 
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 2509c75..6685562 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -29,7 +29,7 @@
 #include "Window.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "View.hxx"
 #include "Outliner.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index c6e14a9..a0ca0b3 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -45,7 +45,7 @@
 #include "strings.hrc"
 #include "res_bmp.hrc"
 #include "GraphicDocShell.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "DrawDocShell.hxx"
 #include "stlpool.hxx"
 #include "anminfo.hxx"
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 7ce9b1b..ab551c2 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -47,7 +47,7 @@
 #include "stlsheet.hxx"
 #include "sdpage.hxx"
 #include "stlpool.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "View.hxx"
 #include "Window.hxx"
 #include "drawview.hxx"
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 9a4012c..6fb6afa 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -33,7 +33,7 @@
 #include "app.hrc"
 #include "strings.hrc"
 #include "drawdoc.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "View.hxx"
 #include "Outliner.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index ccead84..1bd2eff 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -49,9 +49,9 @@
 
 #include "strings.hrc"
 #include "sdstring.hrc"
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include "sdpage.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "Window.hxx"
 #include "sdresid.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 25eb71a..eeabb21 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -54,7 +54,7 @@
 #include "glob.hrc"
 #include "res_bmp.hrc"
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 
 #include "drawdoc.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 2d6b18a..b88fb71 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -57,7 +57,7 @@
 
 #include "app.hrc"
 
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include "ViewShell.hxx"
 #include "drawview.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index c69c2ef..95e9968 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -54,7 +54,7 @@
 #include "strings.hrc"
 #include "helpids.h"
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "fupoor.hxx"
 #include "sdresid.hxx"
 #include "fusel.hxx"
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index d9cee3c..dad6791 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -57,7 +57,7 @@
 #include "sdundogr.hxx"
 #include "undopage.hxx"
 #include "glob.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "fupoor.hxx"
 #include "slideshow.hxx"
 #ifndef SD_FRAME_VIEW
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 1a5dd61..fb14df8 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -50,7 +50,7 @@
 #include "Window.hxx"
 #include "fupoor.hxx"
 #include "fusnapln.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "Ruler.hxx"
 #include "sdresid.hxx"
 #include "GraphicViewShell.hxx"
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3648561..ba08713 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -41,7 +41,7 @@
 #include "app.hrc"
 #include "helpids.h"
 #include "optsitem.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "FrameView.hxx"
 #include "sdattr.hxx"
 #include "futext.hxx"
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index caadb1e..760e411 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -42,7 +42,7 @@
 #include "strings.hrc"
 #include "glob.hrc"
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "animobjs.hxx"
 #include "AnimationChildWindow.hxx"
 #include "NavigatorChildWindow.hxx"
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index a3fe056..1539094 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -45,7 +45,7 @@
 #include "glob.hrc"
 #include "Outliner.hxx"
 #include "Window.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "sdattr.hxx"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 3e1a3af..f1e04ba 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -48,7 +48,7 @@
 #include "Outliner.hxx"
 #include "app.hrc"
 
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "stlsheet.hxx"
 #include "drawview.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 5e7a88b..56efdbea 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -34,7 +34,7 @@
 #include "ViewShellBase.hxx"
 #include "DrawViewShell.hxx"
 #include "OutlineViewShell.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "sdresid.hxx"
 #include "pres.hxx"
 #include "glob.hrc"
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 25c6ff0..63d8de6 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/progress.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/svxids.hrc>
-#include "eetext.hxx"
+#include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 42fa3b8..68f47ff 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -56,7 +56,7 @@
 #include "Client.hxx"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "sdpage.hxx"
 #include "glob.hrc"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 5e926d3..92168e2 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -27,7 +27,7 @@
 
 
 #include "sdattr.hxx"
-#include "app.hxx"
+#include "sdmod.hxx"
 #include "app.hrc"
 #include "glob.hrc"
 #include "res_bmp.hrc"

-- 
To view, visit https://gerrit.libreoffice.org/3487
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaccc7c9d81b55ef3a039cb90c4e089ebfc7fe337
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Dunphy <michael.w.dunphy at gmail.com>

More information about the LibreOffice mailing list