writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++++++++++
writerfilter/source/rtftok/rtfsdrimport.cxx | 17 +++++++++++++++++
2 files changed, 27 insertions(+)
New commits:
commit f1b510f2dd55e8e0b1b6be0e9a0d6e215e123498
Author: Pavel Kysilka <goldenf...@linuxsoft.cz>
Date: Mon Jun 25 20:45:19 2012 +0200
implement RTF_DPELLIPSE
Change-Id: Icb531e05f84c8ce7e79a15113102113be3609f45
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index afd7350..6b171ae 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2080,6 +2080,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_DPLINE:
case RTF_DPRECT:
+ case RTF_DPELLIPSE:
{
sal_Int32 nType = 0;
switch (nKeyword)
@@ -2090,6 +2091,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_DPRECT:
nType = ESCHER_ShpInst_Rectangle;
break;
+ case RTF_DPELLIPSE:
+ nType = ESCHER_ShpInst_Ellipse;
+ break;
default:
break;
}
commit cb34f044ce09d6b03620941d5882c3625a36b69c
Author: Pavel Kysilka <goldenf...@linuxsoft.cz>
Date: Mon Jun 25 21:06:42 2012 +0200
implement shape lineWidth
Change-Id: I5a6fd4c8fcb2641cdceabcd58c3fa0ccae059d25
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index e6daa45..9ba957e 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -160,6 +160,12 @@ void RTFSdrImport::resolve(RTFShape& rShape)
aAny <<= i->second.toInt32()*100/65536;
xPropertySet->setPropertyValue("RotateAngle", aAny);
}
+ else if (i->first == "lineWidth" && xPropertySet.is())
+ {
+
+ aAny <<= i->second.toInt32()/360;
+ xPropertySet->setPropertyValue("LineWidth", aAny);
+ }
else if ( i->first == "pVerticies" )
{
uno::Sequence<drawing::EnhancedCustomShapeParameterPair>
aCoordinates;
commit 0ee9dc2f85dba7938cc5ebbfd11be8f337703484
Author: Pavel Kysilka <goldenf...@linuxsoft.cz>
Date: Mon Jun 25 21:05:13 2012 +0200
implement shape rotation
Change-Id: Ib7c76768e302556a88ae6d87770c57f31ea8d36b
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 156e525..e6daa45 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -155,6 +155,11 @@ void RTFSdrImport::resolve(RTFShape& rShape)
aAny <<= uno::makeAny(sal_uInt32(opacity));
xPropertySet->setPropertyValue("FillTransparence", aAny);
}
+ else if (i->first == "rotation" && xPropertySet.is())
+ {
+ aAny <<= i->second.toInt32()*100/65536;
+ xPropertySet->setPropertyValue("RotateAngle", aAny);
+ }
else if ( i->first == "pVerticies" )
{
uno::Sequence<drawing::EnhancedCustomShapeParameterPair>
aCoordinates;
commit 35210310d4519736b98873b7970715630a9bc11f
Author: Pavel Kysilka <goldenf...@linuxsoft.cz>
Date: Mon Jun 25 20:58:55 2012 +0200
implement fillOpacity
Change-Id: I71580bb77b6939c9294eaf5203431d32327d5efd
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index ab4118c..156e525 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -149,6 +149,12 @@ void RTFSdrImport::resolve(RTFShape& rShape)
xPropertySet->setPropertyValue("LineStyle", aAny);
}
}
+ else if (i->first == "fillOpacity" && xPropertySet.is())
+ {
+ int opacity = 100 - (i->second.toInt32())*100/65536;
+ aAny <<= uno::makeAny(sal_uInt32(opacity));
+ xPropertySet->setPropertyValue("FillTransparence", aAny);
+ }
else if ( i->first == "pVerticies" )
{
uno::Sequence<drawing::EnhancedCustomShapeParameterPair>
aCoordinates;
commit 46d7c921222cdcd253f159a1cdbd85ed749c2d26
Author: Pavel Kysilka <goldenf...@linuxsoft.cz>
Date: Mon Jun 25 20:35:58 2012 +0200
implement RTF_HIGHLIGHT
Change-Id: I9d695f9b544250017bea69167e3133c4e9ee37a4
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 270d711..afd7350 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2392,6 +2392,12 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aCharacterSprms.set(0x6877, pValue);
}
break;
+ case RTF_HIGHLIGHT:
+ {
+ RTFValue::Pointer_t pValue(new RTFValue(nParam));
+ m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CHighlight,
pValue);
+ }
+ break;
case RTF_UP:
case RTF_DN:
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
