diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-06-12 16:20:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-06-12 19:02:14 +0200 |
| commit | 721c4fc126481f43be86442a73c1bfda8e06cdea (patch) | |
| tree | 8e6d6e4cb4c149717a227d2256580dd400c0a340 | |
| parent | 939fc7dc50a038edb252a8da941ef4e1c018f2b0 (diff) | |
Add ooo.vba.word.XWordBasic.WindowName() method
Change-Id: I0ff24c3bc331d55212855d79060eaa6f8f3dc013
Reviewed-on: https://gerrit.libreoffice.org/55705
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | oovbaapi/ooo/vba/word/XWordBasic.idl | 1 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbaapplication.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbaapplication.hxx | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl b/oovbaapi/ooo/vba/word/XWordBasic.idl index 1920f20543a6..94b810869061 100644 --- a/oovbaapi/ooo/vba/word/XWordBasic.idl +++ b/oovbaapi/ooo/vba/word/XWordBasic.idl @@ -15,6 +15,7 @@ module ooo { module vba { module word { interface XWordBasic { void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in] any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot ); + string WindowName(); }; }; }; }; diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index f3bdd9968667..5110118577ce 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -70,6 +70,7 @@ public: // XWordBasic virtual void SAL_CALL FileOpen( const OUString& Name, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot ) override; + virtual OUString SAL_CALL WindowName() override; }; SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): @@ -459,4 +460,10 @@ SwWordBasic::FileOpen( const OUString& Name, const uno::Any& ConfirmConversions, rDocuments->Open( Name, ConfirmConversions, ReadOnly, AddToMru, PasswordDoc, PasswordDot, Revert, WritePasswordDoc, WritePasswordDot, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any() ); } +OUString SAL_CALL +SwWordBasic::WindowName() +{ + return mpApp->getActiveSwVbaWindow()->getCaption(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index c7e73dd6da26..c032ea546dfe 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -49,7 +49,6 @@ typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ooo::vba::word::XApplic class SwVbaApplication : public SwVbaApplication_BASE { std::vector<css::uno::Reference< ooo::vba::XSink >> mvSinks; - SwVbaWindow* getActiveSwVbaWindow(); public: explicit SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); @@ -58,6 +57,8 @@ public: sal_uInt32 AddSink( const css::uno::Reference< ooo::vba::XSink >& xSink ); void RemoveSink( sal_uInt32 nNumber ); + SwVbaWindow* getActiveSwVbaWindow(); + // XApplication virtual OUString SAL_CALL getName() override; virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override; |