diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-18 15:19:46 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-21 16:19:10 +0100 |
| commit | 587315ebd5e4417e85eb3ffafd978fcddb09b19f (patch) | |
| tree | b44178d66f1876ab0eefbd8670258a73ef640c1c /writerfilter | |
| parent | 8519d51b3a06a84d0d6418651e66e9bb534f1788 (diff) | |
Char shading: use a marker for character background imported from MSO shading
* So MSO format export filters can recognize that it should be exported
as shading.
* Editing in LO removes this shading marker, so from that point there
will be an LO character background.
Change-Id: I853b952f0395b33d36bb2934a6d910f2182cc1d9
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.hxx | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 989465101f62..b64e2165bc25 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1662,6 +1662,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) pCellColorHandler->setOutputFormat( CellColorHandler::Character ); pProperties->resolve(*pCellColorHandler); rContext->InsertProps(pCellColorHandler->getProperties()); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_SHADING_MARKER, uno::makeAny(true), true, CHAR_GRAB_BAG ); } break; } diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index f380c457c8a0..53d101ce9c57 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -349,6 +349,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const case PROP_GRAPHIC_URL: sName = "GraphicURL"; break; case PROP_GRAPHIC_BITMAP: sName = "GraphicBitmap"; break; case PROP_CHAR_SHADING_VALUE: sName = "CharShadingValue"; break; + case PROP_CHAR_SHADING_MARKER: sName = "CharShadingMarker"; break; case PROP_LABEL_CATEGORY: sName = "LabelCategory"; break; case PROP_FIRST_IS_SHARED : sName = "FirstIsShared"; break; case PROP_MIRROR_INDENTS : sName = "MirrorIndents"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index cd52d488fbbc..618d02dec441 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -320,6 +320,7 @@ enum PropertyIds ,PROP_GRAPHIC_URL ,PROP_GRAPHIC_BITMAP ,PROP_CHAR_SHADING_VALUE + ,PROP_CHAR_SHADING_MARKER ,PROP_FIRST_IS_SHARED ,PROP_MIRROR_INDENTS ,PROP_SURROUND_TEXT_WRAP_SMALL |