summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/inc/app.hxx2
-rw-r--r--desktop/source/app/app.cxx4
-rw-r--r--include/test/bootstrapfixture.hxx2
-rw-r--r--include/vcl/cvtgrf.hxx8
-rw-r--r--include/vcl/svapp.hxx3
-rw-r--r--test/source/bootstrapfixture.cxx6
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/gdi/cvtgrf.cxx8
8 files changed, 18 insertions, 17 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 184c86f42875..92577f8b6a0d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -148,7 +148,7 @@ class Desktop : public Application
void OpenSplashScreen();
void CloseSplashScreen();
- DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData* );
+ DECL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void );
/** checks if the office is run the first time
<p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 153196386567..de739c8b4976 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1697,9 +1697,9 @@ int Desktop::doShutdown()
return EXIT_SUCCESS;
}
-IMPL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData )
+IMPL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, rData, bool )
{
- return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData );
+ return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( &rData );
}
bool Desktop::InitializeConfiguration()
diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx
index 069e470be156..f44c5b82d21b 100644
--- a/include/test/bootstrapfixture.hxx
+++ b/include/test/bootstrapfixture.hxx
@@ -46,7 +46,7 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase
bool m_bAssertOnDialog;
public:
- DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData* );
+ DECL_STATIC_LINK_TYPED( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool );
BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true );
virtual ~BootstrapFixture();
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index e311c39b6936..b869a61c181a 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -35,8 +35,8 @@ class VCL_DLLPUBLIC GraphicConverter
{
private:
- Link<> maFilterHdl;
- ConvertData* mpConvertData;
+ Link<ConvertData&,bool> maFilterHdl;
+ ConvertData* mpConvertData;
public:
@@ -48,8 +48,8 @@ public:
ConvertData* GetConvertData() { return mpConvertData; }
- void SetFilterHdl( const Link<>& rLink ) { maFilterHdl = rLink; }
- const Link<>& GetFilterHdl() const { return maFilterHdl; }
+ void SetFilterHdl( const Link<ConvertData&,bool>& rLink ) { maFilterHdl = rLink; }
+ const Link<ConvertData&,bool>& GetFilterHdl() const { return maFilterHdl; }
};
#endif // INCLUDED_VCL_CVTGRF_HXX
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c2b6d045466e..1d8392cd6b5a 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -58,6 +58,7 @@ class MouseEvent;
class ZoomEvent;
class ScrollEvent;
struct ImplSVEvent;
+struct ConvertData;
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/connection/XConnection.hpp>
@@ -1344,7 +1345,7 @@ public:
@see GetFilterHdl
*/
- static void SetFilterHdl( const Link<>& rLink );
+ static void SetFilterHdl( const Link<ConvertData&,bool>& rLink );
///@}
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index eb50025a9fd1..45fb98a2fb93 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -233,10 +233,10 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
#endif
}
-IMPL_STATIC_LINK(
- test::BootstrapFixture, ImplInitFilterHdl, ConvertData*, pData)
+IMPL_STATIC_LINK_TYPED(
+ test::BootstrapFixture, ImplInitFilterHdl, ConvertData&, rData, bool)
{
- return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData );
+ return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( &rData );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b25b738b1c19..320ea6409e3c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1430,7 +1430,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper )
return pSVData->mxDisplayConnection.get();
}
-void Application::SetFilterHdl( const Link<>& rLink )
+void Application::SetFilterHdl( const Link<ConvertData&,bool>& rLink )
{
ImplGetSVData()->maGDIData.mpGrfConverter->SetFilterHdl( rLink );
}
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 1dcd9490fed9..3d13c82d07e6 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -36,13 +36,13 @@ GraphicConverter::~GraphicConverter()
sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ConvertDataFormat nFormat )
{
GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
- sal_uLong nRet = ERRCODE_IO_GENERAL;
+ sal_uLong nRet = ERRCODE_IO_GENERAL;
if( pCvt && pCvt->GetFilterHdl().IsSet() )
{
ConvertData aData( rGraphic, rIStm, nFormat );
- if( pCvt->GetFilterHdl().Call( &aData ) )
+ if( pCvt->GetFilterHdl().Call( aData ) )
{
rGraphic = aData.maGraphic;
nRet = ERRCODE_NONE;
@@ -57,13 +57,13 @@ sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ConvertD
sal_uLong GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, ConvertDataFormat nFormat )
{
GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
- sal_uLong nRet = ERRCODE_IO_GENERAL;
+ sal_uLong nRet = ERRCODE_IO_GENERAL;
if( pCvt && pCvt->GetFilterHdl().IsSet() )
{
ConvertData aData( rGraphic, rOStm, nFormat );
- if( pCvt->GetFilterHdl().Call( &aData ) )
+ if( pCvt->GetFilterHdl().Call( aData ) )
nRet = ERRCODE_NONE;
else if( rOStm.GetError() )
nRet = rOStm.GetError();
generated by cgit (git 2.34.1) at 2025-01-16 12:45:49 +0000