[Libreoffice-commits] .: cppuhelper/Library_cppuhelper.mk cppuhelper/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Dec 6 01:48:13 PST 2012


 cppuhelper/Library_cppuhelper.mk |    1 +
 cppuhelper/source/compat.cxx     |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

New commits:
commit c8a733079f6718dc908edd4af8d9befeac157e80
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Dec 6 09:48:07 2012 +0000

    cppuhelper: add compatible symbol for obsolete method.

diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index a9fb383..07b8a41 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_static_libraries,cppuhelper,\
 $(eval $(call gb_Library_add_exception_objects,cppuhelper,\
 	cppuhelper/source/access_control \
 	cppuhelper/source/bootstrap \
+	cppuhelper/source/compat \
 	cppuhelper/source/component_context \
 	cppuhelper/source/component \
 	cppuhelper/source/defaultbootstrap \
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
new file mode 100644
index 0000000..c24a8a8
--- /dev/null
+++ b/cppuhelper/source/compat.cxx
@@ -0,0 +1,38 @@
+/* -*- 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 .
+ */
+
+#include "sal/config.h"
+#include <rtl/ustring.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/reflection/XIdlClass.hpp>
+
+using namespace ::com::sun::star;
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+SAL_DLLPUBLIC_EXPORT
+reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
+	const uno::Reference < lang::XMultiServiceFactory > &, const rtl::OUString &,
+	const uno::Reference < reflection::XIdlClass > &, const uno::Sequence < rtl::OUString > & )
+	SAL_THROW( () )
+{
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list