summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/browserline.cxx3
-rw-r--r--extensions/source/propctrlr/commoncontrol.hxx14
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx3
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx5
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx7
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx5
-rw-r--r--extensions/source/propctrlr/propeventtranslation.cxx13
-rw-r--r--extensions/source/propctrlr/propeventtranslation.hxx6
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx20
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx12
-rw-r--r--extensions/source/propctrlr/usercontrol.hxx10
11 files changed, 29 insertions, 69 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index c77d211314a0..53a58966e25d 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -26,7 +26,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/propertyvalue.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
#include <tools/debug.hxx>
#include <comphelper/diagnose_ex.hxx>
@@ -111,7 +110,7 @@ namespace pcr
{
m_xControl = rxControl;
auto xWindow = m_xControl->getControlWindow();
- if (weld::TransportAsXWindow* pTunnel = comphelper::getFromUnoTunnel<weld::TransportAsXWindow>(xWindow))
+ if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xWindow.get()))
m_pControlWindow = pTunnel->getWidget();
else
m_pControlWindow = nullptr;
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index eb92980eaff2..746f2f56f600 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -107,13 +107,13 @@ namespace pcr
@param TControlWindow
a class which is derived from weld::Widget
*/
- template < class TControlWindow, class... TControlInterface >
+ template < class TControlInterface, class TControlWindow >
class CommonBehaviourControl :public ::cppu::BaseMutex
- ,public ::cppu::WeakComponentImplHelper< TControlInterface... >
+ ,public ::cppu::WeakComponentImplHelper< TControlInterface >
,public CommonBehaviourControlHelper
{
protected:
- typedef ::cppu::WeakComponentImplHelper< TControlInterface... > ComponentBaseClass;
+ typedef ::cppu::WeakComponentImplHelper< TControlInterface > ComponentBaseClass;
inline CommonBehaviourControl(sal_Int16 nControlType,
std::unique_ptr<weld::Builder> xBuilder,
@@ -179,8 +179,8 @@ namespace pcr
};
//= CommonBehaviourControl - implementation
- template< class TControlWindow, class... TControlInterface >
- inline CommonBehaviourControl< TControlWindow, TControlInterface... >::CommonBehaviourControl(sal_Int16 nControlType,
+ template< class TControlInterface, class TControlWindow >
+ inline CommonBehaviourControl< TControlInterface, TControlWindow >::CommonBehaviourControl(sal_Int16 nControlType,
std::unique_ptr<weld::Builder> xBuilder,
std::unique_ptr<TControlWindow> xWidget,
bool bReadOnly)
@@ -196,8 +196,8 @@ namespace pcr
}
}
- template< class TControlWindow, class... TControlInterface >
- inline void CommonBehaviourControl< TControlWindow, TControlInterface... >::impl_checkDisposed_throw()
+ template< class TControlInterface, class TControlWindow >
+ inline void CommonBehaviourControl< TControlInterface, TControlWindow >::impl_checkDisposed_throw()
{
if ( ComponentBaseClass::rBHelper.bDisposed )
throw css::lang::DisposedException( OUString(), *this );
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index c53b8eacc909..40aceed5dfe7 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/xsd/DataTypeClass.hpp>
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <comphelper/diagnose_ex.hxx>
-#include <comphelper/servicehelper.hxx>
#include <algorithm>
#include <o3tl/functional.hxx>
@@ -244,7 +243,7 @@ namespace pcr
::comphelper::OInterfaceIteratorHelper3 aListenerIterator(m_aPropertyListeners);
while ( aListenerIterator.hasMoreElements() )
{
- PropertyEventTranslation* pTranslator = comphelper::getFromUnoTunnel< PropertyEventTranslation >( aListenerIterator.next() );
+ PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( aListenerIterator.next().get() );
OSL_ENSURE( pTranslator, "EFormsHelper::impl_toggleBindingPropertyListening_throw: invalid listener element in my container!" );
if ( !pTranslator )
continue;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index a4e76388a413..dd4f1302fc31 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -77,7 +77,6 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <comphelper/extract.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbconversion.hxx>
#include <connectivity/dbexception.hxx>
@@ -1709,7 +1708,7 @@ namespace pcr
catch( const UnknownPropertyException& ) {}
if ( xControl.is() )
{
- OFormattedNumericControl* pControl = comphelper::getFromUnoTunnel< OFormattedNumericControl >( xControl );
+ OFormattedNumericControl* pControl = dynamic_cast< OFormattedNumericControl* >( xControl.get() );
DBG_ASSERT( pControl, "FormComponentPropertyHandler::actuatingPropertyChanged: invalid control!" );
if (pControl)
{
@@ -1755,7 +1754,7 @@ namespace pcr
catch( const UnknownPropertyException& ) {}
if ( xControl.is() )
{
- OFormattedNumericControl* pControl = comphelper::getFromUnoTunnel< OFormattedNumericControl >( xControl );
+ OFormattedNumericControl* pControl = dynamic_cast< OFormattedNumericControl* >( xControl.get() );
DBG_ASSERT( pControl, "FormComponentPropertyHandler::actuatingPropertyChanged: invalid control!" );
if ( pControl )
pControl->SetFormatDescription( aNewDesc );
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index dfa83ff0c6e8..77743c622ad7 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/inspection/XStringListControl.hpp>
#include <com/sun/star/inspection/XNumericControl.hpp>
#include <comphelper/diagnose_ex.hxx>
-#include <comphelper/servicehelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
@@ -292,10 +291,8 @@ namespace pcr
std::unique_ptr<weld::Builder> PropertyHandlerHelper::makeBuilder(const OUString& rUIFile, const Reference<XComponentContext>& rContext)
{
Reference<XWindow> xWindow(rContext->getValueByName("BuilderParent"), UNO_QUERY_THROW);
- weld::TransportAsXWindow* pTunnel
- = comphelper::getFromUnoTunnel<weld::TransportAsXWindow>(xWindow);
- assert(pTunnel && "must exist");
- return Application::CreateBuilder(pTunnel->getWidget(), rUIFile);
+ weld::TransportAsXWindow& rTunnel = dynamic_cast<weld::TransportAsXWindow&>(*xWindow);
+ return Application::CreateBuilder(rTunnel.getWidget(), rUIFile);
}
void PropertyHandlerHelper::setBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent)
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 92556e1c05ad..b0516fd90903 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/util/VetoException.hpp>
#include <tools/debug.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <comphelper/servicehelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -339,7 +338,7 @@ namespace pcr
OUString sUIFile("modules/spropctrlr/ui/formproperties.ui");
std::unique_ptr<weld::Builder> xBuilder;
- if (weld::TransportAsXWindow* pTunnel = comphelper::getFromUnoTunnel<weld::TransportAsXWindow>(xContainerWindow))
+ if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xContainerWindow.get()))
{
xBuilder = Application::CreateBuilder(pTunnel->getWidget(), sUIFile);
}
@@ -1108,7 +1107,7 @@ namespace pcr
// for ui-testing try and distinguish different instances of the controls
auto xWindow = _rDescriptor.Control->getControlWindow();
- if (weld::TransportAsXWindow* pTunnel = comphelper::getFromUnoTunnel<weld::TransportAsXWindow>(xWindow))
+ if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xWindow.get()))
{
weld::Widget* m_pControlWindow = pTunnel->getWidget();
if (m_pControlWindow)
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index ce8e794f2211..736c1e06fca2 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -20,7 +20,6 @@
#include "propeventtranslation.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
-#include <comphelper/servicehelper.hxx>
namespace pcr
@@ -49,18 +48,6 @@ namespace pcr
}
- sal_Int64 PropertyEventTranslation::getSomething(
- css::uno::Sequence<sal_Int8> const & aIdentifier)
- {
- return comphelper::getSomethingImpl(aIdentifier, this);
- }
-
- css::uno::Sequence<sal_Int8> const & PropertyEventTranslation::getUnoTunnelId() {
- static comphelper::UnoIdInit const id;
- return id.getSeq();
- }
-
-
void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt )
{
if ( !m_xDelegator.is() )
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index 92e143dfbbc2..43155b8c67f9 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase.hxx>
@@ -30,7 +29,7 @@ namespace pcr
//= PropertyEventTranslation
- typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener, css::lang::XUnoTunnel
+ typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener
> PropertyEventTranslation_Base;
class PropertyEventTranslation : public PropertyEventTranslation_Base
@@ -53,9 +52,6 @@ namespace pcr
const css::uno::Reference< css::beans::XPropertyChangeListener >&
getDelegator() const { return m_xDelegator; }
- sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
- static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
protected:
// XPropertyChangeListener
virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index df8924be806e..fcd194886a1a 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -33,7 +33,7 @@
namespace pcr
{
//= OTimeControl
- typedef CommonBehaviourControl<weld::FormattedSpinButton, css::inspection::XPropertyControl> OTimeControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::FormattedSpinButton> OTimeControl_Base;
class OTimeControl : public OTimeControl_Base
{
std::unique_ptr<weld::TimeFormatter> m_xFormatter;
@@ -61,7 +61,7 @@ namespace pcr
};
//= ODateControl
- typedef CommonBehaviourControl<weld::Container, css::inspection::XPropertyControl> ODateControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::Container> ODateControl_Base;
class ODateControl : public ODateControl_Base
{
std::unique_ptr<weld::Entry> m_xEntry;
@@ -97,7 +97,7 @@ namespace pcr
};
//= OEditControl
- typedef CommonBehaviourControl<weld::Entry, css::inspection::XPropertyControl> OEditControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::Entry> OEditControl_Base;
class OEditControl final : public OEditControl_Base
{
bool m_bIsPassword : 1;
@@ -123,7 +123,7 @@ namespace pcr
};
//= ODateTimeControl
- typedef CommonBehaviourControl<weld::Container, css::inspection::XPropertyControl> ODateTimeControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::Container> ODateTimeControl_Base;
class ODateTimeControl : public ODateTimeControl_Base
{
private:
@@ -162,7 +162,7 @@ namespace pcr
};
//= OHyperlinkControl
- typedef CommonBehaviourControl<weld::Container, css::inspection::XHyperlinkControl> OHyperlinkControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XHyperlinkControl, weld::Container> OHyperlinkControl_Base;
class OHyperlinkControl final : public OHyperlinkControl_Base
{
private:
@@ -203,7 +203,7 @@ namespace pcr
};
//= ONumericControl
- typedef CommonBehaviourControl<weld::MetricSpinButton, css::inspection::XNumericControl> ONumericControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XNumericControl, weld::MetricSpinButton> ONumericControl_Base;
class ONumericControl : public ONumericControl_Base
{
private:
@@ -255,7 +255,7 @@ namespace pcr
};
//= OColorControl
- typedef CommonBehaviourControl<ColorListBox, css::inspection::XPropertyControl> OColorControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, ColorListBox> OColorControl_Base;
class OColorControl : public OColorControl_Base
{
public:
@@ -281,7 +281,7 @@ namespace pcr
};
//= OListboxControl
- typedef CommonBehaviourControl<weld::ComboBox, css::inspection::XStringListControl> OListboxControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XStringListControl, weld::ComboBox> OListboxControl_Base;
class OListboxControl : public OListboxControl_Base
{
public:
@@ -311,7 +311,7 @@ namespace pcr
};
//= OComboboxControl
- typedef CommonBehaviourControl< weld::ComboBox, css::inspection::XStringListControl > OComboboxControl_Base;
+ typedef CommonBehaviourControl< css::inspection::XStringListControl, weld::ComboBox > OComboboxControl_Base;
class OComboboxControl final : public OComboboxControl_Base
{
public:
@@ -351,7 +351,7 @@ namespace pcr
};
//= OMultilineEditControl
- typedef CommonBehaviourControl<weld::Container, css::inspection::XPropertyControl> OMultilineEditControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::Container> OMultilineEditControl_Base;
class OMultilineEditControl : public OMultilineEditControl_Base
{
private:
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 854abfa72037..8cccb48e84b5 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -20,7 +20,6 @@
#include "usercontrol.hxx"
#include <com/sun/star/inspection/PropertyControlType.hpp>
-#include <comphelper/servicehelper.hxx>
#include <svl/numuno.hxx>
#include <vcl/GraphicObject.hxx>
#include <vcl/event.hxx>
@@ -200,17 +199,6 @@ namespace pcr
return ::cppu::UnoType<double>::get();
}
- sal_Int64 OFormattedNumericControl::getSomething(
- css::uno::Sequence<sal_Int8> const & aIdentifier)
- {
- return comphelper::getSomethingImpl(aIdentifier, this);
- }
-
- css::uno::Sequence<sal_Int8> const & OFormattedNumericControl::getUnoTunnelId() {
- static comphelper::UnoIdInit const id;
- return id.getSeq();
- }
-
void OFormattedNumericControl::SetFormatDescription(const FormatDescription& rDesc)
{
bool bFallback = true;
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index bb7a622d7669..86b53e7f122e 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -20,7 +20,6 @@
#pragma once
#include "commoncontrol.hxx"
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <svtools/inettbc.hxx>
#include <svl/zforlist.hxx>
@@ -29,7 +28,7 @@ class SvNumberFormatsSupplierObj;
namespace pcr
{
//= OFormatSampleControl
- typedef CommonBehaviourControl<weld::Container, css::inspection::XPropertyControl> OFormatSampleControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::Container> OFormatSampleControl_Base;
class OFormatSampleControl : public OFormatSampleControl_Base
{
private:
@@ -85,7 +84,7 @@ namespace pcr
};
//= OFormattedNumericControl
- typedef CommonBehaviourControl<weld::FormattedSpinButton, css::inspection::XPropertyControl, css::lang::XUnoTunnel> OFormattedNumericControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::FormattedSpinButton> OFormattedNumericControl_Base;
class OFormattedNumericControl : public OFormattedNumericControl_Base
{
public:
@@ -96,9 +95,6 @@ namespace pcr
virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
virtual css::uno::Type SAL_CALL getValueType() override;
- sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
- static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
void SetFormatDescription( const FormatDescription& rDesc );
// make some FormattedField methods available
@@ -119,7 +115,7 @@ namespace pcr
};
//= OFileUrlControl
- typedef CommonBehaviourControl<SvtURLBox, css::inspection::XPropertyControl> OFileUrlControl_Base;
+ typedef CommonBehaviourControl<css::inspection::XPropertyControl, SvtURLBox> OFileUrlControl_Base;
class OFileUrlControl : public OFileUrlControl_Base
{
private:
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 09:09:50 +0000