diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 6b9eaf4c3804..d16a12e670f0 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DomainMapperTableManager.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2007-05-07 06:20:52 $ + * last change: $Author: os $ $Date: 2007-05-07 12:05:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,9 +43,15 @@ #ifndef INCLUDED_TABLELEFTINDENTHANDLER_HXX #include #endif +#ifndef INCLUDED_DMAPPER_CONVERSIONHELPER_HXX +#include +#endif #ifndef _COM_SUN_STAR_TEXT_HORIORIENTATION_HDL_ #include #endif +#ifndef _COM_SUN_STAR_TEXT_SIZETYPE_HDL_ +#include +#endif namespace dmapper { @@ -100,7 +106,7 @@ bool DomainMapperTableManager::sprm(doctok::Sprm & rSprm) } PropertyMapPtr pTableMap( new PropertyMap ); pTableMap->Insert( PROP_HORI_ORIENT, uno::makeAny( nOrient ) ); - tableProps( pTableMap ); + insertTableProps( pTableMap ); } break; case 0x9601: // sprmTDxaLeft @@ -117,7 +123,7 @@ bool DomainMapperTableManager::sprm(doctok::Sprm & rSprm) { //contains attributes x2902 (LN_unit) and x17e2 (LN_trleft) TableLeftIndentHandlerPtr pTableLeftIndentHandler( new TableLeftIndentHandler ); pProperties->resolve(*pTableLeftIndentHandler); - tableProps(pTableLeftIndentHandler->getProperties()); + insertTableProps(pTableLeftIndentHandler->getProperties()); } } break; @@ -139,11 +145,29 @@ bool DomainMapperTableManager::sprm(doctok::Sprm & rSprm) ++m_nHeaderRepeat; PropertyMapPtr pPropMap( new PropertyMap ); pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( m_nHeaderRepeat )); - tableProps(pPropMap); + insertTableProps(pPropMap); } else m_nHeaderRepeat = -1; break; + case 0x9407: // sprmTDyaRowHeight + { + /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0.5 */ + // table row height - negative values indicate 'exact height' - positive 'at least' + PropertyMapPtr pPropMap( new PropertyMap ); + bool bMinHeight = true; + sal_Int16 nHeight = static_cast( nIntValue ); + if( nHeight < 0 ) + { + bMinHeight = false; + nHeight *= -1; + } + pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny(bMinHeight ? text::SizeType::MIN : text::SizeType::FIX )); + pPropMap->Insert( PROP_HEIGHT, uno::makeAny(ConversionHelper::convertToMM100( nHeight ))); + insertRowProps(pPropMap); + } + break; + case 0xD605: // sprmTTableBorders { /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */ diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 577f71316188..08131ce81618 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PropertyIds.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2007-05-07 06:18:12 $ + * last change: $Author: os $ $Date: 2007-05-07 12:04:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -297,6 +297,18 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const case META_PROP_VERTICAL_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalBorder")); break; case META_PROP_HORIZONTAL_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HorizontalBorder")); break; case PROP_HEADER_ROW_COUNT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderRowCount")); break; + case PROP_IS_AUTO_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight")); break; + case PROP_SIZE_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; +// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; // case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; // case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; // case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index 5b379cb37ad0..30cd6d767181 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -4,9 +4,9 @@ * * $RCSfile: PropertyIds.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: os $ $Date: 2007-05-07 06:18:12 $ + * last change: $Author: os $ $Date: 2007-05-07 12:04:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -239,8 +239,8 @@ enum PropertyIds /*197*/ ,META_PROP_VERTICAL_BORDER /*198*/ ,META_PROP_HORIZONTAL_BORDER /*199*/ ,PROP_HEADER_ROW_COUNT -///*200*/ ,PROP_ -///*201*/ ,PROP_ +/*200*/ ,PROP_IS_AUTO_HEIGHT +/*201*/ ,PROP_SIZE_TYPE ///*202*/ ,PROP_ ///*203*/ ,PROP_ ///*204*/ ,PROP_