use more concrete UNO in basic

Change-Id: I6606008d9b45e00295cf441a7321a677d62317f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173581
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

basctl/source/basicide/basidesh.cxx

@@ -262,8 +262,8 @@ Shell::~Shell()
     aWindowTable.clear();
 
     // Destroy all ContainerListeners for Basic Container.
-    if (ContainerListenerImpl* pListener = static_cast<ContainerListenerImpl*>(m_xLibListener.get()))
-        pListener->removeContainerListener(m_aCurDocument, m_aCurLibName);
+    if (m_xLibListener)
+        m_xLibListener->removeContainerListener(m_aCurDocument, m_aCurLibName);
 
     GetExtraData()->ShellInCriticalSection() = false;
 
@@ -940,16 +940,14 @@ void Shell::SetCurLib( const ScriptDocument& rDocument, const OUString& aLibName
     if ( bCheck && rDocument == m_aCurDocument && aLibName == m_aCurLibName )
         return;
 
-    ContainerListenerImpl* pListener = static_cast< ContainerListenerImpl* >( m_xLibListener.get() );
-
-    if (pListener)
-        pListener->removeContainerListener(m_aCurDocument, m_aCurLibName);
+    if (m_xLibListener)
+        m_xLibListener->removeContainerListener(m_aCurDocument, m_aCurLibName);
 
     m_aCurDocument = rDocument;
     m_aCurLibName = aLibName;
 
-    if ( pListener )
-        pListener->addContainerListener( m_aCurDocument, aLibName );
+    if ( m_xLibListener )
+        m_xLibListener->addContainerListener( m_aCurDocument, aLibName );
 
     if ( bUpdateWindows )
         UpdateWindows();

basctl/source/inc/basidesh.hxx

@@ -55,6 +55,7 @@ class TabBar;
 class BaseWindow;
 class LocalizationMgr;
 class BasicColorConfig;
+class ContainerListenerImpl;
 
 class Shell :
     public SfxViewShell,
@@ -98,7 +99,7 @@ private:
     DocumentEventNotifier m_aNotifier;
 
     friend class ContainerListenerImpl;
-    css::uno::Reference< css::container::XContainerListener > m_xLibListener;
+    rtl::Reference<ContainerListenerImpl> m_xLibListener;
     std::unique_ptr<SvxSearchItem> mpSearchItem;
 
     void                Init();

basctl/source/inc/dlgedobj.hxx

@@ -33,10 +33,10 @@ namespace basctl
 
 typedef std::multimap< sal_Int16, OUString > IndexToNameMap;
 
-
 class DlgEdForm;
 class DlgEditor;
-
+class DlgEdEvtContListenerImpl;
+class DlgEdPropListenerImpl;
 
 // DlgEdObj
 
@@ -51,8 +51,8 @@ class DlgEdObj: public SdrUnoObj
 private:
     bool            bIsListening;
     rtl::Reference<DlgEdForm> pDlgEdForm;
-    css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener;
-    css::uno::Reference< css::container::XContainerListener>  m_xContainerListener;
+    rtl::Reference<DlgEdPropListenerImpl> m_xPropertyChangeListener;
+    rtl::Reference<DlgEdEvtContListenerImpl>  m_xContainerListener;
 
 private:
     DlgEditor& GetDialogEditor ();

basic/source/basmgr/basmgr.cxx

@@ -2045,7 +2045,7 @@ typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper;
 class StarBasicAccess_Impl : public StarBasicAccessHelper
 {
     BasicManager* mpMgr;
-    uno::Reference< container::XNameContainer > mxLibContainer;
+    rtl::Reference< LibraryContainer_Impl > mxLibContainer;
 
 public:
     explicit StarBasicAccess_Impl( BasicManager* pMgr )