diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:05:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:05:13 +0000 |
| commit | 29e5175e12910911ca9a88136be6cd9032a0cc8e (patch) | |
| tree | fea95ae4c436590082ffa407b4559553106ded38 /sd/source/ui/view/MediaObjectBar.cxx | |
| parent | c9ca478ff70f7e6539f268868f349c63c50ffd10 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.7.38); FILE MERGED
2006/11/22 12:42:23 cl 1.7.38.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/view/MediaObjectBar.cxx')
| -rw-r--r-- | sd/source/ui/view/MediaObjectBar.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 00260fa4449a..901f671ebb0e 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MediaObjectBar.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:30:32 $ + * last change: $Author: kz $ $Date: 2006-12-12 19:05:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,14 +84,14 @@ SFX_IMPL_INTERFACE( MediaObjectBar, SfxShell, SdResId( STR_MEDIAOBJECTBARSHELL ) MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ), - pView( pSdView ), - pViewSh( pSdViewShell ) + mpView( pSdView ), + mpViewSh( pSdViewShell ) { - DrawDocShell* pDocShell = pViewSh->GetDocSh(); + DrawDocShell* pDocShell = mpViewSh->GetDocSh(); SetPool( &pDocShell->GetPool() ); SetUndoManager( pDocShell->GetUndoManager() ); - SetRepeatTarget( pView ); + SetRepeatTarget( mpView ); SetHelpId( SD_IF_SDDRAWMEDIAOBJECTBAR ); SetName( String( SdResId( RID_DRAW_MEDIA_TOOLBOX ) ) ); } @@ -114,7 +114,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() ); + SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); bool bDisable = true; if( 1 == pMarkList->GetMarkCount() ) @@ -149,15 +149,13 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - USHORT nSlot = rReq.GetSlot(); - BOOL bGeometryChanged = FALSE; if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; if( pItem ) { - SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() ); + SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); if( 1 == pMarkList->GetMarkCount() ) { |