From 6fb127a62e8f6f55b41eb75e5f7c20339886e021 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 22 Aug 2012 15:11:52 +0200
Subject: Replace use_internal_api with use_udk_api etc. where appropriate

Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1
---
 remotebridges/InternalUnoApi_uuresolver.mk         | 32 -------------
 remotebridges/Library_uuresolver.mk                |  4 +-
 remotebridges/Module_remotebridges.mk              |  1 -
 .../source/unourl_resolver/uuresolver.xml          | 55 ----------------------
 4 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 remotebridges/InternalUnoApi_uuresolver.mk
 delete mode 100644 remotebridges/source/unourl_resolver/uuresolver.xml

(limited to 'remotebridges')

diff --git a/remotebridges/InternalUnoApi_uuresolver.mk b/remotebridges/InternalUnoApi_uuresolver.mk
deleted file mode 100644
index 2ac538ef3a0b..000000000000
--- a/remotebridges/InternalUnoApi_uuresolver.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,uuresolver))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk
index 15fa64e5f6eb..a289b6499eca 100644
--- a/remotebridges/Library_uuresolver.mk
+++ b/remotebridges/Library_uuresolver.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_Library,uuresolver))
 
 $(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
 
-$(eval $(call gb_Library_use_internal_api,uuresolver,\
-	uuresolver \
-))
+$(eval $(call gb_Library_use_udk_api,uuresolver))
 
 $(eval $(call gb_Library_use_libraries,uuresolver,\
 	cppu \
diff --git a/remotebridges/Module_remotebridges.mk b/remotebridges/Module_remotebridges.mk
index f439df7ac147..98903b811a6d 100644
--- a/remotebridges/Module_remotebridges.mk
+++ b/remotebridges/Module_remotebridges.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Module_Module,remotebridges))
 
 $(eval $(call gb_Module_add_targets,remotebridges,\
-	InternalUnoApi_uuresolver \
 	Library_uuresolver \
 ))
 
diff --git a/remotebridges/source/unourl_resolver/uuresolver.xml b/remotebridges/source/unourl_resolver/uuresolver.xml
deleted file mode 100644
index 6ce208d93fda..000000000000
--- a/remotebridges/source/unourl_resolver/uuresolver.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   uuresolver.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.bridge.UnoUrlResolver </name>
-        <description>
-            This component allows
-            to retrieve an object reference from another process.
-        </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.bridge.UnoUrlResolver </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.uno.TypeClass                 </type>
-        <type>   com.sun.star.lang.XTypeProvider            </type>
-        <type>   com.sun.star.lang.XServiceInfo             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
-        <type>   com.sun.star.lang.XComponent               </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>   com.sun.star.registry.XRegistryKey         </type>
-        <type>   com.sun.star.connection.XConnector         </type>
-        <type>   com.sun.star.bridge.XBridgeFactory         </type>
-        <type>   com.sun.star.bridge.XUnoUrlResolver        </type>
-        <type>   com.sun.star.uno.XAggregation              </type>
-        <type>   com.sun.star.uno.XWeak                     </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
-- 
cgit