tdf#111970 svx: use SolarMutex for locking in FmXFormShell

FmXFormShell has a confusing mess of 3 of its own locks plus some
SolarMutexGuards in a couple functions.

But despite all that, most members are accessed without any locking.

First, add a "_Lock" suffix to all (non-API) functions that access
members or call into VCL, then add SolarMutexGuard in all API entry
points that call _Lock functions, and finally remove the existing
silly mutex members.

This should also fix the reported assertion (which probably doesn't
happen on master any more since the Scheduler has its own mutex now).

Change-Id: I215cdfe49ffe675229baa4b19ab419f440f0ffb0

1 files changed, 94 insertions, 100 deletions

diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 9a08becee8ff..37aa7c74b46f 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -176,11 +176,6 @@ class SVX_DLLPUBLIC FmXFormShell   : public FmXFormShell_BASE
         // we explicitly switch off the propbrw before leaving the design mode
         // this flag tells us if we have to switch it on again when reentering
 
-    ::osl::Mutex    m_aAsyncSafety;
-        // secure the access to our thread related members
-    ::osl::Mutex    m_aInvalidationSafety;
-        // secure the access to all our slot invalidation related members
-
     css::form::NavigationBarMode   m_eNavigate;                // kind of navigation
 
         // since I want to mark an SdrObject when searching for the treatment of the "found",
@@ -252,14 +247,14 @@ class SVX_DLLPUBLIC FmXFormShell   : public FmXFormShell_BASE
 public:
     // attribute access
     SAL_DLLPRIVATE const css::uno::Reference< css::frame::XFrame >&
-                getHostFrame() const { return m_xAttachedFrame; }
+                getHostFrame_Lock() const { return m_xAttachedFrame; }
     SAL_DLLPRIVATE const css::uno::Reference< css::sdbc::XResultSet >&
-                getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }
+                getExternallyDisplayedForm_Lock() const { return m_xExternalDisplayedForm; }
 
     SAL_DLLPRIVATE bool
-                didPrepareClose() const { return m_bPreparedClose; }
+                didPrepareClose_Lock() const { return m_bPreparedClose; }
     SAL_DLLPRIVATE void
-                didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }
+                didPrepareClose_Lock(bool bDid) { m_bPreparedClose = bDid; }
 
 public:
     SAL_DLLPRIVATE FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
@@ -289,53 +284,53 @@ protected:
     SAL_DLLPRIVATE virtual void SAL_CALL disposing() override;
 
 public:
-    SAL_DLLPRIVATE void EnableTrackProperties( bool bEnable) { m_bTrackProperties = bEnable; }
-    SAL_DLLPRIVATE bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
+    SAL_DLLPRIVATE void EnableTrackProperties_Lock(bool bEnable) { m_bTrackProperties = bEnable; }
+    SAL_DLLPRIVATE bool IsTrackPropertiesEnabled_Lock() { return m_bTrackProperties; }
 
     // activation handling
-    SAL_DLLPRIVATE void        viewActivated( FmFormView& _rCurrentView, bool _bSyncAction = false );
-    SAL_DLLPRIVATE void        viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController = true );
+    SAL_DLLPRIVATE void        viewActivated_Lock(FmFormView& _rCurrentView, bool _bSyncAction = false);
+    SAL_DLLPRIVATE void        viewDeactivated_Lock(FmFormView& _rCurrentView, bool _bDeactivateController = true);
 
     // IControllerFeatureInvalidation
-    SAL_DLLPRIVATE virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) override;
+    SAL_DLLPRIVATE virtual void invalidateFeatures/*_NoLock*/( const ::std::vector< sal_Int32 >& _rFeatures ) override;
 
