← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/src680/speed-local-link-except.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-04-27 19:29:22 UTC
  • Revision ID: james.westby@ubuntu.com-20060427192922-2dburxv3b63f8v0u
Tags: 2.0.2-2ubuntu5
* Copy of the openoffice.org source.
  - debian/control.in: Change source name.
  - debian/changelog: Change source name.
  - debian/control: Regenerate control file.
* Add kurdish translations exported from Rosetta (2006-04-18).
* Workaround bad message strings in recently included GSI files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/src680/speed-local-link-except.diff
 
1
Index: codemaker/source/cppumaker/cppumaker.cxx
 
2
===================================================================
 
3
RCS file: /cvs/udk/codemaker/source/cppumaker/cppumaker.cxx,v
 
4
retrieving revision 1.8
 
5
diff -u -p -u -r1.8 cppumaker.cxx
 
6
--- codemaker/source/cppumaker/cppumaker.cxx    8 Sep 2005 02:11:34 -0000       1.8
 
7
+++ codemaker/source/cppumaker/cppumaker.cxx    28 Mar 2006 08:54:32 -0000
 
8
@@ -245,6 +249,36 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
9
                exit(99);
 
10
        }
 
11
 
 
12
+       if (!aIncludes.empty() && options.isValid("-O"))
 
13
+       {
 
14
+               OString outPath = options.getOption("-O");
 
15
+               outPath += "/catch.hxx";
 
16
+               FILE *excepts = fopen (outPath, "w+");
 
17
+               fprintf (excepts, "// This file is autogenerated by cppumaker\n");
 
18
+               fprintf (excepts, "// include exception headers\n");
 
19
+
 
20
+               ::std::list<rtl::OString>::const_iterator iter;
 
21
+
 
22
+               for (iter = aIncludes.begin(); iter != aIncludes.end(); iter++)
 
23
+               {
 
24
+                       rtl::OString aStr = *iter;
 
25
+                       fprintf (excepts, "#include <%s.hpp>\n", (const sal_Char *) aStr);
 
26
+               }
 
27
+       
 
28
+               fprintf (excepts, "// dummy method\n");
 
29
+               fprintf (excepts, "extern void force_emit ()\n");
 
30
+               fprintf (excepts, "{\n");
 
31
+               for (iter = aExceptionNames.begin(); iter != aExceptionNames.end(); iter++) {
 
32
+                       fprintf (excepts, "    try {\n");
 
33
+                       fprintf (excepts, "        force_emit ();\n");
 
34
+                       fprintf (excepts, "    }\n");
 
35
+                       rtl::OString aStr = *iter;
 
36
+                       fprintf (excepts, "catch (const %s &r) {} \n", (const sal_Char *)aStr);
 
37
+               }
 
38
+               fprintf (excepts, "}\n\n");
 
39
+               fclose (excepts);
 
40
+       }
 
41
+
 
42
        return 0;
 
43
 }
 
44
 
 
45
 
 
46
Index: codemaker/source/cppumaker/cpputype.cxx
 
47
===================================================================
 
48
RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
 
49
retrieving revision 1.37
 
50
diff -u -p -u -r1.37 cpputype.cxx
 
51
--- codemaker/source/cppumaker/cpputype.cxx     26 Jan 2006 17:42:38 -0000      1.37
 
52
+++ codemaker/source/cppumaker/cpputype.cxx     28 Mar 2006 08:54:34 -0000
 
53
@@ -56,6 +56,9 @@
 
54
 
 
55
 using namespace rtl;
 
56
 
 
57
+::std::list<rtl::OString> aExceptionNames;
 
58
+::std::list<rtl::OString> aIncludes;
 
59
+
 
