diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 17:05:48 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 17:05:48 +0100 |
| commit | 642c1ee8fac66996d2c500c5e247d17c198c6405 (patch) | |
| tree | 22b95030886b0ef8e2a98ad4483abcc6e239a11f /sfx2 | |
| parent | bb964e573e1ce590e67b58cb8131788bcee2872c (diff) | |
removetooltypes01: #i112600# Fix build problem after rebase in sfx2
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 9911c1d92a27..9ffb48e1b34a 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1857,7 +1857,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: if ( bSetDocMacroMode ) { // mark document: it executes an own macro, so it's in a modal mode - pDoc->SetMacroMode_Impl( TRUE ); + pDoc->SetMacroMode_Impl( sal_True ); } if ( bSetGlobalThisComponent ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 8dab74f6c7d8..d8e4258e60d4 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -64,7 +64,6 @@ #include <sfx2/objface.hxx> #include "sfxtypes.hxx" #include "workwin.hxx" -#include <sfx2/macrconf.hxx> #include <sfx2/unoctitm.hxx> #include <sfx2/sfx.hrc> #include <sfx2/sfxuno.hxx> @@ -1118,13 +1117,7 @@ void SfxBindings::Release( SfxControllerItem& rItem ) delete (*pImp->pCaches)[nPos]; pImp->pCaches->Remove(nPos, 1); #endif - if ( SfxMacroConfig::IsMacroSlot( nId ) ) - { - delete (*pImp->pCaches)[nPos]; - pImp->pCaches->Remove(nPos, 1); - } - else - pImp->bCtrlReleased = sal_True; + pImp->bCtrlReleased = sal_True; } } @@ -1474,7 +1467,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl rFound.Insert( pFound ); sal_uInt16 nSlot = pRealSlot->GetSlotId(); - if ( !SfxMacroConfig::IsMacroSlot( nSlot ) && !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) ) + if ( !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) ) { pInterface = pInterface->GetRealInterfaceForSlot( pRealSlot ); DBG_ASSERT (pInterface,"Slot in angegebener Shell nicht gefunden!"); |