[Libreoffice-commits] .: 2 commits - editeng/source solenv/gbuild

[Michael Stahl]

 editeng/source/items/frmitems.cxx |   43 +++++++++++++++++++++++++++++++++++---
 solenv/gbuild/SdiTarget.mk        |    4 +++
 2 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit e81f02795425f2fcd910c9845adc8e9b919833f4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 21 18:10:46 2012 +0200

    SdiTarget.mk: need explicit rule to get object files rebuilt
    
    Without this, when changing sdi file, the objects that include the
    generated header are only rebuilt at the second make invocation.
    
    Change-Id: Idd52a12dd162ec780da3a3b9f24d3bdd9b408a33

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index d911856..43e38ab 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -52,6 +52,10 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLTARGET)
 			-fM$(call gb_SdiTarget_get_dep_target,$*) \
 			$<)
 
+# rule necessary to rebuild cxx files that include the header
+$(call gb_SdiTarget_get_target,%.hxx) : $(call gb_SdiTarget_get_target,%)
+	@true
+
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SdiTarget_get_dep_target,%) :
 	$(if $(wildcard $@),touch $@,\
commit 18ab7f52ebf78f41f824b2245a8a180d97081716
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 21 14:02:36 2012 +0200

    fdo#40874: make recorded border macros run:
    
    When the new BorderLine2 struct with its added members was introduced,
    the PutValues methods that are called by the macro recorder with
    seqeunces of Anys were not adapted, so running recorded macro for
    ".uno:BorderInner" ".uno:BorderOuter" ".uno:SetBorderStyle" fails.
    (regression from b624e6e6cf2ecfc6e6e983af45212fce5e731006,
    7db30f7aa037f52eb07cbb4fd2796bd869204af8)
    
    Change-Id: Icd8a11d7f5c8d79c57020f213a1554540b6c666d

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f98058e..8651534 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2064,7 +2064,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             catch (const uno::Exception&) {}
 
             aNew >>= aSeq;
-            if ( aSeq.getLength() == 4 )
+            if (aSeq.getLength() >= 4 && aSeq.getLength() <= 6)
             {
                 sal_Int32 nVal = 0;
                 if ( aSeq[0] >>= nVal )
@@ -2075,6 +2075,20 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                     aBorderLine.OuterLineWidth = (sal_Int16) nVal;
                 if ( aSeq[3] >>= nVal )
                     aBorderLine.LineDistance = (sal_Int16) nVal;
+                if (aSeq.getLength() >= 5) // fdo#40874 added fields
+                {
+                    if (aSeq[4] >>= nVal)
+                    {
+                        aBorderLine.LineStyle = nVal;
+                    }
+                    if (aSeq.getLength() >= 6)
+                    {
+                        if (aSeq[5] >>= nVal)
+                        {
+                            aBorderLine.LineWidth = nVal;
+                        }
+                    }
+                }
             }
             else
                 return sal_False;
@@ -2854,7 +2868,8 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 try { aNew = xConverter->convertTo( rVal, ::getCppuType((const uno::Sequence < uno::Any >*)0) ); }
                 catch (const uno::Exception&) {}
 
-                if( (aNew >>= aSeq) && aSeq.getLength() == 4 )
+                if ((aNew >>= aSeq) &&
+                    aSeq.getLength() >= 4  && aSeq.getLength() <= 6)
                 {
                     sal_Int32 nVal = 0;
                     if ( aSeq[0] >>= nVal )
@@ -2865,6 +2880,20 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                         aBorderLine.OuterLineWidth = (sal_Int16) nVal;
                     if ( aSeq[3] >>= nVal )
                         aBorderLine.LineDistance = (sal_Int16) nVal;
+                    if (aSeq.getLength() >= 5) // fdo#40874 added fields
+                    {
+                        if (aSeq[4] >>= nVal)
+                        {
+                            aBorderLine.LineStyle = nVal;
+                        }
+                        if (aSeq.getLength() >= 6)
+                        {
+                            if (aSeq[5] >>= nVal)
+                            {
+                                aBorderLine.LineWidth = nVal;
+                            }
+                        }
+                    }
                 }
                 else
                     return sal_False;
@@ -2874,12 +2903,20 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 // serialization for basic macro recording
                 ::com::sun::star::uno::Sequence < sal_Int16 > aSeq;
                 rVal >>= aSeq;
-                if ( aSeq.getLength() == 4 )
+                if (aSeq.getLength() >= 4 && aSeq.getLength() <= 6)
                 {
                     aBorderLine.Color = aSeq[0];
                     aBorderLine.InnerLineWidth = aSeq[1];
                     aBorderLine.OuterLineWidth = aSeq[2];
                     aBorderLine.LineDistance = aSeq[3];
+                    if (aSeq.getLength() >= 5) // fdo#40874 added fields
+                    {
+                        aBorderLine.LineStyle = aSeq[4];
+                        if (aSeq.getLength() >= 6)
+                        {
+                            aBorderLine.LineWidth = aSeq[5];
+                        }
+                    }
                 }
                 else
                     return sal_False;