summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/viewshel.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-18 09:57:26 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-18 15:19:04 +0200
commit5d86154f49d713dada4aaa541755076cfeefa2c6 (patch)
tree25c34f4a032526de9798e6f3a69a76d993d739db /sd/source/ui/view/viewshel.cxx
parent469892f65d9717fcee7996a040b32d713a83b412 (diff)
loplugin:unusedfields improve search for unused collection fields
look for collection-like fields that are never added to, and are therefore effectively unused Change-Id: Id52c5500ea5e3d2436fb5915aebb86278bf2d925 Reviewed-on: https://gerrit.libreoffice.org/60661 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/view/viewshel.cxx')
-rw-r--r--sd/source/ui/view/viewshel.cxx93
1 files changed, 36 insertions, 57 deletions
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 7537c3e8ab31..ddcd4dc0b344 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -102,15 +102,10 @@ class ViewShellObjectBarFactory
{
public:
explicit ViewShellObjectBarFactory (::sd::ViewShell& rViewShell);
- virtual ~ViewShellObjectBarFactory() override;
virtual SfxShell* CreateShell( ::sd::ShellId nId ) override;
virtual void ReleaseShell (SfxShell* pShell) override;
private:
::sd::ViewShell& mrViewShell;
- /** This cache holds the already created object bars.
- */
- typedef ::std::map< ::sd::ShellId,SfxShell*> ShellCache;
- ShellCache maShellCache;
};
} // end of anonymous namespace
@@ -1637,64 +1632,48 @@ ViewShellObjectBarFactory::ViewShellObjectBarFactory (
{
}
-ViewShellObjectBarFactory::~ViewShellObjectBarFactory()
-{
- for (ShellCache::iterator aI(maShellCache.begin());
- aI!=maShellCache.end();
- ++aI)
- {
- delete aI->second;
- }
-}
-
SfxShell* ViewShellObjectBarFactory::CreateShell( ::sd::ShellId nId )
{
SfxShell* pShell = nullptr;
- ShellCache::iterator aI (maShellCache.find(nId));
- if (aI == maShellCache.end() || aI->second==nullptr)
+ ::sd::View* pView = mrViewShell.GetView();
+ switch (nId)
{
- ::sd::View* pView = mrViewShell.GetView();
- switch (nId)
- {
- case ToolbarId::Bezier_Toolbox_Sd:
- pShell = new ::sd::BezierObjectBar(&mrViewShell, pView);
- break;
-
- case ToolbarId::Draw_Text_Toolbox_Sd:
- pShell = new ::sd::TextObjectBar(
- &mrViewShell, mrViewShell.GetDoc()->GetPool(), pView);
- break;
-
- case ToolbarId::Draw_Graf_Toolbox:
- pShell = new ::sd::GraphicObjectBar(&mrViewShell, pView);
- break;
-
- case ToolbarId::Draw_Media_Toolbox:
- pShell = new ::sd::MediaObjectBar(&mrViewShell, pView);
- break;
-
- case ToolbarId::Draw_Table_Toolbox:
- pShell = ::sd::ui::table::CreateTableObjectBar( mrViewShell, pView );
- break;
-
- case ToolbarId::Svx_Extrusion_Bar:
- pShell = new svx::ExtrusionBar(
- &mrViewShell.GetViewShellBase());
- break;
-
- case ToolbarId::Svx_Fontwork_Bar:
- pShell = new svx::FontworkBar(
- &mrViewShell.GetViewShellBase());
- break;
-
- default:
- pShell = nullptr;
- break;
- }
+ case ToolbarId::Bezier_Toolbox_Sd:
+ pShell = new ::sd::BezierObjectBar(&mrViewShell, pView);
+ break;
+
+ case ToolbarId::Draw_Text_Toolbox_Sd:
+ pShell = new ::sd::TextObjectBar(
+ &mrViewShell, mrViewShell.GetDoc()->GetPool(), pView);
+ break;
+
+ case ToolbarId::Draw_Graf_Toolbox:
+ pShell = new ::sd::GraphicObjectBar(&mrViewShell, pView);
+ break;
+
+ case ToolbarId::Draw_Media_Toolbox:
+ pShell = new ::sd::MediaObjectBar(&mrViewShell, pView);
+ break;
+
+ case ToolbarId::Draw_Table_Toolbox:
+ pShell = ::sd::ui::table::CreateTableObjectBar( mrViewShell, pView );
+ break;
+
+ case ToolbarId::Svx_Extrusion_Bar:
+ pShell = new svx::ExtrusionBar(
+ &mrViewShell.GetViewShellBase());
+ break;
+
+ case ToolbarId::Svx_Fontwork_Bar:
+ pShell = new svx::FontworkBar(
+ &mrViewShell.GetViewShellBase());
+ break;
+
+ default:
+ pShell = nullptr;
+ break;
}
- else
- pShell = aI->second;
return pShell;
}