diff options
| author | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-14 09:49:14 +0100 |
|---|---|---|
| committer | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-14 09:51:22 +0100 |
| commit | b1e607a2ee4be0bf305c20fb5ba60bad3f0ed316 (patch) | |
| tree | 8ec59323ea9d2853e085942f886b36e1c3c7e53b | |
| parent | 364b742f3674bf5c90067ba473794042d890e325 (diff) | |
Fix "unused attribute" build error.
This reverts parts of
82ea128f190dbe8d707cb140a5a2bb2b48bef58d
e1309004099d1a1c0a9bc1ba6de9e5054629da3c
which were a bit over-zealous at removing "unused" stuff. LGPLv3+/MPL
| -rw-r--r-- | svtools/inc/svtools/txtattr.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/edit/textdoc.cxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/svtools/inc/svtools/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx index 2b6028965475..bf4c8e38b007 100644 --- a/svtools/inc/svtools/txtattr.hxx +++ b/svtools/inc/svtools/txtattr.hxx @@ -59,7 +59,9 @@ public: virtual ~TextAttrib(); - sal_uInt16 Which() const { return mnWhich; } + sal_uInt16 Which() const { return mnWhich; } + virtual void SetFont( Font& rFont ) const = 0; + virtual TextAttrib* Clone() const = 0; virtual int operator==( const TextAttrib& rAttr ) const = 0; int operator!=( const TextAttrib& rAttr ) const diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index b31395dd43fa..95a26d2c1ebc 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -54,14 +54,14 @@ int SAL_CALL CompareStart( const void* pFirst, const void* pSecond ) // ------------------------------------------------------------------------- TextCharAttrib::TextCharAttrib( const TextAttrib& /* rAttr */, sal_uInt16 nStart, sal_uInt16 nEnd ) { - mpAttr = NULL; + mpAttr = rAttr.Clone(); mnStart = nStart, mnEnd = nEnd; } TextCharAttrib::TextCharAttrib( const TextCharAttrib& rTextCharAttrib ) { - mpAttr = NULL; + mpAttr = rTextCharAttrib.GetAttr().Clone(); mnStart = rTextCharAttrib.mnStart; mnEnd = rTextCharAttrib.mnEnd; } |