mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: SvxFrameDirectionItem::PutValue() wants an UNO short

Browse Source 
And not an UNO com.sun.star.text.WritingMode. This fixes the following
warnings during DOCX import:

warn:legacy.osl:12884:1:writerfilter/source/dmapper/PropertyMap.cxx:1484: Exception in SectionPropertyMap::ApplyProperties_
warn:legacy.osl:12884:1:writerfilter/source/dmapper/PropertyMap.cxx:1496: Exception in SectionPropertyMap::ApplyProperties_

Change-Id: Ib4f392b3e4328311baa5767b5a2079730218fca3
Reviewed-on: https://gerrit.libreoffice.org/37028
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
Miklos Vajna
2017-04-27 14:18:12 +02:00
parent 36977f7404
commit e0c7f21c1e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -1439,13 +1439,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
{ {
if (nIntValue != 0) if (nIntValue != 0)
{ {
rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB )); rContext->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode2::RL_TB) ));
if (!IsRTFImport()) if (!IsRTFImport())
rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false); rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false);
} }
else else
{ {
rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::LR_TB )); rContext->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode2::LR_TB) ));
if (!IsRTFImport()) if (!IsRTFImport())
rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false); rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false);
} }
@@ -1454,7 +1454,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
break; break;
case NS_ooxml::LN_EG_SectPrContents_bidi: case NS_ooxml::LN_EG_SectPrContents_bidi:
if (pSectionContext != nullptr) if (pSectionContext != nullptr)
pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB)); pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode2::RL_TB) ));
break; break;
case NS_ooxml::LN_EG_RPrBase_highlight: case NS_ooxml::LN_EG_RPrBase_highlight:
{ {
@@ -1790,7 +1790,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
pTargetContext = pSectionContext; pTargetContext = pSectionContext;
} }
pTargetContext->Insert(PROP_WRITING_MODE, uno::makeAny( nDirection ) ); pTargetContext->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(nDirection) ) );
} }
break; // sprmSTextFlow break; // sprmSTextFlow
// the following are not part of the official documentation // the following are not part of the official documentation

2
writerfilter/source/dmapper/DomainMapperTableManager.cxx
View File

@@ -376,7 +376,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_TblPrBase_bidiVisual: case NS_ooxml::LN_CT_TblPrBase_bidiVisual:
{ {
TablePropertyMapPtr pPropMap(new TablePropertyMap()); TablePropertyMapPtr pPropMap(new TablePropertyMap());
pPropMap->Insert(PROP_WRITING_MODE, uno::makeAny(nIntValue ? text::WritingMode2::RL_TB : text::WritingMode2::LR_TB)); pPropMap->Insert(PROP_WRITING_MODE, uno::makeAny(sal_Int16(nIntValue ? text::WritingMode2::RL_TB : text::WritingMode2::LR_TB)));
insertTableProps(pPropMap); insertTableProps(pPropMap);
break; break;
} }