summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-17 16:20:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-17 16:20:22 +0100
commitfbaec92d4366caa35e2db8fdb60d8f3976453b65 (patch)
tree56c26631badad5d3a28c1eedae7871d7df6f189d /sd
parent5fd4c95affbad94f5630425e35bced434d18e3d8 (diff)
No need for mpWrapper member
Change-Id: I5b0526dd6fe76735fb25b7864e71e36e4f0eeb98
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index b608cb344e8a..28916b6f1bc3 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -59,7 +59,6 @@ class BasicViewFactory::ViewDescriptor
public:
Reference<XResource> mxView;
std::shared_ptr<sd::ViewShell> mpViewShell;
- ViewShellWrapper* mpWrapper;
Reference<XResourceId> mxViewId;
static bool CompareView (const std::shared_ptr<ViewDescriptor>& rpDescriptor,
const Reference<XResource>& rxView)
@@ -300,22 +299,22 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
mpBase->GetViewShellManager()->ActivateViewShell(pDescriptor->mpViewShell.get());
Reference<awt::XWindow> xWindow(rxPane->getWindow());
- pDescriptor->mpWrapper = new ViewShellWrapper(
+ rtl::Reference<ViewShellWrapper> wrapper(new ViewShellWrapper(
pDescriptor->mpViewShell,
rxViewId,
- xWindow);
+ xWindow));
// register ViewShellWrapper on pane window
if (xWindow.is())
{
- xWindow->addWindowListener(pDescriptor->mpWrapper);
+ xWindow->addWindowListener(wrapper.get());
if (pDescriptor->mpViewShell != nullptr)
{
pDescriptor->mpViewShell->Resize();
}
}
- pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( cppu::UnoType<XResource>::get() ), UNO_QUERY_THROW );
+ pDescriptor->mxView = wrapper.get();
}
return pDescriptor;