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

6 files changed, 60 insertions, 12 deletions

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3e1b1e197128..56b8f08f77cc 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -40,6 +40,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjitem.hxx>
+#include <editeng/numdef.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>                  // SVX_RESSTR
 #include <editeng/bulitem.hxx>
@@ -1302,7 +1303,7 @@ void SdDrawDocument::SetTextDefaults() const
     aNumberFormat.SetStart(1);
     aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
 
-    SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, sal_False);
+    SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM, sal_False);
 
     aNumberFormat.SetLSpace( 0 );
     aNumberFormat.SetAbsLSpace( 0 );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bba9cd06ba63..602fd5883171 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2989,7 +2989,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
 
         const long nOffsetX = (aPartArea.Width() + nGapW) * (bRTL ? -1 : 1);
         const long nOffsetY = aPartArea.Height() + nGapH;
-        const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) - nX : nX;
+        const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) + nX : nX;
 
         for(sal_uInt16 nRow = 0; nRow < nRowCnt; nRow++)
         {
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index cfe6c82a54bc..7c06d27ef75a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -49,6 +49,7 @@
 #include <editeng/bulitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/adjitem.hxx>
+#include <editeng/numdef.hxx>
 #include <svl/itempool.hxx>
 
 #include "stlpool.hxx"
@@ -994,7 +995,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
             aNumberFormat.SetStart(1);
             aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
 
-            SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
+            SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM , sal_False);
 
             for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
             {
@@ -1050,7 +1051,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
             aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
 
             SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,
-                                 10, sal_False );
+                                 SVX_MAX_NUM, sal_False );
             for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
             {
                 aNumberFormat.SetBulletChar( 0x25CF );  // StarBats: 0xF000 + 34
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index c28f4d1e6eae..04018c59167e 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1423,6 +1423,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                             case SVX_NUM_ROMAN_UPPER :
                             case SVX_NUM_ROMAN_LOWER :
                             case SVX_NUM_ARABIC :
+                            case SVX_NUM_NUMBER_UPPER_ZH:
+                            case SVX_NUM_CIRCLE_NUMBER:
+                            case SVX_NUM_NUMBER_UPPER_ZH_TW:
+                            case SVX_NUM_NUMBER_LOWER_ZH:
+                            case SVX_NUM_FULL_WIDTH_ARABIC:
                                 nNumberingType = pBulletPara->nMappedNumType;
                             break;
 
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 481666b1e6a9..04578a28ec23 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                 PortionObj* pPortion = front();
                 CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 );
 
-                switch( (SvxExtNumType)nNumberingType )
+                switch( nNumberingType )
                 {
                     case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
 
@@ -896,15 +896,20 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                             nParaFlags |= 0x90; // wir geben den Font und den Charset vor
                         }
                     }
-                    case SVX_NUM_CHARS_UPPER_LETTER :       // zaehlt von a-z, aa - az, ba - bz, ...
+                    case SVX_NUM_CHARS_UPPER_LETTER :       // count from a-z, aa - az, ba - bz, ...
                     case SVX_NUM_CHARS_LOWER_LETTER :
                     case SVX_NUM_ROMAN_UPPER :
                     case SVX_NUM_ROMAN_LOWER :
                     case SVX_NUM_ARABIC :
-                    case SVX_NUM_PAGEDESC :                 // Numerierung aus der Seitenvorlage
+                    case SVX_NUM_PAGEDESC :                 // numbering from the page template
                     case SVX_NUM_BITMAP :
-                    case SVX_NUM_CHARS_UPPER_LETTER_N :     // zaehlt von  a-z, aa-zz, aaa-zzz
+                    case SVX_NUM_CHARS_UPPER_LETTER_N :     // count from a-z, aa-zz, aaa-zzz
                     case SVX_NUM_CHARS_LOWER_LETTER_N :
+                    case SVX_NUM_NUMBER_UPPER_ZH:
+                    case SVX_NUM_CIRCLE_NUMBER:
+                    case SVX_NUM_NUMBER_UPPER_ZH_TW:
+                    case SVX_NUM_NUMBER_LOWER_ZH:
+                    case SVX_NUM_FULL_WIDTH_ARABIC:
                     {
                         if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
                         {
@@ -990,6 +995,45 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                                     }
                                 }
                                 break;
+                                case SVX_NUM_NUMBER_UPPER_ZH :
+                                {
+                                    if ( sSuffix.Len() )
+                                        nMappedNumType = 0x110001;   // Simplified Chinese with single-byte period.
+                                    else
+                                        nMappedNumType = 0x100001;   // Simplified Chinese.
+                                }
+                                break;
+                                case SVX_NUM_CIRCLE_NUMBER :
+                                {
+                                    nMappedNumType = 0x120001;   // Double byte circle numbers.
+                                }
+                                break;
+                                case SVX_NUM_NUMBER_UPPER_ZH_TW :
+                                {
+                                    if ( sSuffix.Len() )
+                                        nMappedNumType = 0x160001;   // Traditional Chinese with single-byte period.
+                                    else
+                                        nMappedNumType = 0x150001;   // Traditional Chinese.
+                                }
+                                break;
+                                case SVX_NUM_NUMBER_LOWER_ZH :
+                                {
+                                    if ( sSuffix == String( sal_Unicode(0xff0e)) )
+                                        nMappedNumType = 0x260001;   // Japanese with double-byte period.
+                                    else if ( sSuffix.Len() )
+                                        nMappedNumType = 0x1B0001;   // Japanese/Korean with single-byte period.
+                                    else
+                                        nMappedNumType = 0x1A0001;   // Japanese/Korean.
+                                }
+                                break;
+                                case SVX_NUM_FULL_WIDTH_ARABIC :
+                                {
+                                    if ( sSuffix.Len() )
+                                        nMappedNumType = 0x1D0001;   // Double-byte Arabic numbers with double-byte period.
+                                    else
+                                        nMappedNumType = 0x1C0001;   // Double-byte Arabic numbers.
+                                }
+                                break;
                                 default:
                                     break;
                             }
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d217cbf5b68b..6573ea0f46ca 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -327,15 +327,12 @@ void AnnotationWindow::InitControls()
         mpOutliner->SetRefDevice( pDev );
     }
 
+    mpTextWindow->EnableRTL( sal_False );
     mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow );
     mpOutliner->InsertView(mpOutlinerView );
     mpTextWindow->SetOutlinerView(mpOutlinerView);
     mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
 
-    // TODO: ??
-    EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-    mpOutliner->SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
     //create Scrollbars
     mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
     mpVScrollbar->EnableNativeWidget(false);