Delete two pass-through include files and update the file that included them.

Change-Id: I6f02d312d1425dbb28b7cb7a2aa87a734054c4a7
Reviewed-on: https://gerrit.libreoffice.org/3474
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

forms/source/component/DatabaseForm.cxx

@@ -69,11 +69,11 @@
 #include <cppuhelper/implbase2.hxx>
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
-#include <svl/inetstrm.hxx>
 #include <svl/inettype.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/inetmsg.hxx>
+#include <tools/inetstrm.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucblockbytes.hxx>
 #include <unotools/ucbstreamhelper.hxx>

sfx2/source/doc/objmisc.cxx

@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include <svl/inetmsg.hxx>
+#include <tools/inetmsg.hxx>
 #include <tools/diagnose_ex.h>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>

svl/Package_inc.mk

@@ -49,8 +49,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx))

svl/inc/svl/inetmsg.hxx

@@ -1,22 +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 <tools/inetmsg.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svl/inc/svl/inetstrm.hxx

@@ -1,22 +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 <tools/inetstrm.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */