diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-07-04 17:30:42 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-13 06:32:46 +0000 |
| commit | f7b1cd66167050afecf487e3d89ea12de74200b5 (patch) | |
| tree | 75381b63bb5dca7ed1fa2ff5602064750f46f042 /tools | |
| parent | 633413a37ee7442cd899db1269fd3ef404efe58a (diff) | |
Moved SfxModule owner to SfxApplication
::GetAppData replaced with SfxApplication::GetModule
that now returns SfxModule*
SfxModule no longer registers self for ownership
instead it is now registered using SfxApplication::SetModule
Change-Id: Ifbbe1b2b4c5122da8e643b7926d47878d116c6c8
Reviewed-on: https://gerrit.libreoffice.org/26914
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Library_tl.mk | 1 | ||||
| -rw-r--r-- | tools/source/misc/toolsdll.cxx | 33 |
2 files changed, 0 insertions, 34 deletions
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 2916ad3becf4..6ebf57ef40b5 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ tools/source/misc/getprocessworkingdir \ - tools/source/misc/toolsdll \ tools/source/rc/rc \ tools/source/rc/resary \ tools/source/rc/resmgr \ diff --git a/tools/source/misc/toolsdll.cxx b/tools/source/misc/toolsdll.cxx deleted file mode 100644 index 414c7d23ca44..000000000000 --- a/tools/source/misc/toolsdll.cxx +++ /dev/null @@ -1,33 +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 <tools/shl.hxx> - -static void* aAppData[SHL_COUNT]; - -/* - * Query data for other libraries - */ - -void** GetAppData( sal_uInt16 nSharedLib ) -{ - return &(aAppData[nSharedLib]); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |