removed useless static data
This commit is contained in:
@@ -97,9 +97,6 @@ static sal_uInt16 nTimeOut = 300;
|
|||||||
#define TIMEOUT_UPDATING 20
|
#define TIMEOUT_UPDATING 20
|
||||||
#define TIMEOUT_IDLE 2500
|
#define TIMEOUT_IDLE 2500
|
||||||
|
|
||||||
static sal_uInt32 nCache1 = 0;
|
|
||||||
static sal_uInt32 nCache2 = 0;
|
|
||||||
|
|
||||||
typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
|
typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
|
||||||
|
|
||||||
//====================================================================
|
//====================================================================
|
||||||
@@ -916,15 +913,12 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
|
|||||||
if ( pImp->nCachedFunc1 < pImp->pCaches->Count() &&
|
if ( pImp->nCachedFunc1 < pImp->pCaches->Count() &&
|
||||||
(*pImp->pCaches)[pImp->nCachedFunc1]->GetId() == nId )
|
(*pImp->pCaches)[pImp->nCachedFunc1]->GetId() == nId )
|
||||||
{
|
{
|
||||||
++nCache1;
|
|
||||||
DBG_PROFSTOP(SfxBindingsMsgPos);
|
DBG_PROFSTOP(SfxBindingsMsgPos);
|
||||||
return pImp->nCachedFunc1;
|
return pImp->nCachedFunc1;
|
||||||
}
|
}
|
||||||
if ( pImp->nCachedFunc2 < pImp->pCaches->Count() &&
|
if ( pImp->nCachedFunc2 < pImp->pCaches->Count() &&
|
||||||
(*pImp->pCaches)[pImp->nCachedFunc2]->GetId() == nId )
|
(*pImp->pCaches)[pImp->nCachedFunc2]->GetId() == nId )
|
||||||
{
|
{
|
||||||
++nCache2;
|
|
||||||
|
|
||||||
// swap the caches
|
// swap the caches
|
||||||
sal_uInt16 nTemp = pImp->nCachedFunc1;
|
sal_uInt16 nTemp = pImp->nCachedFunc1;
|
||||||
pImp->nCachedFunc1 = pImp->nCachedFunc2;
|
pImp->nCachedFunc1 = pImp->nCachedFunc2;
|
||||||
|
@@ -59,9 +59,6 @@
|
|||||||
#include "objshimp.hxx"
|
#include "objshimp.hxx"
|
||||||
#include <sfx2/request.hxx>
|
#include <sfx2/request.hxx>
|
||||||
|
|
||||||
static const sal_uInt16 nCompatVersion = 2;
|
|
||||||
static const sal_uInt16 nVersion = 3;
|
|
||||||
|
|
||||||
// Static member
|
// Static member
|
||||||
SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
|
SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
|
||||||
|
|
||||||
|
@@ -76,9 +76,6 @@
|
|||||||
#include <sfx2/objface.hxx>
|
#include <sfx2/objface.hxx>
|
||||||
#include "thessubmenu.hxx"
|
#include "thessubmenu.hxx"
|
||||||
|
|
||||||
static const sal_uInt16 nCompatVersion = 4;
|
|
||||||
static const sal_uInt16 nVersion = 5;
|
|
||||||
|
|
||||||
// static member initialization
|
// static member initialization
|
||||||
PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
|
PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user