Cleanup for unix

1 files changed, 10 insertions, 11 deletions

diff --git a/src/xmlcomposer.cpp b/src/xmlcomposer.cpp
index 1bfeb30..9795fe2 100644
--- a/src/xmlcomposer.cpp
+++ b/src/xmlcomposer.cpp
@@ -1,9 +1,6 @@
-// RtfParser.cpp: implementation of the RtfParser class.
-//
-//////////////////////////////////////////////////////////////////////
 
-#include "stdafx.h"
-#include "RtfAnalyser.h"
+#include "usuals.h"
+#include "rtfanalyser.h"
 
 const char* kElDest = "i_dest";
 const char* kElBlock = "i_block";
@@ -1010,9 +1007,11 @@ bool RtfParser::isEqualElement(const DOM::Element& el1, const DOM::Element& el2)
 
 wstring RtfParser::formatInt(int num)
 {
-	wstring n;
-	n.format(L"%d", num);
-	return n;
+  wchar_t buff[12];
+  swprintf(buff, L"%d", num);
+
+  wstring n(buff);
+  return n;
 }
 
 /**
@@ -1092,7 +1091,7 @@ void RtfParser::copyAttributes(const DOM::Element& src, DOM::Element& dest,
 				for(const char** t = hideList; *t != NULL; t++)
 				{
 					if(name == *t)
-						name.clear();
+						name.erase();
 				}
 			}
 
@@ -1477,7 +1476,7 @@ void RtfParser::breakLists(DOM::Document& doc)
 					else
 					{
 						list = NULL;
-						previd.clear();
+						previd.erase();
 					}
 				}
 
@@ -1808,4 +1807,4 @@ void RtfParser::removeDuplicates(const DOM::Document& doc)
 			}
 		}
 	}
-}
\ No newline at end of file
+}