[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - oovbaapi/ooo sw/source

[Tor Lillqvist]

 oovbaapi/ooo/vba/word/XWordBasic.idl |    1 +
 sw/source/ui/vba/vbaapplication.cxx  |    7 +++++++
 sw/source/ui/vba/vbaapplication.hxx  |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit adf3895e91f2e65be8798d199a75b7306c50d995
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 12 16:20:57 2018 +0300

    Add ooo.vba.word.XWordBasic.WindowName() method
    
    Change-Id: I0ff24c3bc331d55212855d79060eaa6f8f3dc013
    Reviewed-on: https://gerrit.libreoffice.org/55710
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

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 0d87f23f36c2..13d18423143e 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -50,7 +50,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 );
@@ -59,6 +58,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;