[Libreoffice-commits] core.git: basctl/source include/sfx2 sc/source sd/source sfx2/source starmath/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Mar 23 10:51:37 UTC 2017
basctl/source/basicide/basidesh.cxx | 1 -
include/sfx2/shell.hxx | 2 --
sc/source/ui/docshell/docsh.cxx | 2 --
sc/source/ui/drawfunc/chartsh.cxx | 1 -
sc/source/ui/drawfunc/drawsh2.cxx | 1 -
sc/source/ui/drawfunc/drformsh.cxx | 1 -
sc/source/ui/drawfunc/drtxtob.cxx | 1 -
sc/source/ui/drawfunc/graphsh.cxx | 1 -
sc/source/ui/drawfunc/mediash.cxx | 1 -
sc/source/ui/drawfunc/oleobjsh.cxx | 1 -
sc/source/ui/view/auditsh.cxx | 1 -
sc/source/ui/view/cellsh.cxx | 1 -
sc/source/ui/view/formatsh.cxx | 1 -
sc/source/ui/view/pgbrksh.cxx | 1 -
sc/source/ui/view/pivotsh.cxx | 1 -
sc/source/ui/view/prevwsh.cxx | 1 -
sc/source/ui/view/tabvwsh4.cxx | 1 -
sd/source/ui/table/tableobjectbar.cxx | 1 -
sd/source/ui/view/GraphicObjectBar.cxx | 1 -
sd/source/ui/view/MediaObjectBar.cxx | 1 -
sd/source/ui/view/drbezob.cxx | 2 --
sd/source/ui/view/drviews5.cxx | 3 ---
sd/source/ui/view/drviewsa.cxx | 4 ----
sd/source/ui/view/drviewse.cxx | 2 --
sd/source/ui/view/outlnvsh.cxx | 1 -
sfx2/source/control/shell.cxx | 12 ------------
starmath/source/view.cxx | 1 -
svx/source/toolbars/extrusionbar.cxx | 1 -
svx/source/toolbars/fontworkbar.cxx | 1 -
sw/source/uibase/misc/glshell.cxx | 2 --
sw/source/uibase/shells/beziersh.cxx | 1 -
sw/source/uibase/shells/drawsh.cxx | 1 -
sw/source/uibase/shells/drformsh.cxx | 1 -
sw/source/uibase/shells/drwtxtsh.cxx | 1 -
sw/source/uibase/shells/frmsh.cxx | 1 -
sw/source/uibase/shells/grfsh.cxx | 1 -
sw/source/uibase/shells/listsh.cxx | 1 -
sw/source/uibase/shells/mediash.cxx | 1 -
sw/source/uibase/shells/navsh.cxx | 1 -
sw/source/uibase/shells/olesh.cxx | 1 -
sw/source/uibase/shells/tabsh.cxx | 1 -
sw/source/uibase/shells/textsh.cxx | 1 -
sw/source/uibase/uiview/pview.cxx | 1 -
sw/source/uibase/uiview/srcview.cxx | 1 -
sw/source/uibase/uiview/view.cxx | 4 ----
sw/source/uibase/web/wfrmsh.cxx | 1 -
sw/source/uibase/web/wgrfsh.cxx | 1 -
sw/source/uibase/web/wlistsh.cxx | 1 -
sw/source/uibase/web/wolesh.cxx | 2 --
sw/source/uibase/web/wtabsh.cxx | 1 -
sw/source/uibase/web/wtextsh.cxx | 1 -
51 files changed, 76 deletions(-)
New commits:
commit 8ab1fe71f546dd5f8d3ec8f53a0fb31e24d55adc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Mar 23 09:38:05 2017 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 09aa70fb0536..bea3e699a8d8 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -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 );
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index d6df8ab36717..c82ef06c0f91 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -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;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 70faa90ca738..f1e0271c109b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -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 ) );
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 26563ac42c64..089793769315 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 3188e05394dd..8bdf4b493582 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -67,7 +67,6 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetHelpId( HID_SCSHELL_DRAWSH );
SetName("Drawing");
mpSelectionChangeHandler->Connect();
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index f96bc0f7bbf8..938eb992c14c 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index ce6f08f1329b..ec6a67a32929 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 2820fd6beade..41defd63a6fb 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 83aab890e836..406cd6fa49c8 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index da80a4976589..cd0c83e53e63 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 216d33c2a582..3bfa57b28b37 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 0e3d1301bfc9..6dda629fbec5 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b22fbd8603da..d68d801f8034 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -143,7 +143,6 @@ ScFormatShell::ScFormatShell(ScViewData* pData) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetHelpId(HID_SCSHELL_FORMATSH);
SetName("Format");
}
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 57254d7cce1a..4a41fd45567a 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -53,7 +53,6 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetHelpId( HID_SCSHELL_PAGEBREAK );
SetName("PageBreak");
}
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index e99b0a658205..2c96d3e62a5a 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 6581d311a68b..6f6465da4f34 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -143,7 +143,6 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
pHorScroll->Show( false );
pVerScroll->Show( false );
pCorner->Show();
- SetHelpId( HID_SCSHELL_PREVWSH );
SetName("Preview");
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index faf166f2def1..6d7c050402a5 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1528,7 +1528,6 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
}
SetRepeatTarget( &aTarget );
pFormShell->SetRepeatTarget( &aTarget );
- SetHelpId( HID_SCSHELL_TABVWSH );
if ( bFirstView ) // first view?
{
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index e6c516512086..7f69df7c14a2 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -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));
}
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 57124390e9ec..c03c3363777d 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -72,7 +72,6 @@ GraphicObjectBar::GraphicObjectBar (
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
SetRepeatTarget( mpView );
- SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR );
SetName( "Graphic objectbar");
}
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 2301694cf020..dbce5caf3d55 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -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));
}
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index f012242a7b36..0511db501b81 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -72,8 +72,6 @@ BezierObjectBar::BezierObjectBar(
SetPool(&pDocShell->GetPool());
SetUndoManager(pDocShell->GetUndoManager());
SetRepeatTarget(mpView);
-
- SetHelpId( SD_IF_SDDRAWBEZIEROBJECTBAR );
}
BezierObjectBar::~BezierObjectBar()
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 2e4c17bfdc6a..372de4953ada 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -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 );
}
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7c4f59dab434..2f1968695614 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -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 );
}
}
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index fd9c2b9089fd..8885953bf0e4 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -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)
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 641fcd429d80..78400790dde2 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -160,7 +160,6 @@ void OutlineViewShell::Construct(DrawDocShell* )
SetName( "OutlineViewShell" );
- SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
}
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index a1a69b6cf169..a6afc6dcef9c 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -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() )
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 67d96420d7d5..22df9455b809 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -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 );
}
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index fbe92238b3bb..7287e3a9f3df 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -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));
}
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index e2bd0ad7e518..176945de222e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -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 ));
}
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 6446f611caf7..82fecf90b152 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -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( )
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 80a451929924..c60d2417c27e 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -57,7 +57,6 @@ SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
{
SetName("Bezier");
- SetHelpId(SW_BEZIERSHELL);
SwWrtShell *pSh = &GetShell();
SdrView* pSdrView = pSh->GetDrawView();
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index b756e19a4c20..1f978e99f7ca 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -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));
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index af77738bb28d..8cd842334412 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -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));
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 5537cd54ad89..1e2407dbce2a 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -132,7 +132,6 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
rSh.NoEdit();
SetName("ObjectText");
- SetHelpId(SW_DRWTXTSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText));
}
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 9909af838364..acfcd314d674 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -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 );
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 6792d70fbe90..6d92d9bd0b27 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -956,7 +956,6 @@ SwGrfShell::SwGrfShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Graphic");
- SetHelpId(SW_GRFSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Graphic));
}
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 786dfe23f7d3..115fda2976c9 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -274,7 +274,6 @@ SwListShell::SwListShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("List");
- SetHelpId(SW_LISTSHELL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index b389c0cb972a..04fa43365382 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -191,7 +191,6 @@ SwMediaShell::SwMediaShell(SwView &_rView) :
{
SetName("Media Playback");
- SetHelpId(SW_MEDIASHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Media));
}
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index 8b0283e92a70..edd99373c84f 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -39,7 +39,6 @@ SwNavigationShell::SwNavigationShell(SwView &_rView)
: SwBaseShell( _rView )
{
SetName("Navigation");
- SetHelpId(SW_NAVIGATIONSHELL);
}
void SwNavigationShell::Execute(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index 328df3c62feb..5171612100c3 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -51,7 +51,6 @@ SwOleShell::SwOleShell(SwView &_rView) :
{
SetName("Object");
- SetHelpId(SW_OLESHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::OLE));
}
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index a53986bd8ea4..45312455c19b 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1404,7 +1404,6 @@ SwTableShell::SwTableShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Table");
- SetHelpId(SW_TABSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table));
}
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 6670aeeb6ded..df0131e19c93 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -831,7 +831,6 @@ SwTextShell::SwTextShell(SwView &_rView) :
SwBaseShell(_rView)
{
SetName("Text");
- SetHelpId(SW_TEXTSHELL);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Text));
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 34de777ec435..0fc2886efe30 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1191,7 +1191,6 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
{
SetName("PageView");
SetWindow( m_pViewWin );
- SetHelpId(SW_PAGEPREVIEW);
CreateScrollbar( true );
CreateScrollbar( false );
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index bb1827bc21a1..9c9995147109 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -252,7 +252,6 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed)
void SwSrcView::Init()
{
- SetHelpId(SW_SRC_VIEWSHELL);
SetName("Source");
SetWindow( aEditWin.get() );
SwDocShell* pDocShell = GetDocShell();
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index cc3d48c693c0..0b3e0dfd6561 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -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 )
{
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index cfb71bdde0e5..f70967ef844e 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -50,7 +50,6 @@ void SwWebFrameShell::InitInterface_Impl()
SwWebFrameShell::SwWebFrameShell(SwView &_rView) :
SwFrameShell(_rView)
{
- SetHelpId(SW_WEBFRAMESHELL);
}
SwWebFrameShell::~SwWebFrameShell()
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 527e443b202e..745a2cf12261 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -56,7 +56,6 @@ SwWebGrfShell::SwWebGrfShell(SwView &_rView) :
{
SetName("Graphic");
- SetHelpId(SW_GRFSHELL);
}
SwWebGrfShell::~SwWebGrfShell()
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 088e25f97e8e..a38288380655 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -49,7 +49,6 @@ SwWebListShell::SwWebListShell(SwView &_rView) :
SwListShell(_rView)
{
SetName("List");
- SetHelpId(SW_LISTSHELL);
}
SwWebListShell::~SwWebListShell()
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 37c8bd2abeef..0cdb514f8fe1 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -46,10 +46,8 @@ void SwWebOleShell::InitInterface_Impl()
SwWebOleShell::SwWebOleShell(SwView &_rView) :
SwOleShell(_rView)
-
{
SetName("Object");
- SetHelpId(SW_OLESHELL);
}
SwWebOleShell::~SwWebOleShell()
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index eedc6c390492..a6294f6e67e5 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -55,7 +55,6 @@ SwWebTableShell::SwWebTableShell(SwView &_rView) :
{
GetShell().UpdateTable();
SetName("Table");
- SetHelpId(SW_TABSHELL);
}
SwWebTableShell::~SwWebTableShell()
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index dc2131b1a38a..837b7aea0f06 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -59,7 +59,6 @@ void SwWebTextShell::InitInterface_Impl()
SwWebTextShell::SwWebTextShell(SwView &_rView) :
SwTextShell(_rView)
{
- SetHelpId(SW_WEBTEXTSHELL);
}
SwWebTextShell::~SwWebTextShell()
More information about the Libreoffice-commits
mailing list