diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-06 17:09:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:32 +0200 |
commit | f1d4534b159cef4db69779c29dc1850eb3366c9d (patch) | |
tree | 25132be36f05a4c1e2bcd87781e5902893727bdb | |
parent | e7c7f96b4170c537f9fac9d25743675e485f76ea (diff) |
convert include/editeng/edtdlg.hxx from String to OUString
Change-Id: Ie42861b0f53e8493d7cff11593c1fa3ae5669843
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 14 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 60 | ||||
-rw-r--r-- | include/editeng/edtdlg.hxx | 56 |
3 files changed, 67 insertions, 63 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 ); diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 7c998dfa637b..8f9c7abcb35d 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -41,7 +41,7 @@ class SvxSpellWrapper; class AbstractThesaurusDialog : public VclAbstractDialog { public: - virtual String GetWord() = 0; + virtual OUString GetWord() = 0; virtual sal_uInt16 GetLanguage() const = 0; virtual Window* GetWindow() = 0; }; @@ -57,28 +57,30 @@ public: class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog { public: - virtual void EnableRubySupport( bool _bVal ) = 0; - virtual void SetByCharacter( bool _bByCharacter ) = 0; - virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; - virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; - virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0; - virtual void SetChangeHdl( const Link& _rHdl ) = 0; - virtual void SetChangeAllHdl( const Link& _rHdl ) = 0; - virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0; - virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0; - virtual void SetFindHdl( const Link& _rHdl ) = 0; - virtual bool GetUseBothDirections() const= 0; - virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; - virtual void SetCurrentString( - const String& _rNewString, - const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, - bool _bOriginatesFromDocument = true )=0; - virtual String GetCurrentString( ) const =0; - virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const =0; - virtual void FocusSuggestion( )= 0; - virtual String GetCurrentSuggestion( ) const =0; + virtual void EnableRubySupport( bool _bVal ) = 0; + virtual void SetByCharacter( bool _bByCharacter ) = 0; + virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; + virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0; + virtual void SetIgnoreHdl( const Link& _rHdl ) = 0; + virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0; + virtual void SetChangeHdl( const Link& _rHdl ) = 0; + virtual void SetChangeAllHdl( const Link& _rHdl ) = 0; + virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0; + virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0; + virtual void SetFindHdl( const Link& _rHdl ) = 0; + virtual bool GetUseBothDirections() const= 0; + virtual editeng::HangulHanjaConversion::ConversionDirection + GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; + virtual void SetCurrentString( + const OUString& _rNewString, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, + bool _bOriginatesFromDocument = true )=0; + virtual OUString GetCurrentString( ) const =0; + virtual editeng::HangulHanjaConversion::ConversionFormat + GetConversionFormat( ) const =0; + virtual void FocusSuggestion( )= 0; + virtual OUString GetCurrentSuggestion( ) const =0; }; class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDialogFactory @@ -86,12 +88,12 @@ class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDi public: virtual ~EditAbstractDialogFactory(); // needed for export of vtable static EditAbstractDialogFactory* Create(); - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, - const String &rWord, sal_Int16 nLanguage ) = 0; + virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, + const OUString &rWord, sal_Int16 nLanguage ) = 0; virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, - const String &rWord, LanguageType nLang, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + const OUString &rWord, LanguageType nLang, + css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) = 0; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; |