summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-03 11:08:31 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-03-04 11:34:07 +0000
commit5b04c9063cc9dd77dc55c361df081812af38cdbd (patch)
tree827cd9405e68df853362ac6a021c4619bf4a6bc3 /sfx2
parentbf48090e0a81c6490ee938eabaef4e791df85229 (diff)
remove unused and commented out code
This code gets never called. Change-Id: I59228cba1444b7b09f74eb5cf8da9b755c7c32f7
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx4
-rw-r--r--sfx2/inc/sfx2/shell.hxx3
-rw-r--r--sfx2/source/control/dispatch.cxx7
-rw-r--r--sfx2/source/control/shell.cxx15
-rw-r--r--sfx2/source/doc/objcont.cxx32
6 files changed, 0 insertions, 63 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 59e87fa65f62..f87183830613 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -121,8 +121,6 @@ public:
virtual ~SfxDispatcher();
- virtual void SetExecuteMode( sal_uInt16 );
-
const SfxPoolItem* Execute( sal_uInt16 nSlot,
SfxCallMode nCall = SFX_CALLMODE_SLOT,
const SfxPoolItem **pArgs = 0,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 6a7dfb51fd08..5d597a83e816 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -500,8 +500,6 @@ public:
virtual void SetOrganizerSearchMask(
SfxStyleSheetBasePool* ) const;
- virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
-
virtual sal_Bool CanHaveChildren(
sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE
@@ -515,8 +513,6 @@ public:
sal_uInt16 nIdx1
);
- virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
-
virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily);
virtual sal_Bool Insert( SfxObjectShell &rSource,
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 880c83df3289..344294a33c04 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -173,9 +173,6 @@ public:
TYPEINFO();
virtual ~SfxShell();
- // TODO/CLEANUP: still needed?!
- virtual SvGlobalName GetGlobalName() const;
-
virtual SfxInterface* GetInterface() const;
static SfxInterface* GetStaticInterface() { return 0; }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 4a8fa5a8224b..8c8cf7a33837 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -146,7 +146,6 @@ struct SfxDispatcher_Impl
// 2==ReadOnlyDoc overturned
sal_uInt16 nFilterCount; // Number of SIDs in pFilterSIDs
const sal_uInt16* pFilterSIDs; // sorted Array of SIDs
- sal_uInt16 nStandardMode; // ExecuteMode from PlugInDispatcher
std::vector<sal_uInt16>* pDisableList;
sal_uInt32 nDisableFlags;
};
@@ -325,7 +324,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
pImp->bFilterEnabling = sal_False;
pImp->nFilterCount = 0;
pImp->pFilterSIDs = 0;
- pImp->nStandardMode = 0;
pImp->pDisableList = pSfxApp->GetDisabledSlotList_Impl();
pImp->nDisableFlags = 0;
@@ -2223,11 +2221,6 @@ void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn )
pBindings->InvalidateAll(sal_True);
}
-void SfxDispatcher::SetExecuteMode( sal_uInt16 nMode )
-{
- pImp->nStandardMode = nMode;
-}
-
SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rpState )
{
SfxShell *pShell = 0;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index db940f033ddd..8c1de06a6592 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -195,21 +195,6 @@ const String& SfxShell::GetName() const
//--------------------------------------------------------------------
-SvGlobalName SfxShell::GetGlobalName() const
-
-/* [Description]
-
- Provides the Global Unique Identifier of the Shell object. With this name
- can the SfxShell instance for example be expressed via OLE Automation, or
- be found in the Registration Database.
-*/
-
-{
- return SvGlobalName();
-}
-
-//--------------------------------------------------------------------
-
SfxDispatcher* SfxShell::GetDispatcher() const
/* [Description]
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 643d3fc414ff..950e669c101d 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -313,38 +313,6 @@ void SfxObjectShell::SetOrganizerSearchMask(
//--------------------------------------------------------------------
-sal_uInt16 SfxObjectShell::GetContentCount(sal_uInt16 nIdx)
-{
- switch(nIdx)
- {
- case INDEX_IGNORE:
- return DEF_CONTENT_COUNT;
- case CONTENT_STYLE:
- {
- SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
- if(!pStylePool)
- return 0;
- SetOrganizerSearchMask(pStylePool);
- return pStylePool->Count();
- }
- case CONTENT_MACRO:
- break;
- }
- return 0;
-}
-
-
-//--------------------------------------------------------------------
-//TODO/CLEANUP: remove this method
-void SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
-{
- if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets
- {
- SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
- SetOrganizerSearchMask(pStylePool);
- }
-}
-
sal_Bool SfxObjectShell::CanHaveChildren(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
switch(nIdx1)