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

INTEGRATION: CWS mav09 (1.40.14); FILE MERGED

Browse source 
2004/09/21 17:01:33 mav 1.40.14.8: RESYNC: (1.48-1.49); FILE MERGED
2004/09/16 18:47:17 mav 1.40.14.7: RESYNC: (1.44-1.48); FILE MERGED
2004/08/09 20:25:10 mav 1.40.14.6: RESYNC: (1.41-1.44); FILE MERGED
2004/06/10 16:47:45 mba 1.40.14.5: #i27773#: some fixed to make InPlace Editing work
2004/05/04 14:07:12 mba 1.40.14.4: #i27773#: remove so3
2004/04/29 18:18:54 mav 1.40.14.3: RESYNC: (1.40-1.41); FILE MERGED
2004/04/27 17:02:06 mba 1.40.14.2: #i27773#: new embedding API
2004/04/14 14:12:25 mba 1.40.14.1: #i27773#: remove so3; new storage API
This commit is contained in:
Kurt Zenker 2004-10-04 17:44:18 +00:00
parent 200adc8c3a
commit 9395a2f36d
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sd/source/ui/view/drviews7.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviews7.cxx,v $
*
* $Revision: 1.49 $
* $Revision: 1.50 $
*
* last change: $Author: rt $ $Date: 2004-09-17 13:49:34 $
* last change: $Author: kz $ $Date: 2004-10-04 18:44:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -130,6 +130,7 @@
#include <svtools/slstitm.hxx>
#endif
#include <svtools/insdlg.hxx>
#include <svtools/moduleoptions.hxx>
#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX
#include <svtools/languageoptions.hxx>
@ -141,15 +142,13 @@
#ifndef _SFXREQUEST_HXX
#include <sfx2/request.hxx>
#endif
#ifndef _PASTEDLG_HXX
#include <so3/pastedlg.hxx>
#endif
#pragma hdrstop
#include <svx/pfiledlg.hxx>
#include <svx/grafctrl.hxx>
#include <svtools/cliplistener.hxx>
#include <sfx2/viewfrm.hxx>
#include "app.hrc"
#include "glob.hrc"
@ -693,7 +692,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (bHasFormat)
{
String sName,sSource;
if (SvPasteObjectDialog::GetEmbeddedName (aDataHelper, sName, sSource, nFormat))
if (SvPasteObjectHelper::GetEmbeddedName (aDataHelper, sName, sSource, nFormat))
aItem.AddClipbrdFormat (nFormat, sName);
}
@ -1364,8 +1363,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_INSERT_MATH );
}
const SvEditObjectProtocol& rProt = GetDocSh()->GetProtocol();
if ( pFuSlideShow || GetDocSh()->IsPreview() || bInEffectAssignment )
{
// Eigene Slots
@ -1654,9 +1651,9 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
// clause because the current function of the docshell can only be
// search and replace or spell checking and in that case switching the
// view mode is allowed.
if (GetDocSh()->IsInPlaceActive() || pFuSlideShow)
if (GetViewFrame()->GetFrame()->IsInPlace() || pFuSlideShow)
{
if ( !GetDocSh()->IsInPlaceActive() )
if ( !GetViewFrame()->GetFrame()->IsInPlace() )
{
rSet.ClearItem( SID_DRAWINGMODE );
rSet.DisableItem( SID_DRAWINGMODE );
@ -1691,7 +1688,6 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
rSet.DisableItem( SID_HANDOUTMODE );
}
svx::ExtrusionBar::getState( pDrView, rSet );
svx::FontworkBar::getState( pDrView, rSet );
}