strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#90020# Supporting UI name and persist name

Browse source
This commit is contained in:
Dieter Loeschky 2001-09-10 10:38:27 +00:00
parent 6647efdb82
commit 1e7ffa6680
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sd/source/ui/view/drviewsc.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviewsc.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: aw $ $Date: 2001-06-14 11:23:28 $
* last change: $Author: dl $ $Date: 2001-09-10 11:37:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -78,6 +78,9 @@
#ifndef _SVDOGRP_HXX //autogen
#include <svx/svdogrp.hxx>
#endif
#ifndef _SVDOOLE2_HXX //autogen
#include <svx/svdoole2.hxx>
#endif
#ifndef _SVDOGRAF_HXX //autogen
#include <svx/svdograf.hxx>
#endif
@ -169,7 +172,7 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
if( nMarkCount == 1 )
{
pObj = rMarkList.GetMark( 0 )->GetObj();
if (pObj->ISA(SdrObjGroup) || pObj->ISA(SdrGrafObj))
if (pObj->ISA(SdrObjGroup) || pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj))
{
aName = pObj->GetName();
}
@ -181,7 +184,7 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
if( pDocSh->CheckObjectName( NULL, aName ) )
{
if (pObj->ISA(SdrObjGroup) || pObj->ISA(SdrGrafObj))
if (pObj->ISA(SdrObjGroup) || pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj))
{
pObj->SetName(aName);
}
@ -190,7 +193,6 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
delete pDlg;
}
// In der Hoffnung, dass Dieter die nachfolgende Zeile stehen laesst
SfxBindings& rBindings = GetViewFrame()->GetBindings();
rBindings.Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
rBindings.Invalidate( SID_CONTEXT );

9
sd/source/ui/view/drviewsj.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviewsj.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: cl $ $Date: 2001-08-29 07:13:02 $
* last change: $Author: dl $ $Date: 2001-09-10 11:38:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -81,6 +81,9 @@
#ifndef _SVDOGRAF_HXX //autogen
#include <svx/svdograf.hxx>
#endif
#ifndef _SVDOOLE2_HXX //autogen
#include <svx/svdoole2.hxx>
#endif
#ifndef _SXELDITM_HXX //autogen
#include <svx/sxelditm.hxx>
#endif
@ -199,7 +202,7 @@ void __EXPORT SdDrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem(SID_UNGROUP);
}
if (!pObj->ISA(SdrObjGroup) && !pObj->ISA(SdrGrafObj))
if (!pObj->ISA(SdrObjGroup) && !pObj->ISA(SdrGrafObj) && !pObj->ISA(SdrOle2Obj))
{
rSet.DisableItem( SID_NAME_GROUP );
}