summaryrefslogtreecommitdiff
path: root/sw/inc/format.hxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-02-05 09:52:00 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-02-05 09:52:00 +0000
commit7b9090b8b68743f26aabd181fe6e76e8941805a4 (patch)
tree8ce1955f0019a5e96e7ad20ece5f797811ece913 /sw/inc/format.hxx
parent2289dc55aae35a6eb269ec26721380a18522fa83 (diff)
INTEGRATION: CWS swqbf95_SRC680 (1.27.112); FILE MERGED
2007/01/25 08:15:59 od 1.27.112.1: #i73790# class <SwFmt> - rename method <ResetAllAttr()> to <ResetAllFmtAttr()> and make it virtual.
Diffstat (limited to 'sw/inc/format.hxx')
-rw-r--r--sw/inc/format.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 43b60a0b3182..58c50a697a61 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: format.hxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: kz $ $Date: 2006-11-08 13:20:48 $
+ * last change: $Author: vg $ $Date: 2007-02-05 10:52:00 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -128,9 +128,12 @@ public:
// Nimmt den Hint mit nWhich aus dem Delta-Array
SW_DLLPUBLIC BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
+ // --> OD 2007-01-24 #i73790#
+ // Method renamed and made virtual
// Nimmt alle Hints aus dem Delta-Array,
// liefert die Anzahl der geloeschten Hints
- USHORT ResetAllAttr();
+ virtual USHORT ResetAllFmtAttr();
+ // <--
inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
inline BOOL IsDefault() const { return DerivedFrom() == 0; }