[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basctl/source

[Caolán McNamara]

 basctl/source/basicide/moduldl2.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0707938e49636759459ba20d94beb848825d826c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 9 15:40:08 2014 +0100

    Resolves: fdo#60904 allow export of VBAProject
    
    xModLibContainerExport has a "VBAProject" entry but
    xDlgLibContainerExport doesn't, so just export the
    one we do have
    
    Change-Id: I15f7794904a5aff7679f2cf9fd654d741fd5cbe3
    Reviewed-on: https://gerrit.libreoffice.org/11883
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 598a170..c04bbda 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1104,8 +1104,14 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
     if ( xModLibContainerExport.is() )
         xModLibContainerExport->exportLibrary( aOULibName, aTargetURL, Handler );
 
-    if ( xDlgLibContainerExport.is() )
-        xDlgLibContainerExport->exportLibrary( aOULibName, aTargetURL, Handler );
+    if (!xDlgLibContainerExport.is())
+        return;
+    Reference<container::XNameAccess> xNameAcc(xDlgLibContainerExport, UNO_QUERY);
+    if (!xNameAcc.is())
+        return;
+    if (!xNameAcc->hasByName(aOULibName))
+        return;
+    xDlgLibContainerExport->exportLibrary(aOULibName, aTargetURL, Handler);
 }
 
 // Implementation XCommandEnvironment