[Libreoffice-commits] .: 2 commits - patches/dev300 patches/vba

[Fridrich Strba]

 patches/dev300/apply                             |    3 --
 patches/dev300/buildfix-fmtargs.diff             |   13 ----------
 patches/dev300/go-oo-splash.diff                 |    6 ++--
 patches/dev300/warning-string-comparsion-sw.diff |   29 -----------------------
 patches/vba/cws-vbasupportdev300.diff            |    4 +--
 5 files changed, 5 insertions(+), 50 deletions(-)

New commits:
commit d8deb9ba79334fed165022a5a8047134f9bfef40
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Oct 10 15:44:43 2010 +0200

    massage some patches to apply

diff --git a/patches/dev300/buildfix-fmtargs.diff b/patches/dev300/buildfix-fmtargs.diff
index 40302fa..c1ee004 100644
--- a/patches/dev300/buildfix-fmtargs.diff
+++ b/patches/dev300/buildfix-fmtargs.diff
@@ -141,19 +141,6 @@ index 00eaaff..7e84b2e 100644
      fprintf(outf, h41, fname);
  
      return SF_OK;
-diff --git vcl/unx/source/plugadapt/salplug.cxx vcl/unx/source/plugadapt/salplug.cxx
-index b328f8c..eebf90e 100644
---- vcl/unx/source/plugadapt/salplug.cxx
-+++ vcl/unx/source/plugadapt/salplug.cxx
-@@ -260,7 +260,7 @@ void SalAbort( const XubString& rErrorText )
-     if( !rErrorText.Len() )
-         std::fprintf( stderr, "Application Error" );
-     else
--        std::fprintf( stderr, ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
-+        std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
-     abort();
- }
- 
 -- 
 1.7.0.1
 
diff --git a/patches/dev300/go-oo-splash.diff b/patches/dev300/go-oo-splash.diff
index 77aa6f0..2530323 100644
--- a/patches/dev300/go-oo-splash.diff
+++ b/patches/dev300/go-oo-splash.diff
@@ -2,9 +2,9 @@
 +++ instsetoo_native/util/openoffice.lst	2010-03-03 17:50:36.000000000 +0100
 @@ -25,10 +25,10 @@ Globals
              POOLPRODUCT 1
-             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
- 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
--			PROGRESSBARCOLOR 14,133,205
+             REGISTRATION_HOST https://registration.documentfoundation.org/RegistrationWeb
+ 			REGISTRATIONURL http://survey.documentfoundation.org/user/index.php
+-			PROGRESSBARCOLOR 126,170,23
 -			PROGRESSSIZE 320,7
 -			PROGRESSPOSITION 185,206
 -			PROGRESSFRAMECOLOR 207,208,211
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index a69a46e..89e5c72 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -18351,7 +18351,7 @@ index 891ac75..db56765 100644
 +	rtl::OUString	aOODlgName;
  };
  
--const sal_Int32 nDialogSize = sizeof( aStringList ) / sizeof( aStringList[ 0 ] );
+-const sal_Int32 nDialogSize = SAL_N_ELEMENTS( aStringList ) ;
 +static const DialogMatch aDialogMatchList[] = 
 +{
 +	{ 1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ) },						// xlDialogOpen -> .uno:Open
@@ -18382,7 +18382,7 @@ index 891ac75..db56765 100644
 +	{ 269,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) ) }					// xlDialogFormatAuto -> .uno:AutoFormat
 +};
 +
-+const sal_Int32 nDialogSize = sizeof( aDialogMatchList ) / sizeof( aDialogMatchList[ 0 ] );
++const sal_Int32 nDialogSize = SAL_N_ELEMENTS( aDialogMatchList ) ;;
  
 +//liuchen modified 2009-2-27
  rtl::OUString 
commit 34047daffd72476a80f2abc1f1471893e0656270
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Oct 10 15:44:26 2010 +0200

    warning-string-comparison-sw.diff: remove patch patching inexisting file

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8f9a783..4b46dbc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1700,9 +1700,6 @@ SectionOwner => michael
 # kill >1Mb of bloat in sal
 size-sal-textenc.diff, i#70166
 
-# warning: comparison with string literal results in unspecified results
-warning-string-comparsion-sw.diff, i#86880, pmladek
-
 [ NovellOnlyUnix ]
 # search also gij32, ..., so the 32-bit package works on 64-bit
 jvmfwk-gij32.diff, n#222708, pmladek
diff --git a/patches/dev300/warning-string-comparsion-sw.diff b/patches/dev300/warning-string-comparsion-sw.diff
deleted file mode 100644
index 06b8c6b..0000000
--- a/patches/dev300/warning-string-comparsion-sw.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- sw/source/filter/rtf/rtfatr.cxx |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/rtf/rtfatr.cxx sw/source/filter/rtf/rtfatr.cxx
-index 367e5e6..0b27f6d 100644
---- sw/source/filter/rtf/rtfatr.cxx
-+++ sw/source/filter/rtf/rtfatr.cxx
-@@ -1425,7 +1425,7 @@ void ExportPICT(const Size &rOrig, const Size &rRendered, const Size &rMapped,
-     const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry,
-     unsigned long nSize, SwRTFWriter &rWrt)
- {
--    bool bIsWMF = (const char *)pBLIPType == (const char *)OOO_STRING_SVTOOLS_RTF_WMETAFILE ? true : false;
-+    bool bIsWMF = (pBLIPType && !strcmp(pBLIPType, OOO_STRING_SVTOOLS_RTF_WMETAFILE)) ? true : false;
-     if (pBLIPType && nSize && pGraphicAry)
-     {
-         rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_PICT;
-@@ -1570,7 +1570,7 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode)
-      the wmf format wrapped in nonshppict, so as to keep wordpad happy. If its
-      a wmf already then we don't need any such wrapping
-     */
--    bool bIsWMF = (const sal_Char*)pBLIPType == (const sal_Char*)OOO_STRING_SVTOOLS_RTF_WMETAFILE ? true : false;
-+    bool bIsWMF = (pBLIPType && !strcmp(pBLIPType, OOO_STRING_SVTOOLS_RTF_WMETAFILE)) ? true : false;
-     if (!bIsWMF)
-         OutComment(rRTFWrt, OOO_STRING_SVTOOLS_RTF_SHPPICT);
- 
--- 
-1.7.0.1
-