remove unused helpid in SfxShell

Unused since commit 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae
"update unusedmethods plugin to deal with constructors"
where I removed a unused SfxDockingWindow constructor.
And in that case, the helpid was only being used to assign
the window a UniqueId.

Change-Id: I148e424424fcf08449440b83a8600071b39d7a07
Reviewed-on: https://gerrit.libreoffice.org/35554
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-03-23 09:38:05 +02:00
parent 61ecebe0d0
commit 8ab1fe71f5
51 changed files with 0 additions and 76 deletions

View File

@ -179,7 +179,6 @@ void Shell::Init()
GetExtraData()->ShellInCriticalSection() = true;
SetName( "BasicIDE" );
SetHelpId( SVX_INTERFACE_BASIDE_VIEWSH );
LibBoxControl::RegisterControl( SID_BASICIDE_LIBSELECTOR );
LanguageBoxControl::RegisterControl( SID_BASICIDE_CURRENT_LANG );

View File

@ -460,8 +460,6 @@ public:
static void VerbState (SfxItemSet&);
SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const;
void SetHelpId(sal_uIntPtr nId);
sal_uIntPtr GetHelpId() const;
virtual SfxObjectShell* GetObjectShell();
void SetDisableFlags( SfxDisableFlags nFlags );
SfxDisableFlags GetDisableFlags() const;

View File

@ -2699,7 +2699,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
StartListening(*pStlPool);
GetPageOnFromPageStyleSet( nullptr, 0, bHeaderOn, bFooterOn );
SetHelpId( HID_SCSHELL_DOCSH );
// InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew
}
@ -2744,7 +2743,6 @@ ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags ) :
SfxStyleSheetPool* pStlPool = aDocument.GetStyleSheetPool();
if (pStlPool)
StartListening(*pStlPool);
SetHelpId( HID_SCSHELL_DOCSH );
aDocument.GetDBCollection()->SetRefreshHandler(
LINK( this, ScDocShell, RefreshDBDataHdl ) );

View File

@ -60,7 +60,6 @@ void ScChartShell::InitInterface_Impl()
ScChartShell::ScChartShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId( HID_SCSHELL_CHARTSH );
SetName( "ChartObject" );
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Chart));
}

View File

@ -67,7 +67,6 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_DRAWSH );
SetName("Drawing");
mpSelectionChangeHandler->Connect();

View File

@ -55,7 +55,6 @@ void ScDrawFormShell::InitInterface_Impl()
ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
SetName("DrawForm");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Form));
}

View File

@ -126,7 +126,6 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_DRTXTOB );
SetName("DrawText");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText));
}

View File

@ -57,7 +57,6 @@ void ScGraphicShell::InitInterface_Impl()
ScGraphicShell::ScGraphicShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_GRAPHIC);
SetName("GraphicObject");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Graphic));
}

View File

@ -48,7 +48,6 @@ void ScMediaShell::InitInterface_Impl()
ScMediaShell::ScMediaShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_MEDIA);
SetName( OUString( ScResId( SCSTR_MEDIASHELL ) ) );
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Media));
}

View File

@ -55,7 +55,6 @@ void ScOleObjectShell::InitInterface_Impl()
ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
SetName("OleObject");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::OLE));
}

View File

@ -54,7 +54,6 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_AUDIT );
SetName("Auditing");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Auditing));
}

View File

@ -81,7 +81,6 @@ ScCellShell::ScCellShell(ScViewData* pData, VclPtr<vcl::Window> frameWin) :
bPastePossible(false),
pFrameWin(frameWin)
{
SetHelpId(HID_SCSHELL_CELLSH);
SetName("Cell");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Cell));
}

View File

@ -143,7 +143,6 @@ ScFormatShell::ScFormatShell(ScViewData* pData) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId(HID_SCSHELL_FORMATSH);
SetName("Format");
}

View File

@ -53,7 +53,6 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_PAGEBREAK );
SetName("PageBreak");
}

View File

@ -63,7 +63,6 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_PIVOTSH );
SetName("Pivot");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Pivot));
}

View File

@ -143,7 +143,6 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
pHorScroll->Show( false );
pVerScroll->Show( false );
pCorner->Show();
SetHelpId( HID_SCSHELL_PREVWSH );
SetName("Preview");
}

View File

@ -1528,7 +1528,6 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
}
SetRepeatTarget( &aTarget );
pFormShell->SetRepeatTarget( &aTarget );
SetHelpId( HID_SCSHELL_TABVWSH );
if ( bFirstView ) // first view?
{

View File

@ -91,7 +91,6 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
SetUndoManager( pDocShell->GetUndoManager() );
}
SetRepeatTarget( mpView );
SetHelpId( SD_IF_SDDRAWTABLEOBJECTBAR );
SetName( SD_RESSTR( RID_DRAW_TABLE_TOOLBOX ) );
SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table));
}

View File

