Remove pass-through header file sot/inc/sot/clsids.hxx

Change-Id: I122669d4ffaf72fb1d5f6fccc98e8a648f31aa23
Reviewed-on: https://gerrit.libreoffice.org/3490
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

6 files changed, 4 insertions, 32 deletions

diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk
index 4a0ff1613a07..4cee0fca5dd8 100644
--- a/sot/Package_inc.mk
+++ b/sot/Package_inc.mk
@@ -18,7 +18,6 @@
 #
 
 $(eval $(call gb_Package_Package,sot_inc,$(SRCDIR)/sot/inc))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/clsids.hxx,sot/clsids.hxx))
 $(eval $(call gb_Package_add_file,sot_inc,inc/sot/exchange.hxx,sot/exchange.hxx))
 $(eval $(call gb_Package_add_file,sot_inc,inc/sot/factory.hxx,sot/factory.hxx))
 $(eval $(call gb_Package_add_file,sot_inc,inc/sot/filelist.hxx,sot/filelist.hxx))
diff --git a/sot/inc/sot/clsids.hxx b/sot/inc/sot/clsids.hxx
deleted file mode 100644
index d508db7e6215..000000000000
--- a/sot/inc/sot/clsids.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 _SOT_CLSIDS_HXX
-#define _SOT_CLSIDS_HXX
-
-// all the definitions of the class ids are moved to the comphelper
-#include <comphelper/classids.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index a9f1db500ffe..c56cc5f9ec14 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -25,7 +25,7 @@
 #include <sot/sotdata.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <sot/clsids.hxx>
+#include <comphelper/classids.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/documentconstants.hxx>
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 28c285027cd7..6aa6cd03dae5 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -22,7 +22,7 @@
 #include <tools/string.hxx>
 #include <sot/object.hxx>
 #include <sot/sotdata.hxx>
-#include <sot/clsids.hxx>
+#include <comphelper/classids.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 620b997e3d3c..f4d473f93114 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -24,7 +24,7 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include "sot/filelist.hxx"
-#include "sot/clsids.hxx"
+#include <comphelper/classids.hxx>
 
 #include <tools/globname.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 71d541ea12ac..cdaf433187db 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -60,7 +60,7 @@
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include "sot/clsids.hxx"
+#include <comphelper/classids.hxx>
 
 #include <vector>