Index: sc/source/core/data/docpool.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sc/source/core/data/docpool.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 docpool.cxx --- sc/source/core/data/docpool.cxx 15 Sep 2004 05:30:43 -0000 1.1.1.1 +++ sc/source/core/data/docpool.cxx 17 Sep 2004 08:57:14 -0000 @@ -256,7 +256,7 @@ ppPoolDefaults = new SfxPoolItem*[ATTR_ENDINDEX-ATTR_STARTINDEX+1]; ppPoolDefaults[ ATTR_FONT - ATTR_STARTINDEX ] = pStdFont; - ppPoolDefaults[ ATTR_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200 ); // 10 pt; + ppPoolDefaults[ ATTR_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 320 ); // 16 pt; ppPoolDefaults[ ATTR_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem; ppPoolDefaults[ ATTR_FONT_POSTURE - ATTR_STARTINDEX ] = new SvxPostureItem; ppPoolDefaults[ ATTR_FONT_UNDERLINE - ATTR_STARTINDEX ] = new SvxUnderlineItem; @@ -266,13 +266,13 @@ ppPoolDefaults[ ATTR_FONT_COLOR - ATTR_STARTINDEX ] = new SvxColorItem( Color(COL_AUTO) ); ppPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_FONT_LANGUAGE ); ppPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont; - ppPoolDefaults[ ATTR_CJK_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CJK_FONT_HEIGHT ); + ppPoolDefaults[ ATTR_CJK_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 320, 100, ATTR_CJK_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CJK_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CJK_FONT_POSTURE ); ppPoolDefaults[ ATTR_CJK_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_CJK_FONT_LANGUAGE ); ppPoolDefaults[ ATTR_CTL_FONT - ATTR_STARTINDEX ] = pCtlFont; - ppPoolDefaults[ ATTR_CTL_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CTL_FONT_HEIGHT ); + ppPoolDefaults[ ATTR_CTL_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 320, 100, ATTR_CTL_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CTL_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CTL_FONT_POSTURE ); ppPoolDefaults[ ATTR_CTL_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), Index: svx/inc/fhgtitem.hxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/svx/inc/fhgtitem.hxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 fhgtitem.hxx --- svx/inc/fhgtitem.hxx 15 Sep 2004 05:29:07 -0000 1.1.1.1 +++ svx/inc/fhgtitem.hxx 17 Sep 2004 08:57:33 -0000 @@ -100,7 +100,7 @@ public: TYPEINFO(); - SvxFontHeightItem( const ULONG nSz = 240, const USHORT nPropHeight = 100, + SvxFontHeightItem( const ULONG nSz = 320, const USHORT nPropHeight = 100, const USHORT nId = ITEMID_FONTHEIGHT ); // "pure virtual Methoden" vom SfxPoolItem Index: svx/source/dialog/chardlg.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/svx/source/dialog/chardlg.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 chardlg.cxx --- svx/source/dialog/chardlg.cxx 15 Sep 2004 05:29:08 -0000 1.1.1.1 +++ svx/source/dialog/chardlg.cxx 17 Sep 2004 08:57:34 -0000 @@ -531,7 +531,7 @@ MAP_TWIP ); } else - nH = 240; // as default 12pt + nH = 320; // as default 16pt rFont.SetSize( Size( 0, nH ) ); } @@ -1491,7 +1491,7 @@ const SvxFontHeightItem& rOldItem = (const SvxFontHeightItem&)GetItemSet().GetParent()->Get( nWhich ); - SvxFontHeightItem aHeight( 240, 100, nWhich ); + SvxFontHeightItem aHeight( 320, 100, nWhich ); if ( pSizeBox->IsPtRelative() ) aHeight.SetHeight( rOldItem.GetHeight(), (USHORT)( nSize / 10 ), SFX_MAPUNIT_POINT, eUnit ); else @@ -2934,9 +2934,9 @@ // to handle the changes of the other pages SetExchangeSupport(); - GetPreviewFont().SetSize( Size( 0, 240 ) ); - GetPreviewCJKFont().SetSize( Size( 0, 240 ) ); - GetPreviewCTLFont().SetSize( Size( 0, 240 ) ); + GetPreviewFont().SetSize( Size( 0, 320 ) ); + GetPreviewCJKFont().SetSize( Size( 0, 320 ) ); + GetPreviewCTLFont().SetSize( Size( 0, 320 ) ); m_aNormalPosBtn.Check(); PositionHdl_Impl( &m_aNormalPosBtn ); Index: svx/source/editeng/eerdll.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/svx/source/editeng/eerdll.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 eerdll.cxx --- svx/source/editeng/eerdll.cxx 15 Sep 2004 05:29:12 -0000 1.1.1.1 +++ svx/source/editeng/eerdll.cxx 17 Sep 2004 08:57:34 -0000 @@ -161,7 +161,7 @@ // Zeichenattribute: ppDefItems[16] = new SvxColorItem( Color( COL_AUTO ), EE_CHAR_COLOR ); ppDefItems[17] = new SvxFontItem( EE_CHAR_FONTINFO ); - ppDefItems[18] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT ); + ppDefItems[18] = new SvxFontHeightItem( 320, 100, EE_CHAR_FONTHEIGHT ); ppDefItems[19] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH ); ppDefItems[20] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ); ppDefItems[21] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE ); @@ -178,8 +178,8 @@ ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL ); ppDefItems[33] = new SvxFontItem( EE_CHAR_FONTINFO_CJK ); ppDefItems[34] = new SvxFontItem( EE_CHAR_FONTINFO_CTL ); - ppDefItems[35] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CJK ); - ppDefItems[36] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CTL ); + ppDefItems[35] = new SvxFontHeightItem( 320, 100, EE_CHAR_FONTHEIGHT_CJK ); + ppDefItems[36] = new SvxFontHeightItem( 320, 100, EE_CHAR_FONTHEIGHT_CTL ); ppDefItems[37] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ); ppDefItems[38] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ); ppDefItems[39] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ); Index: sw/source/core/doc/docdraw.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sw/source/core/doc/docdraw.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 docdraw.cxx --- sw/source/core/doc/docdraw.cxx 15 Sep 2004 05:31:03 -0000 1.1.1.1 +++ sw/source/core/doc/docdraw.cxx 17 Sep 2004 08:57:35 -0000 @@ -536,7 +536,7 @@ pSdrPool->FreezeIdRanges(); // SJ: #95129# set FontHeight pool defaults without changing static SdrEngineDefaults - aAttrPool.SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT )); + aAttrPool.SetPoolDefaultItem(SvxFontHeightItem( 320, 100, EE_CHAR_FONTHEIGHT )); RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create DrawDocument" ); //Das SdrModel gehoert dem Dokument, wir haben immer zwei Layer und eine Index: sw/source/core/doc/tblafmt.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sw/source/core/doc/tblafmt.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 tblafmt.cxx --- sw/source/core/doc/tblafmt.cxx 15 Sep 2004 05:31:03 -0000 1.1.1.1 +++ sw/source/core/doc/tblafmt.cxx 17 Sep 2004 08:57:35 -0000 @@ -250,11 +250,11 @@ SwBoxAutoFmt::SwBoxAutoFmt() : aFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) ), aCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) ), - aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ), + aCJKHeight( 320, 100, RES_CHRATR_CJK_FONTSIZE ), aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ), aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ), aCTLFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CTL_FONT ) ), - aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ), + aCTLHeight( 320, 100, RES_CHRATR_CTL_FONTSIZE ), aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ), aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ), aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 ) Index: sw/source/core/draw/drawdoc.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sw/source/core/draw/drawdoc.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 drawdoc.cxx --- sw/source/core/draw/drawdoc.cxx 15 Sep 2004 05:31:03 -0000 1.1.1.1 +++ sw/source/core/draw/drawdoc.cxx 17 Sep 2004 08:57:35 -0000 @@ -213,7 +213,7 @@ pDoc( pDocSh->GetDoc() ) { SetScaleUnit( MAP_TWIP ); - SetDefaultFontHeight( 240 ); + SetDefaultFontHeight( 320 ); // 16 pt SetSwapGraphics( TRUE ); ASSERT( pDocSh, "DocShell not found" ); Index: sw/source/core/layout/wsfrm.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sw/source/core/layout/wsfrm.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 wsfrm.cxx --- sw/source/core/layout/wsfrm.cxx 15 Sep 2004 05:31:06 -0000 1.1.1.1 +++ sw/source/core/layout/wsfrm.cxx 17 Sep 2004 08:57:38 -0000 @@ -3197,7 +3197,7 @@ } while ( pFrm && pCol ); - return nDiff ? nDiff : nFirstDiff ? nFirstDiff : 240; + return nDiff ? nDiff : nFirstDiff ? nFirstDiff : 320; } BOOL lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) Index: sw/source/core/text/frmform.cxx =================================================================== RCS file: /cvsroot/thaioo/OpenOffice_Test/sw/source/core/text/frmform.cxx,v retrieving revision 1.1.1.1 diff -a -u -r1.1.1.1 frmform.cxx --- sw/source/core/text/frmform.cxx 15 Sep 2004 05:31:07 -0000 1.1.1.1 +++ sw/source/core/text/frmform.cxx 17 Sep 2004 08:57:38 -0000 @@ -1945,10 +1945,10 @@ if( nDiff > 0 ) Shrink( nDiff ); } - else if( 240 < nFrmHeight ) - Shrink( nFrmHeight - 240 ); - else if( 240 > nFrmHeight ) - Grow( 240 - nFrmHeight ); + else if( 320 < nFrmHeight ) + Shrink( nFrmHeight - 320 ); + else if( 320 > nFrmHeight ) + Grow( 320 - nFrmHeight ); nFrmHeight = (Frm().*fnRect->fnGetHeight)(); long nTop = (this->*fnRect->fnGetTopMargin)();