Curvirgo さん ありがとうございます。
このパッチの結果、何がどうなっていますか？
教えてください。よろしくお願いいたします。
平野
2010/5/6 Yoshiyuki Masutomi <curvi...@gmail.com>:
> curvirgoです。
>
> (2010年05月04日 14:03), Kazunari Hirano wrote:
>> 独自ビルドには、このi54320 Paragraph Styleのデフォルトセッティングについて、どのようなパッチがあたっていますか？
> 以下の様に変更しています。
>
> --- SRC680_m219/sw/source/core/bastyp/init.cxx.orig 2007-06-27
> 22:17:00.000000000 +0900
> +++ SRC680_m219/sw/source/core/bastyp/init.cxx 2007-07-08 18:21:24.000000000
> +0900
> @@ -351,6 +351,8 @@
> #include <fmtwrapinfluenceonobjpos.hxx>
> #endif
>
> +using namespace com::sun::star::lang;
> +
>
> extern void _FrmFinit();
> extern void ClearFEShellTabCols();
> @@ -659,6 +661,8 @@
> void _InitCore()
> {
> SfxPoolItem* pItem;
> + Locale aLocale;
> + aLocale = Application::GetSettings().GetLocale();
>
> // erstmal alle Attribut-Pointer auf 0 setzen
> memset( aAttrTab, 0, (POOLATTR_END - POOLATTR_BEGIN) *
> @@ -735,7 +739,17 @@
> // TextAttr - Dummies
>
> aAttrTab[ RES_PARATR_LINESPACING- POOLATTR_BEGIN ] = new
> SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
> - aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] = new SvxAdjustItem(
> SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
> + if( aLocale.Language.equalsAscii( "ja" ) ||
> + aLocale.Language.equalsAscii( "ko" ) ||
> + aLocale.Language.equalsAscii( "zh-CN" ) ||
> + aLocale.Language.equalsAscii( "zh-TW" ) )
> + {
> + aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] = new SvxAdjustItem(
> SVX_ADJUST_BLOCK, RES_PARATR_ADJUST );
> + }
> + else
> + {
> + aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] = new SvxAdjustItem(
> SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
> + }
> aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] = new SvxFmtSplitItem(
> sal_True, RES_PARATR_SPLIT );
> aAttrTab[ RES_PARATR_WIDOWS- POOLATTR_BEGIN ] = new SvxWidowsItem( 0,
> RES_PARATR_WIDOWS );
> aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] = new SvxOrphansItem( 0,
> RES_PARATR_ORPHANS );
> @@ -751,6 +765,17 @@
>
> aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] = new
> SvxScriptSpaceItem( TRUE, RES_PARATR_SCRIPTSPACE );
> aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new
> SvxHangingPunctuationItem( TRUE, RES_PARATR_HANGINGPUNCTUATION );
> + if( aLocale.Language.equalsAscii( "ja" ) ||
> + aLocale.Language.equalsAscii( "ko" ) ||
> + aLocale.Language.equalsAscii( "zh-CN" ) ||
> + aLocale.Language.equalsAscii( "zh-TW" ) )
> + {
> + aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new
> SvxHangingPunctuationItem( FALSE, RES_PARATR_HANGINGPUNCTUATION );
> + }
> + else
> + {
> + aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new
> SvxHangingPunctuationItem( TRUE, RES_PARATR_HANGINGPUNCTUATION );
> + }
> aAttrTab[ RES_PARATR_FORBIDDEN_RULES - POOLATTR_BEGIN ] = new
> SvxForbiddenRuleItem( TRUE, RES_PARATR_FORBIDDEN_RULES );
> aAttrTab[ RES_PARATR_VERTALIGN - POOLATTR_BEGIN ] = new
> SvxParaVertAlignItem( 0, RES_PARATR_VERTALIGN );
> aAttrTab[ RES_PARATR_SNAPTOGRID - POOLATTR_BEGIN ] = new
> SvxParaGridItem( sal_True, RES_PARATR_SNAPTOGRID );
> --- OOO320_m2/sw/source/core/doc/docnew.cxx.orig 2009-10-17
> 22:46:37.000000000 +0900
> +++ OOO320_m2/sw/source/core/doc/docnew.cxx 2009-10-18 18:33:48.000000000
> +0900
> @@ -125,9 +125,11 @@
> #include <sfx2/Metadatable.hxx>
> #include <fmtmeta.hxx> // MetaFieldManager
>
> +#include <vcl/svapp.hxx>
>
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::document;
> +using namespace ::com::sun::star::lang;
>
> const sal_Char __FAR_DATA sFrmFmtStr[] = "Frameformat";
> const sal_Char __FAR_DATA sEmptyPageStr[] = "Empty Page";
> @@ -340,6 +342,9 @@
> // Note: Any non-hidden compatibility flag should obtain its default
> // by asking SvtCompatibilityOptions, see below.
> //
> + Locale aLocale;
> + aLocale = Application::GetSettings().GetLocale();
> +
> const SvtCompatibilityOptions aOptions;
> mbParaSpaceMax = aOptions.IsAddSpacing();
> mbParaSpaceMaxAtPages = aOptions.IsAddSpacingAtPages();
> @@ -355,7 +360,16 @@
> mbOldNumbering = false; // hidden
> mbUseHiResolutionVirtualDevice = true; // hidden
> mbIgnoreFirstLineIndentInNumbering = false; // hidden
> - mbDoNotJustifyLinesWithManualBreak = !aOptions.IsExpandWordSpace();
> + if( aLocale.Language.equalsAscii( "ja" ) ||
> + aLocale.Language.equalsAscii( "ko" ) ||
> + aLocale.Language.equalsAscii( "zh-CN" ) ||
> + aLocale.Language.equalsAscii( "zh-TW" ) )
> + {
> + mbDoNotJustifyLinesWithManualBreak =
> aOptions.IsExpandWordSpace();
> + }else
> + {
> + mbDoNotJustifyLinesWithManualBreak =
> !aOptions.IsExpandWordSpace();
> + }
> mbDoNotResetParaAttrsForNumFont = false; // hidden
> mbOutlineLevelYieldsOutlineRule = false; // hidden
> mbTableRowKeep = false; // hidden
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@ja.openoffice.org
> For additional commands, e-mail: dev-h...@ja.openoffice.org
>
>
--
Kazunari Hirano - Marketing Project Coordinator - OpenOffice.org
Japanese Language Project
http://ja.openoffice.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@ja.openoffice.org
For additional commands, e-mail: dev-h...@ja.openoffice.org
