mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bit-rot in the iOS "code"

Browse Source
This commit is contained in:
Tor Lillqvist
2012-01-24 14:59:03 +02:00
parent adb9a3e60e
commit d088fd397f
10 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vcl/Library_vcl.mk
View File

@@ -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 \

6
vcl/inc/ios/salframe.h
View File

@@ -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();

2
vcl/inc/ios/salgdi.h
View File

@@ -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

2
vcl/inc/ios/salinst.h
View File

@@ -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();

2
vcl/inc/ios/salprn.h
View File

@@ -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 );

4
vcl/inc/ios/salsys.h
View File

@@ -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);
};

14
vcl/ios/source/app/salinst.cxx
View File

@@ -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();

4
vcl/ios/source/app/salsys.cxx
View File

@@ -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)
{

2
vcl/ios/source/gdi/salgdi.cxx
View File

@@ -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 ) );

6
vcl/ios/source/window/salframe.cxx
View File

@@ -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 );
}