include/toolkit/controls/unocontrolcontainermodel.hxx |    6 ++----
 include/toolkit/controls/unocontrolmodel.hxx          |    1 +
 solenv/clang-format/excludelist                       |    2 +-
 svx/source/svdraw/sdrpagewindow.cxx                   |    4 ++--
 toolkit/source/controls/unocontrolcontainermodel.cxx  |    2 +-
 toolkit/source/helper/vclunohelper.cxx                |    2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 2853601a8f28e88713215ae9273e204f84fbf76e
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jun 14 19:40:15 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jun 16 12:57:55 2025 +0200

    use more concrete UNO classes
    
    Change-Id: I14d12f6c577be7a47cead8c12c6db8d360e78867
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186527
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/toolkit/inc/controls/unocontrolcontainermodel.hxx 
b/include/toolkit/controls/unocontrolcontainermodel.hxx
similarity index 94%
rename from toolkit/inc/controls/unocontrolcontainermodel.hxx
rename to include/toolkit/controls/unocontrolcontainermodel.hxx
index 83db8af31b7c..e682e39ed789 100644
--- a/toolkit/inc/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -19,12 +19,10 @@
 
 #pragma once
 
-
+#include <toolkit/dllapi.h>
 #include <toolkit/controls/unocontrolmodel.hxx>
 
-
-
-class UnoControlContainerModel final : public UnoControlModel
+class TOOLKIT_DLLPUBLIC UnoControlContainerModel final : public UnoControlModel
 {
     css::uno::Any                                                      
ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
     ::cppu::IPropertyArrayHelper&                                      
getInfoHelper() override;
diff --git a/include/toolkit/controls/unocontrolmodel.hxx 
b/include/toolkit/controls/unocontrolmodel.hxx
index b1b2d4e54ddc..01a63ba57698 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
 
 #include <toolkit/dllapi.h>
+
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index f5c978a463f1..252944c0701f 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5952,6 +5952,7 @@ include/toolkit/awt/vclxwindows.hxx
 include/toolkit/controls/unocontrol.hxx
 include/toolkit/controls/unocontrolbase.hxx
 include/toolkit/controls/unocontrolcontainer.hxx
+include/toolkit/controls/unocontrolcontainermodel.hxx
 include/toolkit/controls/unocontrolmodel.hxx
 include/toolkit/controls/unocontrols.hxx
 include/toolkit/helper/accessiblefactory.hxx
@@ -13442,7 +13443,6 @@ toolkit/inc/controls/tabpagecontainer.hxx
 toolkit/inc/controls/tabpagemodel.hxx
 toolkit/inc/controls/tkscrollbar.hxx
 toolkit/inc/controls/treecontrolpeer.hxx
-toolkit/inc/controls/unocontrolcontainermodel.hxx
 toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/btndlg.hxx
 toolkit/inc/helper/imagealign.hxx
diff --git a/svx/source/svdraw/sdrpagewindow.cxx 
b/svx/source/svdraw/sdrpagewindow.cxx
index c0aae8e61521..51898101a2c3 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
+#include <toolkit/controls/unocontrolcontainermodel.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -96,9 +97,8 @@ rtl::Reference<UnoControlContainer> const & 
SdrPageWindow::GetControlContainer(
         else
         {
             // Printer and VirtualDevice, or rather: no OutDev
-            uno::Reference< lang::XMultiServiceFactory > xFactory( 
::comphelper::getProcessServiceFactory() );
             const_cast< SdrPageWindow* >( this )->mpImpl->mxControlContainer = 
new UnoControlContainer();
-            uno::Reference< awt::XControlModel > 
xModel(xFactory->createInstance(u"com.sun.star.awt.UnoControlContainerModel"_ustr),
 uno::UNO_QUERY);
+            rtl::Reference< UnoControlContainerModel > xModel(new 
UnoControlContainerModel(comphelper::getProcessComponentContext()));
             mpImpl->mxControlContainer->setModel(xModel);
 
             OutputDevice& rOutDev = rPaintWindow.GetOutputDevice();
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx 
b/toolkit/source/controls/unocontrolcontainermodel.cxx
index ee5512bb0c99..5a4b41efda13 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <controls/unocontrolcontainermodel.hxx>
+#include <toolkit/controls/unocontrolcontainermodel.hxx>
 #include <helper/property.hxx>
 
 #include <helper/unopropertyarrayhelper.hxx>
diff --git a/toolkit/source/helper/vclunohelper.cxx 
b/toolkit/source/helper/vclunohelper.cxx
index 2fa6503202bd..c83705fbca10 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -44,7 +44,7 @@
 #include <awt/vclxgraphics.hxx>
 #include <toolkit/awt/vclxfont.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
-#include <controls/unocontrolcontainermodel.hxx>
+#include <toolkit/controls/unocontrolcontainermodel.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/awt/Toolkit.hpp>

Reply via email to