diff options
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/saldisp.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/unx/salframe.h | 8 | ||||
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/salmenu.h | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/x11/x11sys.hxx | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index e65b8bd21be9..ded2d1c65ac8 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -363,8 +363,8 @@ public: void ModifierMapping(); void SimulateKeyPress( sal_uInt16 nKeyCode ); sal_uInt16 GetIndicatorState() const; - String GetKeyNameFromKeySym( KeySym keysym ) const; - XubString GetKeyName( sal_uInt16 nKeyCode ) const; + rtl::OUString GetKeyNameFromKeySym( KeySym keysym ) const; + rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) const; sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, @@ -474,7 +474,7 @@ public: */ // get foreign key names namespace vcl_sal { - String getKeysymReplacementName( + rtl::OUString getKeysymReplacementName( const char* pKeyboard, KeySym nSymbol ); } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 32d2459cb12b..6343d44f2417 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -128,7 +128,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame // icon id int mnIconID; - String m_aTitle; + rtl::OUString m_aTitle; rtl::OUString m_sWMClass; @@ -224,7 +224,7 @@ public: 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 SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); @@ -252,8 +252,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/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 59bb8b7688dc..9ef77738d89a 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -267,7 +267,7 @@ public: virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); 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 ); virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData*, sal_Int32* pGlyphIDs, diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index e7b5effed653..f693a3393907 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -49,9 +49,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, BOOL bCheck ); virtual void EnableItem( unsigned nPos, BOOL bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); }; diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index 04598346c7e3..403625f20aa7 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -49,9 +49,9 @@ public: virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ); virtual rtl::OUString GetScreenName( unsigned int nScreen ); - virtual int ShowNativeDialog( const String& rTitle, - const String& rMessage, - const std::list< String >& rButtons, + virtual int ShowNativeDialog( const rtl::OUString& rTitle, + const rtl::OUString& rMessage, + const std::list< rtl::OUString >& rButtons, int nDefButton ); }; |