Keep the container and object separate methods.

ScVbaControl doesn't have any container instance to pass to the
old method.

1 files changed, 5 insertions, 2 deletions

diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index e908d75472c1..af244143f69e 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -148,9 +148,12 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(  const sal_Int32 i_nIn
             if ( xElementAsForm.is() )
                 break;
 
-            rtl::OUString sCodeName;
+            // Try getting the code name from the container first (faster),
+            // then from the element if that fails (slower).
             Reference<XInterface> xThis = static_cast<XContainer*>(this);
-            sCodeName = xNameQuery->getCodeNameForObject(xThis, xElement);
+            rtl::OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis);
+            if (sCodeName.isEmpty())
+                sCodeName = xNameQuery->getCodeNameForObject(xElement);
 
             Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
             ::rtl::OUString sServiceName;