[Libreoffice-commits] .: 2 commits - oox/source

[Muthu Subramanian]

 oox/source/drawingml/shapecontext.cxx |    5 +++++
 oox/source/xls/stylesbuffer.cxx       |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7c210a708b3243a08505933464fc113bff1c4035
Author: Muthu Subramanian K <sumuthu at novell.com>
Date:   Tue Nov 30 18:31:53 2010 +0530

    Import of super/subscript properties of cells - n#655193

diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx
index 89d1111..23bdc20 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/oox/source/xls/stylesbuffer.cxx
@@ -1161,10 +1161,11 @@ void Font::writeToPropertyMap( PropertyMap& rPropMap, FontPropertyType ePropType
     if( maUsedFlags.mbShadowUsed )
         rPropMap[ PROP_CharShadowed ] <<= maApiData.mbShadow;
     // escapement
-    if( maUsedFlags.mbEscapementUsed && (ePropType == FONT_PROPTYPE_TEXT) )
+    if( maUsedFlags.mbEscapementUsed )
     {
         rPropMap[ PROP_CharEscapement ] <<= maApiData.mnEscapement;
-        rPropMap[ PROP_CharEscapementHeight ] <<= maApiData.mnEscapeHeight;
+        if( ePropType == FONT_PROPTYPE_TEXT )
+            rPropMap[ PROP_CharEscapementHeight ] <<= maApiData.mnEscapeHeight;
     }
 }
 
commit af5275531d8ee29461b9e6dcdac5ebbb1bead54e
Author: Muthu Subramanian K <sumuthu at novell.com>
Date:   Tue Nov 30 18:12:33 2010 +0530

    Import hyperlinks of textboxes/shapes - n#655216

diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 52fef7b..765b48e 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -41,6 +41,7 @@
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/customshapegeometry.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
+#include "hyperlinkcontext.hxx"
 #include "tokens.hxx"
 
 using rtl::OUString;
@@ -94,6 +95,10 @@ Reference< XFastContextHandler > ShapeContext::createFastChildContext( sal_Int32
         mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
         break;
     }
+    case XML_hlinkMouseOver:
+    case XML_hlinkClick:
+        xRet = new HyperLinkContext( *this, xAttribs,  getShape()->getShapeProperties() );
+        break;
     case XML_ph:
         mpShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
         if( xAttribs->hasAttribute( XML_idx ) )