Skip to content

C
core
Kaydet (Commit) f1d4534b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

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

Change-Id: Ie42861b0f53e8493d7cff11593c1fa3ae5669843
üst e7c7f96b
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 63 deletions
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ f1d4534b
......@@ -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 )
{
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ f1d4534b
......@@ -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 );
......
include/editeng/edtdlg.hxx
Dosyayı görüntüle @ f1d4534b
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment