diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-11-02 21:34:07 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-11-02 21:34:07 +0100 |
commit | 690240a49a3f4726f9b416c36c50e3416ff107c2 (patch) | |
tree | 838a38a2c35b32dcc09045d392d1daef971f64ad /sfx2 | |
parent | c6a62c8b4b51751d0e25f8607f2fb89d6072d90b (diff) |
undoapi: argh, the last changeset was never intended to be 'qfinish'ed, or even pushed. Reverted.
Diffstat (limited to 'sfx2')
-rwxr-xr-x | sfx2/source/doc/docundomanager.cxx | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 004b3860cd99..d326e584c45a 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -157,40 +157,6 @@ namespace sfx2 } //================================================================================================================== - //= helper - //================================================================================================================== - namespace - { -#ifdef DBG_UTIL - struct UndoManagerDiagnosticsGuard - { - UndoManagerDiagnosticsGuard( const ::svl::IUndoManager& i_undoManager ) - :m_pUndoManager( dynamic_cast< SfxUndoManager* >( const_cast< ::svl::IUndoManager* >( &i_undoManager ) ) ) - { - if ( m_pUndoManager ) - m_pUndoManager->DbgEnableCompatibilityAssertions( false ); - } - - ~UndoManagerDiagnosticsGuard() - { - if ( m_pUndoManager ) - m_pUndoManager->DbgEnableCompatibilityAssertions( true ); - } - - private: - SfxUndoManager* m_pUndoManager; - }; -#else - struct UndoManagerDiagnosticsGuard - { - UndoManagerDiagnosticsGuard( const ::svl::IUndoManager& ) - { - } - }; -#endif - } - - //================================================================================================================== //= DocumentUndoManager_Impl //================================================================================================================== struct DocumentUndoManager_Impl : public SfxUndoListener @@ -200,7 +166,6 @@ namespace sfx2 DocumentUndoManager& rAntiImpl; bool bAPIActionRunning; ::std::stack< bool > aContextVisibilities; - ::std::stack< ::rtl::OUString > aContextTitles; #if OSL_DEBUG_LEVEL > 0 ::std::stack< bool > aContextAPIFlags; #endif @@ -249,8 +214,6 @@ namespace sfx2 pUndoManager = NULL; } - const ::rtl::OUString& getTopContextTitle() const { return aContextTitles.top(); } - // SfxUndoListener virtual void actionUndone( SfxUndoAction& i_action ); virtual void actionRedone( SfxUndoAction& i_action ); @@ -366,8 +329,6 @@ namespace sfx2 aContextAPIFlags.push( bAPIActionRunning ); #endif - aContextTitles.push( i_comment ); - if ( bAPIActionRunning ) return; @@ -398,8 +359,6 @@ namespace sfx2 OSL_ENSURE( bCurrentContextIsAPIContext == bAPIActionRunning, "DocumentUndoManager_Impl::listActionLeftAndMerged: API and non-API contexts interwoven!" ); #endif - aContextTitles.pop(); - if ( bAPIActionRunning ) return; @@ -546,7 +505,6 @@ namespace sfx2 USHORT nContextElements = 0; bool isHiddenContext = false; - const ::rtl::OUString sContextTitle = m_pImpl->getTopContextTitle(); { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); |