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

removetooltypes01: #i112600# Fix build problem after rebase in sfx2

Browse source
This commit is contained in:
Carsten Driesner 2011-02-07 17:05:48 +01:00
parent bb964e573e
commit 642c1ee8fa
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sfx2/source/appl/appuno.cxx
View file

@ -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 )

11
sfx2/source/control/bindings.cxx
View file

@ -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!");