diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 5 | ||||
| -rw-r--r-- | svx/util/crashreport.component | 26 | ||||
| -rw-r--r-- | svx/util/svx.component | 5 |
3 files changed, 6 insertions, 30 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index c11aac85071c..efb5a6e1b031 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -19,10 +19,7 @@ $(eval $(call gb_Library_Library,svx)) -$(eval $(call gb_Library_set_componentfiles,svx, \ - $(call gb_Helper_optional,BREAKPAD,svx/util/crashreport) \ - svx/util/svx \ -,services)) +$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx,services)) $(eval $(call gb_Library_set_include,svx,\ -I$(SRCDIR)/svx/inc \ diff --git a/svx/util/crashreport.component b/svx/util/crashreport.component deleted file mode 100644 index 7d3dddf366aa..000000000000 --- a/svx/util/crashreport.component +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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 . - --> - -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.svx.CrashReportUI" - constructor="com_sun_star_comp_svx_CrashReportUI_get_implementation"> - <service name="com.sun.star.dialog.CrashReportUI"/> - </implementation> -</component> diff --git a/svx/util/svx.component b/svx/util/svx.component index 97f68c4734c8..9fffed787719 100644 --- a/svx/util/svx.component +++ b/svx/util/svx.component @@ -32,6 +32,11 @@ constructor="com_sun_star_comp_svx_RecoveryUI_get_implementation"> <service name="com.sun.star.dialog.RecoveryUI"/> </implementation> + <implementation name="com.sun.star.comp.svx.CrashReportUI" + constructor="com_sun_star_comp_svx_CrashReportUI_get_implementation" + CONDITION="BUILD_TYPE:BREAKPAD"> + <service name="com.sun.star.dialog.CrashReportUI"/> + </implementation> <implementation name="com.sun.star.comp.svx.SafeModeUI" constructor="com_sun_star_comp_svx_SafeModeUI_get_implementation"> <service name="com.sun.star.dialog.SafeModeUI"/> |