-    SAL_DLLPRIVATE void ExecuteTabOrderDialog(         // execute SID_FM_TAB_DIALOG
+    SAL_DLLPRIVATE void ExecuteTabOrderDialog_Lock( // execute SID_FM_TAB_DIALOG
         const css::uno::Reference< css::awt::XTabControllerModel >& _rxForForm
     );
 
     // stuff
-    SAL_DLLPRIVATE void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
-    SAL_DLLPRIVATE void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element);
+    SAL_DLLPRIVATE void AddElement_Lock(const css::uno::Reference< css::uno::XInterface>& Element);
+    SAL_DLLPRIVATE void RemoveElement_Lock(const css::uno::Reference< css::uno::XInterface>& Element);
 
     /** updates m_xForms, to be either <NULL/>, if we're in alive mode, or our current page's forms collection,
         if in design mode
     */
-    SAL_DLLPRIVATE void UpdateForms( bool _bInvalidate );
+    SAL_DLLPRIVATE void UpdateForms_Lock(bool bInvalidate);
 
-    SAL_DLLPRIVATE void ExecuteSearch();               // execute SID_FM_SEARCH
-    SAL_DLLPRIVATE void CreateExternalView();          // execute SID_FM_VIEW_AS_GRID
+    SAL_DLLPRIVATE void ExecuteSearch_Lock();      // execute SID_FM_SEARCH
+    SAL_DLLPRIVATE void CreateExternalView_Lock(); // execute SID_FM_VIEW_AS_GRID
 
-    SAL_DLLPRIVATE bool        GetY2KState(sal_uInt16& n);
-    SAL_DLLPRIVATE void        SetY2KState(sal_uInt16 n);
+    SAL_DLLPRIVATE bool GetY2KState_Lock(sal_uInt16 & n);
+    SAL_DLLPRIVATE void SetY2KState_Lock(sal_uInt16 n);
 
 protected:
     // form handling
     /// load or unload the forms on a page
-    SAL_DLLPRIVATE         void        loadForms( FmFormPage* _pPage, const LoadFormsFlags _nBehaviour );
-    SAL_DLLPRIVATE         void        smartControlReset( const css::uno::Reference< css::container::XIndexAccess >& _rxModels );
+    SAL_DLLPRIVATE void loadForms_Lock( FmFormPage* _pPage, const LoadFormsFlags _nBehaviour );
+    SAL_DLLPRIVATE void smartControlReset( const css::uno::Reference< css::container::XIndexAccess >& _rxModels );
 
 
-    SAL_DLLPRIVATE void startListening();
-    SAL_DLLPRIVATE void stopListening();
+    SAL_DLLPRIVATE void startListening_Lock();
+    SAL_DLLPRIVATE void stopListening_Lock();
 
     SAL_DLLPRIVATE css::uno::Reference< css::awt::XControl >