60
 namespace {
 
61
 
 
62
 rtl::OString translateSimpleUnoType(rtl::OString const & unoType) {
 
63
@@ -3265,6 +3294,16 @@ sal_Bool ExceptionType::dumpHFile(
 
64
        return sal_True;
 
65
 }
 
66
 
 
67
+bool
 
68
+ExceptionType::dumpFiles(CppuOptions * options, rtl::OString const & outPath)
 
69
+{
 
70
+       OString aTypeName = scopedName (OString(), m_typeName);
 
71
+       aExceptionNames.insert(aExceptionNames.end(), aTypeName);
 
72
+
 
73
+       aIncludes.insert(aIncludes.end(), m_typeName);
 
74
+       return CppuType::dumpFiles (options, outPath);
 
75
+}
 
76
+
 
77
 sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
 
78
        throw( CannotDumpException )
 
79
 {
 
80
 
 
81
 
 
82
Index: codemaker/source/cppumaker/cpputype.hxx
 
83
===================================================================
 
84
RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.hxx,v
 
85
retrieving revision 1.9
 
86
diff -u -p -u -r1.9 cpputype.hxx
 
87
--- codemaker/source/cppumaker/cpputype.hxx     10 Jan 2006 15:46:47 -0000      1.9
 
88
+++ codemaker/source/cppumaker/cpputype.hxx     28 Mar 2006 08:54:34 -0000
 
89
@@ -61,6 +61,11 @@ enum CppuTypeDecl
 
90
 class CppuOptions;
 
91
 class FileStream;
 
92
 
 
93
+#include <list>
 
94
+extern ::std::list<rtl::OString> aExceptionNames;
 
95
+extern ::std::list<rtl::OString> aIncludes;
 
96
+extern bool do_internal;
 
97
+
 
98
 class CppuType
 
99
 {
 
100
 public:
 
101
@@ -300,6 +305,7 @@ public:
 
102
 
 
103
        virtual ~ExceptionType();
 
104
 
 
105
+    bool        dumpFiles(CppuOptions * options, rtl::OString const & outPath);
 
106
        sal_Bool        dumpDeclaration(FileStream& o) throw( CannotDumpException );
 
107
        sal_Bool        dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
108
        sal_Bool        dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
109
 
 
110
 
 
111
--- /dev/null
 
112
+++ offuh/except/except.cxx
 
113
@@ -0,0 +1,25 @@
 
114
+#include <sal/config.h>
 
115
+#include <cppu/macros.hxx>
 
116
+
 
117
+// We don't want to hide all this shared goodness:
 
118
+#undef CPPU_GCC_DLLPUBLIC_EXPORT
 
119
+#define CPPU_GCC_DLLPUBLIC_EXPORT 
 
120
+#undef CPPU_GCC_DLLPRIVATE
 
121
+#define CPPU_GCC_DLLPRIVATE 
 
122
+
 
123
+#define CPPU_INTERNAL_IMPL 1 
 
124
+
 
125
+// Evilness: sal/config.h includes stdlib.h
 
126
+// that has some workarounds for 'major' / 'minor'
 
127
+// issues, at least on Linux. These then cause problems
 
128
+// with chained constructors: FooClass : major(0) tec.
 
129
+
 
130
+// obscure CORBA compat interfaces
 
131
+#undef major
 
132
+#undef minor
 
133
+
 
134
+// com/sun/star/drawing/CaptionEscapeDirection.idl: keyword genius
 
135
+#define auto not_auto
 
136
+
 
137
+#include <catch.hxx>
 
138
+
 
139
 
 
140
 
 
141
--- /dev/null   2006-03-11 13:25:00.000000000 +0000
 
142
+++ offuh/except/makefile.mk    2006-03-17 11:44:41.000000000 +0000
 
143
@@ -0,0 +1,23 @@
 
144
+# --- Settings -----------------------------------------------------
 
145
+
 
146
+PRJ=..
 
147
+
 
148
+PRJNAME=offuh
 
149
+TARGET=unotypes
 
150
+ENABLE_EXCEPTIONS=TRUE
 
151
+
 
152
+.INCLUDE :  settings.mk
 
153
+
 
154
+LIB1TARGET= $(SLB)$/$(TARGET).lib
 
155
+LIB1OBJFILES= $(SLO)$/except.obj
 
156
+
 
157
+SHL1TARGET=exlink$(UPD)$(DLLPOSTFIX)
 
158
+SHL1LIBS=$(LIB1TARGET)
 
159
+SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
 
160
+
 
161
+# --- Targets -------------------------------------------------------
 
162
+
 
163
+.INCLUDE :  target.mk
 
164
+
 
165
+$(LIB1OBJFILES) : $(MISC)$/offuh.don
 
166
+
 
167
 
 
168
 
 
169
Index: offuh/prj/build.lst
 
170
===================================================================
 
171
RCS file: /cvs/api/offuh/prj/build.lst,v
 
172
retrieving revision 1.4
 
173
diff -u -p -u -r1.4 build.lst
 
174
--- offuh/prj/build.lst 18 Sep 2002 09:14:33 -0000      1.4
 
175
+++ offuh/prj/build.lst 3 Apr 2006 09:56:29 -0000
 
176
@@ -2,3 +2,4 @@ ou      offuh   ::      offapi codemaker NULL
 
177
 ou     offuh                                                                   usr1    -       all     ou_mkout NULL
 
178
 ou     offuh\prj                                                               get             -       all     ou_prj NULL
 
179
 ou     offuh\source                                                    nmake   -       all     ou_source NULL
 
180
+ou     offuh\except                                                    nmake   -       all     ou_except ou_source NULL
 
181
 
 
182
 
 
183
Index: offuh/prj/d.lst
 
184
===================================================================
 
185
RCS file: /cvs/api/offuh/prj/d.lst,v
 
186
retrieving revision 1.59
 
187
diff -u -p -u -r1.59 d.lst
 
188
--- offuh/prj/d.lst     9 Jun 2005 14:54:16 -0000       1.59
 
189
+++ offuh/prj/d.lst     3 Apr 2006 09:56:29 -0000
 
190
@@ -319,6 +326,9 @@ mkdir: %_DEST%\inc%_EXT%\com\sun\star\xm
 
191
 
 
192
 ..\%__SRC%\inc\com\sun\star\script\browse\*.hpp %_DEST%\inc%_EXT%\com\sun\star\script\browse\*.hpp
 
193
 ..\%__SRC%\inc\com\sun\star\script\browse\*.hdl %_DEST%\inc%_EXT%\com\sun\star\script\browse\*.hdl
 
194
+
 
195
+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
 
196
+
 
197
 ..\%__SRC%\inc\com\sun\star\script\provider\*.hpp %_DEST%\inc%_EXT%\com\sun\star\script\provider\*.hpp
 
198
 ..\%__SRC%\inc\com\sun\star\script\provider\*.hdl %_DEST%\inc%_EXT%\com\sun\star\script\provider\*.hdl
 
199
 
 
200
 
 
201
Index: scp2/source/ooo/file_library_ooo.scp
 
202
===================================================================
 
203
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
 
204
retrieving revision 1.184.2.2
 
205
diff -u -p -u -r1.184.2.2 file_library_ooo.scp
 
206
--- scp2/source/ooo/file_library_ooo.scp        17 Feb 2006 16:52:02 -0000      1.184.2.2
 
207
+++ scp2/source/ooo/file_library_ooo.scp        3 Apr 2006 10:13:58 -0000
 
208
@@ -468,6 +490,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl
 
209
 
 
210
 STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
 
211
 
 
212
+#ifdef LINUX
 
213
+File gid_File_Lib_ExLib
 
214
+    TXT_FILE_BODY;
 
215
+    Styles = (PACKED,PATCH);
 
216
+    Dir = gid_Dir_Program;
 
217
+    Name = LIBNAME(exlink);
 
218
+End
 
219
+#endif
 
220
+
 
221
 #ifndef SYSTEM_CURL
 
222
 
 
223
 File gid_File_Lib_Curl