diff options
64 files changed, 62 insertions, 90 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 620558b06357..e5ae969c483d 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -101,7 +101,7 @@ #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <svl/languageoptions.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include "servicenames_charttypes.hxx" #include <rtl/strbuf.hxx> diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 08f8dd395ff0..02282e48a01e 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -47,7 +47,7 @@ #include <vcl/lstbox.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/frmdescr.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ade7b811f577..57a761c99107 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -26,7 +26,7 @@ #include <tools/solar.h> #include <rtl/math.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index b8864e2d0bb3..11bbf0efba6c 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 442f3d822cb5..58b304d04ba8 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -643,7 +643,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/zoomitem.hxx> #include <signal.h> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/filelist.hxx> #include <sot/formats.hxx> diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 87bac8df1336..1ce003777c4f 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; #include <sfx2/objsh.hxx> #include <sot/storage.hxx> #include <sfx2/app.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include "address.hxx" #include "scfobj.hxx" diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 7b79ae85adf6..4831f74d4152 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -24,7 +24,7 @@ #include <svx/objfac3d.hxx> #include <svx/tbxcolor.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/taskpane.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7b5a38318301..c99ca76ef4ab 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -23,7 +23,7 @@ #include "scitems.hxx" #include <editeng/justifyitem.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <vcl/msgbox.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 5b47107a1f94..3faea47f1238 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -38,7 +38,7 @@ #include <svtools/insdlg.hxx> #include <svtools/soerr.hxx> #include <svx/svxdlg.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 6529ffd50b13..b31200bad87d 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -31,7 +31,7 @@ #include <svx/svdundo.hxx> #include <sfx2/app.hxx> #include <unotools/moduleoptions.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> #include "chartuno.hxx" diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 1a66c97d8a9c..cb9c09f19788 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -39,7 +39,7 @@ #include <vcl/graph.hxx> #include <vcl/hatch.hxx> #include <sot/formats.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sal/macros.h> #include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index cd37a7b38f11..a39be5b4ba64 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -29,7 +29,7 @@ #include <svl/stritem.hxx> #include <svl/ptitem.hxx> #include <svl/urlbmk.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <vcl/graph.hxx> #include <vcl/virdev.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index c320fc1dbe9b..1611c7f37433 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -37,7 +37,7 @@ #include <svx/svdpage.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> #include <unotools/pathoptions.hxx> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 0094aca2e64a..4679970fce46 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -518,7 +518,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/zoomitem.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/filelist.hxx> #include <sot/formats.hxx> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 16f9ae0158d7..356ddfbdda5c 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -66,7 +66,7 @@ #include <cppuhelper/proptypehlp.hxx> #include <toolkit/unohlp.hxx> #include <rtl/crc.h> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <unotools/ucbstreamhelper.hxx> #include <com/sun/star/text/FontRelief.hpp> #include <editeng/frmdiritem.hxx> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 2d1db9bd02c2..9422ba9261a8 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -38,7 +38,7 @@ #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> #include <svtools/sfxecode.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <sfx2/request.hxx> #include <unotools/fltrcfg.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 830879bcfb14..15539547c558 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -38,7 +38,7 @@ #include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> #include <vcl/graphicfilter.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 3082542b8e19..836480067f91 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -23,7 +23,7 @@ #include <svl/srchitem.hxx> #include <tools/globname.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/objface.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 72a6f6a4eeac..abe5311e27ff 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -47,7 +47,7 @@ #include <avmedia/mediawindow.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sfx2/printer.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <svtools/sfxecode.hxx> #include <svtools/transfer.hxx> #include <svl/urlbmk.hxx> diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 13d2676a3837..123a3f4629a1 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -41,7 +41,7 @@ #include <svx/svdundo.hxx> #include <sfx2/app.hxx> #include <svl/itempool.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <svx/fmmodel.hxx> #include <sot/formats.hxx> #include <editeng/outliner.hxx> diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 31dcf3752feb..ac74080916c7 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -43,7 +43,7 @@ #include <rtl/ustrbuf.hxx> #include <unotools/moduleoptions.hxx> #include <svx/dialogs.hrc> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include "strings.hrc" #include "app.hrc" diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index b699be98a85e..3682a3b587be 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -70,7 +70,7 @@ #include <unotools/ucbhelper.hxx> #include <svtools/asynclink.hxx> #include <tools/diagnose_ex.h> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/app.hxx> #include <sfx2/docfac.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 9024cd0bf551..b96d694a4373 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -68,7 +68,7 @@ #include <unotools/tempfile.hxx> #include <osl/mutex.hxx> #include <vcl/salctype.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/storinfo.hxx> #include <comphelper/storagehelper.hxx> #include <toolkit/helper/vclunohelper.hxx> 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> diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index f6cd82351b26..4d928aae5837 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -124,7 +124,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/zoomitem.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/factory.hxx> #include <sot/formats.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 0e2aa3eaadc6..ff6b0c748b20 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -38,7 +38,7 @@ #include <sfx2/printer.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 42520978eaeb..c17df22d1a8f 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -329,7 +329,7 @@ #include <salhelper/thread.hxx> #include <salhelper/timer.hxx> #include <set> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/filelist.hxx> #include <sot/formats.hxx> diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index f26d72f09a97..cca25679c349 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -22,7 +22,7 @@ #include <svtools/svtresid.hxx> #include <unotools/configmgr.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/stg.hxx> #include <sal/macros.h> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index d4cbc53220d8..318254eb1d73 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -30,7 +30,7 @@ #include <unotools/streamwrap.hxx> #include <tools/globname.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index fc5ce1cc5f4c..8ad8e56b96ef 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -24,7 +24,7 @@ #include <vcl/wrkwin.hxx> #include "vcl/image.hxx" #include <sot/storage.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index fb69e88f5a62..90f92744a28d 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -479,7 +479,7 @@ #include <sfx2/tplpitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/factory.hxx> #include <sot/filelist.hxx> diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 4026a3291cd8..9d4c52023595 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -20,7 +20,7 @@ #include <svx/charthelper.hxx> #include <svtools/embedhlp.hxx> #include <tools/globname.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XUpdatable.hpp> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 034f5b8b8b08..fcf27cc5bcbb 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -53,7 +53,7 @@ #include <svx/svdpagv.hxx> #include <tools/globname.hxx> #include <vcl/jobset.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <sfx2/linkmgr.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 16f5bb83fee3..715653f0c55c 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -23,7 +23,7 @@ // HACK #include <sot/storage.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <svx/svdview.hxx> #include <string.h> #include <vcl/svapp.hxx> diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 461b4ad66f7d..df6e8ba547a1 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> #include <sfx2/dispatch.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <comphelper/serviceinfohelper.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 49c7892db88b..59b8b59ac43b 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -27,7 +27,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpool.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/frmdescr.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index d62dead1f5b8..c8dbc57129d0 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -40,7 +40,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <map> #include "svx/xmleohlp.hxx" diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 5f9a62f47f51..37614687d21e 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -695,7 +695,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/zoomitem.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sot/exchange.hxx> #include <sot/factory.hxx> #include <sot/filelist.hxx> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index dd710f5e8617..4ed21abd71f2 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -24,7 +24,7 @@ #include <editeng/formatbreakitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <docsh.hxx> #include <ndole.hxx> #include <txttxmrk.hxx> diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 089198ab0179..058483c831a5 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -25,7 +25,7 @@ #include <vcl/msgbox.hxx> #include <svtools/parhtml.hxx> #include <sot/storage.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index efefee8d8e8c..4f3432c20feb 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/embed/EmbedStates.hpp> #include <comphelper/embeddedobjectcontainer.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <com/sun/star/uno/Any.hxx> #include <svtools/embedhlp.hxx> diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 104813f179b5..6e5235f4ded2 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/embeddedobjectcontainer.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> using namespace com::sun::star; diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 987a465d59d2..ee13b1f55f08 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <com/sun/star/embed/XEmbedObjectCreator.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XLinkageSupport.hpp> diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index c230dd641f70..a84f99c57a77 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <rtl/ustrbuf.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <xmloff/prstylei.hxx> #include <xmloff/maptype.hxx> diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 3a3194ab64f9..203dfe69164d 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -45,7 +45,7 @@ #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svtools/soerr.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> #include <swevent.hxx> diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 4f92956e4912..df07c221ab6c 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -61,7 +61,7 @@ #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> #include <sot/storage.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <fmtcol.hxx> #include <swevent.hxx> #include <view.hxx> // for the current view diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index aebce5f424b6..115caa0bd6f2 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <svl/mailenum.hxx> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 0b68d0ca5255..3551a6d78fdf 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -46,7 +46,7 @@ #include <svtools/insdlg.hxx> #include "svtools/treelistentry.hxx" -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <unotools/configmgr.hxx> #include <docsh.hxx> #include <config.hrc> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 01130f009590..de107cd426a0 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -36,7 +36,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/swframevalidation.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/viewfrm.hxx> #include <fmturl.hxx> diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx index 679babc36240..4fcdfeda25f5 100644 --- a/sw/source/ui/globdoc/globdoc.cxx +++ b/sw/source/ui/globdoc/globdoc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <unotools/moduleoptions.hxx> #include <unomid.h> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 894528bb5a41..3ba91472e165 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <editeng/acorrcfg.hxx> #include <wdocsh.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 933a1d85d124..d19b1ff76667 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -44,7 +44,7 @@ #include <chartins.hrc> #include <anchoredobject.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index 720c5af468e6..c7e4401cec85 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <sot/storage.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include "edtwin.hxx" #include "wrtsh.hxx" diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index 97afbfd88b18..ebe5aeb6b0a5 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -25,7 +25,7 @@ #include <svtools/sfxecode.hxx> #include <vcl/msgbox.hxx> #include <svtools/parhtml.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <iodetect.hxx> #include <swdetect.hxx> diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index 67ca9f4fa1b6..b3ec036767b7 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -21,7 +21,7 @@ #include <sfx2/app.hxx> #include <svx/svxids.hrc> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <sfx2/objface.hxx> #include <sfx2/msg.hxx> diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 66605f503df2..f08bcadfb792 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -524,7 +524,7 @@ #include <sal/types.h> #include <sax/tools/converter.hxx> #include <set> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 8c0bd6eec25c..22dc3ac1e575 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -32,7 +32,7 @@ #include <rtl/logfile.hxx> #include <comphelper/processfactory.hxx> #include <tools/globname.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <xmloff/nmspmap.hxx> #include "xmloff/xmlnmspe.hxx" diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index b00df847f95f..a3b000443dcf 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/util/XModifiable2.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <tools/globname.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlimp.hxx> #include "xmloff/xmlnmspe.hxx" diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 51f0427ea1bb..0d3d0d16acb6 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -44,7 +44,7 @@ #include <tools/debug.hxx> #include <xmloff/contextid.hxx> #include <xmloff/xmltoken.hxx> -#include <sot/clsids.hxx> +#include <comphelper/classids.hxx> #include <tools/globname.hxx> #include <com/sun/star/beans/XPropertyState.hpp> |