summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-02-17 16:53:53 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2011-02-17 16:53:53 +0100
commit74cc209439d9f239f929fed3f5ebbab1ef81439d (patch)
tree8d9fc2a93a061ec34ab26f0d48705b55595516e2 /svx
parent3b630726e69547741b1ed567d65e87a0f53d18b4 (diff)
parentfe7c78ed3c5f826462da773f019e5df7a21fa7ac (diff)
CWS-TOOLING: integrate CWS gridsort
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/fmgridif.cxx3
-rw-r--r--svx/source/form/formcontroller.cxx7
2 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 47aeceda995b..0dce12e13cfb 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -365,7 +365,8 @@ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference
DBG_NAME(FmXGridControl )
//------------------------------------------------------------------------------
FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFactory)
- :m_aModifyListeners(*this, GetMutex())
+ :UnoControl( _rxFactory)
+ ,m_aModifyListeners(*this, GetMutex())
,m_aUpdateListeners(*this, GetMutex())
,m_aContainerListeners(*this, GetMutex())
,m_aSelectionListeners(*this, GetMutex())
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 528661d2abe4..6f6cdbf9c2a6 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -479,7 +479,10 @@ class FmXAutoControl: public UnoControl
friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl();
public:
- FmXAutoControl(){}
+ FmXAutoControl( const ::comphelper::ComponentContext& i_context )
+ :UnoControl( i_context.getLegacyServiceFactory() )
+ {
+ }
virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString::createFromAscii("Edit");}
virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException );
@@ -1451,7 +1454,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
&& ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_AUTOINCREMENT ) )
)
{
- replaceControl( xControl, new FmXAutoControl );
+ replaceControl( xControl, new FmXAutoControl( m_aContext ) );
}
}
}