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/dbfld.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/dbfld.hxx')
| -rw-r--r-- | sw/inc/dbfld.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 5d2c51af7880..9d83bed743d8 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -62,7 +62,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField bool bValidValue : 1; bool bInitialized : 1; - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; public: @@ -164,7 +164,7 @@ public: SwDBNextSetField( SwDBNextSetFieldType*, const OUString& rCond, const SwDBData& rDBData); - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; void Evaluate(SwDoc const *); @@ -204,7 +204,7 @@ class SwDBNumSetField : public SwDBNameInfField public: SwDBNumSetField(SwDBNumSetFieldType*, const OUString& rCond, const OUString& rDBNum, const SwDBData& rDBData); - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; inline bool IsCondValid() const; @@ -247,7 +247,7 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField public: SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData); - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; @@ -269,7 +269,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField public: SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uInt32 nFormat = 0); - virtual OUString Expand() const override; + virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override; virtual std::unique_ptr<SwField> Copy() const override; void Evaluate(SwDoc const *); |