diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-05 20:28:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-05 20:31:17 +0100 |
| commit | 19dde56de6f4d8613f156148f1e60256a8f5172a (patch) | |
| tree | 1d368687adf0d519f4d14cc64cc77d70170b5247 /lotuswordpro/source/filter/lwptablelayout.hxx | |
| parent | only set cur. page once when removing mult. pages (diff) | |
| download | core-19dde56de6f4d8613f156148f1e60256a8f5172a.tar.gz core-19dde56de6f4d8613f156148f1e60256a8f5172a.zip | |
fftester: double use of XFTable, ref this up
Change-Id: I8e0c2319b2f43b66686fbce372c5df63c75b343a
Diffstat (limited to 'lotuswordpro/source/filter/lwptablelayout.hxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwptablelayout.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 3dfd32f369df..d17f734d1bb4 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -127,7 +127,7 @@ private: public: void XFConvert(XFContentContainer* pCont) override; - void ConvertTable(XFTable* pXFTable,sal_uInt16 nStartRow, + void ConvertTable(rtl::Reference<XFTable> const & pXFTable, sal_uInt16 nStartRow, sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol); const OUString& GetDefaultRowStyleName(){return m_DefaultRowStyleName;} void SetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol,XFCell* pXFCell); @@ -135,17 +135,17 @@ public: const std::map<sal_uInt16,LwpRowLayout*>& GetRowsMap(){return m_RowsMap;} LwpRowLayout* GetRowLayout(sal_uInt16 nRow); private: - void ConvertDefaultRow(XFTable* pXFTable,sal_uInt8 nStartCol, - sal_uInt8 nEndCol,sal_uInt16 nRowID); - void ConvertColumn(XFTable *pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol); - sal_uInt16 ConvertHeadingRow(XFTable* pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow); + void ConvertDefaultRow(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, + sal_uInt8 nEndCol, sal_uInt16 nRowID); + void ConvertColumn(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, sal_uInt8 nEndCol); + sal_uInt16 ConvertHeadingRow(rtl::Reference<XFTable> const & pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow); static bool FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan); - void SplitRowToCells(XFTable* pTmpTable,XFTable* pXFTable, + void SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nFirstColSpann,sal_uInt8* pCellMark); std::map<sal_uInt16,LwpRowLayout*> m_RowsMap; void SplitConflictCells(); - XFTable* m_pXFTable; + rtl::Reference<XFTable> m_pXFTable; std::map<std::pair<sal_uInt16,sal_uInt8>,XFCell*> m_CellsMap; void PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID); |