-        impl_getControl(
+        impl_getControl_Lock(
             const css::uno::Reference< css::awt::XControlModel>& i_rxModel,
             const FmFormObj& i_rKnownFormObj
         );
 
     // collects in strNames the names of all forms
-    SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow(
+    SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow_Lock(
         const css::uno::Reference< css::uno::XInterface>& _rxStartingPoint,
         const OUString& _rCurrentLevelPrefix,
         FmFormArray& _out_rForms,
@@ -344,163 +339,162 @@ protected:
     /** checks whenever the instance is already disposed, if so, this is reported as assertion error (debug
         builds only) and <TRUE/> is returned.
     */
-    SAL_DLLPRIVATE bool    impl_checkDisposed() const;
+    SAL_DLLPRIVATE bool    impl_checkDisposed_Lock() const;
 
 public:
     // method for non design mode (alive mode)
-    SAL_DLLPRIVATE void setActiveController( const css::uno::Reference< css::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false );
-    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
-    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
-    SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm>& getActiveForm() const {return m_xActiveForm;}
-    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}
+    SAL_DLLPRIVATE void setActiveController_Lock(const css::uno::Reference< css::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false);
+    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveController_Lock() const { return m_xActiveController; }
+    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveInternalController_Lock() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
+    SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm>& getActiveForm_Lock() const { return m_xActiveForm; }
+    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getNavController_Lock() const { return m_xNavigationController; }
 
-    SAL_DLLPRIVATE const svx::ControllerFeatures& getActiveControllerFeatures() const
+    SAL_DLLPRIVATE const svx::ControllerFeatures& getActiveControllerFeatures_Lock() const
         { return m_aActiveControllerFeatures; }
-    SAL_DLLPRIVATE const svx::ControllerFeatures& getNavControllerFeatures() const
+    SAL_DLLPRIVATE const svx::ControllerFeatures& getNavControllerFeatures_Lock() const
         { return m_aNavControllerFeatures.isAssigned() ? m_aNavControllerFeatures : m_aActiveControllerFeatures; }
 
     /** announces a new "current selection"
         @return
             <TRUE/> if and only if the to-bet-set selection was different from the previous selection
     */
-    SAL_DLLPRIVATE bool    setCurrentSelection( const InterfaceBag& _rSelection );
+    SAL_DLLPRIVATE bool setCurrentSelection_Lock(const InterfaceBag& rSelection);
 
     /** sets the new selection to the last known marked controls
     */
-    SAL_DLLPRIVATE bool    selectLastMarkedControls();
+    SAL_DLLPRIVATE bool selectLastMarkedControls_Lock();
 
     /** retrieves the current selection
     */
-    void    getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const;
+    void    getCurrentSelection_Lock(InterfaceBag& /* [out] */ _rSelection) const;
 
     /** sets a new current selection as indicated by a mark list
         @return
             <TRUE/> if and only if the to-bet-set selection was different from the previous selection
     */
-    SAL_DLLPRIVATE bool    setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
+    SAL_DLLPRIVATE bool setCurrentSelectionFromMark_Lock(const SdrMarkList& rMarkList);
 
     /// returns the currently selected form, or the form which all currently selected controls belong to, or <NULL/>
     SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm >&
-                getCurrentForm() const { return m_xCurrentForm; }
-    SAL_DLLPRIVATE void        forgetCurrentForm();
+                getCurrentForm_Lock() const { return m_xCurrentForm; }
+    SAL_DLLPRIVATE void forgetCurrentForm_Lock();
     /// returns whether the last known marking contained only controls
-    SAL_DLLPRIVATE bool    onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
+    SAL_DLLPRIVATE bool onlyControlsAreMarked_Lock() const { return !m_aLastKnownMarkedControls.empty(); }
 
     /// determines whether the current selection consists of exactly the given object
-    SAL_DLLPRIVATE bool    isSolelySelected(
+    SAL_DLLPRIVATE bool isSolelySelected_Lock(
                 const css::uno::Reference< css::uno::XInterface >& _rxObject
             );
 
     /// handles a MouseButtonDown event of the FmFormView
-    SAL_DLLPRIVATE void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
+    SAL_DLLPRIVATE void handleMouseButtonDown_Lock( const SdrViewEvent& _rViewEvent );
     /// handles the request for showing the "Properties"
-    SAL_DLLPRIVATE void handleShowPropertiesRequest();
+    SAL_DLLPRIVATE void handleShowPropertiesRequest_Lock();
 
-    SAL_DLLPRIVATE bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
-    SAL_DLLPRIVATE bool hasDatabaseBar() const {return m_bDatabaseBar;}
+    SAL_DLLPRIVATE bool hasForms_Lock() const { return m_xForms.is() && m_xForms->getCount() != 0; }
+    SAL_DLLPRIVATE bool hasDatabaseBar_Lock() const { return m_bDatabaseBar; }
 
-    SAL_DLLPRIVATE void ShowSelectionProperties( bool bShow );
-    SAL_DLLPRIVATE bool IsPropBrwOpen() const;
+    SAL_DLLPRIVATE void ShowSelectionProperties_Lock(bool bShow);
+    SAL_DLLPRIVATE bool IsPropBrwOpen_Lock() const;
 
-    SAL_DLLPRIVATE void DetermineSelection(const SdrMarkList& rMarkList);
-    SAL_DLLPRIVATE void SetSelection(const SdrMarkList& rMarkList);
-    SAL_DLLPRIVATE void SetSelectionDelayed();
+    SAL_DLLPRIVATE void DetermineSelection_Lock(const SdrMarkList& rMarkList);
+    SAL_DLLPRIVATE void SetSelection_Lock(const SdrMarkList& rMarkList);
+    SAL_DLLPRIVATE void SetSelectionDelayed_Lock();
 
-    SAL_DLLPRIVATE void SetDesignMode(bool bDesign);
+    SAL_DLLPRIVATE void SetDesignMode_Lock(bool bDesign);
 
-    SAL_DLLPRIVATE bool    GetWizardUsing() const { return m_bUseWizards; }
-    SAL_DLLPRIVATE void    SetWizardUsing(bool _bUseThem);
+    SAL_DLLPRIVATE bool GetWizardUsing_Lock() const { return m_bUseWizards; }
+    SAL_DLLPRIVATE void SetWizardUsing_Lock(bool _bUseThem);
 
         // setting the filter mode
-    SAL_DLLPRIVATE bool isInFilterMode() const {return m_bFilterMode;}
-    SAL_DLLPRIVATE void startFiltering();
-    SAL_DLLPRIVATE void stopFiltering(bool bSave);
+    SAL_DLLPRIVATE bool isInFilterMode_Lock() const { return m_bFilterMode; }
+    SAL_DLLPRIVATE void startFiltering_Lock();
+    SAL_DLLPRIVATE void stopFiltering_Lock(bool bSave);
 
         // a menu that contains all ControlConversion entries
-    SAL_DLLPRIVATE static VclBuilder* GetConversionMenu();
+    SAL_DLLPRIVATE static VclBuilder* GetConversionMenu_Lock();
 
     /// checks whether a given control conversion slot can be applied to the current selection
-    SAL_DLLPRIVATE        bool canConvertCurrentSelectionToControl(const OString& rIdent);
+    SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(const OString& rIdent);
     /// enables or disables all conversion slots in a menu, according to the current selection
-    SAL_DLLPRIVATE        void checkControlConversionSlotsForCurrentSelection( Menu& rMenu );
+    SAL_DLLPRIVATE void checkControlConversionSlotsForCurrentSelection_Lock(Menu& rMenu);
     /// executes a control conversion slot for a given object
-    SAL_DLLPRIVATE        bool executeControlConversionSlot(const css::uno::Reference< css::form::XFormComponent >& _rxObject, const OString& rIdent);
+    SAL_DLLPRIVATE bool executeControlConversionSlot_Lock(const css::uno::Reference< css::form::XFormComponent >& _rxObject, const OString& rIdent);
     /** executes a control conversion slot for the current selection
         @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/>
     */
-    SAL_DLLPRIVATE        void executeControlConversionSlot(const OString& rIdent);
+    SAL_DLLPRIVATE void executeControlConversionSlot_Lock(const OString& rIdent);
     /// checks whether the given slot id denotes a control conversion slot
     SAL_DLLPRIVATE static bool isControlConversionSlot(const OString& rIdent);
 
-    SAL_DLLPRIVATE void    ExecuteTextAttribute( SfxRequest& _rReq );
-    SAL_DLLPRIVATE void    GetTextAttributeState( SfxItemSet& _rSet );
-    SAL_DLLPRIVATE bool    IsActiveControl( bool _bCountRichTextOnly ) const;
-    SAL_DLLPRIVATE void    ForgetActiveControl();
-    SAL_DLLPRIVATE void    SetControlActivationHandler( const Link<LinkParamNone*,void>& _rHdl );
+    SAL_DLLPRIVATE void ExecuteTextAttribute_Lock(SfxRequest& _rReq);
+    SAL_DLLPRIVATE void GetTextAttributeState_Lock(SfxItemSet& _rSet);
+    SAL_DLLPRIVATE bool IsActiveControl_Lock(bool _bCountRichTextOnly) const;
+    SAL_DLLPRIVATE void ForgetActiveControl_Lock();
+    SAL_DLLPRIVATE void SetControlActivationHandler_Lock(const Link<LinkParamNone*,void>& _rHdl);
 
     /// classifies our host document
-    SAL_DLLPRIVATE ::svxform::DocumentType
-            getDocumentType() const;
-    SAL_DLLPRIVATE bool    isEnhancedForm() const;
+    SAL_DLLPRIVATE ::svxform::DocumentType getDocumentType_Lock() const;
+    SAL_DLLPRIVATE bool isEnhancedForm_Lock() const;
 
     /// determines whether our host document is currently read-only
-    SAL_DLLPRIVATE bool    IsReadonlyDoc() const;
+    SAL_DLLPRIVATE bool IsReadonlyDoc_Lock() const;
 
     // Setting the curObject/selObject/curForm is delayed (SetSelectionDelayed). With the
     // following functions this can be inquired/enforced.
-    SAL_DLLPRIVATE inline bool IsSelectionUpdatePending();
-    SAL_DLLPRIVATE void        ForceUpdateSelection();
+    SAL_DLLPRIVATE inline bool IsSelectionUpdatePending_Lock();
+    SAL_DLLPRIVATE void        ForceUpdateSelection_Lock();
 
-    SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel>          getContextDocument() const;
-    SAL_DLLPRIVATE css::uno::Reference< css::form::XForm>            getInternalForm(const css::uno::Reference< css::form::XForm>& _xForm) const;
-    SAL_DLLPRIVATE css::uno::Reference< css::sdbc::XResultSet>       getInternalForm(const css::uno::Reference< css::sdbc::XResultSet>& _xForm) const;
+    SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel>          getContextDocument_Lock() const;
+    SAL_DLLPRIVATE css::uno::Reference< css::form::XForm>            getInternalForm_Lock(const css::uno::Reference< css::form::XForm>& _xForm) const;
+    SAL_DLLPRIVATE css::uno::Reference< css::sdbc::XResultSet>       getInternalForm_Lock(const css::uno::Reference< css::sdbc::XResultSet>& _xForm) const;
         // if the form belongs to the controller (extern) displaying a grid, the according internal form will
         // be displayed, _xForm else
 
     // check if the current control of the active controller has the focus
-    SAL_DLLPRIVATE bool    HasControlFocus() const;
+    SAL_DLLPRIVATE bool HasControlFocus_Lock() const;
 
 private:
-    DECL_DLLPRIVATE_LINK(OnFoundData, FmFoundRecordInformation&, void);
-    DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation&, void);
-    DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext&, sal_uInt32);
-    DECL_DLLPRIVATE_LINK(OnTimeOut, Timer*, void);
-    DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*, void);
-    DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPageImpl&, void);
+    DECL_DLLPRIVATE_LINK(OnFoundData_Lock, FmFoundRecordInformation&, void);
+    DECL_DLLPRIVATE_LINK(OnCanceledNotFound_Lock, FmFoundRecordInformation&, void);
+    DECL_DLLPRIVATE_LINK(OnSearchContextRequest_Lock, FmSearchContext&, sal_uInt32);
+    DECL_DLLPRIVATE_LINK(OnTimeOut_Lock, Timer*, void);
+    DECL_DLLPRIVATE_LINK(OnFirstTimeActivation_Lock, void*, void);
+    DECL_DLLPRIVATE_LINK(OnFormsCreated_Lock, FmFormPageImpl&, void);
 
