[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

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

New commits:
commit 69dd5ccb82a5ee14a9490112a3e50a1ffcbc98d8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 4 13:05:40 2010 +0300

    Make buildfix-fmtargs.diff apply again

diff --git a/patches/dev300/buildfix-fmtargs.diff b/patches/dev300/buildfix-fmtargs.diff
index cc82992..40302fa 100644
--- a/patches/dev300/buildfix-fmtargs.diff
+++ b/patches/dev300/buildfix-fmtargs.diff
@@ -1,18 +1,3 @@
----
- cpputools/source/unoexe/unoexe.cxx            |    4 ++--
- extensions/source/logging/consolehandler.cxx  |    4 ++--
- fpicker/source/unx/gnome/SalGtkFilePicker.cxx |    2 +-
- icc/makefile.mk                               |    2 +-
- icc/mdv-fmtargs-buildfix.patch                |   20 ++++++++++++++++++++
- rsc/source/prj/start.cxx                      |    2 +-
- svtools/bmpmaker/bmp.cxx                      |    2 +-
- svtools/bmpmaker/bmpsum.cxx                   |    2 +-
- svtools/bmpmaker/g2g.cxx                      |    2 +-
- vcl/source/fontsubset/sft.cxx                 |   16 ++++++++--------
- vcl/unx/source/plugadapt/salplug.cxx          |    2 +-
- 11 files changed, 39 insertions(+), 19 deletions(-)
- create mode 100644 icc/mdv-fmtargs-buildfix.patch
-
 diff --git cpputools/source/unoexe/unoexe.cxx cpputools/source/unoexe/unoexe.cxx
 index 268114a..ed3c1f3 100644
 --- cpputools/source/unoexe/unoexe.cxx
@@ -103,45 +88,6 @@ index 0000000..5774e36
 +     if (!IsTypeValid(tagsig, typesig)) {
 +       sReport += icValidateNonCompliantMsg;
 +       sReport += buf;
-diff --git svtools/bmpmaker/bmp.cxx svtools/bmpmaker/bmp.cxx
-index b5de769..78c8c94 100644
---- svtools/bmpmaker/bmp.cxx
-+++ svtools/bmpmaker/bmp.cxx
-@@ -161,7 +161,7 @@ void BmpApp::Message( const String& rText, BYTE cExit )
- 
-     ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
-     aText.Append( "\r\n" );
--    fprintf( stderr, aText.GetBuffer() );
-+    fprintf( stderr, "%s", aText.GetBuffer() );
- }
- 
- // -----------------------------------------------------------------------------
-diff --git svtools/bmpmaker/bmpsum.cxx svtools/bmpmaker/bmpsum.cxx
-index 574f7f6..3a5eef6 100644
---- svtools/bmpmaker/bmpsum.cxx
-+++ svtools/bmpmaker/bmpsum.cxx
-@@ -167,7 +167,7 @@ void BmpSum::Message( const String& rText, BYTE nExitCode )
- 
-     ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
-     aText.Append( "\r\n" );
--    fprintf( stderr, aText.GetBuffer() );
-+    fprintf( stderr, "%s", aText.GetBuffer() );
- }
- 
- // -----------------------------------------------------------------------------
-diff --git svtools/bmpmaker/g2g.cxx svtools/bmpmaker/g2g.cxx
-index dbdb9ac..7dc52d8 100644
---- svtools/bmpmaker/g2g.cxx
-+++ svtools/bmpmaker/g2g.cxx
-@@ -125,7 +125,7 @@ void G2GApp::Message( const String& rText, BYTE nExitCode )
- 
-     ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
-     aText.Append( "\r\n" );
--    fprintf( stderr, aText.GetBuffer() );
-+    fprintf( stderr, "%s", aText.GetBuffer() );
- }
- 
- // -----------------------------------------------------------------------------
 diff --git vcl/source/fontsubset/sft.cxx vcl/source/fontsubset/sft.cxx
 index 00eaaff..7e84b2e 100644
 --- vcl/source/fontsubset/sft.cxx