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

INTEGRATION: CWS sdwarningsbegone (1.5.38); FILE MERGED

Browse source 
2006/11/22 12:41:58 cl 1.5.38.1: #i69285# warning free code changes for unxlngi6.pro
This commit is contained in:
Kurt Zenker 2006-12-12 16:29:34 +00:00
parent 50c5873340
commit 3593dd57f0
3 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sd/source/ui/func/undoback.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: undoback.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: obo $ $Date: 2006-09-16 18:59:37 $
* last change: $Author: kz $ $Date: 2006-12-12 17:28:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -50,7 +50,7 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction );
// -----------------------------------------------------------------------------
SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ) :
SdUndoAction( pDoc ),
SdUndoAction( &rDoc ),
mrPage( rPage ),
mpBackgroundObj( pBackgroundObj ? pBackgroundObj->Clone() : NULL )
{
@ -98,20 +98,7 @@ void SdBackgroundObjUndoAction::Redo()
// -----------------------------------------------------------------------------
void SdBackgroundObjUndoAction::Repeat()
{
}
// -----------------------------------------------------------------------------
BOOL SdBackgroundObjUndoAction::CanRepeat( SfxRepeatTarget& ) const
{
return FALSE;
}
// -----------------------------------------------------------------------------
SdUndoAction* SdBackgroundObjUndoAction::Clone() const
{
return new SdBackgroundObjUndoAction( *pDoc, mrPage, mpBackgroundObj );
return new SdBackgroundObjUndoAction( *mpDoc, mrPage, mpBackgroundObj );
}

9
sd/source/ui/func/undoheaderfooter.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: undoheaderfooter.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: obo $ $Date: 2006-09-16 18:59:51 $
* last change: $Author: kz $ $Date: 2006-12-12 17:28:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -75,8 +75,3 @@ void SdHeaderFooterUndoAction::Redo()
SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
}
void SdHeaderFooterUndoAction::Repeat()
{
Redo();
}

17
sd/source/ui/func/unmovss.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: unmovss.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: obo $ $Date: 2006-09-16 19:00:34 $
* last change: $Author: kz $ $Date: 2006-12-12 17:29:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -83,7 +83,7 @@ SdMoveStyleSheetsUndoAction::SdMoveStyleSheetsUndoAction(
void SdMoveStyleSheetsUndoAction::Undo()
{
SfxStyleSheetBasePool* pPool = pDoc->GetStyleSheetPool();
SfxStyleSheetBasePool* pPool = mpDoc->GetStyleSheetPool();
SdStyleSheet* pSheet = NULL;
/********************************************************************
@ -145,17 +145,6 @@ void SdMoveStyleSheetsUndoAction::Redo()
Undo();
}
/*************************************************************************
|*
|* Repeat()
|*
\************************************************************************/
void SdMoveStyleSheetsUndoAction::Repeat()
{
DBG_ASSERT(FALSE, "SdMoveStyleSheetsUndoAction::Repeat: nicht implementiert");
}
/*************************************************************************
|*
|* Destruktor, Liste loeschen; ggfs. die enthaltenen StyleSheets loeschen