diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-29 13:03:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 10:25:33 +0000 |
| commit | 76c549eb01dcb7b5bf28a271ce00e386f3d388ba (patch) | |
| tree | bb09874a25b3b29c52556228abdf4aafb9ca6515 /sw/inc/frmfmt.hxx | |
| parent | 84972949a3501003b0b6ad98f07f1b4ab83f3ca1 (diff) | |
Integrate branch of IAccessible2
Conflicts:
everything
Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index aa86dce5da9f..1b26316d7ee6 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -44,11 +44,13 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt ::com::sun::star::uno::XInterface> m_wXObject; protected: + SwFrmFmt* pCaptionFmt; SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) + ,pCaptionFmt( NULL ) {} SwFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, @@ -56,9 +58,10 @@ protected: const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) + ,pCaptionFmt( NULL ) {} - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); public: TYPEINFO(); ///< Already in base class Client. @@ -122,6 +125,10 @@ public: virtual OUString GetDescription() const; + sal_Bool HasCaption() const; + void SetCaptionFmt(SwFrmFmt* pFmt); + SwFrmFmt* GetCaptionFmt() const; + SW_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface> const& GetXObject() const { return m_wXObject; } @@ -138,6 +145,8 @@ public: class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt { friend class SwDoc; + OUString msTitle; + OUString msDesc; /** Both not existent. it stores the previous position of Prt rectangle from RequestObjectResize |