Remove obsolete inetdef.hxx

Change-Id: I043e226a1cec527c51cbd91075634d5c9ca371d8

cui/source/options/optinet2.cxx

@@ -39,7 +39,6 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/filedlghelper.hxx>
-#include <tools/inetdef.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/cntwids.hrc>
 #include <sfx2/app.hxx>

sc/source/core/inc/core_pch.hxx

@@ -140,7 +140,6 @@
 #include <sfx2/app.hxx>
 #include <svl/inetmsg.hxx>
 #include <svtools/compat.hxx>
-#include <svl/inetdef.hxx>
 #include <svl/inethist.hxx>
 #include <vcl/accel.hxx>
 #include <sfx2/sfxdefs.hxx>

sc/source/ui/inc/ui_pch.hxx

@@ -154,7 +154,6 @@
 #include <target.hxx>
 #include <tabvwsh.hxx>
 #include <svl/inethist.hxx>
-#include <svl/inetdef.hxx>
 #include <sfx2/sfxdefs.hxx>
 #include <svtools/compat.hxx>
 #include <svl/inetmsg.hxx>

sfx2/source/bastyp/frmhtmlw.cxx

@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-
-#include <svl/inetdef.hxx>
 #include "svtools/htmlkywd.hxx"
 
 #include <rtl/tencinfo.h>

sfx2/source/doc/doc.hrc

@@ -99,7 +99,6 @@
 #define RID_STR_FILTCONFIG                  (RID_SFX_DOC_START+ 52)
 #define RID_STR_FILTBASIC                   (RID_SFX_DOC_START+ 53)
 #define RID_STR_WARNSTYLEOVERWRITE          (RID_SFX_DOC_START+ 54)
-#define RID_DLSTATUS                        (RID_SFX_DOC_START+ 55)
 
 #define MSG_OPEN_READONLY                   (RID_SFX_DOC_START+ 58)
 

sfx2/source/doc/doc.src

@@ -27,8 +27,6 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #define __RSC
-#include <svl/inetdef.hxx>
-
 
  // -----------------------------------------------------------------------
 QueryBox MSG_CONFIRM_FILTER
@@ -229,25 +227,6 @@ String RID_STR_WARNSTYLEOVERWRITE
 {
     Text [ en-US ] = "Should the \"$(ARG1)\" Style be replaced?" ;
 };
-Resource RID_DLSTATUS
-{
-    String INET_NAME_RESOLVE_START
-    {
-        Text [ en-US ] = "Connection to: $(HOST). Waiting for response..." ;
-    };
-    String INET_CONNECT_START
-    {
-        Text [ en-US ] = "Opening $(TARGET) at $(HOST)" ;
-    };
-    String INET_READ_STATUS
-    {
-        Text [ en-US ] = "Loading: $(TARGET) from $(HOST). Loaded: $(BYTE)" ;
-    };
-    String INET_CONNECTION_CLOSED
-    {
-        Text [ en-US ] = "Disconnected" ;
-    };
-};
 QueryBox MSG_OPEN_READONLY
 {
     BUTTONS = WB_YES_NO ;

sfx2/source/doc/objuno.cxx

@@ -47,7 +47,6 @@
 #include <com/sun/star/document/XCompatWriterDocProperties.hpp>
 
 #include <unotools/configmgr.hxx>
-#include <tools/inetdef.hxx>
 #include <unotools/bootstrap.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>

svl/Package_inc.mk

@@ -59,7 +59,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/httpcook.hxx,svl/httpcook.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/inetdef.hxx,svl/inetdef.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))

svl/inc/svl/inetdef.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/inetdef.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

tools/Package_inc.mk

@@ -49,7 +49,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx))

tools/inc/tools/inetdef.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TOOLS_INETDEF_HXX
-#define _TOOLS_INETDEF_HXX
-
-//============================================================================
-// The following definitions seem obsolete and might get removed in future.
-
-#if defined __RSC
-#define INET_NAME_RESOLVE_START 1
-#define INET_CONNECT_START 4
-#define INET_READ_STATUS 12
-#define INET_READ_SUCCESS 14
-#define INET_CONNECTION_CLOSED 16
-#endif // __RSC
-    // the above definitions are only used in sfx2/source/doc/doc.src
-
-#endif // _TOOLS_INETDEF_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

unotools/source/config/docinfohelper.cxx

@@ -26,9 +26,7 @@
  *
  ************************************************************************/
 
-
 #include <rtl/ustrbuf.hxx>
-#include <tools/inetdef.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/docinfohelper.hxx>

xmloff/source/core/xmlexp.cxx

@@ -86,7 +86,6 @@
 #include <unotools/docinfohelper.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
-#include <tools/inetdef.hxx>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>

xmloff/source/meta/xmlmetae.cxx

@@ -26,9 +26,7 @@
  *
  ************************************************************************/
 
-
 #include <tools/debug.hxx>
-#include <tools/inetdef.hxx>
 #include <i18npool/mslangid.hxx>
 #include <rtl/ustrbuf.hxx>