diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 18:44:10 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-15 15:10:07 +0100 |
| commit | e6d76a2e14c7504219f94e9ed8c213b7e58f3e5b (patch) | |
| tree | 465bf89026e1424eaf8870cff0c5e5c2ed3e3e4d /sw/inc/expfld.hxx | |
| parent | f8cab2f422895ebad8be9b8b3bb76600e6eaf1d0 (diff) | |
sw_redlinehide_3: transport layout from ExpandField() to Expand()
While at it, rename that to ExpandImpl() so it's unique.
Change-Id: I217deb72b4dfdca777e28e18ff56e49863e66640
Diffstat (limited to 'sw/inc/expfld.hxx')
| -rw-r--r-- | sw/inc/expfld.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 7389a6d40ec9..acf7818a05b3 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField bool m_bLateInitialization; // #i82544# - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; public: @@ -207,7 +207,7 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField sal_uInt16 mnSubType; SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; public: @@ -292,7 +292,7 @@ class SW_DLLPUBLIC SwInputField : public SwField SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; // Accessing Input Field's content @@ -378,7 +378,7 @@ class SwTableField : public SwValueField, public SwTableFormula OUString sExpand; sal_uInt16 nSubType; - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; /// Search TextNode containing the field. |