[Libreoffice-commits] .: 2 commits - sal/inc sal/textenc

[Tor Lillqvist]

 sal/inc/sal/main.h      |    2 ++
 sal/textenc/tables.cxx  |   10 ++++------
 sal/textenc/textenc.cxx |    7 +++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 4d01097098e31d1953a50e8ef4b4c9bbf0662114
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 3 01:08:48 2011 +0300

    Don't use dynamic loading on iOS

diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx
index 00d7811..8197f68 100644
--- a/sal/textenc/tables.cxx
+++ b/sal/textenc/tables.cxx
@@ -26,6 +26,10 @@
  *
  ************************************************************************/
 
+#ifdef IOS
+#define Impl_getTextEncodingData tables_Impl_getTextEncodingData
+#endif
+
 #ifndef INCLUDED_RTL_TEXTENC_GETTEXTENCODINGDATA_H
 #include "gettextencodingdata.h"
 #endif
@@ -127,12 +131,6 @@ static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
 
 ImplTextEncodingData const *
 Impl_getTextEncodingData(rtl_TextEncoding nEncoding)
-#ifdef IOS
-    // Dunno if the g++ for iOS is just pickier, or why other g++
-    // versions don't complain about the lack of throw to match the
-    // one in the declaration in gettextencodingdata.h.o
-    SAL_THROW_EXTERN_C()
-#endif
 {
     static ImplTextEncodingData const * const aData[]
         = { NULL, /* DONTKNOW */
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 7404d51..61a2b1a 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -100,7 +100,12 @@ extern "C" {
 
 // Yes - we should use the unpleasant to use templatized
 // sal:: doublecheckfoo thing here.
+#ifndef IOS
 static TextEncodingFunction pTables;
+#else
+extern "C" ImplTextEncodingData *tables_Impl_getTextEncodingData(rtl_TextEncoding);
+#define pTables tables_Impl_getTextEncodingData
+#endif
 
 #define DOSTRING( x )  #x
 #define STRING( x )    DOSTRING( x )
@@ -137,6 +142,7 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
 // ----------------------------------------------
 #endif
         default:
+#ifndef IOS
             if (!pTables)
             {
                 static char const pName[] = STRING(PLUGIN_NAME);
@@ -148,6 +154,7 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
                     pTables = (TextEncodingFunction)osl_getAsciiFunctionSymbol(aModule, pSymbol);
                 }
             }
+#endif
             if (pTables)
                 return pTables(nEncoding);
 //			else
commit 6d12b5bb68defce4d566aac2c3dd4317efbbc438
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 3 01:07:40 2011 +0300

    Avoid compiler warning

diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 370cba4..cc4c5c5 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -102,6 +102,8 @@ static int sal_main(void);
 
 - (BOOL)application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
 {
+  (void) application;
+  (void) launchOptions;
   UIWindow *uiw = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
   uiw.backgroundColor = [UIColor redColor];
   self.window = uiw;