1 files changed, 12 insertions, 16 deletions

diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index c84ba34cfb95..02187ee2aabd 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
@@ -61,7 +61,6 @@ namespace frm
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::awt;
-    using namespace ::com::sun::star::io;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::frame;
@@ -85,10 +84,10 @@ namespace frm
     OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XComponentContext>& _rxFactory, const OUString& _aService)
         :OControl(_rxFactory, _aService)
         ,m_aSubmissionVetoListeners( m_aMutex )
+        ,m_aFeatureInterception( _rxFactory )
         ,m_aApproveActionListeners( m_aMutex )
         ,m_aActionListeners( m_aMutex )
     {
-        m_pFeatureInterception.reset( new ControlFeatureInterception( _rxFactory ) );
     }
 
 
@@ -129,13 +128,13 @@ namespace frm
 
     void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
-        m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor  );
+        m_aFeatureInterception.registerDispatchProviderInterceptor( _rxInterceptor  );
     }
 
 
     void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
-        m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor  );
+        m_aFeatureInterception.releaseDispatchProviderInterceptor( _rxInterceptor  );
     }
 
     // OComponentHelper
@@ -146,7 +145,7 @@ namespace frm
         m_aApproveActionListeners.disposeAndClear( aEvent );
         m_aActionListeners.disposeAndClear( aEvent );
         m_aSubmissionVetoListeners.disposeAndClear( aEvent );
-        m_pFeatureInterception->dispose();
+        m_aFeatureInterception.dispose();
 
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -234,7 +233,7 @@ namespace frm
             case FormButtonType_SUBMIT:
             {
                 // if some outer component can provide an interaction handler, use it
-                Reference< XInteractionHandler > xHandler( m_pFeatureInterception->queryDispatch( "private:/InteractionHandler" ), UNO_QUERY );
+                Reference< XInteractionHandler > xHandler( m_aFeatureInterception.queryDispatch( "private:/InteractionHandler" ), UNO_QUERY );
                 try
                 {
                     implSubmit( rEvt, xHandler );
@@ -292,7 +291,7 @@ namespace frm
                 xSet->getPropertyValue(PROPERTY_DISPATCHURLINTERNAL) >>= bDispatchUrlInternal;
                 if ( bDispatchUrlInternal )
                 {
-                    m_pFeatureInterception->getTransformer().parseSmartWithProtocol( aURL, INET_FILE_SCHEME );
+                    m_aFeatureInterception.getTransformer().parseSmartWithProtocol( aURL, INET_FILE_SCHEME );
 
                     OUString aTargetFrame;
                     xSet->getPropertyValue(PROPERTY_TARGET_FRAME) >>= aTargetFrame;
@@ -301,17 +300,14 @@ namespace frm
                             FrameSearchFlag::SELF | FrameSearchFlag::PARENT |
                             FrameSearchFlag::SIBLINGS | FrameSearchFlag::CREATE );
 
-                    Sequence<PropertyValue> aArgs(1);
-                    PropertyValue& rProp = aArgs.getArray()[0];
-                    rProp.Name = "Referer";
-                    rProp.Value <<= xModel->getURL();
+                    Sequence<PropertyValue> aArgs { comphelper::makePropertyValue("Referer", xModel->getURL()) };
 
                     if (xDisp.is())
                         xDisp->dispatch( aURL, aArgs );
                 }
                 else
                 {
-                    URL aHyperLink = m_pFeatureInterception->getTransformer().getStrictURL( ".uno:OpenHyperlink" );
+                    URL aHyperLink = m_aFeatureInterception.getTransformer().getStrictURL( ".uno:OpenHyperlink" );
 
                     Reference< XDispatch >  xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink, OUString() , 0);
 
@@ -800,10 +796,10 @@ namespace frm
     {
         switch (nHandle)
         {
-            case PROPERTY_ID_BUTTONTYPE             : return makeAny( FormButtonType_PUSH );
+            case PROPERTY_ID_BUTTONTYPE             : return Any( FormButtonType_PUSH );
             case PROPERTY_ID_TARGET_URL             :
-            case PROPERTY_ID_TARGET_FRAME           : return makeAny( OUString() );
-            case PROPERTY_ID_DISPATCHURLINTERNAL    : return makeAny( false );
+            case PROPERTY_ID_TARGET_FRAME           : return Any( OUString() );
+            case PROPERTY_ID_DISPATCHURLINTERNAL    : return Any( false );
             default:
                 return OControlModel::getPropertyDefaultByHandle(nHandle);
         }