.. к rev 68840

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68848 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp

@@ -136,7 +136,7 @@ OfficeArtFOPTEPtr OfficeArtFOPTE::load_and_create(XLS::CFRecord& record)
 		case NSOfficeDrawing::gtextSpacing:
 			fopte = OfficeArtFOPTEPtr(new FixedPoint);
 			break;
-		case NSOfficeDrawing::fFitTextToShape:
+		case NSOfficeDrawing::textBoolean:
 			fopte = OfficeArtFOPTEPtr(new TextBooleanProperties);
 			break;
 		case NSOfficeDrawing::gtextUNICODE:

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp

@@ -1022,7 +1022,7 @@ void XlsConverter::convert_fill_style(std::vector<ODRAW::OfficeArtFOPTEPtr> & pr
 			case NSOfficeDrawing::fillShadeType:
 			{
 			}break;
-			case NSOfficeDrawing::fNoFillHitTest:
+			case NSOfficeDrawing::fillBoolean:
 			{
 				ODRAW::FillStyleBooleanProperties * bools = (ODRAW::FillStyleBooleanProperties *)(props[i].get());
 				if (bools)
@@ -1079,7 +1079,7 @@ void XlsConverter::convert_line_style(std::vector<ODRAW::OfficeArtFOPTEPtr> & pr
 			{
 				xlsx_context->get_drawing_context().set_line_dash(props[i]->op);
 			}break;
-			case NSOfficeDrawing::fNoLineDrawDash:
+			case NSOfficeDrawing::lineBoolean:
 			{
 				ODRAW::LineStyleBooleanProperties * bools = (ODRAW::LineStyleBooleanProperties *)(props[i].get());
 				if (bools)
@@ -1267,7 +1267,7 @@ void XlsConverter::convert_text(std::vector<ODRAW::OfficeArtFOPTEPtr> & props)
 			{
 				xlsx_context->get_drawing_context().set_text_vertical(props[i]->op);
 			}break;
-		case NSOfficeDrawing::fFitTextToShape:
+		case NSOfficeDrawing::textBoolean:
 			{
 				ODRAW::TextBooleanProperties *bools = dynamic_cast<ODRAW::TextBooleanProperties*>(props[i].get());
 				if (bools)