summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--toolkit/inc/controls/accessiblecontrolcontext.hxx9
-rw-r--r--toolkit/source/controls/accessiblecontrolcontext.cxx32
2 files changed, 11 insertions, 30 deletions
diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index 31d5cf132a66..a61cf8a30227 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -86,16 +86,9 @@ namespace toolkit
vcl::Window* implGetWindow( css::uno::Reference< css::awt::XWindow >* _pxUNOWindow = nullptr ) const;
- /// ctor. @see Init
- OAccessibleControlContext();
+ OAccessibleControlContext(const css::uno::Reference<css::accessibility::XAccessible>& rxCreator);
virtual ~OAccessibleControlContext() override;
- /** late ctor
- */
- void Init(
- const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator
- );
-
// OCommonAccessibleComponent overridables
virtual css::awt::Rectangle implGetBounds( ) override;
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 9a070da4e9e7..220383037f47 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -46,26 +46,9 @@ namespace toolkit
//= OAccessibleControlContext
- OAccessibleControlContext::OAccessibleControlContext()
+ OAccessibleControlContext::OAccessibleControlContext(const Reference< XAccessible >& rxCreator)
{
- // nothing to do here, we have a late ctor
- }
-
-
- OAccessibleControlContext::~OAccessibleControlContext()
- {
- ensureDisposed();
- }
-
-
- void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator )
- {
- OContextEntryGuard aGuard( this );
-
- // retrieve the model of the control
- OSL_ENSURE( !m_xControlModel.is(), "OAccessibleControlContext::Init: already know a control model...!???" );
-
- Reference< awt::XControl > xControl( _rxCreator, UNO_QUERY );
+ Reference<awt::XControl> xControl(rxCreator, UNO_QUERY);
if ( xControl.is() )
m_xControlModel.set(xControl->getModel(), css::uno::UNO_QUERY);
OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: invalid creator (no control, or control without model!" );
@@ -76,7 +59,13 @@ namespace toolkit
startModelListening();
// announce the XAccessible to our base class
- comphelper::OAccessibleComponentHelper::lateInit( _rxCreator );
+ comphelper::OAccessibleComponentHelper::lateInit(rxCreator);
+ }
+
+
+ OAccessibleControlContext::~OAccessibleControlContext()
+ {
+ ensureDisposed();
}
@@ -85,8 +74,7 @@ namespace toolkit
rtl::Reference<OAccessibleControlContext> pNew;
try
{
- pNew = new OAccessibleControlContext;
- pNew->Init( _rxCreator );
+ pNew = new OAccessibleControlContext(_rxCreator);
}
catch( const Exception& )
{