-    SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE);
+    SAL_DLLPRIVATE void LoopGrids_Lock(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE);
 
     // invalidation of slots
-    SAL_DLLPRIVATE void    InvalidateSlot( sal_Int16 nId, bool bWithId );
-    SAL_DLLPRIVATE void    UpdateSlot( sal_Int16 nId );
+    SAL_DLLPRIVATE void InvalidateSlot_Lock(sal_Int16 nId, bool bWithId);
+    SAL_DLLPRIVATE void UpdateSlot_Lock(sal_Int16 nId);
     // locking the invalidation - if the internal locking counter goes to 0, all accumulated slots
     // are invalidated (asynchronously)
-    SAL_DLLPRIVATE void    LockSlotInvalidation(bool bLock);
+    SAL_DLLPRIVATE void LockSlotInvalidation_Lock(bool bLock);
 
-    DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*, void);
+    DECL_DLLPRIVATE_LINK(OnInvalidateSlots_Lock, void*, void);
 
-    SAL_DLLPRIVATE void    CloseExternalFormViewer();
+    SAL_DLLPRIVATE void CloseExternalFormViewer_Lock();
         // closes the task-local beamer displaying a grid view for a form
 
     // ConfigItem related stuff
     SAL_DLLPRIVATE virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
-    SAL_DLLPRIVATE void implAdjustConfigCache();
+    SAL_DLLPRIVATE void implAdjustConfigCache_Lock();
 
     SAL_DLLPRIVATE css::uno::Reference< css::awt::XControlContainer >
