convert include/editeng/edtdlg.hxx from String to OUString

Change-Id: Ie42861b0f53e8493d7cff11593c1fa3ae5669843

2 files changed, 38 insertions, 36 deletions

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index c2f5d890cedc..1b099ab70b33 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -325,14 +325,14 @@ editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversio
 }
 
 void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString(
-                    const String& _rNewString,
+                    const OUString& _rNewString,
                     const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions,
                     bool _bOriginatesFromDocument
                 )
 {
      pDlg->SetCurrentString(_rNewString,_rSuggestions,_bOriginatesFromDocument);
 }
-String   AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const
+OUString   AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const
 {
     return pDlg->GetCurrentString();
 }
@@ -346,12 +346,12 @@ void AbstractHangulHanjaConversionDialog_Impl::FocusSuggestion( )
     pDlg->FocusSuggestion();
 }
 
-String  AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const
+OUString  AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const
 {
     return pDlg->GetCurrentSuggestion();
 }
 
-String AbstractThesaurusDialog_Impl::GetWord()
+OUString AbstractThesaurusDialog_Impl::GetWord()
 {
     return pDlg->GetWord();
 };
@@ -1163,15 +1163,15 @@ AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHan
 }
 
 AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent,
-                                ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
-                                const String &rWord, sal_Int16 nLanguage )
+                                css::uno::Reference< css::linguistic2::XThesaurus >  xThesaurus,
+                                const OUString &rWord, sal_Int16 nLanguage )
 {
     SvxThesaurusDialog* pDlg = new SvxThesaurusDialog( pParent, xThesaurus, rWord, nLanguage );
     return new AbstractThesaurusDialog_Impl( pDlg );
 }
 
 AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Window* pParent,
-                                                const String &rWord, LanguageType nLang,
+                                                const OUString &rWord, LanguageType nLang,
                                                 ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
                                                 SvxSpellWrapper* pWrapper )
 {
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 3915ba7161f2..29a56662cf1e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -140,36 +140,38 @@ public:
 class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog
 {
     DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog)
-    virtual void    EndDialog(long nResult = 0);
-    virtual void    EnableRubySupport( bool _bVal );
-    virtual void    SetByCharacter( bool _bByCharacter ) ;
-    virtual void    SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
-    virtual void    SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
-    virtual void    SetOptionsChangedHdl( const Link& _rHdl );
-    virtual void    SetIgnoreHdl( const Link& _rHdl );
-    virtual void    SetIgnoreAllHdl( const Link& _rHdl ) ;
-    virtual void    SetChangeHdl( const Link& _rHdl ) ;
-    virtual void    SetChangeAllHdl( const Link& _rHdl ) ;
-    virtual void    SetClickByCharacterHdl( const Link& _rHdl ) ;
-    virtual void    SetConversionFormatChangedHdl( const Link& _rHdl ) ;
-    virtual void    SetFindHdl( const Link& _rHdl );
-    virtual bool    GetUseBothDirections( ) const;
-    virtual editeng::HangulHanjaConversion::ConversionDirection    GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const;
-    virtual void    SetCurrentString(
-                    const String& _rNewString,
-                    const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions,
-                    bool _bOriginatesFromDocument = true
-                );
-    virtual String  GetCurrentString( ) const ;
-    virtual editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const ;
-    virtual void    FocusSuggestion( );
-    virtual String  GetCurrentSuggestion( ) const;
+    virtual void      EndDialog(long nResult = 0);
+    virtual void      EnableRubySupport( bool _bVal );
+    virtual void      SetByCharacter( bool _bByCharacter ) ;
+    virtual void      SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
+    virtual void      SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
+    virtual void      SetOptionsChangedHdl( const Link& _rHdl );
+    virtual void      SetIgnoreHdl( const Link& _rHdl );
+    virtual void      SetIgnoreAllHdl( const Link& _rHdl ) ;
+    virtual void      SetChangeHdl( const Link& _rHdl ) ;
+    virtual void      SetChangeAllHdl( const Link& _rHdl ) ;
+    virtual void      SetClickByCharacterHdl( const Link& _rHdl ) ;
+    virtual void      SetConversionFormatChangedHdl( const Link& _rHdl ) ;
+    virtual void      SetFindHdl( const Link& _rHdl );
+    virtual bool      GetUseBothDirections( ) const;
+    virtual editeng::HangulHanjaConversion::ConversionDirection
+                      GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const;
+    virtual void      SetCurrentString(
+                        const OUString& _rNewString,
+                        const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions,
+                        bool _bOriginatesFromDocument = true
+                      );
+    virtual OUString  GetCurrentString( ) const ;
+    virtual editeng::HangulHanjaConversion::ConversionFormat
+                      GetConversionFormat( ) const ;
+    virtual void      FocusSuggestion( );
+    virtual OUString  GetCurrentSuggestion( ) const;
 };
 
 class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog
 {
     DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog)
-    virtual String      GetWord();
+    virtual OUString    GetWord();
     virtual sal_uInt16  GetLanguage() const;
     virtual Window*     GetWindow();
 };
@@ -570,11 +572,11 @@ public:
 
    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
                                             editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
-    virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
-                                                const String &rWord, sal_Int16 nLanguage );
+   virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
+                                                const OUString &rWord, sal_Int16 nLanguage );
 
-    virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( Window*,
-                                                const String &rWord, LanguageType nLang,
+   virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( Window*,
+                                                const OUString &rWord, LanguageType nLang,
                                                 ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
                                                 SvxSpellWrapper* pWrapper );