diff options
Diffstat (limited to 'desktop')
22 files changed, 22 insertions, 22 deletions
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index 10a63e3d841e..b18f77ebf66c 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -12,10 +12,10 @@ $(eval $(call gb_Library_Library,migrationoo3)) $(eval $(call gb_Library_use_sdk_api,migrationoo3)) $(eval $(call gb_Library_use_libraries,migrationoo3,\ + comphelper \ cppu \ cppuhelper \ sal \ - tl \ utl \ )) diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx index f4e8cf931cef..bc0dd95fd4ea 100644 --- a/desktop/inc/pch/precompiled_deployment.hxx +++ b/desktop/inc/pch/precompiled_deployment.hxx @@ -76,7 +76,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <svl/inettype.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <ucbhelper/content.hxx> #include <unotools/unotoolsdllapi.h> #include <xmlscript/xml_helper.hxx> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 58efb5dc3b0f..8abbaa97ea2c 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -172,7 +172,7 @@ #include <svtools/svtdllapi.h> #include <tools/color.hxx> #include <tools/degree.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/fontenum.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 058e953ac60e..135a5b5fdb1f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -117,7 +117,7 @@ #include <basic/sbstar.hxx> #include <desktop/crashreport.hxx> #include <tools/urlobj.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <svtools/fontsubstconfig.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/apearcfg.hxx> diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index a70004e23b3f..9ce317209e87 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -34,7 +34,7 @@ #include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbhelper.hxx> diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 712ed6c73bd5..8b53d564feb1 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -25,7 +25,7 @@ #include <sal/log.hxx> #include <cppuhelper/implbase.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/lok.hxx> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 38150714921f..16b76cb789fd 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -54,7 +54,7 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <unotools/mediadescriptor.hxx> #include <unotools/tempfile.hxx> diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 8a07e26c3134..5eb2f0636bcd 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -36,7 +36,7 @@ #include <rtl/ustring.hxx> #include <svl/languageoptions.hxx> #include <svtools/langhelp.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <app.hxx> diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index dc3fb67f214b..ad3df6bf3fd6 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -26,7 +26,7 @@ #include <comphelper/propertyvalue.hxx> #include <svl/documentlockfile.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/table/XCell2.hpp> #include <com/sun/star/sheet/XCalculatable.hpp> diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 669a7316cb42..7243db43e691 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -31,7 +31,7 @@ #include <rtl/bootstrap.hxx> #endif #include <rtl/ustring.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/bootstrap.hxx> #include "userinstall.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 7fd0bdac3296..14fe03882ede 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -52,7 +52,7 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 5ee3f53c653d..10a2cfb1f136 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -32,7 +32,7 @@ #include <comphelper/propertysequence.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 1e7beea34a05..5b6d6a92b947 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <osl/diagnose.h> #include <rtl/ustring.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <ucbhelper/content.hxx> #include <dp_dependencies.hxx> diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 68765a63fe26..3e7802e01935 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -34,7 +34,7 @@ #include <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <tools/urlobj.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/security.hxx> diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b9aa6518a092..2e42211e4f4d 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -36,7 +36,7 @@ #include <utility> #include <xmlscript/xml_helper.hxx> #include <svl/inettype.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <o3tl/string_view.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 2a681fe87e7d..28fe1b8de218 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/tempfile.hxx> #include <optional> #include <utility> diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 36b761b5490a..0eb02321a74f 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -68,7 +68,7 @@ #include <com/sun/star/deployment/PlatformException.hpp> #include <com/sun/star/deployment/Prerequisites.hpp> #include <optional> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <algorithm> #include <memory> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f9e871fb99f1..d5403e2deb6b 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -152,7 +152,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/abstdlg.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <vcl/uitest/uiobject.hxx> #include <vcl/jsdialog/executor.hxx> diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 524ca86152d1..5d0db5a52bfd 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -34,7 +34,7 @@ #include <unotools/bootstrap.hxx> #include <rtl/uri.hxx> #include <i18nlangtag/lang.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <osl/security.hxx> diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index a3f9e02b6157..174f82ec6936 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -21,7 +21,7 @@ #include "oo3extensionmigration.hxx" #include <sal/log.hxx> #include <osl/file.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/bootstrap.hxx> #include <unotools/textsearch.hxx> #include <comphelper/sequence.hxx> diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 66afe6c18bb4..b8612f668b22 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/uno/XNamingService.hpp> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <o3tl/string_view.hxx> using namespace css::bridge; diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index cca5b7ae3365..2acf82a5bf30 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -29,7 +29,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/anytostring.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> |