summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-01-24 14:59:03 +0200
committerTor Lillqvist <tml@iki.fi>2012-01-27 22:44:00 +0200
commitd088fd397f7c61a517255fac1fc470b28e4e5798 (patch)
tree850ea8791323c1a2fcc48e50c0ff37ab4c9fb94f /vcl/inc
parentadb9a3e60ede9105187e9dee73446d3d44b529ec (diff)
Fix bit-rot in the iOS "code"
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/ios/salframe.h6
-rw-r--r--vcl/inc/ios/salgdi.h2
-rw-r--r--vcl/inc/ios/salinst.h2
-rw-r--r--vcl/inc/ios/salprn.h2
-rw-r--r--vcl/inc/ios/salsys.h4
5 files changed, 8 insertions, 8 deletions
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);
};