xlst->xlsx fix chart range (= defined name)

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -789,6 +789,10 @@ namespace BinXlsxRW{
 					}
 				}
 			}
+            else
+            {
+                //range is defined name
+            }
 		}
 	}
 	void ChartWriter::parseMultiLvlStrRef(const OOX::Spreadsheet::CT_MultiLvlStrRef* pMultiLvlStrRef, bool bUpdateRange, const wchar_t* cRangeName)

Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h

@@ -408,6 +408,7 @@ namespace OOX
 				bool bRes = false;
 				int nIndex = sRef.Find('!');
 				CString sCellRef;
+
                 if(-1 != nIndex)
 				{
 					CString sSheetPrefix = sRef.Left(nIndex);
@@ -416,8 +417,10 @@ namespace OOX
 						sSheetPrefix = sSheetPrefix.Mid(1, sSheetPrefix.GetLength() - 2);
 					}
 					sSheetPrefix.Replace(L"''", L"'");
+
                     int nIndexWbStart   = sSheetPrefix.Find('[');
                     int nIndexWbEnd     = sSheetPrefix.Find(']');
+
                     if(-1 != nIndexWbStart && -1 != nIndexWbEnd)
 					{
                         workbook        = sSheetPrefix.Mid(nIndexWbStart + 1, nIndexWbEnd - nIndexWbStart - 1);
@@ -456,6 +459,7 @@ namespace OOX
 			static bool parseRef(CString sRef, int& nRow, int& nCol)
 			{
 				bool bRes = false;
+
                 nRow = 0;
 				nCol = 0;
 				int nLegnth = sRef.GetLength();
@@ -477,8 +481,11 @@ namespace OOX
 						{
 							nCol = nCol * 26 + sAdd[i] - 'A' + 1;
 						}
+                        if (!sDig.IsEmpty())
+                        {
                             nRow = _wtoi(sDig);
                             bRes = true;
+                        }
 					}
 				}
 				return bRes;

X2tConverter/build/Qt/X2tConverter.pro

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.2.391
+VERSION = 2.0.2.392
 DEFINES += INTVER=$$VERSION
 
 TEMPLATE = app