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

undoapi: removed EnterStandardMode, again. The requirements / results in the different applications are that different - it does make sense to have a single method doing this, as defining its semantics is rather impossible

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-11-19 10:36:41 +01:00
parent 31357d2dc3
commit ab4ff99c8d
3 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sfx2/inc/sfx2/viewsh.hxx
View file

@ -214,14 +214,7 @@ public:
virtual String GetSelectionText( BOOL bCompleteWords = FALSE );
virtual BOOL HasSelection( BOOL bText = TRUE ) const;
virtual SdrView* GetDrawView() const;
/** enters a standard mode of the view.
The view should leave any special modes, such as text editing of a shape, and the like.
The default implementation of the method doesn't do anything. It's up to the derived classes to define
what their "standard mode" is.
*/
virtual void EnterStandardMode();
void SetSubShell( SfxShell *pShell );
SfxShell* GetSubShell() const { return pSubShell; }
void AddSubShell( SfxShell& rShell );

21
sfx2/source/doc/docundomanager.cxx
View file

@ -117,7 +117,6 @@ namespace sfx2
}
void invalidateXDo_nolck();
void enterViewStandardMode();
private:
static IUndoManager* impl_retrieveUndoManager( SfxBaseModel& i_baseModel )
@ -170,24 +169,6 @@ namespace sfx2
}
}
//------------------------------------------------------------------------------------------------------------------
void DocumentUndoManager_Impl::enterViewStandardMode()
{
// TODO: not sure this is a good idea: This might add another action to the Undo/Redo stack, which
// will render the current call somewhat meaningless - finally, the caller can't be sure that really the action
// is undone/redone which s/he intended to.
SfxObjectShell* pDocShell = getObjectShell();
ENSURE_OR_RETURN_VOID( pDocShell, "DocumentUndoManager_Impl::enterViewStandardMode: do doc shell!" );
SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( pDocShell );
while ( pViewFrame )
{
SfxViewShell* pViewShell = pViewFrame->GetViewShell();
ENSURE_OR_CONTINUE( pViewShell, "DocumentUndoManager_Impl::enterViewStandardMode: no view shell in the frame!" );
pViewShell->EnterStandardMode();
pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDocShell );
}
}
//==================================================================================================================
//= SolarMutexFacade
//==================================================================================================================
@ -335,7 +316,6 @@ namespace sfx2
{
// SYNCHRONIZED --->
UndoManagerGuard aGuard( *this );
m_pImpl->enterViewStandardMode();
m_pImpl->aUndoHelper.undo( aGuard );
// <--- SYNCHRONIZED
m_pImpl->invalidateXDo_nolck();
@ -346,7 +326,6 @@ namespace sfx2
{
// SYNCHRONIZED --->
UndoManagerGuard aGuard( *this );
m_pImpl->enterViewStandardMode();
m_pImpl->aUndoHelper.redo( aGuard );
// <--- SYNCHRONIZED
m_pImpl->invalidateXDo_nolck();

6
sfx2/source/view/viewsh.cxx
View file

@ -1391,12 +1391,6 @@ SdrView* SfxViewShell::GetDrawView() const
//--------------------------------------------------------------------
void SfxViewShell::EnterStandardMode()
{
}
//--------------------------------------------------------------------
String SfxViewShell::GetSelectionText
(
BOOL /*bCompleteWords*/ /* FALSE (default)