[Libreoffice-commits] core.git: 2 commits - sd/source sw/source

[Sun Ying]

 sd/source/filter/eppt/pptexanimations.cxx |    3 +--
 sw/source/filter/ww8/ww8par6.cxx          |    4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cc2dd35b24f9ddf14d423cd5f099987223fd6960
Author: Sun Ying <sunying at apache.org>
Date:   Mon Sep 10 01:29:08 2012 +0000

    #119711# support the delay var when export ppt file by AOO
    
    Reported by: Wang Li Feng
    Patch by: Ying Sun
    Review by: Jian Yuan Li

diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index bac80c9..663bd98 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1352,8 +1352,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
                 else if ( aAny >>= fTiming )
                 {
                     bCreateEvent = sal_True;
-                    if ( eTiming == Timing_INDEFINITE )
-                        nBegin = (sal_Int32)( fTiming * 1000.0 );
+                    nBegin = (sal_Int32)( fTiming * 1000.0 );
                 }
             }
             break;
commit ac4c6860961264d23504df90ccf805bd25be032f
Author: Jian Hong Cheng <chengjh at apache.org>
Date:   Fri Aug 31 10:07:04 2012 +0000

    Fix issue i120718: after save the sample file with page border and shadow to doc, the shadow depth and color changed
    
    * source/filter/ww8/ww8par6.cxx
    MS Word Binary compatibility
    
    Patch by: Fan Zheng,<zheng.easyfan at gmail.com>
    Found by: dongjun zong,<zongdj001 at gmail.com>
    Review by: Jian Hong Cheng,<chengjh at apache.org>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c37da4a..c022db6 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1398,7 +1398,9 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray,
     if (bRet)
     {
         rShadow.SetColor(Color(COL_BLACK));
-        short nVal = pSizeArray[WW8_RIGHT];
+    //i120718
+        short nVal = pbrc[WW8_RIGHT].DetermineBorderProperties(bVer67);
+    //End
         if (nVal < 0x10)
             nVal = 0x10;
         rShadow.SetWidth(nVal);