diff options
author | Michael Dunphy <michael.w.dunphy@gmail.com> | 2013-04-19 15:49:58 -0400 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-20 12:45:37 +0000 |
commit | 3af6366dee15674b8e74c084ddc111bc93c5c1c2 (patch) | |
tree | 5930d4ab776e8097a629e377d4a1b1639c8ff9bd | |
parent | 89feda6bfdeacb647d44cb432d5ebc2678c44c89 (diff) |
Remove pass-through header files sd/inc/eetext.hxx and sd/inc/app.hxx
Change-Id: Iaccc7c9d81b55ef3a039cb90c4e089ebfc7fe337
Reviewed-on: https://gerrit.libreoffice.org/3487
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
41 files changed, 40 insertions, 89 deletions
diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx deleted file mode 100644 index 13eab0651a1e..000000000000 --- 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 f623b382ec41..000000000000 --- 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 6a283d486861..2d294eb5e11c 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 107d198eef4a..73ae2771f052 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 abbd02b492d4..52dc47109979 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 198fcc8b8e8c..1d3fac54a0bd 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 0411ef93cac8..b9bf6dab25a8 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 4f4fb64fb556..488e6f540d3a 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 da5a606f6946..1e23fd970384 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 446be74e343f..bb7cad78e5df 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 c97b6577c1ea..9fe08cc68736 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 bc175b42711b..dbd6d3d0e1a4 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 99ba867f57e2..74a268a45175 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 2587f2a41944..26ba6f57873c 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 4b2ba46f6486..31f614042efd 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 9c36397273c9..b9ebdf55e954 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 708a9496d964..37e7954ce3f3 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 70ef8e5f7cee..1cf47842b0ec 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 64f24c6a9cdd..2d1db9bd02c2 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 b2ae452e24d4..830879bcfb14 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 bb952019358c..f5cf9202b492 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 4809358324ad..72a6f6a4eeac 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 2d33d0a079c1..9df2ef1ee815 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 2509c7500f3e..66855624fcf1 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 882fd1451387..263569a153b4 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 7ce9b1bfa0db..ab551c2802db 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 9a4012c1f1d4..6fb6afa74a53 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 ccead8452eb9..1bd2eff6650a 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 2ba19abff3d4..4f016f101aa1 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 f550f9d99967..b88b515a9af4 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 8166e9b63af9..fdf951769e45 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 94dba94af530..3b533be70a3a 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 1a5dd612660f..fb14df8b1ff0 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 36485615dc37..ba087131cc2a 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 caadb1ee3ac9..760e411a0c76 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 54862dfddb38..f1c80f1fb400 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 3e1a3af3dad1..f1e04babdc82 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 5e7a88b59a3a..56efdbea2d04 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 25c6ff0d8a1e..63d8de6483f8 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 42fa3b8f9ed5..68f47ff36e0b 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 5e926d349435..92168e298c89 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" |