Fix bit-rot in the iOS "code"

10 files changed, 27 insertions, 22 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fa6093ee6eca..424197a1977d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -74,12 +74,17 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     i18nisolang1 \
     i18npaper \
     i18nutil \
-    jvmaccess \
     cppu \
     sal \
     $(gb_STDLIBS) \
 ))
 
+ifneq ($(OS),IOS)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    jvmaccess \
+))
+endif
+
 $(eval $(call gb_Library_use_externals,vcl,\
 	icule \
 	icuuc \
diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h
index c6dc691d6302..7b779e0a02e3 100644
--- a/vcl/inc/ios/salframe.h
+++ b/vcl/inc/ios/salframe.h
@@ -112,7 +112,7 @@ public:
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
     virtual sal_Bool                PostEvent( void* pData );
-    virtual void                SetTitle( const XubString& rTitle );
+    virtual void                SetTitle( const rtl::OUString& rTitle );
     virtual void                SetIcon( sal_uInt16 nIcon );
     virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                SetMenu( SalMenu* pSalMenu );
@@ -139,8 +139,8 @@ public:
     virtual void                Sync();
     virtual void                SetInputContext( SalInputContext* pContext );
     virtual void                EndExtTextInput( sal_uInt16 nFlags );
-    virtual String              GetKeyName( sal_uInt16 nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+    virtual rtl::OUString       GetKeyName( sal_uInt16 nKeyCode );
+    virtual rtl::OUString       GetSymbolKeyName( const rtl::OUString& rFontName, sal_uInt16 nKeyCode );
     virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
     virtual LanguageType        GetInputLanguage();
     virtual SalBitmap*          SnapShot();
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 5874675911e8..5773f3e929ed 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -284,7 +284,7 @@ public:
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
     virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual bool            AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successfull
diff --git a/vcl/inc/ios/salinst.h b/vcl/inc/ios/salinst.h
index 9983804bf665..aa465f02f1c9 100644
--- a/vcl/inc/ios/salinst.h
+++ b/vcl/inc/ios/salinst.h
@@ -128,7 +128,7 @@ public:
     virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
     virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
     virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
-    virtual String             GetDefaultPrinter();
+    virtual rtl::OUString       GetDefaultPrinter();
     virtual SalTimer*           CreateSalTimer();
     virtual SalI18NImeStatus*   CreateI18NImeStatus();
     virtual SalSystem*          CreateSalSystem();
diff --git a/vcl/inc/ios/salprn.h b/vcl/inc/ios/salprn.h
index cd90a0f881df..869c2c38a7cb 100644
--- a/vcl/inc/ios/salprn.h
+++ b/vcl/inc/ios/salprn.h
@@ -90,7 +90,7 @@ class IosSalInfoPrinter : public SalInfoPrinter
                                              long& o_rPageWidth, long& o_rPageHeight );
     virtual sal_uLong               GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
     virtual sal_uLong               GetPaperBinCount( const ImplJobSetup* i_pSetupData );
-    virtual String              GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
+    virtual rtl::OUString       GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
     virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
 
diff --git a/vcl/inc/ios/salsys.h b/vcl/inc/ios/salsys.h
index 48ccfabc47bf..2184d2b23c30 100644
--- a/vcl/inc/ios/salsys.h
+++ b/vcl/inc/ios/salsys.h
@@ -43,8 +43,8 @@ public:
     virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
 
     virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
-    virtual int ShowNativeMessageBox( const String& rTitle,
-                                      const String& rMessage,
+    virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
+                                      const rtl::OUString& rMessage,
                                       int nButtonCombination,
                                       int nDefaultButton);
 };
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 76bec375caa2..b47c1688dd68 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -140,13 +140,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
 
 // =======================================================================
 
-void SalAbort( const XubString& rErrorText, bool bDumpCore )
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
 {
-    if( !rErrorText.Len() )
+    if( rErrorText.isEmpty() )
         fprintf( stderr, "Application Error " );
     else
         fprintf( stderr, "%s ",
-            ByteString( rErrorText, osl_getThreadTextEncoding() ).GetBuffer() );
+            rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
     if( bDumpCore )
         abort();
     else
@@ -197,7 +197,7 @@ void InitSalMain()
             if ( aCmdPath.Len() ) {
                 DirEntry aCmdDirEntry( aCmdPath );
                 aCmdDirEntry.ToAbs();
-                aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
+                aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
             }
             // Assign to PATH environment variable
             if ( aCmdPath.Len() )
@@ -205,7 +205,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "PATH=" );
                 aTmpPath += aCmdPath;
                 if ( aPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -215,7 +215,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
                 aTmpPath += aCmdPath;
                 if ( aResPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aResPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -624,7 +624,7 @@ void IosSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalInstance::GetDefaultPrinter()
+rtl::OUString IosSalInstance::GetDefaultPrinter()
 {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 3a517baeb5c7..02cd6442525a 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -147,8 +147,8 @@ static NSString* getStandardString( int nButtonId )
 }
 @end
 
-int IosSalSystem::ShowNativeMessageBox( const String& rTitle,
-                                        const String& rMessage,
+int IosSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
+                                        const rtl::OUString& rMessage,
                                         int nButtonCombination,
                                         int nDefaultButton)
 {
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index f6ffbaa84b2f..7f9e5b4bbc5b 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1511,7 +1511,7 @@ void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
 // -----------------------------------------------------------------------
 
 bool IosSalGraphics::AddTempDevFont( ImplDevFontList*,
-    const String& rFontFileURL, const String& /*rFontName*/ )
+    const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
 {
     ::rtl::OUString aUSytemPath;
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index b1464a6fb40f..baed581973e1 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -240,7 +240,7 @@ sal_Bool IosSalFrame::PostEvent( void *pData )
 }
 
 // -----------------------------------------------------------------------
-void IosSalFrame::SetTitle(const XubString& /* rTitle */)
+void IosSalFrame::SetTitle(const rtl::OUString& /* rTitle */)
 {
 }
 
@@ -617,7 +617,7 @@ void IosSalFrame::EndExtTextInput( sal_uInt16 )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
     static std::map< sal_uInt16, rtl::OUString > aKeyMap;
     if( aKeyMap.empty() )
@@ -704,7 +704,7 @@ XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
 {
     return GetKeyName( nKeyCode );
 }