Tag: cws_src680_rptchart01
User: oj      
Date: 2008-02-19 17:06:59+0000
Modified:
   dba/reportdesign/inc/helpids.hrc

Log:
 merge conflict

File Changes:

Directory: /dba/reportdesign/inc/
=================================

File [changed]: helpids.hrc
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/inc/helpids.hrc?r1=1.3.20.4&r2=1.3.20.5
Delta lines:  +4 -3
-------------------
--- helpids.hrc 2008-02-19 09:22:03+0000        1.3.20.4
+++ helpids.hrc 2008-02-19 17:06:57+0000        1.3.20.5
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: helpids.hrc,v $
  *
- *  $Revision: 1.3.20.4 $
+ *  $Revision: 1.3.20.5 $
  *
- *  last change: $Author: oj $ $Date: 2008/02/19 09:22:03 $
+ *  last change: $Author: oj $ $Date: 2008/02/19 17:06:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,6 +93,7 @@
 // free
 #define HID_RPT_PROP_MINHEIGHTNEWPAGE                  (HID_RPT_START + 51)
 #define HID_RPT_PROP_PRINTWHENGROUPCHANGE              (HID_RPT_START + 52)
+#define HID_RPT_PROP_CHARTTYPE                     (HID_RPT_START + 53)
 // free
 // free
 #define HID_RPT_PROP_VISIBLE                                   (HID_RPT_START 
+ 55)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to