[Libreoffice-commits] core.git: 3 commits - dictionaries filter/source helpcontent2 svx/source

[Armin Le Grand]

 dictionaries                        |    2 +-
 filter/source/msfilter/escherex.cxx |   13 ++++++++++++-
 helpcontent2                        |    2 +-
 svx/source/svdraw/svddrgmt.cxx      |   13 +++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 80e187b58a2def63f8e779214adff3cf64294c8d
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Sep 19 00:55:57 2012 +0000

    #120999# Added support code in SdrDragObjOwn::MoveSdrDrag to rescue the changed AutoGrowWidth setting to allow instantaneous resizing of AutoGrowWidth objects even when using a cloned SdrObject for the UI interaction

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3dad382..2b2e061 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1233,6 +1233,19 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt)
                     {
                         mpClone = pObj->getFullDragClone();
                         mpClone->applySpecialDrag(DragStat());
+
+                        // #120999# AutoGrowWidth may change for SdrTextObj due to the automatism used
+                        // with bDisableAutoWidthOnDragging, so not only geometry changes but
+                        // also this (pretty indirect) property change is possible. If it gets
+                        // changed, it needs to be copied to the original since nothing will
+                        // happen when it only changes in the drag clone
+                        const bool bOldAutoGrowWidth(((SdrTextAutoGrowWidthItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+                        const bool bNewAutoGrowWidth(((SdrTextAutoGrowWidthItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+
+                        if(bOldAutoGrowWidth != bNewAutoGrowWidth)
+                        {
+                            GetDragObj()->SetMergedItem(SdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
+                        }
                     }
 
                     Show();
commit 95136e701c5f631307d1b72ad8adf6b3df9090fe
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jun 13 08:20:49 2012 +0000

    #i119559# fix vertical text in *ppt export
    
    Patch by: Lei Debin, Wang Zhe
    Found by: Li Feng Wang
    Review by: Herbert Duerr

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 89727c3..412fb59 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdoashp.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdmodel.hxx>
+#include <editeng/outlobj.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/cvtgrf.hxx>
@@ -3093,6 +3094,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                 AddOpt(DFF_Prop_gtextAlign,gTextAlign);
                             }
                         }
+                        if((nTextPathFlags & 0x4000) != 0)  //Is Font work
+                        {
+                            OutlinerParaObject* pOutlinerParaObject = pCustoShape->GetOutlinerParaObject();
+                            if ( pOutlinerParaObject && pOutlinerParaObject->IsVertical() )
+                                nTextPathFlags |= 0x2000;
+                        }
                         if ( nTextPathFlags != nTextPathFlagsOrg )
                             AddOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags );
                     }
commit 74700570730f7259a78c031973cbecd98ef777ff
Author: Andre Fischer <af at apache.org>
Date:   Fri Jul 13 08:27:09 2012 +0000

    Fix #i119495# Fixed export of arrow styles to PPT.
    
    Reported by: Du Jing
    Patch by: Jianyuan Li
    Review by: Andre Fischer
    
    Conflicts:
    	filter/source/msfilter/escherex.cxx
    
    Change-Id: Ic45b36a3193b3771d16fa36b9baa8f0661656e1b

diff --git a/dictionaries b/dictionaries
index 66a5a2e..36776c3 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 66a5a2e03573ab1862db1965f7b9c5419db3decd
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 6449ba8..89727c3 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -731,6 +731,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
                 sal_Int16       nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
 
                 OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName);
+                sal_Bool bIsMapped = sal_True;
                 if ( !aApiName.isEmpty() )
                 {
 
@@ -765,8 +766,11 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
                         reLineEnd = ESCHER_LineArrowDiamondEnd;
                     else if ( aApiName == "Arrow" )
                         reLineEnd = ESCHER_LineArrowEnd;
+                    else
+                        bIsMapped = sal_False;
+
                 }
-                else if ( comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 )
+                if ( !bIsMapped && comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 )
                 {
                     sal_Bool b = sal_True;
                     OUString aArrowName( aArrowStartName.getToken( 0, ' ' ) );
diff --git a/helpcontent2 b/helpcontent2
index 037b55c..341ef99 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 037b55c72ae7831f19ffb8429fba81038314c163
+Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b