From 03dbc3f123e231d5c658421344343b341480f436 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 16 Nov 2005 08:51:48 +0000
Subject: INTEGRATION: CWS thaiissues (1.6.36); FILE MERGED 2005/11/10 12:04:06
 os 1.6.36.3: #i42725# font default height fixed 2005/11/08 19:18:59 os
 1.6.36.2: #i42725# default height values now complete 2005/10/13 13:49:44 os
 1.6.36.1: #i42725# font height defaults configurable

---
 sw/source/ui/inc/fontcfg.hxx | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'sw')

diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 9969592b0b54..abcbdbd9bd6b 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fontcfg.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 09:14:32 $
+ *  last change: $Author: obo $ $Date: 2005-11-16 09:51:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,6 +44,9 @@
 #ifndef _LANG_HXX
 #include <tools/lang.hxx>
 #endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
 
 #ifndef INCLUDED_SWDLLAPI_H
 #include "swdllapi.h"
@@ -72,9 +75,15 @@
 #define FONT_GROUP_CJK      1
 #define FONT_GROUP_CTL      2
 
+//pt-size of fonts
+#define FONTSIZE_DEFAULT            240
+#define FONTSIZE_OUTLINE            280
+
+
 class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
 {
     String      sDefaultFonts[DEF_FONT_COUNT];
+    sal_Int32   nDefaultFontHeight[DEF_FONT_COUNT];
 
     SW_DLLPRIVATE com::sun::star::uno::Sequence<rtl::OUString>    GetPropertyNames();
 
@@ -86,6 +95,9 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
                 sDefaultFonts[nFontType] = rSet;
             }
         }
+
+    void ChangeInt( USHORT nFontType, sal_Int32 nHeight );
+
 public:
     SwStdFontConfig();
     ~SwStdFontConfig();
@@ -113,7 +125,13 @@ public:
     void     SetFontIndex  (const String& rSet, sal_uInt8 nFontGroup)
                     {    ChangeString(FONT_INDEX + FONT_PER_GROUP * nFontGroup, rSet);}
 
-    static String   GetDefaultFor(USHORT nFontType, LanguageType eLang);
+    void     SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType )
+                    {    ChangeInt(nFont + FONT_PER_GROUP * nScriptType, nHeight);}
+
+    sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang );
+
+    static String    GetDefaultFor(USHORT nFontType, LanguageType eLang);
+    static sal_Int32 GetDefaultHeightFor(USHORT nFontType, LanguageType eLang);
 };
 #endif
 
-- 
cgit