summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-24 01:24:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-24 11:21:42 +0100
commitcb97526259e265e488a50c2747407f7289f8839c (patch)
tree9878e79d50804e941141fbc8391b47829faf323f /sfx2
parent7e4ed3e5b8b9209240b9608aa0037a6a6732ef1c (diff)
callcatcher: remove various unused methods
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/bitset.hxx2
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx15
-rw-r--r--sfx2/source/bastyp/bitset.cxx54
-rw-r--r--sfx2/source/menu/mnumgr.cxx76
4 files changed, 0 insertions, 147 deletions
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 98a7f583cfb2..32836ca8cc21 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -46,9 +46,7 @@ public:
sal_Bool operator!() const;
BitSet();
BitSet( const BitSet& rOrig );
- BitSet( sal_uInt16* pArray, sal_uInt16 nSize );
~BitSet();
- BitSet( const Range& rRange );
sal_uInt16 Count() const;
BitSet& operator=( const BitSet& rOrig );
BitSet& operator=( sal_uInt16 nBit );
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index c95b31b4f38f..e1fff9a494fb 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -105,7 +105,6 @@ private:
SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
public:
- SfxPopupMenuManager( const ResId&, SfxBindings& );
SfxPopupMenuManager( PopupMenu*, SfxBindings& );
~SfxPopupMenuManager();
static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow );
@@ -116,22 +115,8 @@ public:
sal_uInt16 Execute( const Point& rPos, Window *pWindow );
sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
- sal_uInt16 Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
-
- // @deprecated (start)!!
- // Don't use these methods any longer. The whole class will be removed in the future.
- // Changing code which relies on these methods would need much more effort!
- void StartInsert();
- void EndInsert();
- void CheckItem( sal_uInt16, sal_Bool );
- void RemoveItem( sal_uInt16 );
- void InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId,
- sal_uInt16 nPos = MENU_APPEND );
- void InsertSeparator( sal_uInt16 nPos = MENU_APPEND );
- // @deprecated (end)
void RemoveDisabledEntries();
- void AddClipboardFunctions();
Menu* GetSVMenu();
};
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 6dead7468b30..9faab1d54ad4 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -138,51 +138,6 @@ BitSet::BitSet( const BitSet& rOrig )
//--------------------------------------------------------------------
-// creates a bitset from an array
-
-BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ):
- nCount(nSize)
-{
- DBG_MEMTEST();
- // find the highest bit to set
- sal_uInt16 nMax = 0;
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- if ( pArray[n] > nMax )
- nMax = pArray[n];
-
- // if there are bits at all
- if ( nMax > 0 )
- {
- // allocate memory for all blocks needed
- nBlocks = nMax / 32 + 1;
- pBitmap = new sal_uIntPtr[nBlocks];
- memset( pBitmap, 0, 4 * nBlocks );
-
- // set all the bits
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- {
- // compute the block no. and bitvalue
- sal_uInt16 nBlock = n / 32;
- sal_uIntPtr nBitVal = 1L << (n % 32);
-
- // set a single bit
- if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 )
- {
- *(pBitmap+nBlock) |= nBitVal;
- ++nCount;
- }
- }
- }
- else
- {
- // initalize emtpy set
- nBlocks = 0;
- pBitmap = 0;
- }
-}
-
-//--------------------------------------------------------------------
-
// frees the storage
BitSet::~BitSet()
@@ -193,15 +148,6 @@ BitSet::~BitSet()
//--------------------------------------------------------------------
-// creates a bitmap with all bits in rRange set
-
-BitSet::BitSet( const Range& )
-{
- DBG_MEMTEST();
-}
-
-//--------------------------------------------------------------------
-
// assignment from another bitset
BitSet& BitSet::operator=( const BitSet& rOrig )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index d8e01e4c2e54..454b2ee17d05 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -298,16 +298,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
return sal_True;
}
-//--------------------------------------------------------------------
-
-// don't insert Popups into ConfigManager, they are not configurable at the moment !
-SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings )
- : SfxMenuManager( rResId, rBindings )
- , pSVMenu( NULL )
-{
- DBG_MEMTEST();
-}
-
SfxPopupMenuManager::~SfxPopupMenuManager()
{
}
@@ -356,74 +346,8 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, v
return nId;
}
-//--------------------------------------------------------------------
-
-sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
-{
- DBG_MEMTEST();
-
- va_list pArgs;
- va_start(pArgs, pArg1);
- sal_uInt16 nRet = Execute( rPoint, pWindow, pArgs, pArg1 );
- va_end(pArgs);
-
- return (nRet);
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::StartInsert()
-{
- ResId aResId(GetType(),*pResMgr);
- aResId.SetRT(RSC_MENU);
- pSVMenu = new PopupMenu( aResId );
- TryToHideDisabledEntries_Impl( pSVMenu );
-}
-
//-------------------------------------------------------------------------
-void SfxPopupMenuManager::EndInsert()
-{
- pBindings->ENTERREGISTRATIONS();
- pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
- Construct( *pMenu );
- pBindings->LEAVEREGISTRATIONS();
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos )
-{
- pSVMenu->InsertSeparator( nPos );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos )
-{
- pSVMenu->InsertItem( nId, rName, nBits,nPos );
- pSVMenu->SetHelpId( nId, rHelpId );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId )
-{
- pSVMenu->RemoveItem( nId );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck )
-{
- pSVMenu->CheckItem( nId, bCheck );
-}
-
-void SfxPopupMenuManager::AddClipboardFunctions()
-{
- bAddClipboardFuncs = sal_True;
-}
-
SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
: pMenu(0),
pOldMenu(0),