2025.6.1
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/***********************************************************************************************************************
|
||||
*
|
||||
* Copyright (c) 2010 - 2022 by Tech Soft 3D, Inc.
|
||||
* Copyright (c) 2010 - 2025 by Tech Soft 3D, Inc.
|
||||
* The information contained herein is confidential and proprietary to Tech Soft 3D, Inc., and considered a trade secret
|
||||
* as defined under civil and criminal statutes. Tech Soft 3D shall pursue its civil and criminal remedies in the event
|
||||
* of unauthorized use or misappropriation of its trade secrets. Use of this information by anyone other than authorized
|
||||
@@ -91,7 +91,7 @@ static void sttraverseTextPosition(const A3DMDTextPosition* pTextPosition, _TiXm
|
||||
|
||||
//######################################################################################################################
|
||||
|
||||
int traverseMarkupTextProperties(const A3DMDTextProperties* pTextProperties, _TiXmlElement* setting)
|
||||
A3DStatus traverseMarkupTextProperties(const A3DMDTextProperties* pTextProperties, _TiXmlElement* setting)
|
||||
{
|
||||
if(pTextProperties == NULL)
|
||||
{
|
||||
@@ -181,7 +181,7 @@ int traverseMarkupTextProperties(const A3DMDTextProperties* pTextProperties, _Ti
|
||||
|
||||
//######################################################################################################################
|
||||
|
||||
int traverseMarkupText(const A3DMarkupText* pMarkup, _TiXmlElement* setting)
|
||||
A3DStatus traverseMarkupText(const A3DMarkupText* pMarkup, _TiXmlElement* setting)
|
||||
{
|
||||
A3DMarkupTextData sMarkupData;
|
||||
A3D_INITIALIZE_DATA(A3DMarkupTextData, sMarkupData);
|
||||
@@ -190,7 +190,7 @@ int traverseMarkupText(const A3DMarkupText* pMarkup, _TiXmlElement* setting)
|
||||
A3DStatus iRet = A3DMarkupTextGet(pMarkup, &sMarkupData);
|
||||
if(iRet != A3D_SUCCESS)
|
||||
{
|
||||
markup_text->SetAttribute("error", iRet);
|
||||
markup_text->SetAttribute("error", A3DMiscGetErrorMsg(iRet));
|
||||
return iRet;
|
||||
}
|
||||
|
||||
@@ -209,13 +209,13 @@ int traverseMarkupText(const A3DMarkupText* pMarkup, _TiXmlElement* setting)
|
||||
sttraverseAlignmentType(sMarkupData.m_eLeaderAlignmentType, markup_text);
|
||||
sttraverseTextPosition(sMarkupData.m_psTextPosition, markup_text);
|
||||
markup_text->SetDoubleAttribute("Wrapping_width", sMarkupData.m_dWrappingWidth);
|
||||
traverseMarkupTextProperties(sMarkupData.m_psTextPosition, markup_text);
|
||||
traverseMarkupTextProperties(sMarkupData.m_pTextProperties, markup_text);
|
||||
|
||||
return A3DMarkupTextGet(NULL, &sMarkupData);
|
||||
}
|
||||
|
||||
//######################################################################################################################
|
||||
int traverseMarkupRichText(const A3DMarkupRichText* pMarkup, _TiXmlElement* setting)
|
||||
A3DStatus traverseMarkupRichText(const A3DMarkupRichText* pMarkup, _TiXmlElement* setting)
|
||||
{
|
||||
A3DMarkupRichTextData sMarkupData;
|
||||
A3D_INITIALIZE_DATA(A3DMarkupRichTextData, sMarkupData);
|
||||
@@ -224,7 +224,7 @@ int traverseMarkupRichText(const A3DMarkupRichText* pMarkup, _TiXmlElement* sett
|
||||
A3DStatus iRet = A3DMarkupRichTextGet(pMarkup, &sMarkupData);
|
||||
if(iRet != A3D_SUCCESS)
|
||||
{
|
||||
markup_text->SetAttribute("error", iRet);
|
||||
markup_text->SetAttribute("error", A3DMiscGetErrorMsg(iRet));
|
||||
return iRet;
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ int traverseMarkupRichText(const A3DMarkupRichText* pMarkup, _TiXmlElement* sett
|
||||
if (A3DMkpRTFFieldCreate(sMarkupData.m_pcRichText, &pRTF) == A3D_SUCCESS)
|
||||
{
|
||||
A3DMkpRTFFieldData sRTFFieldData;
|
||||
A3D_INITIALIZE_DATA(A3DRTFFieldData, sRTFFieldData);
|
||||
A3D_INITIALIZE_DATA(A3DMkpRTFFieldData, sRTFFieldData);
|
||||
|
||||
while (A3DMkpRTFFieldGet(pRTF, &sRTFFieldData) == A3D_SUCCESS)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user