merge to m66

1 files changed, 7 insertions, 1 deletions

diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 4099f241b72a..25f792ed7417 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -86,12 +86,14 @@ public:
 
     virtual sal_uInt32 GetObjInventor() const;
     virtual sal_uInt16 GetObjIdentifier() const;
-    virtual void ReformatText();
+    virtual void NbcReformatText();
 
     virtual SdrObject*  Clone() const;
     // #116235# virtual SdrObject*  Clone(SdrPage* pPage, SdrModel* pModel) const;
     virtual void        operator= (const SdrObject& rObj);
 
+    virtual void SetModel(SdrModel* pNewModel);
+
     virtual void clonedFrom(const FmFormObj* _pSource);
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> _rTopLevelDestContainer);
@@ -124,6 +126,10 @@ private:
         its parent.
     */
     void    impl_isolateControlModel_nothrow();
+
+    /** forwards the reference device of our SdrModel to the control model
+    */
+    void    impl_checkRefDevice_nothrow( bool _force = false );
 };