summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/options/optinet2.cxx1
-rw-r--r--sc/source/core/inc/core_pch.hxx1
-rw-r--r--sc/source/ui/inc/ui_pch.hxx1
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx2
-rw-r--r--sfx2/source/doc/doc.hrc1
-rw-r--r--sfx2/source/doc/doc.src21
-rw-r--r--sfx2/source/doc/objuno.cxx1
-rw-r--r--svl/Package_inc.mk1
-rw-r--r--svl/inc/svl/inetdef.hxx31
-rw-r--r--tools/Package_inc.mk1
-rw-r--r--tools/inc/tools/inetdef.hxx46
-rw-r--r--unotools/source/config/docinfohelper.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx1
-rw-r--r--xmloff/source/meta/xmlmetae.cxx2
14 files changed, 0 insertions, 112 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 19a95a744f6c..dfd413a18ba6 100644
--- a/cui/source/options/optinet2.cxx
+++ b/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>
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index f2ad2723199d..db3f84548a96 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/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>
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index a5c129bceff4..295bb28266af 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/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>
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index bcb60dac94b5..63f3ec0fb82f 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-#include <svl/inetdef.hxx>
#include "svtools/htmlkywd.hxx"
#include <rtl/tencinfo.h>
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index dbff52d422df..660f69f99159 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/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)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 0222868be338..d45856101b60 100644
--- a/sfx2/source/doc/doc.src
+++ b/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 ;
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 64574a117202..b5182ac31d73 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/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>
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index 6b869a02e267..dd71260ca5c8 100644
--- a/svl/Package_inc.mk
+++ b/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))
diff --git a/svl/inc/svl/inetdef.hxx b/svl/inc/svl/inetdef.hxx
deleted file mode 100644
index 3984dcced8f6..000000000000
--- a/svl/inc/svl/inetdef.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- 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: */
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 58c82700c047..f216f057be2c 100644
--- a/tools/Package_inc.mk
+++ b/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))
diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
deleted file mode 100644
index 137cb2f66f47..000000000000
--- a/tools/inc/tools/inetdef.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- 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: */
diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index d8aa666e9ec7..be64bd3a0522 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/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>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 9dc41e6d88dd..82c414ef2a83 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/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>
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 590368f5c541..8d8597275606 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/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>