diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-24 13:56:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-24 21:17:38 +0200 |
commit | b6c3afdcbe66075f5a82d35ce8e403e7fe696174 (patch) | |
tree | 39515bc8ef815d88a1c903ecfc18bcf9d1e3af4b /sd | |
parent | c8e8ae885b519e2bb282b087606b3be2a07c218d (diff) |
SdrGlobalData::aUserMakeObjUserDataHdl is unused
ever since
commit ddb1d5ebf0a81888001ffa1dbab883df70cdc279
Author: Felix Zhang <fezhang@suse.com>
Date: Fri Nov 18 18:23:52 2011 +0800
remove unused Sdr methods
removed the SdrObjFactory::MakeNewObjUserData method
Change-Id: I95c167b2f20b436bcc0085b6b616406ac210045f
Reviewed-on: https://gerrit.libreoffice.org/40363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/inc/sdobjfac.hxx | 39 | ||||
-rw-r--r-- | sd/source/core/sdobjfac.cxx | 59 | ||||
-rw-r--r-- | sd/source/ui/app/sddll.cxx | 4 |
4 files changed, 0 insertions, 103 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 3c5cd3318f2e..ecaf83587f26 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -135,7 +135,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/core/drawdoc_animations \ sd/source/core/pglink \ sd/source/core/sdiocmpt \ - sd/source/core/sdobjfac \ sd/source/core/sdpage \ sd/source/core/sdpage2 \ sd/source/core/sdpage_animations \ diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx deleted file mode 100644 index 56c96baf3442..000000000000 --- a/sd/inc/sdobjfac.hxx +++ /dev/null @@ -1,39 +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 . - */ - -#ifndef INCLUDED_SD_INC_SDOBJFAC_HXX -#define INCLUDED_SD_INC_SDOBJFAC_HXX - -#include <tools/link.hxx> - -class SdrObjFactory; - -class SdObjectFactory -{ -public: - SdObjectFactory() {} - - DECL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); -}; - -extern SdObjectFactory aSdObjectFactory; - -#endif // INCLUDED_SD_INC_SDOBJFAC_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx deleted file mode 100644 index abffd218030b..000000000000 --- a/sd/source/core/sdobjfac.cxx +++ /dev/null @@ -1,59 +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 <basic/sbx.hxx> - -#include "sdmod.hxx" -#include "sdpage.hxx" -#include "sdobjfac.hxx" -#include "glob.hxx" -#include "anminfo.hxx" -#include "imapinfo.hxx" -#include "drawdoc.hxx" - -SdObjectFactory aSdObjectFactory; - -/************************************************************************* -|* -|* void SdObjectFactory::MakeUserData() -|* -\************************************************************************/ - -IMPL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) -{ - if ( aParams.nInventor == SdrInventor::StarDrawUserData ) - { - switch( aParams.nObjIdentifier ) - { - case SD_ANIMATIONINFO_ID: - return new SdAnimationInfo( *aParams.pObject ); - break; - - case SD_IMAPINFO_ID: - return new SdIMapInfo; - break; - - default: - break; - } - } - return nullptr; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 60b7a8b4748c..8b8430d32d56 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -51,7 +51,6 @@ #include "OutlineViewShellBase.hxx" #include "PaneChildWindows.hxx" #include "sdresid.hxx" -#include "sdobjfac.hxx" #include "SpellDialogChildWindow.hxx" #include "SlideSorterViewShell.hxx" #include "SlideSorterViewShellBase.hxx" @@ -287,9 +286,6 @@ void SdDLL::Init() // register css::form::component::Form-Object-Factory FmFormObjFactory(); - // register Object-Factory - SdrObjFactory::InsertMakeUserDataHdl(LINK(&aSdObjectFactory, SdObjectFactory, MakeUserData)); - // register your exotic remote controls here #ifdef ENABLE_SDREMOTE if (!utl::ConfigManager::IsAvoidConfig() && !Application::IsHeadlessModeEnabled()) |