diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 48508ad376b0..0026ad1943a3 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -20,7 +20,6 @@ import xml.etree.ElementTree as ET core_factory_list = [ ("libi18npoollo.a", "i18npool_component_getFactory"), - ("libvcllo.a", "vcl_component_getFactory"), ("libsvtlo.a", "svt_component_getFactory"), ] diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 20062dade35f..cf2dff7ff509 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -480,7 +480,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/app/weldutils \ vcl/source/app/winscheduler \ vcl/source/components/dtranscomp \ - vcl/source/components/factory \ vcl/source/components/fontident \ vcl/source/filter/bmp/BmpReader \ vcl/source/filter/bmp/BmpWriter \ diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx deleted file mode 100644 index 63e9043c4878..000000000000 --- a/vcl/source/components/factory.cxx +++ /dev/null @@ -1,34 +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 . - */ - -#include - -extern "C" { - - VCL_DLLPUBLIC void* vcl_component_getFactory( - const char* /*pImplementationName*/, - void* /*pXUnoSMgr*/, - void* /*pXUnoKey*/) - { - return nullptr; - } - -} /* extern "C" */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/vcl.common.component b/vcl/vcl.common.component index 6f9bdccf7125..a7bdb6e4472f 100644 --- a/vcl/vcl.common.component +++ b/vcl/vcl.common.component @@ -18,7 +18,7 @@ --> + xmlns="http://openoffice.org/2010/uno-components">