[Libreoffice-commits] core.git: 3 commits - oox/source

[Markus Mohrhard]

 oox/source/export/vmlexport.cxx   |    4 ++--
 oox/source/helper/propertymap.cxx |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 78e2431d3e1aafe672a40d2ce79fbb1c48244fff
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Mar 7 22:54:50 2014 +0100

    fix OOXML validation error
    
    Change-Id: I02082c04832959ae520b964ab3fd5e0b0fc34173

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index a1e1dea..35eeae7 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -366,7 +366,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
                     }
                     if ( pWrapType )
                         m_pSerializer->singleElementNS( XML_w10, XML_wrap,
-                                FSNS( XML_v, XML_type ), pWrapType,
+                                XML_type, pWrapType,
                                 FSEND );
                 }
                 bAlreadyWritten[ ESCHER_Prop_WrapText ] = true;
commit 60b36a7968782f44fa9351649f8cdd28ad85f40d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Mar 7 22:15:13 2014 +0100

    fix OOXML validation error, related fdo#42584
    
    Use correct namespace for detectmouseclick
    
    Change-Id: I2830ef089ade94e69a49cb8ceba7fe91fa86817f

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index de62d73..a1e1dea 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -578,7 +578,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
                     }
 
                     if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
-                        impl_AddBool( pAttrList, XML_detectmouseclick, nValue != 0 );
+                        impl_AddBool( pAttrList, FSNS(XML_o, XML_detectmouseclick), nValue != 0 );
 
                     if (rProps.GetOpt(ESCHER_Prop_fillOpacity, nValue))
                         // Partly undo the transformation at the end of EscherPropertyContainer::CreateFillProperties(): VML opacity is 0..1.
commit 2e2c4aa158bd8da84ea6d6f23bcef58e939e08de
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Mar 7 21:54:09 2014 +0100

    remove remaining debug logging
    
    Change-Id: I81eb911ae6117fb557d6d5730a4d381d6fd75f4b

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 5e27b44..a06afd9 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -201,7 +201,6 @@ bool PropertyMap::setAnyProperty( sal_Int32 nPropId, const Any& rValue )
     if( nPropId < 0 )
         return false;
 
-    SAL_WARN_IF(sal_Int32(mpPropNames->size()) <= nPropId, "oox", "invalid PropId");
     maProperties[ nPropId ] = rValue;
     return true;
 }