summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-09-20 11:35:05 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-09-20 11:35:05 +0000
commitd702afa312097d83c062b4e11d6e46b0571a3eca (patch)
tree512984caf5d424d3499d33ea863b18d8f83eeb35 /sw
parent350fb69f29d7bcaef15866ac5b6823e8420c5079 (diff)
INTEGRATION: CWS gt09 (1.11.38); FILE MERGED
2004/08/25 13:45:39 os 1.11.38.1: #i22106# new caption features
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/undobj.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 0da58f1960..b7857aaa03 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: undobj.hxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: hr $ $Date: 2004-09-08 14:52:03 $
+ * last change: $Author: rt $ $Date: 2004-09-20 12:35:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1604,6 +1604,7 @@ class SwUndoInsertLabel : public SwUndo
};
String sText;
+ String sCharacterStyle;
// OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
USHORT nFldId;
SwLabelType eType;
@@ -1615,6 +1616,7 @@ class SwUndoInsertLabel : public SwUndo
public:
SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
const BOOL bBefore, const USHORT nId,
+ const String& rCharacterStyle,
const BOOL bCpyBrd );
virtual ~SwUndoInsertLabel();