chart refactoring

This commit is contained in:
Elena.Subbotina
2023-02-16 19:24:16 +03:00
parent 3a4792e858
commit 1f3a104356
13 changed files with 1584 additions and 2434 deletions

View File

@ -999,7 +999,7 @@ namespace PPTX
if (pChart.IsInit() == false) return L"";
if (!pChart->m_oChartSpace.m_externalData) return L"";
if (!pChart->m_oChartSpace.m_externalData->m_id) return L"";
if (!pChart->m_oChartSpace.m_externalData->m_id.IsInit()) return L"";
file = pChart->Find(*pChart->m_oChartSpace.m_externalData->m_id);

View File

@ -500,7 +500,7 @@ namespace PPTX
//----------------------------------------------------------------
std::wstring id;
if ((pChart.IsInit()) && (pChart->m_oChartSpace.m_externalData) && (pChart->m_oChartSpace.m_externalData->m_id))
if ((pChart.IsInit()) && (pChart->m_oChartSpace.m_externalData) && (pChart->m_oChartSpace.m_externalData->m_id.IsInit()))
id = *pChart->m_oChartSpace.m_externalData->m_id;
else if ((pChartEx.IsInit()) && (true == pChartEx->m_oChartSpace.m_chartData.m_externalData.IsInit()))
id = pChartEx->m_oChartSpace.m_chartData.m_externalData->m_id.get_value_or(L"");