@ -72,7 +72,6 @@ GraphicObjectBar::GraphicObjectBar (
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
SetRepeatTarget( mpView );
SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR );
SetName( "Graphic objectbar");
}

View File

@ -65,7 +65,6 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
SetRepeatTarget( mpView );
SetHelpId( SD_IF_SDDRAWMEDIAOBJECTBAR );
SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX));
}

View File

@ -72,8 +72,6 @@ BezierObjectBar::BezierObjectBar(
SetPool(&pDocShell->GetPool());
SetUndoManager(pDocShell->GetUndoManager());
SetRepeatTarget(mpView);
SetHelpId( SD_IF_SDDRAWBEZIEROBJECTBAR );
}
BezierObjectBar::~BezierObjectBar()

View File

@ -485,17 +485,14 @@ void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans
if (mePageKind == PageKind::Notes)
{
SetHelpId( SID_NOTES_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_NOTES_MODE );
}
else if (mePageKind == PageKind::Handout)
{
SetHelpId( SID_HANDOUT_MASTER_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUT_MASTER_MODE );
}
else
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
}
}

View File

@ -273,14 +273,12 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if( eDocType == DocumentType::Draw )
{
SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL );
}
else
{
if (mePageKind == PageKind::Notes)
{
SetHelpId( SID_NOTES_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_NOTES_MODE );
// AutoLayouts have to be created
@ -288,7 +286,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
}
else if (mePageKind == PageKind::Handout)
{
SetHelpId( SID_HANDOUT_MASTER_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUT_MASTER_MODE );
// AutoLayouts have to be created
@ -296,7 +293,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
}
else
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
}
}

View File

@ -559,8 +559,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
GetCurrentFunction()->Activate();
SetOldFunction( GetCurrentFunction() );
SetHelpId( GetCurrentFunction()->GetSlotID() );
}
// invalidate shell, is faster than every individually (says MI)

View File

@ -160,7 +160,6 @@ void OutlineViewShell::Construct(DrawDocShell* )
SetName( "OutlineViewShell" );
SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
}

View File

@ -62,7 +62,6 @@ struct SfxShell_Impl: public SfxBroadcaster
SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent;
bool bActive;
SfxDisableFlags nDisableFlags;
sal_uIntPtr nHelpId;
svtools::AsynchronLink* pExecuter;
svtools::AsynchronLink* pUpdater;
std::vector<std::unique_ptr<SfxSlot> > aSlotArr;
@ -76,7 +75,6 @@ struct SfxShell_Impl: public SfxBroadcaster
, pRepeatTarget(nullptr)
, bActive(false)
, nDisableFlags(SfxDisableFlags::NONE)
, nHelpId(0)
, pExecuter(nullptr)
, pUpdater(nullptr)
{
@ -639,16 +637,6 @@ const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const
return nullptr;
}
void SfxShell::SetHelpId(sal_uIntPtr nId)
{
pImpl->nHelpId = nId;
}
sal_uIntPtr SfxShell::GetHelpId() const
{
return pImpl->nHelpId;
}
SfxObjectShell* SfxShell::GetObjectShell()
{
if ( GetViewShell() )

View File

@ -1932,7 +1932,6 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *)
SetWindow(mpGraphic.get());
SfxShell::SetName("SmView");
SfxShell::SetUndoManager( &GetDoc()->GetEditEngine().GetUndoManager() );
SetHelpId( HID_SMA_VIEWSHELL_DOCUMENT );
}

View File

@ -69,7 +69,6 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell )
if( pViewShell )
SetPool(&pViewShell->GetPool());
SetHelpId( SVX_INTERFACE_EXTRUSION_BAR );
SetName(SVX_RESSTR(RID_SVX_EXTRUSION_BAR));
}

View File

@ -190,7 +190,6 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell )
if( pViewShell )
SetPool(&pViewShell->GetPool());
SetHelpId( SVX_INTERFACE_FONTWORK_BAR );
SetName( SVX_RESSTR( RID_SVX_FONTWORK_BAR ));
}

View File

@ -133,7 +133,6 @@ SwGlosDocShell::SwGlosDocShell(bool bNewShow)
: SwDocShell( (bNewShow)
? SfxObjectCreateMode::STANDARD : SfxObjectCreateMode::INTERNAL )
{
SetHelpId(SW_GLOSDOCSHELL);
}
SwGlosDocShell::~SwGlosDocShell( )
@ -169,7 +168,6 @@ bool SwGlosDocShell::Save()
SwWebGlosDocShell::SwWebGlosDocShell()
: SwWebDocShell()
{
SetHelpId(SW_WEBGLOSDOCSHELL);
}
SwWebGlosDocShell::~SwWebGlosDocShell( )

View File

@ -57,7 +57,6 @@ SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
{
SetName("Bezier");
SetHelpId(SW_BEZIERSHELL);
SwWrtShell *pSh = &GetShell();
SdrView* pSdrView = pSh->GetDrawView();

View File

@ -535,7 +535,6 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
SwDrawShell::SwDrawShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
SetHelpId(SW_DRAWSHELL);
SetName("Draw");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Draw));

