diff options
| -rw-r--r-- | cui/source/factory/init.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/edit.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index 3859666dd9b8..a903d19269c8 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -25,7 +25,7 @@ // caution: needs C-Linkage since dynamically loaded via symbol name extern "C" { -SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, String& o_rResult) +SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, OUString& o_rResult) { bool bRet = false; SvxCharacterMap* aDlg = new SvxCharacterMap( i_pParent ); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 6df1f7b8fd25..77a277f17df8 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -46,7 +46,7 @@ struct Impl_IMEInfos; #define EDIT_NOLIMIT STRING_LEN #define EDIT_UPDATEDATA_TIMEOUT 350 -typedef XubString (*FncGetSpecialChars)( Window* pWin, const Font& rFont ); +typedef OUString (*FncGetSpecialChars)( Window* pWin, const Font& rFont ); // -------- // - Edit - diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5a5fb9e1919e..646993d66659 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -170,11 +170,11 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const Font& i_rFont, String& o_rOutString ); +extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString ); #endif -String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) +OUString GetSpecialCharsForEdit(Window* pParent, const Font& rFont) { static bool bDetermineFunction = false; static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 545fb273e869..ffd256a8e729 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1586,9 +1586,9 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( pImplFncGetSpecialChars ) { Selection aSaveSel = GetSelection(); // if someone changes the selection in Get/LoseFocus, e.g. URL bar - XubString aChars = pImplFncGetSpecialChars( this, GetFont() ); + OUString aChars = pImplFncGetSpecialChars( this, GetFont() ); SetSelection( aSaveSel ); - if ( aChars.Len() ) + if ( !aChars.isEmpty() ) { ImplInsertText( aChars ); ImplModified(); @@ -2176,9 +2176,9 @@ void Edit::Command( const CommandEvent& rCEvt ) break; case SV_MENU_EDIT_INSERTSYMBOL: { - XubString aChars = pImplFncGetSpecialChars( this, GetFont() ); + OUString aChars = pImplFncGetSpecialChars( this, GetFont() ); SetSelection( aSaveSel ); - if ( aChars.Len() ) + if ( !aChars.isEmpty() ) { ImplInsertText( aChars ); ImplModified(); |