Skip to content

O
onlyoffice_core
Commit 8e17291c authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

RtfFormatWriter

parent b7fb3d89
Hide whitespace changes
Inline Side-by-side
Showing with 902 additions and 877 deletions
ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.h
View file @ 8e17291c
...@@ -72,100 +72,70 @@ ...@@ -72,100 +72,70 @@
#include "math.h" #include "math.h"
class RtfBorderCommand class RtfBorderCommand
{ {
public:static bool ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CString sCommand, bool hasParameter, int parameter,RtfBorder& oOutput) public:
{ static bool ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CString sCommand, bool hasParameter, int parameter,RtfBorder& oOutput)
if( _T("brdrs") == sCommand ) {
oOutput.m_eType = RtfBorder::bt_brdrs; if( _T("brdrs") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrs;
else if( _T("brdrth") == sCommand ) else if( _T("brdrth") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrth;
oOutput.m_eType = RtfBorder::bt_brdrth; else if( _T("brdrsh") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrsh;
else if( _T("brdrsh") == sCommand ) else if( _T("brdrdb") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdb;
oOutput.m_eType = RtfBorder::bt_brdrsh; else if( _T("brdrdot") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdot;
else if( _T("brdrdb") == sCommand ) else if( _T("brdrdash") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdash;
oOutput.m_eType = RtfBorder::bt_brdrdb; else if( _T("brdrhair") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrhair;
else if( _T("brdrdot") == sCommand ) else if( _T("brdrdashsm") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashsm;
oOutput.m_eType = RtfBorder::bt_brdrdot; else if( _T("brdrdashd") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashd;
else if( _T("brdrdash") == sCommand ) else if( _T("brdrdashdd") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashdd;
oOutput.m_eType = RtfBorder::bt_brdrdash; else if( _T("brdrdashdot") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashdot;
else if( _T("brdrhair") == sCommand ) else if( _T("brdrdashdotdot") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashdot;
oOutput.m_eType = RtfBorder::bt_brdrhair; else if( _T("brdrtriple") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtriple;
else if( _T("brdrdashsm") == sCommand ) else if( _T("brdrtnthsg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthsg;
oOutput.m_eType = RtfBorder::bt_brdrdashsm; else if( _T("brdrthtnsg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrthtnsg;
else if( _T("brdrdashd") == sCommand ) else if( _T("brdrtnthtnsg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthtnsg;
oOutput.m_eType = RtfBorder::bt_brdrdashd; else if( _T("brdrtnthmg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthmg;
else if( _T("brdrdashdd") == sCommand ) else if( _T("brdrthtnmg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrthtnmg;
oOutput.m_eType = RtfBorder::bt_brdrdashdd; else if( _T("brdrtnthtnmg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthtnmg;
else if( _T("brdrdashdot") == sCommand ) else if( _T("brdrtnthlg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthlg;
oOutput.m_eType = RtfBorder::bt_brdrdashdot; else if( _T("brdrthtnlg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrthtnlg;
else if( _T("brdrdashdotdot") == sCommand ) else if( _T("brdrtnthtnlg") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrtnthtnlg;
oOutput.m_eType = RtfBorder::bt_brdrdashdot; else if( _T("brdrwavy") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrwavy;
else if( _T("brdrtriple") == sCommand ) else if( _T("brdrwavydb") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrwavydb;
oOutput.m_eType = RtfBorder::bt_brdrtriple; else if( _T("brdrdashdotstr") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrdashdotstr;
else if( _T("brdrtnthsg") == sCommand ) else if( _T("brdremboss") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdremboss;
oOutput.m_eType = RtfBorder::bt_brdrtnthsg; else if( _T("brdrengrave") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrengrave;
else if( _T("brdrthtnsg") == sCommand ) else if( _T("brdroutset") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdroutset;
oOutput.m_eType = RtfBorder::bt_brdrthtnsg; else if( _T("brdrinset") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrinset;
else if( _T("brdrtnthtnsg") == sCommand ) else if( _T("brdrnone") == sCommand ) oOutput.m_eType = RtfBorder::bt_brdrnone;
oOutput.m_eType = RtfBorder::bt_brdrtnthtnsg; else if( _T("brdrw") == sCommand )
else if( _T("brdrtnthmg") == sCommand ) {
oOutput.m_eType = RtfBorder::bt_brdrtnthmg; if( true == hasParameter )
else if( _T("brdrthtnmg") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrthtnmg;
else if( _T("brdrtnthtnmg") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrtnthtnmg;
else if( _T("brdrtnthlg") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrtnthlg;
else if( _T("brdrthtnlg") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrthtnlg;
else if( _T("brdrtnthtnlg") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrtnthtnlg;
else if( _T("brdrwavy") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrwavy;
else if( _T("brdrwavydb") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrwavydb;
else if( _T("brdrdashdotstr") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrdashdotstr;
else if( _T("brdremboss") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdremboss;
else if( _T("brdrengrave") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrengrave;
else if( _T("brdroutset") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdroutset;
else if( _T("brdrinset") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrinset;
else if( _T("brdrnone") == sCommand )
oOutput.m_eType = RtfBorder::bt_brdrnone;
else if( _T("brdrw") == sCommand )
{ {
if( true == hasParameter ) oOutput.m_nWidth = parameter;
{ if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_nWidth = parameter; oOutput.m_eType = RtfBorder::bt_brdrs;
if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_eType = RtfBorder::bt_brdrs;
}
} }
else if( _T("brsp") == sCommand ) }
else if( _T("brsp") == sCommand )
{
if( true == hasParameter )
{ {
if( true == hasParameter ) oOutput.m_nSpace = parameter;
{ if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_nSpace = parameter; oOutput.m_eType = RtfBorder::bt_brdrs;
if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_eType = RtfBorder::bt_brdrs;
}
} }
else if( _T("brdrcf") == sCommand ) }
else if( _T("brdrcf") == sCommand )
{
if( true == hasParameter )
{ {
if( true == hasParameter ) oOutput.m_nColor = parameter;
{ if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_nColor = parameter; oOutput.m_eType = RtfBorder::bt_brdrs;
if( RtfBorder::bt_none == oOutput.m_eType )
oOutput.m_eType = RtfBorder::bt_brdrs;
}
} }
else
return false;
return true;
} }
else
return false;
return true;
}
}; };
class RtfShadingCommand class RtfShadingCommand
{ {
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXBorderReader.h
View file @ 8e17291c
...@@ -282,7 +282,7 @@ public: ...@@ -282,7 +282,7 @@ public:
} }
} }
if (oOutputBorder.m_eType != RtfBorder::bt_brdrnone) if (oOutputBorder.m_eType != RtfBorder::bt_none)
{ {
if ((m_ooxBorder->m_oColor.IsInit()) && (m_ooxBorder->m_oColor->GetValue() == SimpleTypes::hexcolorRGB)) if ((m_ooxBorder->m_oColor.IsInit()) && (m_ooxBorder->m_oColor->GetValue() == SimpleTypes::hexcolorRGB))
{ {
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View file @ 8e17291c
...@@ -370,11 +370,11 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap ...@@ -370,11 +370,11 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
if (ooxText) if (ooxText)
{ {
CString sValue; CString sValue;
if ((ooxText->m_oSpace.IsInit()) && (ooxText->m_oSpace->GetValue() == SimpleTypes::xmlspacePreserve)) //if ((ooxText->m_oSpace.IsInit()) && (ooxText->m_oSpace->GetValue() == SimpleTypes::xmlspacePreserve))
{ //{
sValue = RtfUtility::Preserve(ooxText->m_sText); // sValue = RtfUtility::Preserve(ooxText->m_sText);
} //}
else //else
sValue = ooxText->m_sText; sValue = ooxText->m_sText;
RtfCharPtr oNewChar = RtfCharPtr( new RtfChar() ); RtfCharPtr oNewChar = RtfCharPtr( new RtfChar() );
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXPictureAnchorReader.h
View file @ 8e17291c
...@@ -51,11 +51,11 @@ public: ...@@ -51,11 +51,11 @@ public:
oOutput.m_eAnchorTypeShape = RtfShape::st_anchor; oOutput.m_eAnchorTypeShape = RtfShape::st_anchor;
oOutput.m_nShapeType = 75;//NSOfficeDrawing::sptPictureFrame; oOutput.m_nShapeType = 75;//NSOfficeDrawing::sptPictureFrame;
oOutput.m_bAllowOverlap = m_ooxAnchor->m_oAllowOverlap.IsInit() ? m_ooxAnchor->m_oAllowOverlap->ToBool() : false; oOutput.m_bAllowOverlap = m_ooxAnchor->m_oAllowOverlap.IsInit() ? m_ooxAnchor->m_oAllowOverlap->ToBool() : false;
oOutput.m_nZOrderRelative = m_ooxAnchor->m_oBehindDoc.IsInit() ? m_ooxAnchor->m_oBehindDoc->ToBool() : false; oOutput.m_nZOrderRelative = m_ooxAnchor->m_oBehindDoc.IsInit() ? m_ooxAnchor->m_oBehindDoc->ToBool() : false;
oOutput.m_bHidden = m_ooxAnchor->m_oHidden.IsInit() ? m_ooxAnchor->m_oHidden->ToBool() : false; oOutput.m_bHidden = m_ooxAnchor->m_oHidden.IsInit() ? m_ooxAnchor->m_oHidden->ToBool() : false;
oOutput.m_bLayoutInCell = m_ooxAnchor->m_oLayoutInCell.IsInit() ? m_ooxAnchor->m_oLayoutInCell->ToBool() : false; oOutput.m_bLayoutInCell = m_ooxAnchor->m_oLayoutInCell.IsInit() ? m_ooxAnchor->m_oLayoutInCell->ToBool() : false;
oOutput.m_bLockAnchor = m_ooxAnchor->m_oLocked.IsInit() ? m_ooxAnchor->m_oLocked->ToBool() : false; oOutput.m_bLockAnchor = m_ooxAnchor->m_oLocked.IsInit() ? m_ooxAnchor->m_oLocked->ToBool() : false;
oOutput.m_nZOrder = m_ooxAnchor->m_oRelativeHeight.IsInit() ? true : false; oOutput.m_nZOrder = m_ooxAnchor->m_oRelativeHeight.IsInit() ? true : false;
int nDistLeft = m_ooxAnchor->m_oDistL.IsInit() ? m_ooxAnchor->m_oDistL->ToTwips() : PROP_DEF; int nDistLeft = m_ooxAnchor->m_oDistL.IsInit() ? m_ooxAnchor->m_oDistL->ToTwips() : PROP_DEF;
...@@ -94,46 +94,46 @@ public: ...@@ -94,46 +94,46 @@ public:
{ {
switch(m_ooxAnchor->m_oPositionH->m_oRelativeFrom->GetValue()) switch(m_ooxAnchor->m_oPositionH->m_oRelativeFrom->GetValue())
{ {
case SimpleTypes::relfromhCharacter : case SimpleTypes::relfromhCharacter:
{ {
oOutput.m_nPositionHRelative = 3; oOutput.m_nPositionHRelative = 3;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
case SimpleTypes::relfromhColumn : case SimpleTypes::relfromhColumn:
{ {
oOutput.m_nPositionHRelative = 2; oOutput.m_nPositionHRelative = 2;
oOutput.m_eXAnchor = RtfShape::ax_column; oOutput.m_eXAnchor = RtfShape::ax_column;
}break; }break;
case SimpleTypes::relfromhInsideMargin : case SimpleTypes::relfromhInsideMargin:
{ {
oOutput.m_nPositionHRelative = 6; oOutput.m_nPositionHRelative = 6;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
case SimpleTypes::relfromhLeftMargin : case SimpleTypes::relfromhLeftMargin:
{ {
oOutput.m_nPositionHRelative = 4; oOutput.m_nPositionHRelative = 4;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
case SimpleTypes::relfromhMargin : case SimpleTypes::relfromhMargin:
{ {
oOutput.m_nPositionHRelative = 0; oOutput.m_nPositionHRelative = 0;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
case SimpleTypes::relfromhOutsideMargin : case SimpleTypes::relfromhOutsideMargin:
{ {
oOutput.m_nPositionHRelative = 7; oOutput.m_nPositionHRelative = 7;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
case SimpleTypes::relfromhPage : case SimpleTypes::relfromhPage :
{ {
oOutput.m_nPositionHRelative = 1; oOutput.m_nPositionHRelative = 1;
oOutput.m_eXAnchor = RtfShape::ax_page; oOutput.m_eXAnchor = RtfShape::ax_page;
}break; }break;
case SimpleTypes::relfromhRightMargin : case SimpleTypes::relfromhRightMargin :
{ {
oOutput.m_nPositionHRelative = 5; oOutput.m_nPositionHRelative = 5;
oOutput.m_eXAnchor = RtfShape::ax_margin; oOutput.m_eXAnchor = RtfShape::ax_margin;
}break; }break;
} }
} }
if (m_ooxAnchor->m_oPositionH->m_oAlign.IsInit()) if (m_ooxAnchor->m_oPositionH->m_oAlign.IsInit())
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXShapeReader.cpp
View file @ 8e17291c
...@@ -170,7 +170,10 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop) ...@@ -170,7 +170,10 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop)
case SimpleTypes::Vml::cssptRotation: case SimpleTypes::Vml::cssptRotation:
{ {
pShape->m_nRotation = 65536 * prop->get_Value().dValue; pShape->m_nRotation = 65536 * prop->get_Value().dValue;
if( PROP_DEF != pShape->m_nRelRight || PROP_DEF != pShape->m_nRelLeft || PROP_DEF != pShape->m_nRelTop || PROP_DEF != pShape->m_nRelBottom ) if( PROP_DEF != pShape->m_nRelRight
|| PROP_DEF != pShape->m_nRelLeft
|| PROP_DEF != pShape->m_nRelTop
|| PROP_DEF != pShape->m_nRelBottom )
pShape->m_nRelRotation = pShape->m_nRotation; pShape->m_nRelRotation = pShape->m_nRotation;
}break; }break;
case SimpleTypes::Vml::cssptVisibility : case SimpleTypes::Vml::cssptVisibility :
...@@ -207,11 +210,19 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop) ...@@ -207,11 +210,19 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop)
}break; }break;
case SimpleTypes::Vml::csspctMsoWidthPercent: case SimpleTypes::Vml::csspctMsoWidthPercent:
{ {
pShape->m_nPctWidth = prop->get_Value().oValue.dValue; pShape->m_nPctWidth = prop->get_Value().dValue;
}break; }break;
case SimpleTypes::Vml::csspctMsoHeightPercent: case SimpleTypes::Vml::csspctMsoHeightPercent:
{ {
pShape->m_nPctHeight = prop->get_Value().oValue.dValue; pShape->m_nPctHeight = prop->get_Value().dValue;
}break;
case SimpleTypes::Vml::cssptVRotateLetters:
{
pShape->m_bGtextFVertical = prop->get_Value().bValue;
}break;
case SimpleTypes::Vml::cssptVTextKern:
{
pShape->m_bGtextFKern = prop->get_Value().bValue;
}break; }break;
case SimpleTypes::Vml::cssptDirection : break; case SimpleTypes::Vml::cssptDirection : break;
case SimpleTypes::Vml::cssptLayoutFlow : break; case SimpleTypes::Vml::cssptLayoutFlow : break;
...@@ -228,10 +239,8 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop) ...@@ -228,10 +239,8 @@ bool ParseStyle(RtfShape* pShape, SimpleTypes::Vml::CCssProperty* prop)
case SimpleTypes::Vml::cssptFontWeight : break; case SimpleTypes::Vml::cssptFontWeight : break;
case SimpleTypes::Vml::cssptMsoTextShadow : break; case SimpleTypes::Vml::cssptMsoTextShadow : break;
case SimpleTypes::Vml::cssptTextDecoration : break; case SimpleTypes::Vml::cssptTextDecoration : break;
case SimpleTypes::Vml::cssptVRotateLetters : break;
case SimpleTypes::Vml::cssptVSameLetterHeights : break; case SimpleTypes::Vml::cssptVSameLetterHeights : break;
case SimpleTypes::Vml::cssptVTextAlign : break; case SimpleTypes::Vml::cssptVTextAlign : break;
case SimpleTypes::Vml::cssptVTextKern : break;
case SimpleTypes::Vml::cssptVTextReverse : break; case SimpleTypes::Vml::cssptVTextReverse : break;
case SimpleTypes::Vml::cssptVTextSpacingMode : break; case SimpleTypes::Vml::cssptVTextSpacingMode : break;
case SimpleTypes::Vml::cssptVTextSpacing : break; case SimpleTypes::Vml::cssptVTextSpacing : break;
...@@ -298,13 +307,17 @@ bool OOXShapeReader::Parse2( ReaderParameter oParam , RtfShapePtr& oOutput) ...@@ -298,13 +307,17 @@ bool OOXShapeReader::Parse2( ReaderParameter oParam , RtfShapePtr& oOutput)
oOutput->m_oPicture = RtfPicturePtr( new RtfPicture() ); oOutput->m_oPicture = RtfPicturePtr( new RtfPicture() );
//todooo проверить что за путь тут выставляется //todooo проверить что за путь тут выставляется
OOXPictureGraphicReader::WriteDataToPicture( sImagePath, *oOutput->m_oPicture, oParam.oReader->m_sPath ); OOXPictureGraphicReader::WriteDataToPicture( sImagePath, *oOutput->m_oPicture, oParam.oReader->m_sPath );
oOutput->m_nFillType = 2;
} }
} }
if (fill->m_oColor.IsInit()) if (fill->m_oColor.IsInit())
oOutput->m_nFillColor = (fill->m_oColor->Get_B() << 16) + (fill->m_oColor->Get_G() << 8) + fill->m_oColor->Get_R(); oOutput->m_nFillColor = (fill->m_oColor->Get_B() << 16) + (fill->m_oColor->Get_G() << 8) + fill->m_oColor->Get_R();
if (fill->m_oColor2.IsInit()) if (fill->m_oColor2.IsInit())
oOutput->m_nFillColor2 = (fill->m_oColor2->Get_B() << 16) + (fill->m_oColor2->Get_G() << 8) + fill->m_oColor2->Get_R(); {
oOutput->m_nFillColor2 = (fill->m_oColor2->Get_B() << 16) + (fill->m_oColor2->Get_G() << 8) + fill->m_oColor2->Get_R();
}
if (fill->m_oOpacity.IsInit()) if (fill->m_oOpacity.IsInit())
oOutput->m_nFillOpacity = fill->m_oOpacity->GetValue() * 100; oOutput->m_nFillOpacity = fill->m_oOpacity->GetValue() * 100;
...@@ -479,6 +492,15 @@ bool OOXShapeReader::Parse2( ReaderParameter oParam , RtfShapePtr& oOutput) ...@@ -479,6 +492,15 @@ bool OOXShapeReader::Parse2( ReaderParameter oParam , RtfShapePtr& oOutput)
{ {
oOutput->m_sGtextUNICODE = text_path->m_sString.get(); oOutput->m_sGtextUNICODE = text_path->m_sString.get();
} }
if ((text_path->m_oFitPath.IsInit()) && (text_path->m_oFitPath->GetValue()))
{
oOutput->m_bGtextFStretch = 1;
oOutput->m_bGtextFBestFit = 1;
oOutput->m_bGtextFShrinkFit = 1;
}
if (text_path->m_oTrim.IsInit())
{
}
if (text_path->m_oStyle.IsInit()) if (text_path->m_oStyle.IsInit())
{ {
ParseStyles( oOutput, text_path->m_oStyle->m_arrProperties ); ParseStyles( oOutput, text_path->m_oStyle->m_arrProperties );
...@@ -706,6 +728,8 @@ bool OOXShapeGroupReader::Parse( ReaderParameter oParam , RtfShapeGroupPtr& oOut ...@@ -706,6 +728,8 @@ bool OOXShapeGroupReader::Parse( ReaderParameter oParam , RtfShapeGroupPtr& oOut
oOutput->m_bLayoutInCell = m_vmlGroup->m_oAllowInCell.GetValue(); oOutput->m_bLayoutInCell = m_vmlGroup->m_oAllowInCell.GetValue();
oOutput->m_bAllowOverlap = m_vmlGroup->m_oAllowOverlap.GetValue(); oOutput->m_bAllowOverlap = m_vmlGroup->m_oAllowOverlap.GetValue();
oOutput->m_nZOrderRelative = 0;
oOutput->m_nWrapType = 3; //def oOutput->m_nWrapType = 3; //def
......
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
View file @ 8e17291c
...@@ -2320,20 +2320,22 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter) ...@@ -2320,20 +2320,22 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter)
CString sResult; CString sResult;
RENDER_RTF_BOOL( m_bBidi, sResult, _T("taprtl") ) RENDER_RTF_BOOL( m_bBidi, sResult, _T("taprtl") )
if( PROP_DEF == m_nAutoFit || 1 == m_nAutoFit )
if( PROP_DEF == m_nAutoFit || 1 == m_nAutoFit )
sResult += _T("\\trautofit1"); sResult += _T("\\trautofit1");
else if( 0 == m_nAutoFit ) else if( 0 == m_nAutoFit )
sResult += _T("\\trautofit0"); sResult += _T("\\trautofit0");
RENDER_RTF_INT( m_nAutoFit, sResult, _T("trautofit") )
RENDER_RTF_INT( m_nGraph, sResult, _T("trgaph") ) RENDER_RTF_INT( m_nAutoFit, sResult, _T("trautofit") )
RENDER_RTF_INT( nTableIndent, sResult, _T("tblind") ) RENDER_RTF_INT( m_nGraph, sResult, _T("trgaph") )
RENDER_RTF_INT( nTableIndentUnits, sResult, _T("tblindtype") ) RENDER_RTF_INT( nTableIndent, sResult, _T("tblind") )
RENDER_RTF_INT( nTableIndentUnits, sResult, _T("tblindtype") )
RENDER_RTF_INT( m_nWrapLeft, sResult, _T("tdfrmtxtLeft") ) RENDER_RTF_INT( m_nWrapLeft, sResult, _T("tdfrmtxtLeft") )
RENDER_RTF_INT( m_nWrapRight, sResult, _T("tdfrmtxtRight") ) RENDER_RTF_INT( m_nWrapRight, sResult, _T("tdfrmtxtRight") )
RENDER_RTF_INT( m_nWrapTop, sResult, _T("tdfrmtxtTop") ) RENDER_RTF_INT( m_nWrapTop, sResult, _T("tdfrmtxtTop") )
RENDER_RTF_INT( m_nWrapBottom, sResult, _T("tdfrmtxtBottom") ) RENDER_RTF_INT( m_nWrapBottom, sResult, _T("tdfrmtxtBottom") )
RENDER_RTF_BOOL( m_bOverlap, sResult, _T("tabsnoovrlp") ) RENDER_RTF_BOOL( m_bOverlap, sResult, _T("tabsnoovrlp") )
switch ( m_eHRef ) switch ( m_eHRef )
{ {
...@@ -2381,22 +2383,22 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter) ...@@ -2381,22 +2383,22 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter)
} }
RENDER_RTF_INT( m_nLeft, sResult, _T("trleft") ) RENDER_RTF_INT( m_nLeft, sResult, _T("trleft") )
RENDER_RTF_INT( m_nDefCellMarLeft, sResult, _T("trpaddl") ); RENDER_RTF_INT( m_nDefCellMarLeft, sResult, _T("trpaddl") );
RENDER_RTF_INT( m_nDefCellMarRight, sResult, _T("trpaddr") ); RENDER_RTF_INT( m_nDefCellMarRight, sResult, _T("trpaddr") );
RENDER_RTF_INT( m_nDefCellMarTop, sResult, _T("trpaddt") ); RENDER_RTF_INT( m_nDefCellMarTop, sResult, _T("trpaddt") );
RENDER_RTF_INT( m_nDefCellMarBottom, sResult, _T("trpaddb") ); RENDER_RTF_INT( m_nDefCellMarBottom, sResult, _T("trpaddb") );
RENDER_RTF_INT( m_nDefCellMarLeftUnits, sResult, _T("trpaddfl") ); RENDER_RTF_INT( m_nDefCellMarLeftUnits, sResult, _T("trpaddfl") );
RENDER_RTF_INT( m_nDefCellMarRightUnits, sResult, _T("trpaddfr") ); RENDER_RTF_INT( m_nDefCellMarRightUnits, sResult, _T("trpaddfr") );
RENDER_RTF_INT( m_nDefCellMarTopUnits, sResult, _T("trpaddft") ); RENDER_RTF_INT( m_nDefCellMarTopUnits, sResult, _T("trpaddft") );
RENDER_RTF_INT( m_nDefCellMarBottomUnits, sResult, _T("trpaddfb") ); RENDER_RTF_INT( m_nDefCellMarBottomUnits, sResult, _T("trpaddfb") );
RENDER_RTF_INT( m_nDefCellSpBottom, sResult, _T("trspdb") ); RENDER_RTF_INT( m_nDefCellSpBottom, sResult, _T("trspdb") );
RENDER_RTF_INT( m_nDefCellSpLeft, sResult, _T("trspdl") ); RENDER_RTF_INT( m_nDefCellSpLeft, sResult, _T("trspdl") );
RENDER_RTF_INT( m_nDefCellSpRight, sResult, _T("trspdr") ); RENDER_RTF_INT( m_nDefCellSpRight, sResult, _T("trspdr") );
RENDER_RTF_INT( m_nDefCellSpTop, sResult, _T("trspdt") ); RENDER_RTF_INT( m_nDefCellSpTop, sResult, _T("trspdt") );
RENDER_RTF_INT( m_nDefCellSpBottomUnits, sResult, _T("trspdfb") ); RENDER_RTF_INT( m_nDefCellSpBottomUnits, sResult, _T("trspdfb") );
RENDER_RTF_INT( m_nDefCellSpLeftUnits, sResult, _T("trspdfl") ); RENDER_RTF_INT( m_nDefCellSpLeftUnits, sResult, _T("trspdfl") );
RENDER_RTF_INT( m_nDefCellSpRightUnits, sResult, _T("trspdfr") ); RENDER_RTF_INT( m_nDefCellSpRightUnits, sResult, _T("trspdfr") );
RENDER_RTF_INT( m_nDefCellSpTopUnits, sResult, _T("trspdft") ); RENDER_RTF_INT( m_nDefCellSpTopUnits, sResult, _T("trspdft") );
if( m_oBorderLeft.IsValid() == true ) if( m_oBorderLeft.IsValid() == true )
{ {
...@@ -2433,15 +2435,15 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter) ...@@ -2433,15 +2435,15 @@ CString RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter)
//RENDER_RTF_INT( m_nStyle, sResult, _T("ts") ) //RENDER_RTF_INT( m_nStyle, sResult, _T("ts") )
RENDER_RTF_BOOL( m_bAutoFirstRow, sResult, _T("tbllkhdrrows") ) RENDER_RTF_BOOL( m_bAutoFirstRow, sResult, _T("tbllkhdrrows") )
RENDER_RTF_BOOL( m_bAutoLastRow, sResult, _T("tbllklastrow") ) RENDER_RTF_BOOL( m_bAutoLastRow, sResult, _T("tbllklastrow") )
RENDER_RTF_BOOL( m_bAutoFirstCol, sResult, _T("tbllkhdrcols") ) RENDER_RTF_BOOL( m_bAutoFirstCol, sResult, _T("tbllkhdrcols") )
RENDER_RTF_BOOL( m_bAutoLastCol, sResult, _T("tbllklastcol") ) RENDER_RTF_BOOL( m_bAutoLastCol, sResult, _T("tbllklastcol") )
RENDER_RTF_BOOL( m_bAutoNoRowBand, sResult, _T("tbllknorowband") ) RENDER_RTF_BOOL( m_bAutoNoRowBand, sResult, _T("tbllknorowband") )
RENDER_RTF_BOOL( m_bAutoNoColBand, sResult, _T("tbllknocolband") ) RENDER_RTF_BOOL( m_bAutoNoColBand, sResult, _T("tbllknocolband") )
RENDER_RTF_INT( m_nRowBandSize, sResult, _T("tscbandsh") ) RENDER_RTF_INT( m_nRowBandSize, sResult, _T("tscbandsh") )
RENDER_RTF_INT( m_nColBandSize, sResult, _T("tscbandsv") ) RENDER_RTF_INT( m_nColBandSize, sResult, _T("tscbandsv") )
return sResult; return sResult;
} }
......
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.h
View file @ 8e17291c
...@@ -915,26 +915,26 @@ public: ...@@ -915,26 +915,26 @@ public:
void SetDefault( ) void SetDefault( )
{ {
DEFAULT_PROPERTY_DEF( m_eType, bt_none ) DEFAULT_PROPERTY_DEF( m_eType, bt_none )
DEFAULT_PROPERTY( m_nWidth ) DEFAULT_PROPERTY ( m_nWidth )
DEFAULT_PROPERTY( m_nSpace ) DEFAULT_PROPERTY ( m_nSpace )
DEFAULT_PROPERTY( m_nColor ) DEFAULT_PROPERTY ( m_nColor )
} }
void SetEmpty( ) void SetEmpty( )
{ {
m_eType = bt_brdrnone; m_eType = bt_brdrnone;
m_nWidth = 0; m_nWidth = 0;
m_nSpace = 0; m_nSpace = 0;
m_nColor = PROP_DEF; m_nColor = PROP_DEF;
} }
void Merge( RtfBorder& oBorPr ) void Merge( RtfBorder& oBorPr )
{ {
//свойство должно быть как единое целое, поэтому если oBorPr задано, то переписыватся целиком //свойство должно быть как единое целое, поэтому если oBorPr задано, то переписыватся целиком
if( bt_none != oBorPr.m_eType || PROP_DEF != oBorPr.m_nWidth || PROP_DEF != oBorPr.m_nSpace || PROP_DEF != oBorPr.m_nColor ) if( bt_none != oBorPr.m_eType || PROP_DEF != oBorPr.m_nWidth || PROP_DEF != oBorPr.m_nSpace || PROP_DEF != oBorPr.m_nColor )
{ {
m_eType = oBorPr.m_eType; m_eType = oBorPr.m_eType;
m_nWidth = oBorPr.m_nWidth; m_nWidth = oBorPr.m_nWidth;
m_nSpace = oBorPr.m_nSpace; m_nSpace = oBorPr.m_nSpace;
m_nColor = oBorPr.m_nColor; m_nColor = oBorPr.m_nColor;
} }
} }
CString RenderToRtf(RenderParameter oRenderParameter); CString RenderToRtf(RenderParameter oRenderParameter);
...@@ -2016,56 +2016,56 @@ public: ...@@ -2016,56 +2016,56 @@ public:
} }
void Merge( RtfTableProperty& oTablePr ) void Merge( RtfTableProperty& oTablePr )
{ {
MERGE_PROPERTY( m_bBidi, oTablePr ) MERGE_PROPERTY( m_bBidi, oTablePr )
MERGE_PROPERTY( m_nAutoFit, oTablePr ) MERGE_PROPERTY( m_nAutoFit, oTablePr )
MERGE_PROPERTY( m_nGraph, oTablePr ) MERGE_PROPERTY( m_nGraph, oTablePr )
MERGE_PROPERTY( nTableIndent, oTablePr ) MERGE_PROPERTY( nTableIndent, oTablePr )
MERGE_PROPERTY( nTableIndentUnits, oTablePr ) MERGE_PROPERTY( nTableIndentUnits, oTablePr )
MERGE_PROPERTY_DEF( m_eJust, oTablePr, rj_none ) MERGE_PROPERTY_DEF( m_eJust, oTablePr, rj_none )
MERGE_PROPERTY( m_nWrapLeft, oTablePr ) MERGE_PROPERTY( m_nWrapLeft, oTablePr )
MERGE_PROPERTY( m_nWrapRight, oTablePr ) MERGE_PROPERTY( m_nWrapRight, oTablePr )
MERGE_PROPERTY( m_nWrapTop, oTablePr ) MERGE_PROPERTY( m_nWrapTop, oTablePr )
MERGE_PROPERTY( m_nWrapBottom, oTablePr ) MERGE_PROPERTY( m_nWrapBottom, oTablePr )
MERGE_PROPERTY( m_bOverlap, oTablePr ) MERGE_PROPERTY( m_bOverlap, oTablePr )
MERGE_PROPERTY_DEF( m_eHRef, oTablePr, hr_none ) MERGE_PROPERTY_DEF( m_eHRef, oTablePr, hr_none )
MERGE_PROPERTY_DEF( m_eVRef, oTablePr, vr_none ) MERGE_PROPERTY_DEF( m_eVRef, oTablePr, vr_none )
MERGE_PROPERTY_DEF( m_eHPos, oTablePr, hp_none ) MERGE_PROPERTY_DEF( m_eHPos, oTablePr, hp_none )
MERGE_PROPERTY_DEF( m_eVPos, oTablePr, vp_none ) MERGE_PROPERTY_DEF( m_eVPos, oTablePr, vp_none )
MERGE_PROPERTY( m_nHPos, oTablePr ) MERGE_PROPERTY( m_nHPos, oTablePr )
MERGE_PROPERTY( m_nVPos, oTablePr ) MERGE_PROPERTY( m_nVPos, oTablePr )
MERGE_PROPERTY( m_nLeft, oTablePr ) MERGE_PROPERTY( m_nLeft, oTablePr )
MERGE_PROPERTY( m_nWidth, oTablePr ) MERGE_PROPERTY( m_nWidth, oTablePr )
MERGE_PROPERTY_DEF( m_eMUWidth, oTablePr, mu_none ) MERGE_PROPERTY_DEF( m_eMUWidth, oTablePr, mu_none )
MERGE_PROPERTY( m_nDefCellMarBottom, oTablePr ) MERGE_PROPERTY( m_nDefCellMarBottom, oTablePr )
MERGE_PROPERTY( m_nDefCellMarRight, oTablePr ) MERGE_PROPERTY( m_nDefCellMarRight, oTablePr )
MERGE_PROPERTY( m_nDefCellMarLeft, oTablePr ) MERGE_PROPERTY( m_nDefCellMarLeft, oTablePr )
MERGE_PROPERTY( m_nDefCellMarTop, oTablePr ) MERGE_PROPERTY( m_nDefCellMarTop, oTablePr )
MERGE_PROPERTY( m_nDefCellMarBottomUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellMarBottomUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellMarRightUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellMarRightUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellMarLeftUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellMarLeftUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellMarTopUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellMarTopUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellSpBottom, oTablePr ) MERGE_PROPERTY( m_nDefCellSpBottom, oTablePr )
MERGE_PROPERTY( m_nDefCellSpLeft, oTablePr ) MERGE_PROPERTY( m_nDefCellSpLeft, oTablePr )
MERGE_PROPERTY( m_nDefCellSpRight, oTablePr ) MERGE_PROPERTY( m_nDefCellSpRight, oTablePr )
MERGE_PROPERTY( m_nDefCellSpTop, oTablePr ) MERGE_PROPERTY( m_nDefCellSpTop, oTablePr )
MERGE_PROPERTY( m_nDefCellSpBottomUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellSpBottomUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellSpLeftUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellSpLeftUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellSpRightUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellSpRightUnits, oTablePr )
MERGE_PROPERTY( m_nDefCellSpTopUnits, oTablePr ) MERGE_PROPERTY( m_nDefCellSpTopUnits, oTablePr )
m_oBorderLeft.Merge( oTablePr.m_oBorderLeft ); m_oBorderLeft.Merge ( oTablePr.m_oBorderLeft );
m_oBorderRight.Merge( oTablePr.m_oBorderRight ); m_oBorderRight.Merge( oTablePr.m_oBorderRight );
m_oBorderTop.Merge( oTablePr.m_oBorderTop ); m_oBorderTop.Merge ( oTablePr.m_oBorderTop );
m_oBorderBottom.Merge( oTablePr.m_oBorderBottom ); m_oBorderBottom.Merge( oTablePr.m_oBorderBottom );
m_oBorderVert.Merge( oTablePr.m_oBorderVert ); m_oBorderVert.Merge ( oTablePr.m_oBorderVert );
m_oBorderHor.Merge( oTablePr.m_oBorderHor ); m_oBorderHor.Merge ( oTablePr.m_oBorderHor );
m_oShading.Merge( oTablePr.m_oShading ); m_oShading.Merge ( oTablePr.m_oShading );
MERGE_PROPERTY( m_nStyle, oTablePr ) MERGE_PROPERTY( m_nStyle, oTablePr )
...@@ -2507,6 +2507,13 @@ public: ...@@ -2507,6 +2507,13 @@ public:
void SetDefault() void SetDefault()
{ {
RtfTableProperty::SetDefault(); RtfTableProperty::SetDefault();
//не SetEmpty() !!!
m_oBorderLeft.SetDefault();
m_oBorderRight.SetDefault();
m_oBorderTop.SetDefault();
m_oBorderBottom.SetDefault();
m_oBorderVert.SetDefault();
m_oBorderHor.SetDefault();
DEFAULT_PROPERTY( m_nIndex ) DEFAULT_PROPERTY( m_nIndex )
DEFAULT_PROPERTY( m_nBandIndex ) DEFAULT_PROPERTY( m_nBandIndex )
......
ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp
View file @ 8e17291c
...@@ -158,12 +158,17 @@ void RtfShape::SetDefault() ...@@ -158,12 +158,17 @@ void RtfShape::SetDefault()
DEFAULT_PROPERTY( m_nGtextSize ) DEFAULT_PROPERTY( m_nGtextSize )
DEFAULT_PROPERTY( m_bGtext ) DEFAULT_PROPERTY( m_bGtext )
DEFAULT_PROPERTY( m_bGtextFVertical )
m_aTextItems = TextItemContainerPtr(); DEFAULT_PROPERTY( m_bGtextFKern )
m_oPicture = RtfPicturePtr(); DEFAULT_PROPERTY( m_bGtextFStretch )
DEFAULT_PROPERTY( m_bGtextFShrinkFit )
DEFAULT_PROPERTY( m_bGtextFBestFit )
m_aTextItems = TextItemContainerPtr();
m_oPicture = RtfPicturePtr();
m_bIsOle = false; m_bIsOle = false;
m_bInGroup = false; m_bInGroup = false;
} }
CString RtfShape::RenderToRtf(RenderParameter oRenderParameter) CString RtfShape::RenderToRtf(RenderParameter oRenderParameter)
...@@ -172,17 +177,17 @@ CString RtfShape::RenderToRtf(RenderParameter oRenderParameter) ...@@ -172,17 +177,17 @@ CString RtfShape::RenderToRtf(RenderParameter oRenderParameter)
CString sResult; CString sResult;
//запоминаем координаты и если нужно поворачиваем //запоминаем координаты и если нужно поворачиваем
int nLeft = m_nLeft; int nLeft = m_nLeft;
int nTop = m_nTop; int nTop = m_nTop;
int nRight = m_nRight; int nRight = m_nRight;
int nBottom = m_nBottom; int nBottom = m_nBottom;
int nRotate = m_nRotation; int nRotate = m_nRotation;
int nRelLeft = m_nRelLeft; int nRelLeft = m_nRelLeft;
int nRelTop = m_nRelTop; int nRelTop = m_nRelTop;
int nRelRight = m_nRelRight; int nRelRight = m_nRelRight;
int nRelBottom = m_nRelBottom; int nRelBottom = m_nRelBottom;
int nRelRotate = m_nRelRotation; int nRelRotate = m_nRelRotation;
if( PROP_DEF != m_nRotation && PROP_DEF != m_nLeft && PROP_DEF != m_nTop && if( PROP_DEF != m_nRotation && PROP_DEF != m_nLeft && PROP_DEF != m_nTop &&
PROP_DEF != m_nRight && PROP_DEF != m_nBottom ) PROP_DEF != m_nRight && PROP_DEF != m_nBottom )
...@@ -363,18 +368,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -363,18 +368,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
//Position absolute //Position absolute
if( PROP_DEF != m_nPositionH ) if( PROP_DEF != m_nPositionH )
sResult.AppendFormat( _T("{\\sp{\\sn posh}{\\sv %d}}"), m_nPositionH); sResult.AppendFormat( _T("{\\sp{\\sn posh}{\\sv %d}}"), m_nPositionH);
if( PROP_DEF != m_nPositionHRelative ) if( PROP_DEF != m_nPositionHRelative )
sResult.AppendFormat( _T("{\\sp{\\sn posrelh}{\\sv %d}}"), m_nPositionHRelative); sResult.AppendFormat( _T("{\\sp{\\sn posrelh}{\\sv %d}}"), m_nPositionHRelative);
if( PROP_DEF != m_nPositionV ) if( PROP_DEF != m_nPositionV )
sResult.AppendFormat( _T("{\\sp{\\sn posv}{\\sv %d}}"), m_nPositionV); sResult.AppendFormat( _T("{\\sp{\\sn posv}{\\sv %d}}"), m_nPositionV);
if( PROP_DEF != m_nPositionVRelative ) if( PROP_DEF != m_nPositionVRelative )
sResult.AppendFormat( _T("{\\sp{\\sn posrelv}{\\sv %d}}"), m_nPositionVRelative); sResult.AppendFormat( _T("{\\sp{\\sn posrelv}{\\sv %d}}"), m_nPositionVRelative);
if( PROP_DEF != m_bLayoutInCell ) if( PROP_DEF != m_bLayoutInCell )
sResult.AppendFormat( _T("{\\sp{\\sn fLayoutInCell}{\\sv %d}}"), m_bLayoutInCell); sResult.AppendFormat( _T("{\\sp{\\sn fLayoutInCell}{\\sv %d}}"), m_bLayoutInCell);
if( PROP_DEF != m_bAllowOverlap ) if( PROP_DEF != m_bAllowOverlap )
sResult.AppendFormat( _T("{\\sp{\\sn fAllowOverlap}{\\sv %d}}"), m_bAllowOverlap); sResult.AppendFormat( _T("{\\sp{\\sn fAllowOverlap}{\\sv %d}}"),m_bAllowOverlap);
//Position relative //Position relative
if( PROP_DEF != m_nPositionHPct ) if( PROP_DEF != m_nPositionHPct )
...@@ -382,17 +387,17 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -382,17 +387,17 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
if( PROP_DEF != m_nPositionVPct ) if( PROP_DEF != m_nPositionVPct )
sResult.AppendFormat( _T("{\\sp{\\sn pctVertPos}{\\sv %d}}"), m_nPositionVPct); sResult.AppendFormat( _T("{\\sp{\\sn pctVertPos}{\\sv %d}}"), m_nPositionVPct);
if( PROP_DEF != m_nPctWidth ) if( PROP_DEF != m_nPctWidth )
sResult.AppendFormat( _T("{\\sp{\\sn pctHoriz}{\\sv %d}}"), m_nPctWidth); sResult.AppendFormat( _T("{\\sp{\\sn pctHoriz}{\\sv %d}}"), m_nPctWidth);
if( PROP_DEF != m_nPctHeight ) if( PROP_DEF != m_nPctHeight )
sResult.AppendFormat( _T("{\\sp{\\sn pctVert}{\\sv %d}}"), m_nPctHeight); sResult.AppendFormat( _T("{\\sp{\\sn pctVert}{\\sv %d}}"), m_nPctHeight);
if( PROP_DEF != m_nPctWidthRelative ) if( PROP_DEF != m_nPctWidthRelative )
sResult.AppendFormat( _T("{\\sp{\\sn sizerelh}{\\sv %d}}"), m_nPctWidthRelative); sResult.AppendFormat( _T("{\\sp{\\sn sizerelh}{\\sv %d}}"), m_nPctWidthRelative);
if( PROP_DEF != m_nPctHeightRelative ) if( PROP_DEF != m_nPctHeightRelative )
sResult.AppendFormat( _T("{\\sp{\\sn sizerelv}{\\sv %d}}"), m_nPctHeightRelative); sResult.AppendFormat( _T("{\\sp{\\sn sizerelv}{\\sv %d}}"), m_nPctHeightRelative);
if( PROP_DEF != m_nColStart ) if( PROP_DEF != m_nColStart )
sResult.AppendFormat( _T("{\\sp{\\sn colStart}{\\sv %d}}"), m_nColStart); sResult.AppendFormat( _T("{\\sp{\\sn colStart}{\\sv %d}}"), m_nColStart);
if( PROP_DEF != m_nColSpan ) if( PROP_DEF != m_nColSpan )
sResult.AppendFormat( _T("{\\sp{\\sn colSpan}{\\sv %d}}"), m_nColSpan); sResult.AppendFormat( _T("{\\sp{\\sn colSpan}{\\sv %d}}"), m_nColSpan);
//Rehydration //Rehydration
if( _T("") != m_sMetroBlob ) if( _T("") != m_sMetroBlob )
sResult.AppendFormat( _T("{\\sp{\\sn metroBlob}{\\sv %d}}"), m_sMetroBlob.GetBuffer()); sResult.AppendFormat( _T("{\\sp{\\sn metroBlob}{\\sv %d}}"), m_sMetroBlob.GetBuffer());
...@@ -400,18 +405,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -400,18 +405,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
//Object Type //Object Type
if( PROP_DEF != m_bIsBullet ) if( PROP_DEF != m_bIsBullet )
sResult.AppendFormat( _T("{\\sp{\\sn fIsBullet}{\\sv %d}}"), m_bIsBullet); sResult.AppendFormat( _T("{\\sp{\\sn fIsBullet}{\\sv %d}}"), m_bIsBullet);
if( PROP_DEF != m_nRotation ) if( PROP_DEF != m_nRotation )
sResult.AppendFormat( _T("{\\sp{\\sn rotation}{\\sv %d}}"), m_nRotation); sResult.AppendFormat( _T("{\\sp{\\sn rotation}{\\sv %d}}"), m_nRotation);
if( PROP_DEF != m_bFlipV ) if( PROP_DEF != m_bFlipV )
sResult.AppendFormat( _T("{\\sp{\\sn fFlipV}{\\sv %d}}"), m_bFlipV); sResult.AppendFormat( _T("{\\sp{\\sn fFlipV}{\\sv %d}}"), m_bFlipV);
if( PROP_DEF != m_bFlipH ) if( PROP_DEF != m_bFlipH )
sResult.AppendFormat( _T("{\\sp{\\sn fFlipH}{\\sv %d}}"), m_bFlipH); sResult.AppendFormat( _T("{\\sp{\\sn fFlipH}{\\sv %d}}"), m_bFlipH);
if( PROP_DEF != m_nShapeType ) if( PROP_DEF != m_nShapeType )
sResult.AppendFormat( _T("{\\sp{\\sn shapeType}{\\sv %d}}"), m_nShapeType); sResult.AppendFormat( _T("{\\sp{\\sn shapeType}{\\sv %d}}"), m_nShapeType);
if( PROP_DEF != m_nZOrderRelative ) if( PROP_DEF != m_nZOrderRelative )
sResult.AppendFormat( _T("{\\sp{\\sn fBehindDocument}{\\sv %d}}"), m_nZOrderRelative); sResult.AppendFormat( _T("{\\sp{\\sn fBehindDocument}{\\sv %d}}"), m_nZOrderRelative);
if( PROP_DEF != m_bHidden ) if( PROP_DEF != m_bHidden )
sResult.AppendFormat( _T("{\\sp{\\sn fHidden}{\\sv %d}}"), m_bHidden); sResult.AppendFormat( _T("{\\sp{\\sn fHidden}{\\sv %d}}"), m_bHidden);
//Text //Text
//sResult += _T("{\\sp{\\sn fLockText}{\\sv 0}}"); //sResult += _T("{\\sp{\\sn fLockText}{\\sv 0}}");
...@@ -442,11 +447,11 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -442,11 +447,11 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
if( PROP_DEF != m_bFitTextToShape ) if( PROP_DEF != m_bFitTextToShape )
sResult.AppendFormat( _T("{\\sp{\\sn fFitTextToShape}{\\sv %d}}"), m_bFitTextToShape); sResult.AppendFormat( _T("{\\sp{\\sn fFitTextToShape}{\\sv %d}}"), m_bFitTextToShape);
if( PROP_DEF != m_nCcol ) if( PROP_DEF != m_nCcol )
sResult.AppendFormat( _T("{\\sp{\\sn ccol}{\\sv %d}}"), m_nCcol); sResult.AppendFormat( _T("{\\sp{\\sn ccol}{\\sv %d}}"), m_nCcol);
if( PROP_DEF != m_nTxdir ) if( PROP_DEF != m_nTxdir )
sResult.AppendFormat( _T("{\\sp{\\sn txdir}{\\sv %d}}"), m_nTxdir); sResult.AppendFormat( _T("{\\sp{\\sn txdir}{\\sv %d}}"), m_nTxdir);
if( PROP_DEF != m_nWrapText ) if( PROP_DEF != m_nWrapText )
sResult.AppendFormat( _T("{\\sp{\\sn WrapText}{\\sv %d}}"), m_nWrapText); sResult.AppendFormat( _T("{\\sp{\\sn WrapText}{\\sv %d}}"), m_nWrapText);
//Geometry //Geometry
if( PROP_DEF != m_nAdjustValue[0] ) if( PROP_DEF != m_nAdjustValue[0] )
sResult.AppendFormat( _T("{\\sp{\\sn adjustValue}{\\sv %d}}"), m_nAdjustValue[0] ); sResult.AppendFormat( _T("{\\sp{\\sn adjustValue}{\\sv %d}}"), m_nAdjustValue[0] );
...@@ -470,18 +475,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -470,18 +475,18 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
sResult.AppendFormat( _T("{\\sp{\\sn adjust10Value}{\\sv %d}}"), m_nAdjustValue[9] ); sResult.AppendFormat( _T("{\\sp{\\sn adjust10Value}{\\sv %d}}"), m_nAdjustValue[9] );
//custom //custom
if( PROP_DEF != m_nGeoLeft) if( PROP_DEF != m_nGeoLeft)
sResult.AppendFormat( _T("{\\sp{\\sn geoLeft}{\\sv %d}}"), m_nGeoLeft ); sResult.AppendFormat( _T("{\\sp{\\sn geoLeft}{\\sv %d}}"), m_nGeoLeft );
if( PROP_DEF != m_nGeoTop) if( PROP_DEF != m_nGeoTop)
sResult.AppendFormat( _T("{\\sp{\\sn geoTop}{\\sv %d}}"), m_nGeoTop); sResult.AppendFormat( _T("{\\sp{\\sn geoTop}{\\sv %d}}"), m_nGeoTop);
if( PROP_DEF != m_nGeoRight) if( PROP_DEF != m_nGeoRight)
sResult.AppendFormat( _T("{\\sp{\\sn geoRight}{\\sv %d}}"), m_nGeoRight ); sResult.AppendFormat( _T("{\\sp{\\sn geoRight}{\\sv %d}}"), m_nGeoRight );
if( PROP_DEF != m_nGeoBottom) if( PROP_DEF != m_nGeoBottom)
sResult.AppendFormat( _T("{\\sp{\\sn geoBottom}{\\sv %d}}"), m_nGeoBottom ); sResult.AppendFormat( _T("{\\sp{\\sn geoBottom}{\\sv %d}}"), m_nGeoBottom );
if( PROP_DEF != m_nShapePath) if( PROP_DEF != m_nShapePath)
sResult.AppendFormat( _T("{\\sp{\\sn shapePath}{\\sv %d}}"), m_nShapePath ); sResult.AppendFormat( _T("{\\sp{\\sn shapePath}{\\sv %d}}"), m_nShapePath );
if( !m_aPVerticles.empty()) if( !m_aPVerticles.empty())
{ {
sResult.AppendFormat( _T("{\\sp{\\sn pVerticies}{\\sv 8;%d"), m_aPVerticles.size() ); sResult.AppendFormat( _T("{\\sp{\\sn pVerticies}{\\sv 8;%d"), m_aPVerticles.size() );
for( int i = 0; i < m_aPVerticles.size(); i ++ ) for( int i = 0; i < m_aPVerticles.size(); i ++ )
sResult.AppendFormat( _T(";(%d,%d)"), m_aPVerticles[i].first, m_aPVerticles[i].second ); sResult.AppendFormat( _T(";(%d,%d)"), m_aPVerticles[i].first, m_aPVerticles[i].second );
sResult += _T("}}"); sResult += _T("}}");
...@@ -496,63 +501,63 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -496,63 +501,63 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
} }
//Connectors //Connectors
if( PROP_DEF != m_nConnectionType ) if( PROP_DEF != m_nConnectionType )
sResult.AppendFormat( _T("{\\sp{\\sn cxk}{\\sv %d}}"), m_nConnectionType ); sResult.AppendFormat( _T("{\\sp{\\sn cxk}{\\sv %d}}"), m_nConnectionType );
if( PROP_DEF != m_nConnectorStyle ) if( PROP_DEF != m_nConnectorStyle )
sResult.AppendFormat( _T("{\\sp{\\sn cxstyle}{\\sv %d}}"), m_nConnectorStyle ); sResult.AppendFormat( _T("{\\sp{\\sn cxstyle}{\\sv %d}}"), m_nConnectorStyle );
//Picture Effects //Picture Effects
if( PROP_DEF != m_nCropFromTop ) if( PROP_DEF != m_nCropFromTop )
sResult.AppendFormat( _T("{\\sp{\\sn cropFromTop}{\\sv %d}}"), m_nCropFromTop ); sResult.AppendFormat( _T("{\\sp{\\sn cropFromTop}{\\sv %d}}"), m_nCropFromTop );
if( PROP_DEF != m_nCropFromBottom ) if( PROP_DEF != m_nCropFromBottom )
sResult.AppendFormat( _T("{\\sp{\\sn cropFromBottom}{\\sv %d}}"), m_nCropFromBottom ); sResult.AppendFormat( _T("{\\sp{\\sn cropFromBottom}{\\sv %d}}"), m_nCropFromBottom );
if( PROP_DEF != m_nCropFromLeft ) if( PROP_DEF != m_nCropFromLeft )
sResult.AppendFormat( _T("{\\sp{\\sn cropFromLeft}{\\sv %d}}"), m_nCropFromLeft ); sResult.AppendFormat( _T("{\\sp{\\sn cropFromLeft}{\\sv %d}}"), m_nCropFromLeft );
if( PROP_DEF != m_nCropFromRight ) if( PROP_DEF != m_nCropFromRight )
sResult.AppendFormat( _T("{\\sp{\\sn cropFromRight}{\\sv %d}}"), m_nCropFromRight ); sResult.AppendFormat( _T("{\\sp{\\sn cropFromRight}{\\sv %d}}"), m_nCropFromRight );
//Grouped Shapes //Grouped Shapes
if( PROP_DEF != m_nGroupBottom ) if( PROP_DEF != m_nGroupBottom )
sResult.AppendFormat( _T("{\\sp{\\sn groupBottom}{\\sv %d}}"), m_nGroupBottom ); sResult.AppendFormat( _T("{\\sp{\\sn groupBottom}{\\sv %d}}"), m_nGroupBottom );
if( PROP_DEF != m_nGroupLeft ) if( PROP_DEF != m_nGroupLeft )
sResult.AppendFormat( _T("{\\sp{\\sn groupLeft}{\\sv %d}}"), m_nGroupLeft ); sResult.AppendFormat( _T("{\\sp{\\sn groupLeft}{\\sv %d}}"), m_nGroupLeft );
if( PROP_DEF != m_nGroupRight ) if( PROP_DEF != m_nGroupRight )
sResult.AppendFormat( _T("{\\sp{\\sn groupRight}{\\sv %d}}"), m_nGroupRight ); sResult.AppendFormat( _T("{\\sp{\\sn groupRight}{\\sv %d}}"), m_nGroupRight );
if( PROP_DEF != m_nGroupTop ) if( PROP_DEF != m_nGroupTop )
sResult.AppendFormat( _T("{\\sp{\\sn groupTop}{\\sv %d}}"), m_nGroupTop ); sResult.AppendFormat( _T("{\\sp{\\sn groupTop}{\\sv %d}}"), m_nGroupTop );
if( PROP_DEF != m_nRelBottom ) if( PROP_DEF != m_nRelBottom )
sResult.AppendFormat( _T("{\\sp{\\sn relBottom}{\\sv %d}}"), m_nRelBottom ); sResult.AppendFormat( _T("{\\sp{\\sn relBottom}{\\sv %d}}"), m_nRelBottom );
if( PROP_DEF != m_nRelLeft ) if( PROP_DEF != m_nRelLeft )
sResult.AppendFormat( _T("{\\sp{\\sn relLeft}{\\sv %d}}"), m_nRelLeft ); sResult.AppendFormat( _T("{\\sp{\\sn relLeft}{\\sv %d}}"), m_nRelLeft );
if( PROP_DEF != m_nRelRight ) if( PROP_DEF != m_nRelRight )
sResult.AppendFormat( _T("{\\sp{\\sn relRight}{\\sv %d}}"), m_nRelRight ); sResult.AppendFormat( _T("{\\sp{\\sn relRight}{\\sv %d}}"), m_nRelRight );
if( PROP_DEF != m_nRelTop ) if( PROP_DEF != m_nRelTop )
sResult.AppendFormat( _T("{\\sp{\\sn relTop}{\\sv %d}}"), m_nRelTop ); sResult.AppendFormat( _T("{\\sp{\\sn relTop}{\\sv %d}}"), m_nRelTop );
if( PROP_DEF != m_nRelRotation ) if( PROP_DEF != m_nRelRotation)
sResult.AppendFormat( _T("{\\sp{\\sn relRotation}{\\sv %d}}"), m_nRelRotation ); sResult.AppendFormat( _T("{\\sp{\\sn relRotation}{\\sv %d}}"), m_nRelRotation );
if( PROP_DEF != m_nRelZOrder ) if( PROP_DEF != m_nRelZOrder )
sResult.AppendFormat( _T("{\\sp{\\sn dhgt}{\\sv %d}}"), m_nRelZOrder ); sResult.AppendFormat( _T("{\\sp{\\sn dhgt}{\\sv %d}}"), m_nRelZOrder );
//Fill //Fill
if( 0 == m_bFilled ) if( 0 == m_bFilled )
sResult += _T("{\\sp{\\sn fFilled}{\\sv 0}}"); sResult += _T("{\\sp{\\sn fFilled}{\\sv 0}}");
if( PROP_DEF != m_nFillType ) if( PROP_DEF != m_nFillType )
sResult.AppendFormat( _T("{\\sp{\\sn fillType}{\\sv %d}}"), m_nFillType ); sResult.AppendFormat( _T("{\\sp{\\sn fillType}{\\sv %d}}"), m_nFillType );
if( PROP_DEF != m_nFillColor ) if( PROP_DEF != m_nFillColor )
sResult.AppendFormat( _T("{\\sp{\\sn fillColor}{\\sv %d}}"), m_nFillColor ); sResult.AppendFormat( _T("{\\sp{\\sn fillColor}{\\sv %d}}"), m_nFillColor );
if( PROP_DEF != m_nFillColor2 ) if( PROP_DEF != m_nFillColor2 )
sResult.AppendFormat( _T("{\\sp{\\sn fillBackColor}{\\sv %d}}"), m_nFillColor2 ); sResult.AppendFormat( _T("{\\sp{\\sn fillBackColor}{\\sv %d}}"), m_nFillColor2 );
if( PROP_DEF != m_nFillOpacity ) if( PROP_DEF != m_nFillOpacity )
sResult.AppendFormat( _T("{\\sp{\\sn fillOpacity}{\\sv %d}}"), ( m_nFillOpacity * 65536 /100 ) ); sResult.AppendFormat( _T("{\\sp{\\sn fillOpacity}{\\sv %d}}"), ( m_nFillOpacity * 65536 /100 ) );
if( PROP_DEF != m_nFillFocus ) if( PROP_DEF != m_nFillFocus )
sResult.AppendFormat( _T("{\\sp{\\sn fillFocus}{\\sv %d}}"), m_nFillFocus ); sResult.AppendFormat( _T("{\\sp{\\sn fillFocus}{\\sv %d}}"), m_nFillFocus );
if( PROP_DEF != m_nFillAngle ) if( PROP_DEF != m_nFillAngle )
sResult.AppendFormat( _T("{\\sp{\\sn fillAngle}{\\sv %d}}"), m_nFillAngle * 65536 ); sResult.AppendFormat( _T("{\\sp{\\sn fillAngle}{\\sv %d}}"), m_nFillAngle * 65536 );
//Line //Line
if( 0 == m_bLine ) if( 0 == m_bLine )
sResult += _T("{\\sp{\\sn fLine}{\\sv 0}}"); sResult += _T("{\\sp{\\sn fLine}{\\sv 0}}");
if( PROP_DEF != m_nLineColor ) if( PROP_DEF != m_nLineColor )
sResult.AppendFormat( _T("{\\sp{\\sn lineColor}{\\sv %d}}"), m_nLineColor ); sResult.AppendFormat( _T("{\\sp{\\sn lineColor}{\\sv %d}}"), m_nLineColor );
if( PROP_DEF != m_nLineStartArrow ) if( PROP_DEF != m_nLineStartArrow )
sResult.AppendFormat( _T("{\\sp{\\sn lineStartArrowhead}{\\sv %d}}"), m_nLineStartArrow ); sResult.AppendFormat( _T("{\\sp{\\sn lineStartArrowhead}{\\sv %d}}"), m_nLineStartArrow );
if( PROP_DEF != m_nLineEndArrow ) if( PROP_DEF != m_nLineEndArrow )
sResult.AppendFormat( _T("{\\sp{\\sn lineEndArrowhead}{\\sv %d}}"), m_nLineEndArrow ); sResult.AppendFormat( _T("{\\sp{\\sn lineEndArrowhead}{\\sv %d}}"), m_nLineEndArrow );
if( PROP_DEF != m_nLineStartArrowWidth ) if( PROP_DEF != m_nLineStartArrowWidth )
sResult.AppendFormat( _T("{\\sp{\\sn lineStartArrowWidth}{\\sv %d}}"), m_nLineStartArrowWidth ); sResult.AppendFormat( _T("{\\sp{\\sn lineStartArrowWidth}{\\sv %d}}"), m_nLineStartArrowWidth );
if( PROP_DEF != m_nLineStartArrowLength ) if( PROP_DEF != m_nLineStartArrowLength )
...@@ -562,9 +567,9 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -562,9 +567,9 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
if( PROP_DEF != m_nLineEndArrowLength ) if( PROP_DEF != m_nLineEndArrowLength )
sResult.AppendFormat( _T("{\\sp{\\sn lineEndArrowLength}{\\sv %d}}"), m_nLineEndArrowLength ); sResult.AppendFormat( _T("{\\sp{\\sn lineEndArrowLength}{\\sv %d}}"), m_nLineEndArrowLength );
if( PROP_DEF != m_nLineWidth ) if( PROP_DEF != m_nLineWidth )
sResult.AppendFormat( _T("{\\sp{\\sn lineWidth}{\\sv %d}}"), m_nLineWidth ); sResult.AppendFormat( _T("{\\sp{\\sn lineWidth}{\\sv %d}}"), m_nLineWidth );
if( PROP_DEF != m_nLineDashing ) if( PROP_DEF != m_nLineDashing )
sResult.AppendFormat( _T("{\\sp{\\sn lineDashing}{\\sv %d}}"), m_nLineDashing ); sResult.AppendFormat( _T("{\\sp{\\sn lineDashing}{\\sv %d}}"), m_nLineDashing );
//pWrapPolygonVertices Points of the text wrap polygon. //pWrapPolygonVertices Points of the text wrap polygon.
if( !m_aWrapPoints.empty()) if( !m_aWrapPoints.empty())
...@@ -578,6 +583,7 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -578,6 +583,7 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
if( PROP_DEF != m_bGtext ) if( PROP_DEF != m_bGtext )
{ {
sResult.AppendFormat( _T("{\\sp{\\sn fGtext}{\\sv %d}}"), m_bGtext ); sResult.AppendFormat( _T("{\\sp{\\sn fGtext}{\\sv %d}}"), m_bGtext );
if( !m_sGtextUNICODE.IsEmpty() ) if( !m_sGtextUNICODE.IsEmpty() )
{ {
sResult += _T("{\\sp{\\sn gtextUNICODE}{\\sv "); sResult += _T("{\\sp{\\sn gtextUNICODE}{\\sv ");
...@@ -588,8 +594,12 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter) ...@@ -588,8 +594,12 @@ CString RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter)
sResult += _T("{\\sp{\\sn gtextFont}{\\sv "); sResult += _T("{\\sp{\\sn gtextFont}{\\sv ");
sResult += m_sGtextFont + _T("}}"); sResult += m_sGtextFont + _T("}}");
} }
if( PROP_DEF != m_nGtextSize ) if( PROP_DEF != m_nGtextSize ) sResult.AppendFormat( _T("{\\sp{\\sn gtextSize}{\\sv %d}}"), m_nGtextSize );
sResult.AppendFormat( _T("{\\sp{\\sn gtextSize}{\\sv %d}}"), m_nGtextSize ); if( PROP_DEF != m_bGtextFVertical ) sResult.AppendFormat( _T("{\\sp{\\sn gtextFVertical}{\\sv %d}}"), m_bGtextFVertical);
if( PROP_DEF != m_bGtextFKern ) sResult.AppendFormat( _T("{\\sp{\\sn gtextFKern}{\\sv %d}}"), m_bGtextFKern);
if( PROP_DEF != m_bGtextFStretch ) sResult.AppendFormat( _T("{\\sp{\\sn gtextFStretch}{\\sv %d}}"), m_bGtextFStretch);
if( PROP_DEF != m_bGtextFShrinkFit ) sResult.AppendFormat( _T("{\\sp{\\sn gtextFShrinkFit}{\\sv %d}}"), m_bGtextFShrinkFit);
if( PROP_DEF != m_bGtextFBestFit ) sResult.AppendFormat( _T("{\\sp{\\sn gtextFBestFit}{\\sv %d}}"), m_bGtextFBestFit);
} }
return sResult; return sResult;
......
ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.h
View file @ 8e17291c
...@@ -179,6 +179,12 @@ public: ...@@ -179,6 +179,12 @@ public:
CString m_sGtextFont; CString m_sGtextFont;
int m_nGtextSize; int m_nGtextSize;
int m_bGtext; int m_bGtext;
int m_bGtextFVertical;
int m_bGtextFKern;
int m_bGtextFStretch;
int m_bGtextFShrinkFit;
int m_bGtextFBestFit;
//pWrapPolygonVertices Points of the text wrap polygon. //pWrapPolygonVertices Points of the text wrap polygon.
std::vector< std::pair<int, int> > m_aWrapPoints; std::vector< std::pair<int, int> > m_aWrapPoints;
...@@ -212,24 +218,26 @@ public: ...@@ -212,24 +218,26 @@ public:
void ToRtfRotation( int nAngel , int &nLeft, int &nTop, int& nRight, int& nBottom ) void ToRtfRotation( int nAngel , int &nLeft, int &nTop, int& nRight, int& nBottom )
{ {
nAngel = nAngel/ 65536;
//поворачиваем на 45 градусов //поворачиваем на 45 градусов
nAngel -= 45; nAngel -= 45;
//делаем угол от 0 до 360 //делаем угол от 0 до 360
nAngel = nAngel % 360; nAngel = nAngel % 360;
if( nAngel < 0 )
nAngel += 360; if( nAngel < 0 ) nAngel += 360;
int nQuater = nAngel / 90; // определяем четверть int nQuater = nAngel / 90; // определяем четверть
if( 0 == nQuater || 2 == nQuater ) if( 0 == nQuater || 2 == nQuater )
{ {
//поворачиваем относительно центра на 90 градусов обратно //поворачиваем относительно центра на 90 градусов обратно
int nCenterX = ( nLeft + nRight ) / 2; int nCenterX = ( nLeft + nRight ) / 2;
int nCenterY = ( nTop + nBottom ) / 2; int nCenterY = ( nTop + nBottom ) / 2;
int nWidth = nRight - nLeft; int nWidth = nRight - nLeft;
int nHeight = nBottom - nTop; int nHeight = nBottom - nTop;
nLeft = nCenterX - nHeight / 2; nLeft = nCenterX - nHeight / 2;
nRight = nCenterX + nHeight / 2; nRight = nCenterX + nHeight / 2;
nTop = nCenterY - nWidth / 2; nTop = nCenterY - nWidth / 2;
nBottom = nCenterY + nWidth / 2; nBottom = nCenterY + nWidth / 2;
} }
} }
......
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View file @ 8e17291c
This source diff could not be displayed because it is too large. You can view the blob instead.
Common/DocxFormat/Source/DocxFormat/Logic/Vml.h
View file @ 8e17291c
...@@ -2635,19 +2635,19 @@ namespace OOX ...@@ -2635,19 +2635,19 @@ namespace OOX
ComplexTypes_WriteAttribute2( _T("id=\""), m_oId ); ComplexTypes_WriteAttribute2( _T("id=\""), m_oId );
ComplexTypes_WriteAttribute ( _T("style=\""), m_oStyle ); ComplexTypes_WriteAttribute ( _T("style=\""), m_oStyle );
if ( SimpleTypes::booleanFalse != m_oOn.GetValue() ) if ( (m_oOn.IsInit()) && (SimpleTypes::booleanFalse != m_oOn->GetValue()) )
sResult += _T("on=\"true\" "); sResult += _T("on=\"true\" ");
if ( SimpleTypes::booleanFalse != m_oFitShape.GetValue() ) if ( (m_oFitShape.IsInit()) && ( SimpleTypes::booleanFalse != m_oFitShape->GetValue()) )
sResult += _T("fitshape=\"true\" "); sResult += _T("fitshape=\"true\" ");
if ( SimpleTypes::booleanFalse != m_oFitPath.GetValue() ) if ( (m_oFitPath.IsInit()) && ( SimpleTypes::booleanFalse != m_oFitPath->GetValue()) )
sResult += _T("fitpath=\"true\" "); sResult += _T("fitpath=\"true\" ");
if ( SimpleTypes::booleanFalse != m_oTrim.GetValue() ) if ( (m_oTrim.IsInit()) && ( SimpleTypes::booleanFalse != m_oTrim->GetValue()) )
sResult += _T("trim=\"true\" "); sResult += _T("trim=\"true\" ");
if ( SimpleTypes::booleanFalse != m_oXScale.GetValue() ) if ( (m_oXScale.IsInit()) && ( SimpleTypes::booleanFalse != m_oXScale->GetValue()) )
sResult += _T("xscale=\"true\" "); sResult += _T("xscale=\"true\" ");
ComplexTypes_WriteAttribute2( _T("string=\""), m_sString ); ComplexTypes_WriteAttribute2( _T("string=\""), m_sString );
...@@ -2710,14 +2710,14 @@ namespace OOX ...@@ -2710,14 +2710,14 @@ namespace OOX
public: public:
// Attributes // Attributes
SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oFitPath; nullable<SimpleTypes::CTrueFalse<>> m_oFitPath;
SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oFitShape; nullable<SimpleTypes::CTrueFalse<>> m_oFitShape;
nullable<CString> m_oId; nullable<CString> m_oId;
SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oOn; nullable<SimpleTypes::CTrueFalse<>> m_oOn;
nullable<CString> m_sString; nullable<CString> m_sString;
nullable<SimpleTypes::Vml::CCssStyle> m_oStyle; nullable<SimpleTypes::Vml::CCssStyle> m_oStyle;
SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oTrim; nullable<SimpleTypes::CTrueFalse<>> m_oTrim;
SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oXScale; nullable<SimpleTypes::CTrueFalse<>> m_oXScale;
nullable<CString> m_sStringOriginal; nullable<CString> m_sStringOriginal;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7