summaryrefslogtreecommitdiff
path: root/converters/libwps/patches/patch-aa
blob: 1cae58c6aacf6c1d8f58f049d939e567efe1005f (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
$NetBSD: patch-aa,v 1.1 2010/11/25 10:52:19 wiz Exp $

_U is defined in a NetBSD internal header.

--- src/conv/raw/RawListener.cpp.orig	2010-11-09 08:36:50.000000000 +0000
+++ src/conv/raw/RawListener.cpp
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include "RawListener.h"
 
-#define _U(M, L) \
+#define _RLU(M, L) \
 	if (!m_printCallgraphScore) \
 			__iuprintf M; \
 	else \
@@ -148,7 +148,7 @@ void RawListenerImpl::setDocumentMetaDat
 
 void RawListenerImpl::startDocument()
 {
-	_U(("startDocument()\n"), LC_START_DOCUMENT);
+	_RLU(("startDocument()\n"), LC_START_DOCUMENT);
 }
 
 void RawListenerImpl::endDocument()
@@ -163,7 +163,7 @@ void RawListenerImpl::definePageStyle(co
 
 void RawListenerImpl::openPageSpan(const WPXPropertyList &propList)
 {
-	_U(("openPageSpan(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openPageSpan(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_PAGE_SPAN);
 }
 
@@ -175,7 +175,7 @@ void RawListenerImpl::closePageSpan()
 
 void RawListenerImpl::openHeader(const WPXPropertyList &propList)
 {
-	_U(("openHeader(%s)\n",
+	_RLU(("openHeader(%s)\n",
 	    getPropString(propList).cstr()),
 	   LC_OPEN_HEADER_FOOTER);
 }
@@ -188,7 +188,7 @@ void RawListenerImpl::closeHeader()
 
 void RawListenerImpl::openFooter(const WPXPropertyList &propList)
 {
-	_U(("openFooter(%s)\n",
+	_RLU(("openFooter(%s)\n",
 	    getPropString(propList).cstr()),
 	   LC_OPEN_HEADER_FOOTER);
 }
@@ -206,7 +206,7 @@ void RawListenerImpl::defineParagraphSty
 
 void RawListenerImpl::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
-	_U(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
+	_RLU(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
 	   LC_OPEN_PARAGRAPH);
 }
 
@@ -222,7 +222,7 @@ void RawListenerImpl::defineCharacterSty
 
 void RawListenerImpl::openSpan(const WPXPropertyList &propList)
 {
-	_U(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
+	_RLU(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
 }
 
 void RawListenerImpl::closeSpan()
@@ -237,7 +237,7 @@ void RawListenerImpl::defineSectionStyle
 
 void RawListenerImpl::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
-	_U(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
+	_RLU(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
 }
 
 void RawListenerImpl::closeSection()
@@ -283,13 +283,13 @@ void RawListenerImpl::defineUnorderedLis
 
 void RawListenerImpl::openOrderedListLevel(const WPXPropertyList &propList)
 {
-	_U(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_ORDERED_LIST_LEVEL);
 }
 
 void RawListenerImpl::openUnorderedListLevel(const WPXPropertyList &propList)
 {
-	_U(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_UNORDERED_LIST_LEVEL);
 }
 
@@ -306,7 +306,7 @@ void RawListenerImpl::closeUnorderedList
 
 void RawListenerImpl::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
-	_U(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
+	_RLU(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
 	   LC_OPEN_LIST_ELEMENT);
 }
 
@@ -317,7 +317,7 @@ void RawListenerImpl::closeListElement()
 
 void RawListenerImpl::openFootnote(const WPXPropertyList &propList)
 {
-	_U(("openFootnote(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openFootnote(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_FOOTNOTE);
 }
 
@@ -328,7 +328,7 @@ void RawListenerImpl::closeFootnote()
 
 void RawListenerImpl::openEndnote(const WPXPropertyList &propList)
 {
-	_U(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
+	_RLU(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_ENDNOTE);
 }
 
@@ -339,7 +339,7 @@ void RawListenerImpl::closeEndnote()
 
 void RawListenerImpl::openComment(const WPXPropertyList &propList)
 {
-	_U(("openComment(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openComment(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_COMMENT);
 }
 
@@ -350,7 +350,7 @@ void RawListenerImpl::closeComment()
 
 void RawListenerImpl::openTextBox(const WPXPropertyList &propList)
 {
-	_U(("openTextBox(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTextBox(%s)\n", getPropString(propList).cstr()),
 	  LC_OPEN_TEXT_BOX);
 }
 
@@ -361,12 +361,12 @@ void RawListenerImpl::closeTextBox()
 	
 void RawListenerImpl::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
-	_U(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
+	_RLU(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
 }
 
 void RawListenerImpl::openTableRow(const WPXPropertyList &propList)
 {
-	_U(("openTableRow(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTableRow(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_TABLE_ROW);
 }
 
@@ -377,7 +377,7 @@ void RawListenerImpl::closeTableRow()
 
 void RawListenerImpl::openTableCell(const WPXPropertyList &propList)
 {
-	_U(("openTableCell(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTableCell(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_TABLE_CELL);
 }
 
@@ -398,7 +398,7 @@ void RawListenerImpl::closeTable()
 
 void RawListenerImpl::openFrame(const WPXPropertyList &propList)
 {
-	_U(("openFrame(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openFrame(%s)\n", getPropString(propList).cstr()),
 	  LC_OPEN_FRAME);
 }