View File

@ -247,7 +247,6 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet)
SwDrawFormShell::SwDrawFormShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
SetHelpId(SW_DRAWFORMSHELL);
GetShell().NoEdit();
SetName("DrawForm");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Form));

View File

@ -132,7 +132,6 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
rSh.NoEdit();
SetName("ObjectText");
SetHelpId(SW_DRWTXTSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText));
}

View File

@ -962,7 +962,6 @@ SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
{
SetName("Frame");
SetHelpId(SW_FRAMESHELL);
// #96392# Use this to announce it is the frame shell who creates the selection.
SwTransferable::CreateSelection( _rView.GetWrtShell(), this );

View File

@ -956,7 +956,6 @@ SwGrfShell::SwGrfShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Graphic");
SetHelpId(SW_GRFSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Graphic));
}

View File

@ -274,7 +274,6 @@ SwListShell::SwListShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("List");
SetHelpId(SW_LISTSHELL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -191,7 +191,6 @@ SwMediaShell::SwMediaShell(SwView &_rView) :
{
SetName("Media Playback");
SetHelpId(SW_MEDIASHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Media));
}

View File

@ -39,7 +39,6 @@ SwNavigationShell::SwNavigationShell(SwView &_rView)
: SwBaseShell( _rView )
{
SetName("Navigation");
SetHelpId(SW_NAVIGATIONSHELL);
}
void SwNavigationShell::Execute(SfxRequest &rReq)

View File

@ -51,7 +51,6 @@ SwOleShell::SwOleShell(SwView &_rView) :
{
SetName("Object");
SetHelpId(SW_OLESHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::OLE));
}

View File

@ -1404,7 +1404,6 @@ SwTableShell::SwTableShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Table");
SetHelpId(SW_TABSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table));
}

View File

@ -831,7 +831,6 @@ SwTextShell::SwTextShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Text");
SetHelpId(SW_TEXTSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Text));
}

View File

@ -1191,7 +1191,6 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
{
SetName("PageView");
SetWindow( m_pViewWin );
SetHelpId(SW_PAGEPREVIEW);
CreateScrollbar( true );
CreateScrollbar( false );

View File

@ -252,7 +252,6 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed)
void SwSrcView::Init()
{
SetHelpId(SW_SRC_VIEWSHELL);
SetName("Source");
SetWindow( aEditWin.get() );
SwDocShell* pDocShell = GetDocShell();

View File

@ -381,17 +381,13 @@ void SwView::SelectShell()
{
bSetExtInpCntxt = true;
eShellMode = ShellMode::Text;
sal_uInt32 nHelpId = 0;
if ( m_nSelectionType & nsSelectionType::SEL_NUM )
{
eShellMode = ShellMode::ListText;
m_pShell = new SwListShell( *this );
nHelpId = m_pShell->GetHelpId();
rDispatcher.Push( *m_pShell );
}
m_pShell = new SwTextShell(*this);
if(nHelpId)
m_pShell->SetHelpId(nHelpId);
rDispatcher.Push( *m_pShell );
if ( m_nSelectionType & nsSelectionType::SEL_TBL )
{

View File

@ -50,7 +50,6 @@ void SwWebFrameShell::InitInterface_Impl()
SwWebFrameShell::SwWebFrameShell(SwView &_rView) :
SwFrameShell(_rView)
{
SetHelpId(SW_WEBFRAMESHELL);
}
SwWebFrameShell::~SwWebFrameShell()

View File

@ -56,7 +56,6 @@ SwWebGrfShell::SwWebGrfShell(SwView &_rView) :
{
SetName("Graphic");
SetHelpId(SW_GRFSHELL);
}
SwWebGrfShell::~SwWebGrfShell()

View File

@ -49,7 +49,6 @@ SwWebListShell::SwWebListShell(SwView &_rView) :
SwListShell(_rView)
{
SetName("List");
SetHelpId(SW_LISTSHELL);
}
SwWebListShell::~SwWebListShell()

View File

@ -46,10 +46,8 @@ void SwWebOleShell::InitInterface_Impl()
SwWebOleShell::SwWebOleShell(SwView &_rView) :
SwOleShell(_rView)
{
SetName("Object");
SetHelpId(SW_OLESHELL);
}
SwWebOleShell::~SwWebOleShell()

View File

@ -55,7 +55,6 @@ SwWebTableShell::SwWebTableShell(SwView &_rView) :
{
GetShell().UpdateTable();
SetName("Table");
SetHelpId(SW_TABSHELL);
}
SwWebTableShell::~SwWebTableShell()

View File

@ -59,7 +59,6 @@ void SwWebTextShell::InitInterface_Impl()
SwWebTextShell::SwWebTextShell(SwView &_rView) :
SwTextShell(_rView)
{
SetHelpId(SW_WEBTEXTSHELL);
}
SwWebTextShell::~SwWebTextShell()