[ooo-build-commit] .: 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/core/graphic/ndgrf.cxx |    4 ++++
 sw/source/ui/config/fontcfg.cxx  |    5 ++++-
 sw/source/ui/inc/fontcfg.hxx     |    1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 11ab1028c5e354ac40ee58ace0dc84989eae8a27
Author: Jiao Jianhua <jjiao at novell.com>
Date:   Tue Sep 14 17:14:11 2010 +0200

    sw-default-cjk-fontsize.diff: default CJK font fontsize as 10.5pt
    
    i#72010

diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 48455b7..89e7f14 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/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 a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 69721d3..70af7f2 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/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
 
 
commit 216f84e4b0933612276690a7f69f264e9ded5c71
Author: Florian Reuter <freuter at novell.com>
Date:   Tue Sep 14 17:11:44 2010 +0200

    sw-graphic-save-problem.diff:
    
    n240770

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 3c2f958..cc62d29 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/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() ) )
     {