diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-11-16 08:51:48 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-11-16 08:51:48 +0000 |
commit | 03dbc3f123e231d5c658421344343b341480f436 (patch) | |
tree | b51e2fd341c1d401c088312e0d71d00fb045a9db /sw | |
parent | 446b0e68da3c4a9082487478e25481090694dfa2 (diff) |
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
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/inc/fontcfg.hxx | 24 |
1 files changed, 21 insertions, 3 deletions
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 |