make row heights ( incl default row height ) from excel are saved absolute

Currently default row heights imported from Excel are not adjusted Optimally ( AdjustRowHeight() is no longer called ) However to ensure correct round tripping the CR_MANUALSIZE flag *is* still set, this results in the style:use-optimal-row-height="true" being set for default row height(s) when saving as odf. So, for example absolute positions which are calculated on importing the Excel document ( where the row height is *not* optimally adjusted ) are still saved with the 'style:use-optimal-row-height' set. When the row heights are read back into calc the row sizes are changed any absolutely positioned objects are now out of place. This patch ensures *all* row heights are from an imported excel document are saved with style:use-optimal-row-height="false"

Change-Id: If898b97ddb0c8b59a401d7b3c133b0eec09cd1db

11 files changed, 86 insertions, 0 deletions

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2c6316caa522..55c3cd2cda4d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -139,2 +139,3 @@
 #include <vector>
+#include <vbahelper/vbaaccesshelper.hxx>
 
@@ -4271,2 +4272,16 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
         {
+            // if source doc was Excel then
+            uno::Reference< frame::XModel > xModel = GetModel();
+            if ( xModel.is() )
+            {
+                uno::Reference< lang::XUnoTunnel >  xObjShellTunnel( xModel, uno::UNO_QUERY );
+                SfxObjectShell* pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel.is() ? xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()) : NULL );
+                if ( pFoundShell && ooo::vba::isAlienExcelDoc( *pFoundShell ) )
+                {
+                    xRowStylesPropertySetMapper = new XMLPropertySetMapper((XMLPropertyMapEntry*)aXMLScFromXLSRowStylesProperties, xScPropHdlFactory);
+                    xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper);
+                    GetAutoStylePool()->SetFamilyPropSetMapper( XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)),
+                        xRowStylesExportPropertySetMapper );
+                }
+            }
             CollectUserDefinedNamespaces(GetDocument()->GetPool(), ATTR_USERDEF);
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index e29431136f4d..ad965b1c9257 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -155,2 +155,10 @@ const XMLPropertyMapEntry aXMLScRowStylesProperties[] =
 
+const XMLPropertyMapEntry aXMLScFromXLSRowStylesProperties[] =
+{
+    MAP( "Height", XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
+    MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
+    MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL_FALSE, CTF_SC_ROWOPTIMALHEIGHT),
+    MAP_END()
+};
+
 const XMLPropertyMapEntry aXMLScTableStylesImportProperties[] =
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index 07a4d307a2c3..5aebca131915 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -43,2 +43,3 @@ extern const XMLPropertyMapEntry aXMLScColumnStylesProperties[];
 extern const XMLPropertyMapEntry aXMLScRowStylesProperties[];
+extern const XMLPropertyMapEntry aXMLScFromXLSRowStylesProperties[];
 extern const XMLPropertyMapEntry aXMLScRowStylesImportProperties[];
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index ba7783476d94..828ff54d7d3a 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
@@ -91,2 +91,4 @@ public:
                     const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True );
+    void SetFamilyPropSetMapper( sal_Int32 nFamily, const ::rtl::OUString& rStrName,
+                    const UniReference< SvXMLExportPropertyMapper >& rMapper );
 
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx
index 9aee08b6fc59..dc790e4ca51a 100644
--- a/xmloff/inc/xmloff/xmltypes.hxx
+++ b/xmloff/inc/xmloff/xmltypes.hxx
@@ -282,2 +282,3 @@
 #define XML_TYPE_TEXT_OVERLINE_HASCOLOR (XML_TEXT_TYPES_START + 113)
+#define XML_TYPE_BOOL_FALSE             (XML_TEXT_TYPES_START + 114)
 
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 884bf0f09075..3fda5126ee50 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -106,2 +106,18 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
 
+void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
+        sal_Int32 nFamily,
+        const OUString& rStrName,
+        const UniReference < SvXMLExportPropertyMapper > & rMapper )
+{
+
+    XMLFamilyData_Impl aTemporary( nFamily );
+    sal_uLong nPos;
+
+    if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
+    {
+        XMLFamilyData_Impl* pFamily = maFamilyList.GetObject( nPos );
+        if ( pFamily )
+            pFamily-> mxMapper = rMapper;
+    }
+}
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 9feedb51ae5d..75420461e1a6 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -187,2 +187,4 @@ public:
         const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True );
+    void SetFamilyPropSetMapper( sal_Int32 nFamily, const ::rtl::OUString& rStrName,
+        const UniReference < SvXMLExportPropertyMapper > & rMapper );
     void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName );
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index a2d2ea18762c..ef8e99aa1d09 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -173,2 +173,5 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_
             break;
+        case XML_TYPE_BOOL_FALSE :
+            pPropHdl = new XMLBoolFalsePropHdl;
+            break;
         case XML_TYPE_MEASURE :
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index d0eed7a50475..5e428abb01ba 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -314,2 +314,10 @@ void SvXMLAutoStylePoolP::AddFamily(
 
+void  SvXMLAutoStylePoolP::SetFamilyPropSetMapper(
+        sal_Int32 nFamily,
+        const OUString& rStrName,
+        const UniReference < SvXMLExportPropertyMapper > & rMapper )
+{
+    pImpl->SetFamilyPropSetMapper( nFamily, rStrName, rMapper );
+}
+
 void SvXMLAutoStylePoolP::RegisterName( sal_Int32 nFamily,
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index b34b37a166fd..8535c0b818d0 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -237,2 +237,22 @@ sal_Bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue
 //
+// class XMLBoolFalsePropHdl
+//
+
+XMLBoolFalsePropHdl::~XMLBoolFalsePropHdl()
+{
+    // nothing to do
+}
+
+sal_Bool XMLBoolFalsePropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const
+{
+    return sal_False;
+}
+
+sal_Bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue*/, const SvXMLUnitConverter& rCnv) const
+{
+    return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( sal_False ), rCnv );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
 // class XMLBoolPropHdl
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 83b7741b5758..529df72e2d22 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -145,2 +145,12 @@ public:
 
+class XMLBoolFalsePropHdl : public XMLBoolPropHdl
+{
+public:
+    virtual ~XMLBoolFalsePropHdl();
+
+    virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+    virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+
+};
+
 /**