strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use more concrete UNO type in toolkit

Browse source 
Change-Id: I3527b51948e6b23cc9448a2c98dbe2765cef48b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173158
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-09-11 09:02:23 +02:00
parent d0d45b3736
commit 4f86862b8a
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toolkit/inc/awt/vclxgraphics.hxx
View file

@ -32,6 +32,7 @@
#include <memory>
class OutputDevice;
class VCLXDevice;
namespace vcl { class Region; }
namespace com::sun::star::graphic { class XGraphic; }
@ -55,7 +56,7 @@ class VCLXGraphics final : public cppu::WeakImplHelper<
{
private:
// used to return same reference on each call to getDevice()
css::uno::Reference< css::awt::XDevice> mxDevice;
rtl::Reference<VCLXDevice> mxDevice;
VclPtr<OutputDevice> mpOutputDevice;
vcl::Font maFont;

5
toolkit/inc/awt/vclxprinter.hxx
View file

@ -37,6 +37,7 @@
namespace com::sun::star::awt { class XPrinter; }
namespace vcl { class OldStylePrintAdaptor; }
class Printer;
class VCLXDevice;
// relevant properties for the printer:
/*
@ -58,7 +59,7 @@ class VCLXPrinterPropertySet :public VCLXPrinterPropertySet_Base
{
protected:
VclPtr<Printer> mxPrinter;
css::uno::Reference< css::awt::XDevice > mxPrnDevice;
rtl::Reference< VCLXDevice > mxPrnDevice;
sal_Int16 mnOrientation;
bool mbHorizontal;
@ -67,7 +68,7 @@ public:
virtual ~VCLXPrinterPropertySet() override;
Printer* GetPrinter() const { return mxPrinter.get(); }
css::uno::Reference< css::awt::XDevice > const & GetDevice();
rtl::Reference< VCLXDevice > const & GetDevice();
// css::uno::XInterface
DECLARE_XINTERFACE();

2
toolkit/inc/controls/controlmodelcontainerbase.hxx
View file

@ -223,7 +223,7 @@ protected:
bool mbSizeModified;
bool mbPosModified;
rtl::Reference< StdTabController > mxTabController;
css::uno::Reference< css::util::XModifyListener > mxListener;
rtl::Reference< ResourceListener > mxListener;
void ImplInsertControl( css::uno::Reference< css::awt::XControlModel > const & rxModel, const OUString& rName );
void ImplRemoveControl( css::uno::Reference< css::awt::XControlModel > const & rxModel );

4
toolkit/inc/controls/geometrycontrolmodel.hxx
View file

@ -36,7 +36,7 @@ namespace com::sun::star {
class XComponentContext;
}
}
namespace toolkit { class ScriptEventContainer; }
// namespace toolkit
// {
@ -56,7 +56,7 @@ namespace com::sun::star {
protected:
css::uno::Reference< css::uno::XAggregation >
m_xAggregate;
css::uno::Reference< css::container::XNameContainer >
rtl::Reference< toolkit::ScriptEventContainer >
mxEventContainer;
// <properties>

2
toolkit/source/awt/vclxprinter.cxx
View file

@ -62,7 +62,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
mxPrinter.reset();
}
css::uno::Reference< css::awt::XDevice > const & VCLXPrinterPropertySet::GetDevice()
rtl::Reference< VCLXDevice > const & VCLXPrinterPropertySet::GetDevice()
{
if ( !mxPrnDevice.is() )
{