diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-10 11:07:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-10 11:25:19 +0100 |
| commit | d9729bc06d676a36120f3da252d1a4fa39d103d8 (patch) | |
| tree | 72f1e6e06248beb9c908ecbbe9f846037768e419 /sw/inc | |
| parent | f4e951a61a20edd6efbd244966e851aa378e66ad (diff) | |
this FindFlyFrm variant returns the Selected FlyFrm
the other one actively searches for the FlyFrm that
matches the XEmbeddedObject argument
Change-Id: I2f9271c01337b4a32d7b644f82d16d85c2dc5b51
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/fesh.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 952e9cab3e8d..7109a320c01d 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -207,7 +207,7 @@ private: std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom; bool m_bCheckForOLEInCaption; - SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const; + SAL_DLLPRIVATE SwFlyFrm *GetSelectedFlyFrm() const; SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; /// Terminate actions for all shells and call ChangeLink. @@ -394,7 +394,7 @@ public: SwFrameFormat* GetCurFrameFormat() const; ///< If frame then frame style, else 0. void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style. - const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); } + const SwFlyFrm *GetCurrFlyFrm() const { return GetSelectedFlyFrm(); } /// Find/delete fly containing the cursor. SwFrameFormat* WizardGetFly(); |