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

[Pierre Lepage]

 basctl/source/basicide/macrodlg.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d9a7d03e325d8b7487c08e9448c8a6890821866
Author: Pierre Lepage <pierrelepage3 at gmail.com>
Date:   Sat Nov 5 14:12:56 2016 -0400

    tdf#96717: The macro name desired by the user is now took into account.
    
    Change-Id: I3949ffed6dcf85e01bc5fc24a27a04265e54fe44
    Reviewed-on: https://gerrit.libreoffice.org/30592
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 84273ae..88dd8e6 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -364,13 +364,16 @@ SbMethod* MacroChooser::CreateMacro()
         else if ( !pBasic->GetModules().empty() )
             pModule = pBasic->GetModules().front().get();
 
+        // Retain the desired macro name before the macro dialog box is forced to close
+        // by opening the module name dialog window when no module exists in the current library.
+        OUString aSubName = m_pMacroNameEdit->GetText();
+
         if ( !pModule )
         {
             pModule = createModImpl( static_cast<vcl::Window*>( this ),
                 aDocument, *m_pBasicBox, aLibName, aModName, false );
         }
 
-        OUString aSubName = m_pMacroNameEdit->GetText();
         DBG_ASSERT( !pModule || !pModule->FindMethod( aSubName, SbxClassType::Method ), "Macro existiert schon!" );
         pMethod = pModule ? basctl::CreateMacro( pModule, aSubName ) : nullptr;
     }