[Libreoffice-commits] core.git: basctl/source

Caolán McNamara caolanm at redhat.com
Thu Oct 9 07:43:10 PDT 2014


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

New commits:
commit 6033e2d29d7ee9df5201c9834ba6b070da03e98e
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

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0428182..15e16db 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1106,8 +1106,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


More information about the Libreoffice-commits mailing list