diff options
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index e4fa0cc4d778..d0f9676b3490 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -43,20 +43,23 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface> m_wXObject; -protected: - 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 ) - {} + //UUUU + FillAttributesPtr maFillAttributes; - SwFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, - const sal_uInt16* pWhichRange = 0 ) - : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), - pDrvdFrm, nFmtWhich ) - {} +protected: + SwFrmFmt( + SwAttrPool& rPool, + const sal_Char* pFmtNm, + SwFrmFmt *pDrvdFrm, + sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0); + + SwFrmFmt( + SwAttrPool& rPool, + const OUString &rFmtNm, + SwFrmFmt *pDrvdFrm, + sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; @@ -130,6 +133,9 @@ public: DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt) void RegisterToFormat( SwFmt& rFmt ); + + //UUUU + virtual FillAttributesPtr getFillAttributes() const; }; // The FlyFrame-Format |