[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/buildfix-fmtargs.diff |   78 -----------------------------------
 1 file changed, 78 deletions(-)

New commits:
commit d4c48ab79957965615653f46e7a83ce411f05587
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 10 10:26:06 2010 +0200

    Part of buildfix-fmtargs.diff is in git

diff --git a/patches/dev300/buildfix-fmtargs.diff b/patches/dev300/buildfix-fmtargs.diff
index c1ee004..2e03735 100644
--- a/patches/dev300/buildfix-fmtargs.diff
+++ b/patches/dev300/buildfix-fmtargs.diff
@@ -1,25 +1,3 @@
-diff --git cpputools/source/unoexe/unoexe.cxx cpputools/source/unoexe/unoexe.cxx
-index 268114a..ed3c1f3 100644
---- cpputools/source/unoexe/unoexe.cxx
-+++ cpputools/source/unoexe/unoexe.cxx
-@@ -131,7 +131,7 @@ static sal_Bool s_quiet = false;
- static inline void out( const sal_Char * pText )
- {
-     if (! s_quiet)
--        fprintf( stderr, pText );
-+        fprintf( stderr, "%s", pText );
- }
- //--------------------------------------------------------------------------------------------------
- static inline void out( const OUString & rText )
-@@ -139,7 +139,7 @@ static inline void out( const OUString & rText )
-     if (! s_quiet)
-     {
-         OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
--        fprintf( stderr, aText.getStr() );
-+        fprintf( stderr, "%s", aText.getStr() );
-     }
- }
- 
 diff --git extensions/source/logging/consolehandler.cxx extensions/source/logging/consolehandler.cxx
 index 2eff518..a280a9d 100644
 --- extensions/source/logging/consolehandler.cxx
@@ -88,59 +66,3 @@ index 0000000..5774e36
 +     if (!IsTypeValid(tagsig, typesig)) {
 +       sReport += icValidateNonCompliantMsg;
 +       sReport += buf;
-diff --git vcl/source/fontsubset/sft.cxx vcl/source/fontsubset/sft.cxx
-index 00eaaff..7e84b2e 100644
---- vcl/source/fontsubset/sft.cxx
-+++ vcl/source/fontsubset/sft.cxx
-@@ -2052,7 +2052,7 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
-     fprintf(outf, h02, modname, modver, modextra);
-     fprintf(outf, h09, ttf->psname);
- 
--    fprintf(outf, h10);
-+    fprintf(outf, "%s", h10);
-     fprintf(outf, h11, fname);
- /*    fprintf(outf, h12, 4000000); */
- 
-@@ -2067,17 +2067,17 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
-      */
- 
-     fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs));
--    fprintf(outf, h13);
-+    fprintf(outf, "%s", h13);
-     fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1)));
--    fprintf(outf, h15);
-+    fprintf(outf, "%s", h15);
- 
-     for (i = 0; i < nGlyphs; i++) {
-         fprintf(outf, h16, encoding[i], i);
-     }
- 
-     fprintf(outf, h30, nGlyphs+1);
--    fprintf(outf, h31);
--    fprintf(outf, h32);
-+    fprintf(outf, "%s", h31);
-+    fprintf(outf, "%s", h32);
- 
-     for (i = 0; i < nGlyphs; i++) {
-         fprintf(outf, h33, i);
-@@ -2125,14 +2125,14 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
-         }
-         if (n > 0) fprintf(outf, "\tfill\n");     /* if glyph is not a whitespace character */
- 
--        fprintf(outf, h34);
-+        fprintf(outf, "%s", h34);
- 
-         free(pa);
-         free(path);
-     }
--    fprintf(outf, h35);
-+    fprintf(outf, "%s", h35);
- 
--    fprintf(outf, h40);
-+    fprintf(outf, "%s", h40);
-     fprintf(outf, h41, fname);
- 
-     return SF_OK;
--- 
-1.7.0.1
-