diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-08-26 22:03:54 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-08-27 12:29:57 +0200 |
commit | 09be7ac7dce1e8141f25bc84273968ea273a018c (patch) | |
tree | 736ef1b9d555abb966f19e7c95dcd23dc647956f /sd/inc | |
parent | c7ea7664002b54786795fab7f6233024a6362f71 (diff) |
Move ImageMap related functions to svx
So that in can be used from slideshow module
Change-Id: I105582cf523a454701963a253ba39054f09730e8
Reviewed-on: https://gerrit.libreoffice.org/78156
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/drawdoc.hxx | 7 | ||||
-rw-r--r-- | sd/inc/glob.hxx | 2 | ||||
-rw-r--r-- | sd/inc/imapinfo.hxx | 50 | ||||
-rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 1 |
4 files changed, 2 insertions, 58 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 52e31ce2b91b..64397dd9a960 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <svl/style.hxx> #include <svx/fmmodel.hxx> +#include <svx/ImageMapInfo.hxx> #include <vcl/prntypes.hxx> #include <xmloff/autolayout.hxx> @@ -55,8 +56,6 @@ class Timer; class SfxObjectShell; class SdPage; class SdAnimationInfo; -class SdIMapInfo; -class IMapObject; class SdStyleSheetPool; class SfxMedium; class SvxSearchItem; @@ -478,9 +477,6 @@ public: static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); - SAL_DLLPRIVATE static SdIMapInfo* GetIMapInfo( SdrObject const * pObject ); - SAL_DLLPRIVATE static IMapObject* GetHitIMapObject( SdrObject const * pObject, const Point& rWinPoint ); - SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass.get(); } SAL_DLLPRIVATE void UpdateAllLinks(); @@ -706,7 +702,6 @@ private: SAL_DLLPRIVATE virtual void PageListChanged() override; SAL_DLLPRIVATE virtual void MasterPageListChanged() override; - SAL_DLLPRIVATE virtual ImageMap* GetImageMapForObject(SdrObject* pObj) override; }; namespace sd diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 4708196316d0..884d16032719 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -42,7 +42,7 @@ // Object-Ids for StarDraw UserData #define SD_ANIMATIONINFO_ID 1 -#define SD_IMAPINFO_ID 2 +// SVX_IMAPINFO_ID = 2 // Separator between layout name and template name of presentation templates #define SD_LT_SEPARATOR "~LT~" diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx deleted file mode 100644 index b5eb928ffeaa..000000000000 --- a/sd/inc/imapinfo.hxx +++ /dev/null @@ -1,50 +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_IMAPINFO_HXX -#define INCLUDED_SD_INC_IMAPINFO_HXX - -#include "glob.hxx" -#include <svx/svdobj.hxx> -#include <vcl/imap.hxx> - -class SdIMapInfo : public SdrObjUserData, public SfxListener -{ - - ImageMap aImageMap; - -public: - SdIMapInfo( const ImageMap& rImageMap ) : - SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), - aImageMap( rImageMap ) {}; - - SdIMapInfo( const SdIMapInfo& rIMapInfo ) : - SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), - SfxListener(), - aImageMap( rIMapInfo.aImageMap ) {}; - - virtual std::unique_ptr<SdrObjUserData> Clone( SdrObject* ) const override { return std::unique_ptr<SdrObjUserData>(new SdIMapInfo( *this )); } - - void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } - const ImageMap& GetImageMap() const { return aImageMap; } -}; - -#endif // INCLUDED_SD_INC_IMAPINFO_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 0d640c20e0d6..4e6053bc295a 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -492,7 +492,6 @@ #include <drawdoc.hxx> #include <glob.hxx> #include <helpids.h> -#include <imapinfo.hxx> #include <notifydocumentevent.hxx> #include <sdabstdlg.hxx> #include <sdattr.hxx> |