mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS impress136_SRC680 (1.13.224); FILE MERGED

Browse Source 
2008/01/10 06:55:03 cl 1.13.224.2: RESYNC: (1.13-1.14); FILE MERGED
2007/12/05 12:41:39 af 1.13.224.1: #i73681# Replaced SVXIMAPDLG macro with ViewShell::Implementation::GetImageMapDialog() method.
This commit is contained in:
Vladimir Glazounov
2008-01-28 13:57:41 +00:00
parent e2c0c3121b
commit 5a69b05db2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sd/source/ui/view/drviewsg.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: drviewsg.cxx,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: ihi $ $Date: 2007-11-26 14:37:22 $
* last change: $Author: vg $ $Date: 2008-01-28 14:57:41 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -37,6 +37,7 @@
#include "precompiled_sd.hxx"
#include "DrawViewShell.hxx"
#include "ViewShellImplementation.hxx"
#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
@@ -98,7 +99,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq )
if ( pMark )
{
SdrObject* pSdrObj = pMark->GetMarkedSdrObj();
SvxIMapDlg* pDlg = SVXIMAPDLG();
SvxIMapDlg* pDlg = ViewShell::Implementation::GetImageMapDialog();
if ( pDlg->GetEditingObject() == (void*) pSdrObj )
{
@@ -137,8 +138,10 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet )
{
pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
if ( ( pObj->ISA( SdrGrafObj ) /*|| pObj->ISA( SdrOle2Obj )*/ ) &&
( SVXIMAPDLG()->GetEditingObject() == (void*) pObj ) )
SvxIMapDlg* pImageMapDialog = ViewShell::Implementation::GetImageMapDialog();
if ( ( pObj->ISA( SdrGrafObj ) /*|| pObj->ISA( SdrOle2Obj )*/ )
&& pImageMapDialog!=NULL
&& ( pImageMapDialog->GetEditingObject() == (void*) pObj ) )
{
bDisable = FALSE;
}