diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/inc/htmltbl.hxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/inc/htmltbl.hxx')
| -rw-r--r-- | sw/inc/htmltbl.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 27cb7bc2e94e..928ae53023d6 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -30,7 +30,7 @@ class SwTableBox; class SwTable; class SwHTMLTableLayout; class SwDoc; -class SwFrmFmt; +class SwFrameFormat; #define HTMLTABLE_RESIZE_NOW (ULONG_MAX) @@ -239,7 +239,7 @@ class SwHTMLTableLayout void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const; const SwStartNode *GetAnyBoxStartNode() const; - SwFrmFmt *FindFlyFrmFmt() const; + SwFrameFormat *FindFlyFrameFormat() const; const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); } void ClearPass1Info() { nMin = nMax = 0; } @@ -251,7 +251,7 @@ class SwHTMLTableLayout static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: - SwHTMLTableLayout( const SwTable *pSwTbl, + SwHTMLTableLayout( const SwTable *pSwTable, sal_uInt16 nRows, sal_uInt16 nCols, bool bColsOpt, bool ColTgs, sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt, sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust, |