[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Sep 14 08:30:25 PDT 2010
patches/dev300/apply | 12 --
patches/dev300/cjk-default-compatibility.diff | 125 --------------------------
patches/dev300/sw-default-cjk-fontsize.diff | 36 -------
patches/dev300/sw-graphic-save-problem.diff | 22 ----
4 files changed, 1 insertion(+), 194 deletions(-)
New commits:
commit d3168721f21591c362068dbb8dd46e42675ed98c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 17:23:13 2010 +0200
cjk-default-compatibility.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c595b88..ff5a840 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -14,7 +14,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
- Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, \
+ Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
PopupRemoval, FedoraCommonFixes, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
@@ -263,13 +263,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
# cumulated patch set for OOo4Kids
ooo4kids-allpatches.diff
-[ CJK ]
-#set default CJK font fontsize as 10.5pt
-sw-default-cjk-fontsize.diff i#72010, jianhua
-
-# Doesn't expand spaces for lines with manual break for CJK locales
-cjk-default-compatibility.diff, i#54320, cbosdo
-
#[ CJKTemporaryHacks ]
# the following patch is disabled temporary.
# default value of tab stop for Chinese version
diff --git a/patches/dev300/cjk-default-compatibility.diff b/patches/dev300/cjk-default-compatibility.diff
deleted file mode 100644
index 05b342c..0000000
--- a/patches/dev300/cjk-default-compatibility.diff
+++ /dev/null
@@ -1,125 +0,0 @@
----
- cui/source/options/optgdlg.cxx | 6 ++++
- unotools/inc/unotools/compatibility.hxx | 2 +
- unotools/source/config/compatibility.cxx | 40 ++++++++++++++++++++++++++++++
- 3 files changed, 48 insertions(+), 0 deletions(-)
-
-diff --git cui/source/options/optgdlg.cxx cui/source/options/optgdlg.cxx
-index 41a459e..19c8c02 100644
---- cui/source/options/optgdlg.cxx
-+++ cui/source/options/optgdlg.cxx
-@@ -40,6 +40,7 @@
- #include <vcl/msgbox.hxx>
- #include <vcl/mnemonic.hxx>
- #include <i18npool/mslangid.hxx>
-+#include <unotools/compatibility.hxx>
- #include <unotools/useroptions.hxx>
- #include <unotools/cacheoptions.hxx>
- #include <unotools/fontoptions.hxx>
-@@ -1543,6 +1544,11 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
- // the end of this method
- pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
- rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
-+
-+ sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale );
-+ bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0;
-+ SvtCompatibilityOptions aCompatOpts;
-+ aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK );
- }
-
- if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
-diff --git unotools/inc/unotools/compatibility.hxx unotools/inc/unotools/compatibility.hxx
-index 11aeffc..65e92fa 100644
---- unotools/inc/unotools/compatibility.hxx
-+++ unotools/inc/unotools/compatibility.hxx
-@@ -153,6 +153,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
-
- void Clear();
-
-+ void SetDefault( ::rtl::OUString sName, bool bValue );
-+
- /*-****************************************************************************************************//**
- @short return complete specified list
- @descr Call it to get all entries of compatibility options.
-diff --git unotools/source/config/compatibility.cxx unotools/source/config/compatibility.cxx
-index e502860..4640cf9 100644
---- unotools/source/config/compatibility.cxx
-+++ unotools/source/config/compatibility.cxx
-@@ -35,6 +35,7 @@
- #include <unotools/compatibility.hxx>
- #include <unotools/configmgr.hxx>
- #include <unotools/configitem.hxx>
-+#include <unotools/syslocale.hxx>
- #include <tools/debug.hxx>
- #include <com/sun/star/uno/Any.hxx>
- #include <com/sun/star/uno/Sequence.hxx>
-@@ -247,6 +248,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
- SvtCompatibilityOptions_Impl();
- ~SvtCompatibilityOptions_Impl();
-
-+ void SetDefault( OUString sName, bool bValue );
-+
- //---------------------------------------------------------------------------------------------------------
- // overloaded methods of baseclass
- //---------------------------------------------------------------------------------------------------------
-@@ -425,6 +428,12 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
-
- if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) != sal_False )
- {
-+ SvtSysLocale aSysLocale;
-+ com::sun::star::lang::Locale aLocale = aSysLocale.GetLocale();
-+ if ( aLocale.Language.equalsAscii( "zh" ) || aLocale.Language.equalsAscii( "ja" ) ||
-+ aLocale.Language.equalsAscii( "ko" ) )
-+ aItem.bExpandWordSpace = false;
-+
- m_aDefOptions = aItem;
- bDefaultFound = true;
- }
-@@ -443,6 +452,32 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
- }
- }
-
-+void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue )
-+{
-+ if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) )
-+ m_aDefOptions.SetUsePrtMetrics( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) )
-+ m_aDefOptions.SetAddSpacing( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) )
-+ m_aDefOptions.SetAddSpacingAtPages( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) )
-+ m_aDefOptions.SetUseOurTabStops( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) )
-+ m_aDefOptions.SetNoExtLeading( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) )
-+ m_aDefOptions.SetUseLineSpacing( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) )
-+ m_aDefOptions.SetAddTableSpacing( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) )
-+ m_aDefOptions.SetUseObjPos( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) )
-+ m_aDefOptions.SetUseOurTextWrapping( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) )
-+ m_aDefOptions.SetConsiderWrappingStyle( bValue );
-+ else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) )
-+ m_aDefOptions.SetExpandWordSpace( bValue );
-+}
-+
- //*****************************************************************************************************************
- // public method
- //*****************************************************************************************************************
-@@ -680,6 +715,11 @@ void SvtCompatibilityOptions::Clear()
- m_pDataContainer->Clear();
- }
-
-+void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue )
-+{
-+ m_pDataContainer->SetDefault( sName, bValue );
-+}
-+
- //*****************************************************************************************************************
- // public method
- //*****************************************************************************************************************
---
-1.7.0.1
-
commit 6516156d5d80142fd2297ce15ebd476728c8536d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 17:18:57 2010 +0200
sw-default-cjk-fontsize.diff: move to git repos
diff --git a/patches/dev300/sw-default-cjk-fontsize.diff b/patches/dev300/sw-default-cjk-fontsize.diff
deleted file mode 100644
index 9390afe..0000000
--- a/patches/dev300/sw-default-cjk-fontsize.diff
+++ /dev/null
@@ -1,36 +0,0 @@
----
- sw/source/ui/config/fontcfg.cxx | 5 ++++-
- sw/source/ui/inc/fontcfg.hxx | 1 +
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git sw/source/ui/config/fontcfg.cxx sw/source/ui/config/fontcfg.cxx
-index 48455b7..89e7f14 100644
---- sw/source/ui/config/fontcfg.cxx
-+++ sw/source/ui/config/fontcfg.cxx
-@@ -303,7 +303,10 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eL
- case FONT_OUTLINE_CJK:
- case FONT_OUTLINE_CTL:
- nRet = FONTSIZE_OUTLINE;
-- break;
-+ break;
-+ case FONT_STANDARD_CJK:
-+ nRet = FONTSIZE_CJK_DEFAULT;
-+ break;
- }
- if( eLang == LANGUAGE_THAI && nFontType >= FONT_STANDARD_CTL )
- {
-diff --git sw/source/ui/inc/fontcfg.hxx sw/source/ui/inc/fontcfg.hxx
-index 69721d3..70af7f2 100644
---- sw/source/ui/inc/fontcfg.hxx
-+++ sw/source/ui/inc/fontcfg.hxx
-@@ -58,6 +58,7 @@
-
- //pt-size of fonts
- #define FONTSIZE_DEFAULT 240
-+#define FONTSIZE_CJK_DEFAULT 210
- #define FONTSIZE_OUTLINE 280
-
-
---
-1.7.0.1
-
commit 31520795a96ac269d6658a2da026e4c6f868618c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 17:12:22 2010 +0200
sw-graphic-save-problem.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 69bde66..c595b88 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -219,9 +219,6 @@ dbaccess-default-varchar-lenght.diff, i#62664, jianhua
#for selection delete crash
selection-crash-svx-svdmrkv.diff, i#76084, jianhua
-# hack for n#240776
-sw-graphic-save-problem.diff, flr, n#240776
-
# accelerate intern by not using stl
# The sal-strintern-speed-fix.diff has been merged with the original patch
sal-strintern-speed.diff, i#78496, michael
diff --git a/patches/dev300/sw-graphic-save-problem.diff b/patches/dev300/sw-graphic-save-problem.diff
deleted file mode 100644
index 3930999..0000000
--- a/patches/dev300/sw-graphic-save-problem.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- sw/source/core/graphic/ndgrf.cxx | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git sw/source/core/graphic/ndgrf.cxx sw/source/core/graphic/ndgrf.cxx
-index 3c2f958..cc62d29 100644
---- sw/source/core/graphic/ndgrf.cxx
-+++ sw/source/core/graphic/ndgrf.cxx
-@@ -858,6 +858,10 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
- if( !aUserData.Len() )
- return;
-
-+ if (aNewStrmName.Len()>0) {
-+ aUserData=aNewStrmName;
-+ }
-+
- String aProt( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.Package:" ) );
- if( 0 == aUserData.CompareTo( aProt, aProt.Len() ) )
- {
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list