-            getControlContainerForView();
+            getControlContainerForView_Lock();
 
     /** finds and sets a default for m_xCurrentForm, if it is currently NULL
     */
-    SAL_DLLPRIVATE void    impl_defaultCurrentForm_nothrow();
+    SAL_DLLPRIVATE void impl_defaultCurrentForm_nothrow_Lock();
 
     /** sets m_xCurrentForm to the provided form, and updates everything which
         depends on the current form
     */
-    SAL_DLLPRIVATE void    impl_updateCurrentForm( const css::uno::Reference< css::form::XForm >& _rxNewCurForm );
+    SAL_DLLPRIVATE void impl_updateCurrentForm_Lock( const css::uno::Reference< css::form::XForm >& _rxNewCurForm );
 
     /** adds or removes ourself as XEventListener at m_xActiveController
     */
-    SAL_DLLPRIVATE void    impl_switchActiveControllerListening( const bool _bListen );
+    SAL_DLLPRIVATE void impl_switchActiveControllerListening_Lock(const bool _bListen);
 
     /** add an element
     */
@@ -508,7 +502,7 @@ private:
 
     /** remove an element
     */
-    SAL_DLLPRIVATE void    impl_RemoveElement_nothrow(const css::uno::Reference< css::uno::XInterface>& Element);
+    SAL_DLLPRIVATE void    impl_RemoveElement_nothrow_Lock(const css::uno::Reference< css::uno::XInterface>& Element);
 
     SAL_DLLPRIVATE virtual void ImplCommit() override;
 
@@ -520,7 +514,7 @@ public:
         @param _nSlot
             the slot to execute
     */
-    SAL_DLLPRIVATE void    ExecuteFormSlot( sal_Int32 _nSlot );
+    SAL_DLLPRIVATE void ExecuteFormSlot_Lock(sal_Int32 _nSlot);
 
     /** determines whether the current form slot is currently enabled
     */
@@ -529,11 +523,11 @@ public:
     SAL_DLLPRIVATE static OString SlotToIdent(sal_uInt16 nSlot);
 
 protected:
-    DECL_DLLPRIVATE_LINK( OnLoadForms, void*, void );
+    DECL_DLLPRIVATE_LINK( OnLoadForms_Lock, void*, void );
 };
 
 
-inline bool FmXFormShell::IsSelectionUpdatePending()
+inline bool FmXFormShell::IsSelectionUpdatePending_Lock()
 {
     return m_aMarkTimer.IsActive();
 }