filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2 - filter/source/xsltdialog/xmlfiltertabdialog.hrc | 27 ----------------------- filter/source/xsltdialog/xmlfiltertabdialog.src | 2 - sfx2/Package_inc.mk | 1 sfx2/inc/sfx2/basmgr.hxx | 28 ------------------------ sfx2/source/appl/appbas.cxx | 3 +- sfx2/source/doc/objcont.cxx | 3 +- sfx2/source/doc/objxtor.cxx | 3 +- sfx2/source/doc/sfxbasemodel.cxx | 3 +- vcl/Package_inc.mk | 1 vcl/inc/vcl/button.hxx | 2 - vcl/inc/vcl/decoview.hxx | 2 - vcl/inc/vcl/symbol.hxx | 28 ------------------------ vcl/source/window/splitwin.cxx | 4 ++- 14 files changed, 15 insertions(+), 94 deletions(-)
New commits: commit 8f4fc74c34df6efd6b74aacc610bf6f52b615aa5 Author: Michael Dunphy <michael.w.dun...@gmail.com> Date: Fri Apr 19 19:10:54 2013 -0400 fdo#62699 Remove a few more pass-through headers Change-Id: I4cc2dc7f1da3bc15921939e3bd5908a3f7049eab Reviewed-on: https://gerrit.libreoffice.org/3492 Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org> Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 2808375..78a1505 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -25,7 +25,7 @@ #include "xmlfilterdialogstrings.hrc" #include "xmlfiltertabdialog.hxx" -#include "xmlfiltertabdialog.hrc" +#include "xmlfiltercommon.hrc" #include "xmlfiltertabpagebasic.hrc" #include "xmlfiltertabpagexslt.hrc" #include "xmlfiltertabpagebasic.hxx" diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hrc b/filter/source/xsltdialog/xmlfiltertabdialog.hrc deleted file mode 100644 index b731ade..0000000 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hrc +++ /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 _XMLFILTERTABDIALOG_HRC_ -#define _XMLFILTERTABDIALOG_HRC_ - -#include "xmlfiltercommon.hrc" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.src b/filter/source/xsltdialog/xmlfiltertabdialog.src index d2220ae..4f4f9b1 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.src +++ b/filter/source/xsltdialog/xmlfiltertabdialog.src @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "xmlfiltertabdialog.hrc" +#include "xmlfiltercommon.hrc" #include "xmlfiltertabpagebasic.hrc" #include "xmlfiltertabpagexslt.hrc" #include "xmlfilterhelpids.hrc" diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 0e22e48..23b051a 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) diff --git a/sfx2/inc/sfx2/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx deleted file mode 100644 index c22dd4d..0000000 --- a/sfx2/inc/sfx2/basmgr.hxx +++ /dev/null @@ -1,28 +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 _SFX_BASMGR_HXX -#define _SFX_BASMGR_HXX - -#include <basic/basmgr.hxx> -#include <svtools/svtools.hrc> - -#endif //_SFX_BASMGR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 1dae64a..cbbc05f 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -66,7 +66,8 @@ #include "appdata.hxx" #include "appbas.hxx" #include "sfx2/sfxhelp.hxx" -#include "sfx2/basmgr.hxx" +#include <basic/basmgr.hxx> +#include <svtools/svtools.hrc> #include "sorgitm.hxx" #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 86883d1..41f2046 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -64,7 +64,8 @@ #include "sfx2/sfxhelp.hxx" #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> -#include "sfx2/basmgr.hxx" +#include <basic/basmgr.hxx> +#include <svtools/svtools.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/doctempl.hxx> #include "doc.hrc" diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 3682a3b..6d2c4b5 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -90,7 +90,8 @@ #include "appdata.hxx" #include <sfx2/appuno.hxx> #include <sfx2/sfxsids.hrc> -#include "sfx2/basmgr.hxx" +#include <basic/basmgr.hxx> +#include <svtools/svtools.hrc> #include "sfx2/QuerySaveDocument.hxx" #include "helpid.hrc" #include <sfx2/msg.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index b96d694..90fe7e5 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -96,7 +96,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> -#include <sfx2/basmgr.hxx> +#include <basic/basmgr.hxx> +#include <svtools/svtools.hrc> #include <sfx2/event.hxx> #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index 08be3a2..69fff7d 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -137,7 +137,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgdata.hxx,vcl/svgdata.hxx)) -$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx)) diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 71fffc7..8c116b0 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -23,10 +23,10 @@ #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/image.hxx> -#include <vcl/symbol.hxx> #include <vcl/ctrl.hxx> #include <vcl/bitmap.hxx> #include <vcl/salnativewidgets.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> #include <vector> diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index add5d20..31e6529 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -22,7 +22,7 @@ #include <tools/solar.h> #include <vcl/dllapi.h> -#include <vcl/symbol.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> class Rectangle; class Point; diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx deleted file mode 100644 index 1b19ec3..0000000 --- a/vcl/inc/vcl/symbol.hxx +++ /dev/null @@ -1,28 +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 _SV_SYMBOL_HXX -#define _SV_SYMBOL_HXX - -#include <tools/solar.h> -#include <rsc/rsc-vcl-shared-types.hxx> - -#endif // _SV_SYMBOL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index a0967ce..c411b51 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -22,16 +22,18 @@ #include <tools/debug.hxx> #include <tools/rcid.h> +#include <tools/solar.h> #include <vcl/event.hxx> #include <vcl/wall.hxx> #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> -#include <vcl/symbol.hxx> #include <vcl/image.hxx> #include <vcl/help.hxx> #include <vcl/splitwin.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> + #include <svdata.hxx> #include <svids.hrc> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits