linux build x2t (with odf) tested

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

ASCOfficeOdfFile/src/conversionelement.cpp

@@ -9,16 +9,16 @@ namespace oox {
 
 void conversion_element::docx_convert(docx_conversion_context & Context) 
 {
-   _CP_LOG << L"[warning] empty conversion_element::docx_convert: \"" << typeid(*this).name() << L"\"\n";
+   //_CP_LOG << L"[warning] empty conversion_element::docx_convert: \"" << typeid(*this).name() << L"\"\n";
 }
 
 void conversion_element::xlsx_convert(xlsx_conversion_context & Context)
 {
-    _CP_LOG << L"[warning] empty conversion_element::xlsx_convert: \"" << typeid(*this).name() << L"\"\n";
+   //_CP_LOG << L"[warning] empty conversion_element::xlsx_convert: \"" << typeid(*this).name() << L"\"\n";
 }
 void conversion_element::pptx_convert(pptx_conversion_context & Context)
 {
-   _CP_LOG << L"[warning] empty conversion_element::pptx_convert: \"" << typeid(*this).name() << L"\"\n";
+   //_CP_LOG << L"[warning] empty conversion_element::pptx_convert: \"" << typeid(*this).name() << L"\"\n";
 }
 
 }

ASCOfficeOdfFile/src/docx/xlsx_borders.cpp

@@ -121,7 +121,7 @@ public:
             if (check_border(cellProp->style_diagonal_bl_tr_))
             {
                 border.diagonal = xlsx_border_edge();
-				_CP_OPT(border_style) borderStyle = *cellProp->style_diagonal_bl_tr_;
+                _CP_OPT(border_style) borderStyle(*cellProp->style_diagonal_bl_tr_);
                 process_border(*border.diagonal, borderStyle);
                 border.diagonalUp = true;
             }
@@ -130,7 +130,7 @@ public:
             {
                 if (!border.diagonal)
                     border.diagonal = xlsx_border_edge();
- 				_CP_OPT(border_style) borderStyle = *cellProp->style_diagonal_tl_br_;
+                _CP_OPT(border_style) borderStyle (*cellProp->style_diagonal_tl_br_);
                process_border(*border.diagonal, borderStyle);
                 border.diagonalDown = true;
             }