summaryrefslogtreecommitdiff
path: root/UnoControls/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-07-24 14:41:35 +0200
committerNoel Grandin <noel@peralex.com>2013-07-24 14:44:57 +0200
commit96bd18f692f933b328facf75eb200114bb55eee7 (patch)
tree21c39e18db9b6d501b36972c9df93c553d2aa493 /UnoControls/source
parentf5bf0fa958a709394be833584ed610a2d759ca32 (diff)
fdo#67213 - crash on opening AutoText dialog (Ctrl+F3
Revert "fdo#46808, Convert frame::FrameControl service to new style" This reverts commit 32eaa77db33b3b1f5793e92167b9f8c2708ea543. Conflicts: UnoControls/source/controls/framecontrol.cxx UnoControls/source/inc/framecontrol.hxx .. because I can't work out how it causes fdo#67213 - I suspect my changes might be interacting with UNO aggregation, which is always tricky. Change-Id: Icd14f9a7df98585393c5527a3817e05c26246de9
Diffstat (limited to 'UnoControls/source')
-rw-r--r--UnoControls/source/controls/framecontrol.cxx11
-rw-r--r--UnoControls/source/inc/framecontrol.hxx111
2 files changed, 11 insertions, 111 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 957a3339a3bc..6c30ee8c0f6f 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -46,17 +46,6 @@ using namespace ::com::sun::star::util ;
namespace unocontrols{
-#define SERVICENAME_FRAMECONTROL "com.sun.star.frame.FrameControl"
-#define IMPLEMENTATIONNAME_FRAMECONTROL "stardiv.UnoControls.FrameControl"
-#define PROPERTYNAME_LOADERARGUMENTS "LoaderArguments"
-#define PROPERTYNAME_COMPONENTURL "ComponentURL"
-#define PROPERTYNAME_FRAME "Frame"
-#define PROPERTY_COUNT 3 // you must count the propertys
-#define PROPERTYHANDLE_COMPONENTURL 0 // Id must be the index into the array
-#define PROPERTYHANDLE_FRAME 1
-#define PROPERTYHANDLE_LOADERARGUMENTS 2
-
-
//______________________________________________________________________________________________________________
// construct/destruct
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 285a2a9e4aff..ed97527b3793 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -21,7 +21,6 @@
#define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XFrameControl.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/frame/XFrame2.hpp>
#include <com/sun/star/frame/FrameActionEvent.hpp>
@@ -40,13 +39,23 @@
namespace unocontrols{
+#define SERVICENAME_FRAMECONTROL "com.sun.star.frame.FrameControl"
+#define IMPLEMENTATIONNAME_FRAMECONTROL "stardiv.UnoControls.FrameControl"
+#define PROPERTYNAME_LOADERARGUMENTS "LoaderArguments"
+#define PROPERTYNAME_COMPONENTURL "ComponentURL"
+#define PROPERTYNAME_FRAME "Frame"
+#define ERRORTEXT_VOSENSHURE "This is an invalid property handle."
+#define PROPERTY_COUNT 3 // you must count the propertys
+#define PROPERTYHANDLE_COMPONENTURL 0 // Id must be the index into the array
+#define PROPERTYHANDLE_FRAME 1
+#define PROPERTYHANDLE_LOADERARGUMENTS 2
+
//______________________________________________________________________________________________________________
// class
//______________________________________________________________________________________________________________
class FrameControl : public ::com::sun::star::awt::XControlModel
, public ::com::sun::star::lang::XConnectionPointContainer
- , public ::com::sun::star::frame::XFrameControl
, public BaseControl // This order is necessary for right initialization of m_aMutex!
, public ::cppu::OBroadcastHelper
, public ::cppu::OPropertySetHelper
@@ -175,104 +184,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
) throw( ::com::sun::star::uno::RuntimeException );
-
- //__________________________________________________________________________________________________________
- // XFrameControl
- //__________________________________________________________________________________________________________
-
- virtual rtl::OUString SAL_CALL getComponentURL()
- throw( ::com::sun::star::uno::RuntimeException )
- { return m_sComponentURL; }
- virtual void SAL_CALL setComponentURL(const rtl::OUString& rVal)
- throw( ::com::sun::star::uno::RuntimeException )
- { m_sComponentURL = rVal; }
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > SAL_CALL getFrame()
- throw( ::com::sun::star::uno::RuntimeException )
- { return m_xFrame; }
- virtual void SAL_CALL setFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > & rxFrame)
- throw( ::com::sun::star::uno::RuntimeException )
- { m_xFrame = rxFrame; }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getLoaderArguments()
- throw( ::com::sun::star::uno::RuntimeException )
- { return m_seqLoaderArguments; }
- virtual void SAL_CALL setLoaderArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & rVal)
- throw( ::com::sun::star::uno::RuntimeException )
- { m_seqLoaderArguments = rVal; }
-
- //__________________________________________________________________________________________________________
- // overrides to remove inheritance ambiguity
- //__________________________________________________________________________________________________________
- virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException)
- { return BaseControl::getPeer(); }
- virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException)
- { return BaseControl::getPosSize(); }
- virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (css::uno::RuntimeException)
- { return BaseControl::setPosSize(p1, p2, p3, p4, p5); }
- virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addEventListener(p1); }
- virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeEventListener(p1); }
- virtual void SAL_CALL setVisible(sal_Bool p1) throw (css::uno::RuntimeException)
- { return BaseControl::setVisible(p1); }
- virtual void SAL_CALL setEnable(sal_Bool p1) throw (css::uno::RuntimeException)
- { return BaseControl::setEnable(p1); }
- virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException)
- { return BaseControl::setFocus(); }
- virtual void SAL_CALL addWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addWindowListener(p1); }
- virtual void SAL_CALL removeWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeWindowListener(p1); }
- virtual void SAL_CALL addFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addFocusListener(p1); }
- virtual void SAL_CALL removeFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeFocusListener(p1); }
- virtual void SAL_CALL addKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addKeyListener(p1); }
- virtual void SAL_CALL removeKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeKeyListener(p1); }
- virtual void SAL_CALL addMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addMouseListener(p1); }
- virtual void SAL_CALL removeMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeMouseListener(p1); }
- virtual void SAL_CALL addMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addMouseMotionListener(p1); }
- virtual void SAL_CALL removeMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removeMouseMotionListener(p1); }
- virtual void SAL_CALL addPaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::addPaintListener(p1); }
- virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::removePaintListener(p1); }
- virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException)
- { return BaseControl::getSize(); }
- virtual void SAL_CALL draw(sal_Int32 p1, sal_Int32 p2) throw (css::uno::RuntimeException)
- { return BaseControl::draw(p1, p2); }
- virtual void SAL_CALL setZoom(float p1, float p2) throw (css::uno::RuntimeException)
- { return BaseControl::setZoom(p1, p2); }
- virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::setPropertyValue(p1, p2); }
- virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::getPropertyValue(p1); }
- virtual void SAL_CALL SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
- { return ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& p1) throw (css::uno::RuntimeException)
- { return BaseControl::setContext(p1); }
- virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException)
- { return BaseControl::getContext(); }
- virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException)
- { return BaseControl::getView(); }
- virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (css::uno::RuntimeException)
- { return BaseControl::setDesignMode(p1); }
- virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException)
- { return BaseControl::isDesignMode(); }
- virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException)
- { return BaseControl::isTransparent(); }
-
//__________________________________________________________________________________________________________
// impl but public methods to register service!
//__________________________________________________________________________________________________________