summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-02-17 21:47:49 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-17 21:47:49 +0000
commitada6350a7cdf4984eb3ead31d938004bf9177ae8 (patch)
treefbe87fb987240955c6bfdbe3555ce1bd76393854 /sfx2
parent57c8929c6bf037a767e7016d28b7656cd8fddfb7 (diff)
Removed unused code from svl and sfx2
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/app.hxx1
-rw-r--r--sfx2/inc/sfx2/childwin.hxx2
-rw-r--r--sfx2/inc/sfx2/hintpost.hxx1
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx1
-rw-r--r--sfx2/inc/sfx2/progress.hxx1
-rw-r--r--sfx2/source/appl/appmain.cxx4
-rw-r--r--sfx2/source/bastyp/progress.cxx39
-rw-r--r--sfx2/source/menu/mnuitem.cxx8
-rw-r--r--sfx2/source/notify/hintpost.cxx6
9 files changed, 1 insertions, 62 deletions
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index c255035f8f03..ea9dbc2a4f37 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -147,7 +147,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
void Init();
void Exit();
void SettingsChange( sal_uInt16, const AppSettings & );
- void Main( );
void PreInit( );
void Quit();
void Deinitialize();
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fc7cf83feec7..c96d1a603627 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -307,7 +307,7 @@ public:
return pWin; \
} \
sal_uInt16 Class::GetChildWindowId () \
- { return MyID; } \
+ { return MyID; } \
void Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
{ \
SfxChildWinFactory *pFact = new SfxChildWinFactory( \
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index f455d8438632..0f8eae253b01 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -56,7 +56,6 @@ class SfxHintPoster: public SvRefBase
GenLink aLink;
private:
- void RegisterEvent();
DECL_LINK( DoEvent_Impl, SfxHint * );
protected:
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 62ebce679ed4..08acfa632e1b 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,7 +56,6 @@ public:
SfxMenuControl( sal_uInt16, SfxBindings&);
static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
- static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
~SfxMenuControl();
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 6dbdcfac5993..2f397c38c631 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -66,7 +66,6 @@ public:
void Suspend();
sal_Bool IsSuspended() const { return bSuspended; }
- void Lock();
void UnLock();
void Reschedule();
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 3a1662430337..fbc6c77b9f6a 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -118,10 +118,6 @@ void SfxApplication::PreInit( )
{
}
-void SfxApplication::Main( )
-{
-}
-
//-------------------------------------------------------------------------
SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index d6fb7798c61e..22025a60e1d5 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -461,45 +461,6 @@ void SfxProgress::Suspend()
// -----------------------------------------------------------------------
-void SfxProgress::Lock()
-{
- if( pImp->pActiveProgress ) return;
- // No Reschedule for Embedded-Objects,
- // because we are defenseless against the OLE protocol
- if ( !pImp->xObjSh.Is() )
- {
- for ( SfxObjectShell *pDocSh = SfxObjectShell::GetFirst();
- pDocSh;
- pDocSh = SfxObjectShell::GetNext(*pDocSh) )
- {
- SfxObjectCreateMode eMode = pDocSh->GetCreateMode();
- if ( ( eMode == SFX_CREATE_MODE_EMBEDDED ) ||
- ( eMode == SFX_CREATE_MODE_PREVIEW ) )
- {
- DBG( DbgOutf( "SfxProgress: not locked because EMBEDDED/PREVIEW found" ) );
- pImp->bAllowRescheduling = sal_False;
- }
- }
- }
- else
- {
- SfxObjectCreateMode eMode = pImp->xObjSh->GetCreateMode();
- if ( ( eMode == SFX_CREATE_MODE_EMBEDDED ) ||
- ( eMode == SFX_CREATE_MODE_PREVIEW ) )
- {
- DBG( DbgOutf( "SfxProgress: not locked because ObjectShell is EMBEDDED/PREVIEW" ) );
- pImp->bAllowRescheduling = sal_False;
- }
- }
-
- pImp->Enable_Impl( sal_False );
-
- DBG( DbgOutf( "SfxProgress: locked" ) );
- pImp->bLocked = sal_True;
-}
-
-// -----------------------------------------------------------------------
-
void SfxProgress::UnLock()
{
if( pImp->pActiveProgress ) return;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 9e9585794663..32b173e02927 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -247,14 +247,6 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/,
}
//--------------------------------------------------------------------
-
-void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
-{
- RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
- SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
-}
-
-//--------------------------------------------------------------------
void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pFact)
{
SFX_APP()->RegisterMenuControl_Impl( pMod, pFact );
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 3c849c5fe254..ad6e85ef7bcd 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -32,12 +32,6 @@
#include <sfx2/app.hxx>
#include "sfxtypes.hxx"
-//====================================================================
-
-void SfxHintPoster::RegisterEvent()
-{
-}
-
//--------------------------------------------------------------------
SfxHintPoster::SfxHintPoster( const GenLink& rLink ):