Merge tag 'libreoffice-4.0.3.2' into suse-4.0

Tag libreoffice-4.0.3.2

Conflicts:
	basic/qa/cppunit/test_vba.cxx
	basic/source/runtime/step2.cxx
	dictionaries
	helpcontent2
	instsetoo_native/util/openoffice.lst
	libvisio/UnpackedTarball_visio.mk
	sc/source/ui/vba/vbaapplication.cxx
	sc/source/ui/vba/vbavalidation.cxx
	solenv/inc/minor.mk
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx
	translations

Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed

2 files changed, 72 insertions, 9 deletions

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 69b7b4c7a262..f38aeec06e95 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -978,6 +978,15 @@ void EscherPropertyContainer::CreateLineProperties(
     }
     AddOpt( ESCHER_Prop_lineJoinStyle, eLineJoin );
 
+    if ( EscherPropertyValueHelper::GetPropertyValue(
+        aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineTransparence" ) ), sal_True ) )
+    {
+        sal_Int16 nTransparency = 0;
+        if ( aAny >>= nTransparency )
+            AddOpt( ESCHER_Prop_lineOpacity, ( ( 100 - nTransparency ) << 16 ) / 100 );
+    }
+
+
     if ( bEdge == sal_False )
     {
         AddOpt( ESCHER_Prop_fFillOK, 0x1001 );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 208d8b50c50e..beb774b52579 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -47,6 +47,7 @@
 #include <svx/svdocapt.hxx>
 #include <svx/svdotable.hxx>
 #include <editeng/outlobj.hxx>
+#include <editeng/numdef.hxx>
 #include <svx/svdattr.hxx>
 #include "svx/xattr.hxx"
 #include "svx/svditext.hxx"
@@ -3529,6 +3530,63 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM
                 rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );
             }
             break;
+            case 16: // Simplified Chinese.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+            }
+            break;
+            case 17: // Simplified Chinese with single-byte period.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+                rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+            }
+            break;
+            case 18: // Double byte circle numbers.
+            case 19: // Wingdings white circle numbers.
+            case 20: // Wingdings black circle numbers.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
+            }
+            break;
+            case 21: // Traditional Chinese.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+            }
+            break;
+            case 22: // Traditional Chinese with single-byte period.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+                rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+            }
+            break;
+            case 26: // Japanese/Korean.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+            }
+            break;
+            case 27: // Japanese/Korean with single-byte period.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+                rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+            }
+            break;
+            case 28: // Double-byte Arabic numbers.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+            }
+            break;
+            case 29: // Double-byte Arabic numbers with double-byte period.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+                rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+            }
+            break;
+            case 38: // Japanese with double-byte period.
+            {
+                rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // No such type. Instead with Lower Chinese Number
+                rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+            }
+            break;
         }
         rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
     }
@@ -4226,20 +4284,20 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                 eNumRuleType = SVX_RULETYPE_NUMBERING;
             break;
             case TSS_TYPE_SUBTITLE :
-                nLevels = 10;
+                nLevels = SVX_MAX_NUM;
                 eNumRuleType = SVX_RULETYPE_NUMBERING;
             break;
             case TSS_TYPE_BODY :
             case TSS_TYPE_HALFBODY :
             case TSS_TYPE_QUARTERBODY :
-                nLevels = 10;
+                nLevels = SVX_MAX_NUM;
                 eNumRuleType = SVX_RULETYPE_PRESENTATION_NUMBERING;
             break;
             default :
             case TSS_TYPE_NOTES :
             case TSS_TYPE_UNUSED :
             case TSS_TYPE_TEXT_IN_SHAPE :
-                nLevels = 10;
+                nLevels = SVX_MAX_NUM;
                 eNumRuleType = SVX_RULETYPE_NUMBERING;
             break;
         }
@@ -7272,12 +7330,8 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
         if ( eFillStyle != XFILL_NONE )
         {
             sal_Int16 nFillTransparence( ( (const XFillTransparenceItem&)pObj->GetMergedItem( XATTR_FILLTRANSPARENCE ) ).GetValue() );
-            if ( nFillTransparence != 100 )
-            {
-                nFillTransparence *= 100;
-                static const rtl::OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) );
-                xPropSet->setPropertyValue( sFillTransparence, Any( nFillTransparence ) );
-            }
+            static const rtl::OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) );
+            xPropSet->setPropertyValue( sFillTransparence, Any( nFillTransparence ) );
         }
     }
     catch( const Exception& )