diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 09:22:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 13:03:51 +0000 |
| commit | 2aa0a5230361faef1e053c0badebdd99353dfd71 (patch) | |
| tree | b4f3b62c30ff6a210f8e9f5bfae451549897b376 /sw/inc | |
| parent | 0d3082dbf2e87bed462246307a13e206f7617081 (diff) | |
SetCaptionFmt never called, so pCaptionFmt always NULL
Follow logical consequences of the always-NULL.
And, depressingly, big slabs of the IA2 caption code
in writer doesn't actually do anything.
Change-Id: I35f7ffac19db683010b656b3c88f81b65233b080
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 636f0cb1e869..22ddea9a8029 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -44,13 +44,11 @@ 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, @@ -58,7 +56,6 @@ 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 ); @@ -125,10 +122,6 @@ public: virtual OUString GetDescription() const; - sal_Bool HasCaption() const; - void SetCaptionFmt(SwFrmFmt* pFmt); - SwFrmFmt* GetCaptionFmt() const; - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface> const& GetXObject() const { return m_wXObject; } |