INTEGRATION: CWS vcl85_SRC680 (1.6.72); FILE MERGED

2007/12/21 14:36:57 pl 1.6.72.3: #i84679# fix a mess
2007/12/21 13:06:30 pl 1.6.72.2: RESYNC: (1.6-1.7); FILE MERGED
2007/12/04 17:20:48 pl 1.6.72.1: #i77170# better quickhelp behaviour

vcl/inc/vcl/svdata.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdata.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2007-12-12 13:20:20 $
+ *  last change: $Author: rt $ $Date: 2008-01-29 16:16:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -226,6 +226,7 @@ struct ImplSVGDIData
     vcl::DefaultFontConfiguration* mpDefaultFontConfiguration;
     vcl::FontSubstConfiguration* mpFontSubstConfiguration;
     bool                    mbPrinterPullModel; // true: use pull model instead of normal push model when printing
+    bool                    mbNativeFontConfig; // true: do not override UI font
 };
 
 
@@ -300,6 +301,7 @@ struct ImplSVHelpData
     BOOL                    mbAutoHelpId        : 1;    // generate HelpIds
     BOOL                    mbRequestingHelp    : 1;    // In Window::RequestHelp
     HelpTextWindow*         mpHelpWin;                  // HelpWindow
+    ULONG                   mnLastHelpHideTime;         // ticks of last show
 };
 
 struct ImplSVNWFData