diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-11-27 19:23:22 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-28 19:49:27 +0100 |
| commit | eba961f518774d467b03c5a77828a2a7c21b42ed (patch) | |
| tree | ae65a0d16ae85e5a4227e7a8b34f9df115ba94bb /sw | |
| parent | 57c0ccf77627b485e8ed05cad295c4eef5eb16e4 (diff) | |
lokdialog: Move the LOKWindowId <-> VclPtr<Window> mapping to Window.
This allows registering & de-registering of non-sfx windows too, and makes the
Calc autofilter popup to appear.
Change-Id: I7cbbe94d208115aabcb6fa5f964646c7b7ce4c93
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index f8865610db15..1de906c338b5 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -450,9 +450,6 @@ public: /// @see vcl::ITiledRenderable::getPostIts(). OUString getPostIts() override; - /// @see vcl::ITiledRenderable::findWindow(). - VclPtr<vcl::Window> findWindow(vcl::LOKWindowId nLOKWindowId) const override; - // css::tiledrendering::XTiledRenderable virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index f92e720a34e8..4390c78a9111 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3711,12 +3711,6 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I #endif } -VclPtr<vcl::Window> SwXTextDocument::findWindow(vcl::LOKWindowId nLOKWindowId) const -{ - SfxViewShell* pViewShell = SfxViewShell::Current(); - return pViewShell->GetOpenedDlg(nLOKWindowId); -} - void * SAL_CALL SwXTextDocument::operator new( size_t t) throw() { return SwXTextDocumentBaseClass::operator new(t); |