summaryrefslogtreecommitdiffstats
path: root/kde/calligra/koffice-libwpg02.patch
blob: e2a55a216e560ef8ac7d6fe23b082d99d5f7eb6d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
--- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
@@ -1,16 +1,11 @@
 
-
 include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
 
-set(wpgimport_PART_SRCS 
-WPGImport.cpp 
-OdgExporter.cxx
-FileOutputHandler.cxx
-GraphicsElement.cxx)
+set(wpgimport_PART_SRCS WPGImport.cpp)
 
 kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
 
-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
 
 install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-/* libwpg
- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#include "FileOutputHandler.hxx"
-
-FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
-	mbIsTagOpened(false),
-	mContentStream(contentStream)
-{
-}
-
-void FileOutputHandler::startDocument()
-{
-}
-
-void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
-{
-	if (mbIsTagOpened)
-	{
-		mContentStream << ">";
-		mbIsTagOpened = false;
-	}
-	mContentStream << "<" << psName;
-
-	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
-	{
-		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
-	}
-	mbIsTagOpened = true;
-	msOpenedTagName = psName;
-}
-
-void FileOutputHandler::endElement(const char *psName)
-{
-	if (mbIsTagOpened)
-	{
-		if( msOpenedTagName == psName )
-		{
-			mContentStream << "/>";
-			mbIsTagOpened = false;
-		}
-		else // should not happen, but handle it
-		{
-			mContentStream << ">";
-			mContentStream << "</" << psName << ">";
-			mbIsTagOpened = false;
-		}
-	}
-	else
-	{
-		mContentStream << "</" << psName << ">";
-		mbIsTagOpened = false;
-	}
-}
-
-void FileOutputHandler::characters(const std::string &sCharacters)
-{
-	if (mbIsTagOpened)
-	{
-		mContentStream << ">";
-		mbIsTagOpened = false;
-	}
-	mContentStream << sCharacters.c_str();
-}
-
-void FileOutputHandler::endDocument()
-{
-	if (mbIsTagOpened)
-	{
-		mContentStream << ">";
-		mbIsTagOpened = false;
-	}
-}
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/* libwpg
- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#ifndef FILEOUTPUTHANDLER_H
-#define FILEOUTPUTHANDLER_H
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include "GraphicsHandler.hxx"
-
-class FileOutputHandler : public GraphicsHandler
-{
-  public:
-        explicit FileOutputHandler(std::ostringstream &contentStream);
-        virtual void startDocument();
-        virtual void endDocument();
-        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
-        virtual void endElement(const char *psName);
-        virtual void characters(const std::string &sCharacters);
-
-  private:
-	bool mbIsTagOpened;
-	std::string msOpenedTagName;
-	std::ostringstream &mContentStream;
-};
-#endif
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-/* GraphicsElement: The items we are collecting to be put into the Writer
- * document: paragraph and spans of text, as well as section breaks.
- *
- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- *
- */
-
-/* "This product is not manufactured, approved, or supported by 
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#include "GraphicsElement.hxx"
-#include "GraphicsHandler.hxx"
-#include <string.h>
-
-#define ASCII_SPACE 0x0020
-
-void TagGraphicsElement::print() const
-{
-}
-
-void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
-{
-	pHandler->startElement(getTagName().c_str(), maAttrList);
-}
-
-void OpenTagGraphicsElement::print() const
-{ 
-	TagGraphicsElement::print(); 	
-}
-
-void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
-{
-	std::pair<std::string, std::string> tmpAttribute;
-	tmpAttribute.first = szAttributeName;
-	tmpAttribute.second = sAttributeValue;
-        maAttrList.push_back(tmpAttribute);
-}
-
-void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
-{
-
-	pHandler->endElement(getTagName().c_str());
-}
-
-void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
-{
-	pHandler->characters(msData);
-}
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,84 +0,0 @@
-/* GraphicsElement: The items we are collecting to be put into the Writer
- * document: paragraph and spans of text, as well as section breaks.
- *
- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpd.sourceforge.net
- *
- */
-
-/* "This product is not manufactured, approved, or supported by 
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#ifndef _GRAPHICSELEMENT_H
-#define _GRAPHICSELEMENT_H
-#include <string>
-#include <map>
-#include <vector>
-
-#include "GraphicsHandler.hxx"
-
-class GraphicsElement
-{
-public:	
-	virtual ~GraphicsElement() {}
-	virtual void write(GraphicsHandler *pHandler) const = 0;
-	virtual void print() const {}
-};
-
-class TagGraphicsElement : public GraphicsElement
-{
-public:
-	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
-	const std::string &getTagName() const { return msTagName; }
-	virtual void print() const;
-private:
-	const std::string msTagName;
-};
-
-class OpenTagGraphicsElement : public TagGraphicsElement
-{
-public:
-	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
-	~OpenTagGraphicsElement() {}
-	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
-	virtual void write(GraphicsHandler *pHandler) const;
-	virtual void print () const;
-private:
-	std::vector<std::pair<std::string, std::string> > maAttrList;
-};
-
-class CloseTagGraphicsElement : public TagGraphicsElement
-{
-public:
-	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
-	virtual void write(GraphicsHandler *pHandler) const;
-};
-
-class CharDataGraphicsElement : public GraphicsElement
-{
-public:
-	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
-	virtual void write(GraphicsHandler *pHandler) const;
-private:
-	std::string msData;
-};
-
-
-#endif
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
- *
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-#ifndef _GRAPHICSHANDLER_H
-#define _GRAPHICSHANDLER_H
-#include <string>
-#include <map>
-#include <vector>
-
-class GraphicsHandler
-{
-public:
-	virtual ~GraphicsHandler() {}
-        virtual void startDocument() = 0;
-        virtual void endDocument() = 0;
-        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
-        virtual void endElement(const char *psName) = 0;
-        virtual void characters(const std::string &sCharacters) = 0;
-};
-#endif
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,662 +0,0 @@
-/* libwpg
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#include "OdgExporter.hxx"
-#include "GraphicsElement.hxx"
-#include "GraphicsHandler.hxx"
-#include <locale.h>
-
-static std::string doubleToString(const double value)
-{
-  std::ostringstream tempStream;
-  tempStream << value;
-  std::string decimalPoint(localeconv()->decimal_point);
-  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
-    return tempStream.str();
-  std::string stringValue(tempStream.str());
-  if (!stringValue.empty())
-  {
-    std::string::size_type pos;
-    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
-          stringValue.replace(pos,decimalPoint.size(),".");
-  }
-  return stringValue;
-}
-
-
-OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
-        mpHandler(pHandler),
-        m_fillRule(AlternatingFill),
-        m_gradientIndex(1),
-        m_dashIndex(1),
-        m_styleIndex(1),
-        m_width(0.0f),
-        m_height(0.0f),
-        m_isFlatXML(isFlatXML)
-{
-}
-
-OdgExporter::~OdgExporter()
-{
-        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
-                iterStroke != mStrokeDashElements.end(); iterStroke++)
-                delete (*iterStroke);
-
-        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
-                iterGradient != mGradientElements.end(); iterGradient++)
-                delete (*iterGradient);
-
-        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
-                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
-                delete (*iterAutomaticStyles);
-
-        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
-                bodyIter != mBodyElements.end(); bodyIter++)
-                delete (*bodyIter);
-}
-
-void OdgExporter::startGraphics(double width, double height)
-{
-        m_gradientIndex = 1;
-        m_dashIndex = 1;
-        m_styleIndex = 1;
-        m_width = width;
-        m_height = height;
-
-
-        mpHandler->startDocument();
-        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
-        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
-        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
-        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
-        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
-        if (m_isFlatXML)
-                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
-        tmpOfficeDocumentContent.write(mpHandler);
-
-        OpenTagGraphicsElement("office:settings").write(mpHandler);
-
-        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
-        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
-        configItemSetOpenElement.write(mpHandler);
-
-        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
-        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
-        configItemOpenElement1.addAttribute("config:type", "int");
-        configItemOpenElement1.write(mpHandler);
-        mpHandler->characters("0");
-        mpHandler->endElement("config:config-item");
-
-        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
-        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
-        configItemOpenElement2.addAttribute("config:type", "int");
-        configItemOpenElement2.write(mpHandler);
-        mpHandler->characters("0");
-        mpHandler->endElement("config:config-item");
-
-        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
-        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
-        configItemOpenElement3.addAttribute("config:type", "int");
-        configItemOpenElement3.write(mpHandler);
-        m_value.str("");
-        m_value << (unsigned)(2540 * width);
-        mpHandler->characters(m_value.str());
-        mpHandler->endElement("config:config-item");
-
-        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
-        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
-        configItemOpenElement4.addAttribute("config:type", "int");
-        configItemOpenElement4.write(mpHandler);
-        m_value.str("");
-        m_value << (unsigned)(2540 * height);
-        mpHandler->characters(m_value.str());
-        mpHandler->endElement("config:config-item");
-
-        mpHandler->endElement("config:config-item-set");
-
-        mpHandler->endElement("office:settings");
-
-}
-
-void OdgExporter::endGraphics()
-{
-        OpenTagGraphicsElement("office:styles").write(mpHandler);
-
-        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
-                iterStroke != mStrokeDashElements.end(); iterStroke++)
-                (*iterStroke)->write(mpHandler);
-
-        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
-                iterGradient != mGradientElements.end(); iterGradient++)
-                (*iterGradient)->write(mpHandler);
-
-        mpHandler->endElement("office:styles");
-
-        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
-
-        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
-                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
-                (*iterAutomaticStyles)->write(mpHandler);
-
-        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
-        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
-        tmpStylePageLayoutOpenElement.write(mpHandler);
-
-        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
-        m_value.str("");
-        m_value <<  doubleToString(m_width) << "in";
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(m_height)  << "in";
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
-        m_value.str("");
-        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
-        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
-
-        mpHandler->endElement("style:page-layout-properties");
-
-        mpHandler->endElement("style:page-layout");
-
-        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
-        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
-        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
-        tmpStyleStyleOpenElement.write(mpHandler);
-
-        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
-        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
-        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
-        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
-
-        mpHandler->endElement("style:drawing-page-properties");
-
-        mpHandler->endElement("style:style");
-
-        mpHandler->endElement("office:automatic-styles");
-
-        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
-
-        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
-        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
-        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
-        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
-        tmpStyleMasterPageOpenElement.write(mpHandler);
-
-        mpHandler->endElement("style:master-page");
-
-        mpHandler->endElement("office:master-styles");
-
-        OpenTagGraphicsElement("office:body").write(mpHandler);
-
-        OpenTagGraphicsElement("office:drawing").write(mpHandler);
-
-        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
-        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
-        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
-        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
-        tmpDrawPageOpenElement.write(mpHandler);
-
-        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
-                bodyIter != mBodyElements.end(); bodyIter++)
-        {
-                (*bodyIter)->write(mpHandler);
-        }
-
-        mpHandler->endElement("draw:page");
-        mpHandler->endElement("office:drawing");
-        mpHandler->endElement("office:body");
-        mpHandler->endElement("office:document");
-
-        mpHandler->endDocument();
-}
-
-void OdgExporter::setPen(const libwpg::WPGPen& pen)
-{
-        m_pen = pen;
-}
-
-void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
-{
-        m_brush = brush;
-}
-
-void OdgExporter::setFillRule(FillRule rule)
-{
-        m_fillRule = rule;
-}
-
-void OdgExporter::startLayer(unsigned int)
-{
-}
-
-void OdgExporter::endLayer(unsigned int)
-{
-}
-
-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
-{
-        writeStyle();
-        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
-        m_value.str("");
-        m_value << "gr" << m_styleIndex-1;
-        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(rect.x1) << "in";
-        pDrawRectElement->addAttribute("svg:x", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(rect.y1) << "in";
-        pDrawRectElement->addAttribute("svg:y", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(rect.x2-rect.x1) << "in";
-        pDrawRectElement->addAttribute("svg:width", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(rect.y2-rect.y1) << "in";
-        pDrawRectElement->addAttribute("svg:height", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(rx) << "in";
-        // FIXME: what to do when rx != ry ?
-        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
-        m_value.str("");
-        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
-}
-
-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
-{
-        writeStyle();
-        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
-        m_value.str("");
-        m_value << "gr" << m_styleIndex-1;
-        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(center.x - rx) << "in";
-        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(center.y - ry) << "in";
-        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(2 * rx) << "in";
-        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(2 * ry) << "in";
-        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
-        m_value.str("");
-        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
-}
-
-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
-{
-        if(vertices.count() < 2)
-                return;
-
-        if(vertices.count() == 2)
-        {
-                const libwpg::WPGPoint& p1 = vertices[0];
-                const libwpg::WPGPoint& p2 = vertices[1];
-
-                writeStyle();
-                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
-                m_value.str("");
-                m_value << "gr" << m_styleIndex-1;
-                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
-                m_value.str("");
-                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
-                pDrawLineElement->addAttribute("draw:layer", "layout");
-                m_value << doubleToString(p1.x)  << "in";
-                pDrawLineElement->addAttribute("svg:x1", m_value.str());
-                m_value.str("");
-                m_value << doubleToString(p1.y)  << "in";
-                pDrawLineElement->addAttribute("svg:y1", m_value.str());
-                m_value.str("");
-                m_value  << doubleToString(p2.x)  << "in";
-                pDrawLineElement->addAttribute("svg:x2", m_value.str());
-                m_value.str("");
-                m_value << doubleToString(p2.y)  << "in";
-                pDrawLineElement->addAttribute("svg:y2", m_value.str());
-                m_value.str("");
-                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
-                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
-        }
-        else
-        {
-                // draw as path
-                libwpg::WPGPath path;
-                path.moveTo(vertices[0]);
-                for(unsigned long ii = 1; ii < vertices.count(); ii++)
-                        path.lineTo(vertices[ii]);
-                path.closed = true;
-                drawPath(path);
-        }
-}
-
-void OdgExporter::drawPath(const libwpg::WPGPath& path)
-{
-        if(path.count() == 0)
-                return;
-
-        // try to find the bounding box
-        // this is simple convex hull technique, the bounding box might not be
-        // accurate but that should be enough for this purpose
-        libwpg::WPGPoint p = path.element(0).point;
-        libwpg::WPGPoint q = path.element(0).point;
-        for(unsigned k = 0; k < path.count(); k++)
-        {
-                libwpg::WPGPathElement element = path.element(k);
-                p.x = (p.x > element.point.x) ? element.point.x : p.x;
-                p.y = (p.y > element.point.y) ? element.point.y : p.y;
-                q.x = (q.x < element.point.x) ? element.point.x : q.x;
-                q.y = (q.y < element.point.y) ? element.point.y : q.y;
-                if(element.type == libwpg::WPGPathElement::CurveToElement)
-                {
-                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
-                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
-                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
-                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
-                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
-                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
-                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
-                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
-                }
-        }
-        double vw = q.x - p.x;
-        double vh = q.y - p.y;
-
-        writeStyle();
-
-        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
-        m_value.str("");
-        m_value << "gr" << m_styleIndex-1;
-        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
-        m_value.str("");
-        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
-        pDrawPathElement->addAttribute("draw:layer", "layout");
-        m_value << doubleToString(p.x)  << "in";
-        pDrawPathElement->addAttribute("svg:x", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(p.y)  << "in";
-        pDrawPathElement->addAttribute("svg:y", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(vw) << "in";
-        pDrawPathElement->addAttribute("svg:width", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(vh) << "in";
-        pDrawPathElement->addAttribute("svg:height", m_value.str());
-        m_value.str("");
-        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
-        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
-        m_value.str("");
-
-        for(unsigned i = 0; i < path.count(); i++)
-        {
-                libwpg::WPGPathElement element = path.element(i);
-                libwpg::WPGPoint point = element.point;
-                switch(element.type)
-                {
-                        // 2540 is 2.54*1000, 2.54 in = 1 in
-                        case libwpg::WPGPathElement::MoveToElement:
-                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
-                                m_value << (int)((point.y-p.y)*2540);
-                                break;
-
-                        case libwpg::WPGPathElement::LineToElement:
-                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
-                                m_value << (int)((point.y-p.y)*2540);
-                                break;
-
-                        case libwpg::WPGPathElement::CurveToElement:
-                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
-                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
-                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
-                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
-                                m_value << (int)((point.x-p.x)*2540) << " ";
-                                m_value << (int)((point.y-p.y)*2540);
-                                break;
-
-                        default:
-                                break;
-                }
-        }
-        if(path.closed)
-                m_value << " Z";
-        pDrawPathElement->addAttribute("svg:d", m_value.str());
-        m_value.str("");
-        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
-}
-
-
-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
-{
-        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
-        m_value.str("");
-        m_value << doubleToString(bitmap.rect.x1) << "in";
-        pDrawFrameElement->addAttribute("svg:x", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(bitmap.rect.y1) << "in";
-        pDrawFrameElement->addAttribute("svg:y", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(bitmap.rect.height()) << "in";
-        pDrawFrameElement->addAttribute("svg:height", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(bitmap.rect.width()) << "in";
-        pDrawFrameElement->addAttribute("svg:width", m_value.str());
-        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
-
-        libwpg::WPGString base64Binary;
-        bitmap.generateBase64DIB(base64Binary);
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
-}
-
-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
-{
-        if (binaryData.mimeType.length() <= 0)
-                return;
-        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
-        m_value.str("");
-        m_value << doubleToString(binaryData.rect.x1) << "in";
-        pDrawFrameElement->addAttribute("svg:x", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(binaryData.rect.y1) << "in";
-        pDrawFrameElement->addAttribute("svg:y", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(binaryData.rect.height()) << "in";
-        pDrawFrameElement->addAttribute("svg:height", m_value.str());
-        m_value.str("");
-        m_value << doubleToString(binaryData.rect.width()) << "in";
-        pDrawFrameElement->addAttribute("svg:width", m_value.str());
-        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
-
-        libwpg::WPGString base64Binary = binaryData.getBase64Data();
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
-
-        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
-}
-
-
-static std::string colorToHex(const libwpg::WPGColor& color)
-{
-        char hexdigits[] = "0123456789abcdef";
-        char buffer[] = "123456";
-        buffer[0] = hexdigits[(color.red >> 4) & 15];
-        buffer[1] = hexdigits[color.red & 15];
-        buffer[2] = hexdigits[(color.green >> 4) & 15];
-        buffer[3] = hexdigits[color.green & 15];
-        buffer[4] = hexdigits[(color.blue >> 4) & 15];
-        buffer[5] = hexdigits[color.blue & 15];
-        return std::string(buffer);
-}
-
-void OdgExporter::writeStyle()
-{
-        m_value.str("");
-        m_name.str("");
-
-        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
-        {
-                // ODG only supports dashes with the same length of spaces inbetween
-                // here we take the first space and assume everything else the same
-                // note that dash length is written in percentage
-                double distance = m_pen.dashArray.at(1);
-                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
-                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
-                m_value << "Dash_" << m_dashIndex++;
-                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
-                m_value.str("");
-                m_value << doubleToString(distance*100) << "%";
-                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
-                m_value.str("");
-                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
-                {
-                        m_name << "draw:dots" << i+1;
-                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
-                        m_name.str("");
-                        m_name << "draw:dots" << i+1 << "-length";
-                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
-                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
-                        m_name.str("");
-                        m_value.str("");
-                }
-                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
-                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
-        }
-
-        if(m_brush.style == libwpg::WPGBrush::Gradient)
-        {
-                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
-                tmpDrawGradientElement->addAttribute("draw:style", "linear");
-                m_value << "Gradient_" << m_gradientIndex++;
-                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
-                m_value.str("");
-
-                // ODG angle unit is 0.1 degree
-                double angle = -m_brush.gradient.angle();
-                while(angle < 0)
-                        angle += 360;
-                while(angle > 360)
-                        angle -= 360;
-
-                m_value << (unsigned)(angle*10);
-                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
-                m_value.str("");
-
-                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
-                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
-                m_value << "#" << colorToHex(startColor);
-                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
-                m_value.str("");
-                m_value << "#" << colorToHex(stopColor);
-                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
-                m_value.str("");
-                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
-                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
-                tmpDrawGradientElement->addAttribute("draw:border", "0%");
-                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
-                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
-        }
-
-        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
-        m_value << "gr" << m_styleIndex;
-        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
-        m_value.str("");
-        tmpStyleStyleElement->addAttribute("style:family", "graphic");
-        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
-        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
-
-        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
-
-        if(m_pen.width > 0.0)
-        {
-                m_value << doubleToString(m_pen.width) << "in";
-                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
-                m_value.str("");
-                m_value << "#" << colorToHex(m_pen.foreColor);
-                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
-                m_value.str("");
-
-                if(!m_pen.solid)
-                {
-                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
-                        m_value << "Dash_" << m_dashIndex-1;
-                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
-                        m_value.str("");
-                }
-        }
-        else
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
-
-        if(m_brush.style == libwpg::WPGBrush::NoBrush)
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
-
-        if(m_brush.style == libwpg::WPGBrush::Solid)
-        {
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
-                m_value << "#" << colorToHex(m_brush.foreColor);
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
-                m_value.str("");
-        }
-
-        if(m_brush.style == libwpg::WPGBrush::Gradient)
-        {
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
-                m_value << "Gradient_" << m_gradientIndex-1;
-                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
-                m_value.str("");
-        }
-
-        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
-        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
-
-        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
-        m_styleIndex++;
-}
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-/* libwpg
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#ifndef __ODGEXPORTER_H__
-#define __ODGEXPORTER_H__
-
-#include <iostream>
-#include <sstream>
-#include <string>
-
-#include <libwpg/libwpg.h>
-#include "GraphicsElement.hxx"
-
-class OdgExporter : public libwpg::WPGPaintInterface {
-public:
-	explicit OdgExporter(GraphicsHandler *pHandler,
-			     const bool isFlatXML = false);
-	~OdgExporter();
-
-#if LIBWPG_VERSION_MINOR<2
-	void startGraphics(double imageWidth, double imageHeight);
-	void endGraphics();
-	void startLayer(unsigned int id);
-	void endLayer(unsigned int id);
-
-	void setPen(const libwpg::WPGPen& pen);
-	void setBrush(const libwpg::WPGBrush& brush);
-	void setFillRule(FillRule rule);
-
-	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
-	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
-	void drawPolygon(const libwpg::WPGPointArray& vertices);
-	void drawPath(const libwpg::WPGPath& path);
-	void drawBitmap(const libwpg::WPGBitmap& bitmap);
-	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
-
-private:
-	std::vector <GraphicsElement *> mBodyElements;
-	std::vector <GraphicsElement *> mAutomaticStylesElements;
-	std::vector <GraphicsElement *> mStrokeDashElements;
-	std::vector <GraphicsElement *> mGradientElements;
-	GraphicsHandler *mpHandler;
-
-	libwpg::WPGPen m_pen;
-	libwpg::WPGBrush m_brush;
-	FillRule m_fillRule;
-	int m_gradientIndex;
-	int m_dashIndex;
-	int m_styleIndex;
-	void writeStyle();
-	std::ostringstream m_value, m_name;
-	double m_width, m_height;
-	const bool m_isFlatXML;
-#else
-	virtual void startGraphics(const ::WPXPropertyList &propList);
-	virtual void endGraphics();
-	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
-	virtual void startLayer(const ::WPXPropertyList &propList);
-	virtual void endLayer();
-	virtual void drawRectangle(const ::WPXPropertyList& propList);
-	virtual void drawEllipse(const ::WPXPropertyList& propList);
-	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
-	virtual void drawPath(const ::WPXPropertyListVector &path);
-	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
-	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
-	virtual void endEmbeddedGraphics();
-	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
-	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
-	virtual void endTextObject();
-	virtual void startTextLine(const ::WPXPropertyList &propList);
-	virtual void endTextLine();
-	virtual void startTextSpan(const ::WPXPropertyList &propList);
-	virtual void endTextSpan();
-	virtual void insertText(const ::WPXString &str);
-
-
-private:
-	std::vector <GraphicsElement *> mBodyElements;
-	std::vector <GraphicsElement *> mAutomaticStylesElements;
-	std::vector <GraphicsElement *> mStrokeDashElements;
-	std::vector <GraphicsElement *> mGradientElements;
-	GraphicsHandler *mpHandler;
-
-	int m_gradientIndex;
-	int m_dashIndex;
-	int m_styleIndex;
-	void writeStyle();
-	std::ostringstream m_value, m_name;
-	double m_width, m_height;
-	const bool m_isFlatXML;
-#endif
-};
-
-#endif // __ODGEXPORTER_H__
diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
--- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
@@ -20,28 +20,26 @@
 #include <WPGImport.h>
 #include <WPGImport.moc>
 
-#include <QBuffer>
-#include <QByteArray>
-#include <QString>
-
-#include <kdebug.h>
 #include <KoFilterChain.h>
 #include <KoGlobal.h>
 #include <KoUnit.h>
+#include <KoXmlWriter.h>
+
 #include <kpluginfactory.h>
+#include <KDebug>
 
-#include <KoXmlWriter.h>
+
+#include <QtCore/QString>
+#include <QtCore/QFile>
 
 #include <libwpg/libwpg.h>
 #if LIBWPG_VERSION_MINOR<2
 #include <libwpg/WPGStreamImplementation.h>
 #else
 #include <libwpd-stream/libwpd-stream.h>
+#include <libwpd/libwpd.h>
 #endif
 
-#include "FileOutputHandler.hxx"
-#include "OdgExporter.hxx"
-
 #include <iostream>
 
 K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
@@ -56,35 +54,13 @@
 {
 }
 
-static QByteArray createManifest()
-{
-    KoXmlWriter* manifestWriter;
-    QByteArray manifestData;
-    QBuffer manifestBuffer(&manifestData);
-
-    manifestBuffer.open(QIODevice::WriteOnly);
-    manifestWriter = new KoXmlWriter(&manifestBuffer);
-
-    manifestWriter->startDocument("manifest:manifest");
-    manifestWriter->startElement("manifest:manifest");
-    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
-    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
-    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
-    manifestWriter->addManifestEntry("content.xml", "text/xml");
-    manifestWriter->endElement();
-    manifestWriter->endDocument();
-    delete manifestWriter;
-
-    return manifestData;
-}
-
 
 KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
 {
     if (from != "application/x-wpg")
         return KoFilter::NotImplemented;
 
-    if (to != "application/vnd.oasis.opendocument.graphics")
+    if (to != "image/svg+xml")
         return KoFilter::NotImplemented;
 
 #if LIBWPG_VERSION_MINOR<2
@@ -96,6 +72,7 @@
             input = olestream;
         }
     }
+    libwpg::WPGString output;
 #else
     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
     if (input->isOLEStream()) {
@@ -105,59 +82,31 @@
             input = olestream;
         }
      }
+     ::WPXString output;
 #endif
 
     if (!libwpg::WPGraphics::isSupported(input)) {
-        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
         delete input;
         return KoFilter::NotImplemented;
     }
 
-    // do the conversion
-    std::ostringstream tmpStringStream;
-    FileOutputHandler tmpHandler(tmpStringStream);
-    OdgExporter exporter(&tmpHandler);
-    libwpg::WPGraphics::parse(input, &exporter);
-    delete input;
-
-
-    // create output store
-    KoStore* storeout;
-    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
-                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
-
-    if (!storeout) {
-        kWarning() << "Couldn't open the requested file.";
-        return KoFilter::FileNotFound;
-    }
-
-#if 0
-    if (!storeout->open("styles.xml")) {
-        kWarning() << "Couldn't open the file 'styles.xml'.";
-        return KoFilter::CreationError;
+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
+        kWarning() << "ERROR: SVG Generation failed!";
+        delete input;
+        return KoFilter::ParsingError;
     }
-    //storeout->write( createStyles() );
-    storeout->close();
-#endif
 
-    if (!storeout->open("content.xml")) {
-        kWarning() << "Couldn't open the file 'content.xml'.";
-        return KoFilter::CreationError;
-    }
-    storeout->write(tmpStringStream.str().c_str());
-    storeout->close();
+    delete input;
 
-    // store document manifest
-    storeout->enterDirectory("META-INF");
-    if (!storeout->open("manifest.xml")) {
-        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
-        return KoFilter::CreationError;
+    QFile outputFile(m_chain->outputFile());
+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
+        return KoFilter::InternalError;
     }
-    storeout->write(createManifest());
-    storeout->close();
 
-    // we are done!
-    delete storeout;
+    outputFile.write(output.cstr());
+    outputFile.close();
 
     return KoFilter::OK;
 }