only vcl and toolkit need to use [G|S]etUnoWrapper

Change-Id: I47cdb47cceda32f0871fd2f713ea565852383ca7
Reviewed-on: https://gerrit.libreoffice.org/61765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/svapp.hxx

@@ -1183,23 +1183,6 @@ public:
     */
     static css::uno::Reference< css::awt::XToolkit > GetVCLToolkit();
 
-    /** Get the application's UNO wrapper object.
-
-     Note that this static function will only ever try to create UNO wrapper object once, and
-     if it fails then it will not ever try again, even if the function is called multiple times.
-
-     @param     bCreateIfNotExists  Create the UNO wrapper object if it doesn't exist when true.
-
-     @return UNO wrapper object.
-    */
-    static UnoWrapperBase*      GetUnoWrapper( bool bCreateIfNotExists = true );
-
-    /** Sets the application's UNO Wrapper object.
-
-     @param     pWrapper        Pointer to UNO wrapper object.
-    */
-    static void                 SetUnoWrapper( UnoWrapperBase* pWrapper );
-
     ///@}
 
 

include/vcl/toolkit/unowrap.hxx

@@ -78,6 +78,23 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessible >
                                 CreateAccessible( Menu* pMenu, bool bIsMenuBar ) = 0;
 
+    /** Get the application's UNO wrapper object.
+
+     Note that this static function will only ever try to create UNO wrapper object once, and
+     if it fails then it will not ever try again, even if the function is called multiple times.
+
+     @param     bCreateIfNotExists  Create the UNO wrapper object if it doesn't exist when true.
+
+     @return UNO wrapper object.
+    */
+    static UnoWrapperBase*      GetUnoWrapper( bool bCreateIfNotExists = true );
+
+    /** Sets the application's UNO Wrapper object.
+
+     @param     pWrapper        Pointer to UNO wrapper object.
+    */
+    static void                 SetUnoWrapper( UnoWrapperBase* pWrapper );
+
 protected:
     ~UnoWrapperBase() {}
 };

toolkit/source/awt/vclxtoolkit.cxx

@@ -899,7 +899,7 @@ static void ToolkitWorkerFunction( void* pArgs )
     if( bInitedByVCLToolkit )
     {
         UnoWrapper* pUnoWrapper = new UnoWrapper( pTk );
-        Application::SetUnoWrapper( pUnoWrapper );
+        UnoWrapperBase::SetUnoWrapper( pUnoWrapper );
     }
     getInitCondition().set();
     if( bInitedByVCLToolkit )

vcl/source/app/salvtables.cxx

@@ -2906,7 +2906,7 @@ weld::MessageDialog* SalInstance::CreateMessageDialog(weld::Widget* pParent, Vcl
 
 weld::Window* SalInstance::GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow)
 {
-    UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+    UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
     if (!pWrapper)
         return nullptr;
     VclPtr<vcl::Window> xWindow = pWrapper->GetWindow(rWindow);

vcl/source/app/svapp.cxx

@@ -1394,7 +1394,7 @@ SystemWindowFlags Application::GetSystemWindowMode()
 css::uno::Reference< css::awt::XToolkit > Application::GetVCLToolkit()
 {
     css::uno::Reference< css::awt::XToolkit > xT;
-    UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+    UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
     if ( pWrapper )
         xT = pWrapper->GetVCLToolkit();
     return xT;
@@ -1410,7 +1410,7 @@ extern "C" { static void thisModule() {} }
 
 #endif
 
-UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
+UnoWrapperBase* UnoWrapperBase::GetUnoWrapper( bool bCreateIfNotExist )
 {
     ImplSVData* pSVData = ImplGetSVData();
     static bool bAlreadyTriedToCreate = false;
@@ -1437,7 +1437,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
     return pSVData->mpUnoWrapper;
 }
 
-void Application::SetUnoWrapper( UnoWrapperBase* pWrapper )
+void UnoWrapperBase::SetUnoWrapper( UnoWrapperBase* pWrapper )
 {
     ImplSVData* pSVData = ImplGetSVData();
     SAL_WARN_IF( pSVData->mpUnoWrapper, "vcl", "SetUnoWrapper: Wrapper already exists" );

vcl/source/outdev/outdev.cxx

@@ -144,7 +144,7 @@ void OutputDevice::dispose()
 {
     if ( GetUnoGraphicsList() )
     {
-        UnoWrapperBase* pWrapper = Application::GetUnoWrapper( false );
+        UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper( false );
         if ( pWrapper )
             pWrapper->ReleaseAllGraphics( this );
         delete mpUnoGraphicsList;
@@ -357,7 +357,7 @@ void OutputDevice::SetOutOffYPixel(long nOutOffY)
 
 css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics()
 {
-    UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+    UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
     return pWrapper ? pWrapper->CreateGraphics( this ) : css::uno::Reference< css::awt::XGraphics >();
 }
 

vcl/source/window/menu.cxx

@@ -1310,7 +1310,7 @@ css::uno::Reference<css::accessibility::XAccessible> Menu::GetAccessible()
     }
     else if ( !mxAccessible.is() )
     {
-        UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+        UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
         if ( pWrapper )
             mxAccessible = pWrapper->CreateAccessible(this, IsMenuBar());
     }

vcl/source/window/window.cxx

@@ -225,7 +225,7 @@ void Window::dispose()
         }
     }
 
-    UnoWrapperBase* pWrapper = Application::GetUnoWrapper( false );
+    UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper( false );
     if ( pWrapper )
         pWrapper->WindowDestroyed( this );
 
@@ -3159,7 +3159,7 @@ Reference< css::awt::XWindowPeer > Window::GetComponentInterface( bool bCreate )
 {
     if ( !mpWindowImpl->mxWindowPeer.is() && bCreate )
     {
-        UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+        UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
         if ( pWrapper )
             mpWindowImpl->mxWindowPeer = pWrapper->GetWindowInterface( this );
     }
@@ -3168,7 +3168,7 @@ Reference< css::awt::XWindowPeer > Window::GetComponentInterface( bool bCreate )
 
 void Window::SetComponentInterface( Reference< css::awt::XWindowPeer > const & xIFace )
 {
-    UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+    UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
     SAL_WARN_IF( !pWrapper, "vcl.window", "SetComponentInterface: No Wrapper!" );
     if ( pWrapper )
         pWrapper->SetWindowInterface( this, xIFace );