diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-30 11:45:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:15 +0200 |
commit | 6a23978228411290ed2cef6fe2ab32d6a8a9ca52 (patch) | |
tree | d24a17a8b20e21881177f648c014e07900c31fec /cui | |
parent | 4f0bf3db08ba9b203e30883f260a35d378f20a9c (diff) |
convert include/svx/svxdlg.hxx from String to OUString
Change-Id: I18694c0f74f331c9d798ca85c52c744d43a599bb
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 60 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 80 |
2 files changed, 70 insertions, 70 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 38f09e71160a..c2f5d890cedc 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -468,7 +468,7 @@ void AbstractSearchProgress_Impl::Sync() pDlg->Sync(); } -void AbstractSearchProgress_Impl::SetFileType( const String& rType ) +void AbstractSearchProgress_Impl::SetFileType( const OUString& rType ) { pDlg->SetFileType( rType ); } @@ -502,7 +502,7 @@ PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl() return TakeProgress::LinkStubCleanUpHdl; } -String AbstractTitleDialog_Impl::GetTitle() const +OUString AbstractTitleDialog_Impl::GetTitle() const { return pDlg->GetTitle(); } @@ -522,27 +522,27 @@ void VclAbstractRefreshableDialog_Impl::Sync() pDlg->Sync(); } -String AbstractURLDlg_Impl::GetURL() const +OUString AbstractURLDlg_Impl::GetURL() const { return pDlg->GetURL(); } -String AbstractURLDlg_Impl::GetAltText() const +OUString AbstractURLDlg_Impl::GetAltText() const { return pDlg->GetAltText(); } -String AbstractURLDlg_Impl::GetDesc() const +OUString AbstractURLDlg_Impl::GetDesc() const { return pDlg->GetDesc(); } -String AbstractURLDlg_Impl::GetTarget() const +OUString AbstractURLDlg_Impl::GetTarget() const { return pDlg->GetTarget(); } -String AbstractURLDlg_Impl::GetName() const +OUString AbstractURLDlg_Impl::GetName() const { return pDlg->GetName(); } @@ -582,12 +582,12 @@ sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( sal_Bool bDoit )cons return pDlg->ConnectToDialog(bDoit); } -void AbstractSvxHlinkDlgMarkWnd_Impl::RefreshTree ( String aStrURL ) +void AbstractSvxHlinkDlgMarkWnd_Impl::RefreshTree ( OUString aStrURL ) { pDlg->RefreshTree(aStrURL); } -void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( String aStrMark ) +void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( OUString aStrMark ) { pDlg->SelectEntry(aStrMark); } @@ -787,17 +787,17 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(OUString& rDescriptio pDlg->GetDescription(rDescription); } -void AbstractSvxMessDialog_Impl::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) +void AbstractSvxMessDialog_Impl::SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ) { pDlg->SetButtonText( nBtnId, rNewTxt ); } -String AbstractSvxMultiPathDialog_Impl::GetPath() const +OUString AbstractSvxMultiPathDialog_Impl::GetPath() const { return pDlg->GetPath(); } -void AbstractSvxMultiPathDialog_Impl::SetPath( const String& rPath ) +void AbstractSvxMultiPathDialog_Impl::SetPath( const OUString& rPath ) { pDlg->SetPath( rPath ); } @@ -807,27 +807,27 @@ void AbstractSvxMultiPathDialog_Impl::EnableRadioButtonMode() pDlg->EnableRadioButtonMode(); } -void AbstractSvxMultiPathDialog_Impl::SetTitle( const String& rNewTitle ) +void AbstractSvxMultiPathDialog_Impl::SetTitle( const OUString& rNewTitle ) { pDlg->SetText( rNewTitle ); } -String AbstractSvxMultiFileDialog_Impl::GetPath() const +OUString AbstractSvxMultiFileDialog_Impl::GetPath() const { return pDlg->GetPath(); } -void AbstractSvxMultiFileDialog_Impl::SetPath( const String& rPath ) +void AbstractSvxMultiFileDialog_Impl::SetPath( const OUString& rPath ) { pDlg->SetPath( rPath ); } -String AbstractSvxMultiFileDialog_Impl::GetFiles() const +OUString AbstractSvxMultiFileDialog_Impl::GetFiles() const { return pDlg->GetFiles(); } -void AbstractSvxMultiFileDialog_Impl::SetFiles( const String& rPath ) +void AbstractSvxMultiFileDialog_Impl::SetFiles( const OUString& rPath ) { pDlg->SetFiles( rPath ); } @@ -842,7 +842,7 @@ void AbstractSvxMultiFileDialog_Impl::EnableRadioButtonMode() pDlg->EnableRadioButtonMode(); } -void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) +void AbstractSvxMultiFileDialog_Impl::SetTitle( const OUString& rNewTitle ) { pDlg->SetText( rNewTitle ); } @@ -871,7 +871,7 @@ void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link& lnk) { pDlg->SetCanceledNotFoundHdl(lnk); } -void AbstractFmSearchDialog_Impl::SetActiveField(const String& strField) +void AbstractFmSearchDialog_Impl::SetActiveField(const OUString& strField) { pDlg->SetActiveField(strField); } @@ -928,15 +928,15 @@ void AbstractSvxPostItDialog_Impl::EnableTravel(sal_Bool bNext, sal_Bool bPrev) { pDlg->EnableTravel( bNext, bPrev ); } -String AbstractSvxPostItDialog_Impl::GetNote() +OUString AbstractSvxPostItDialog_Impl::GetNote() { return pDlg->GetNote(); } -void AbstractSvxPostItDialog_Impl::SetNote(const String& rTxt) +void AbstractSvxPostItDialog_Impl::SetNote(const OUString& rTxt) { pDlg->SetNote( rTxt ); } -void AbstractSvxPostItDialog_Impl::ShowLastAuthor(const String& rAuthor, const String& rDate) +void AbstractSvxPostItDialog_Impl::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) { pDlg->ShowLastAuthor( rAuthor, rDate ); } @@ -1261,7 +1261,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window } AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent, - const String& rOldText) + const OUString& rOldText) { TitleDialog* pDlg = new TitleDialog( pParent, rOldText); return new AbstractTitleDialog_Impl( pDlg ); @@ -1283,8 +1283,8 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia } AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, - const String& rURL, const String& rAltText, const String& rDescription, - const String& rTarget, const String& rName, + const OUString& rURL, const OUString& rAltText, const OUString& rDescription, + const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) { URLDlg* pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList); @@ -1427,7 +1427,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction } VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, - const String& rName, + const OUString& rName, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) { @@ -1447,24 +1447,24 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo } AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent, - const String& rName, const String& rDesc ) + const OUString& rName, const OUString& rDesc ) { SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc ); return new AbstractSvxNameDialog_Impl( pDlg ); } -AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName ) +AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) { return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName)); } -AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription) +AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) { return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription)); } AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32, - const String& rText, const String& rDesc, Image* pImg ) + const OUString& rText, const OUString& rDesc, Image* pImg ) { SvxMessDialog* pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg ); return new AbstractSvxMessDialog_Impl( pDlg ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 8816602e5250..3915ba7161f2 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -217,8 +217,8 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress) virtual void Update() ; virtual void Sync() ; - virtual void SetFileType( const String& rType ) ; - virtual void SetDirectory( const INetURLObject& rURL ) ; + virtual void SetFileType( const OUString& rType ) ; + virtual void SetDirectory( const INetURLObject& rURL ) ; virtual PLinkStub GetLinkStubCleanUpHdl() ; }; @@ -238,7 +238,7 @@ class TitleDialog; class AbstractTitleDialog_Impl : public AbstractTitleDialog { DECL_ABSTDLG_BASE(AbstractTitleDialog_Impl,TitleDialog) - virtual String GetTitle() const ; + virtual OUString GetTitle() const ; }; @@ -265,11 +265,11 @@ class URLDlg; class AbstractURLDlg_Impl :public AbstractURLDlg { DECL_ABSTDLG_BASE(AbstractURLDlg_Impl,URLDlg) - virtual String GetURL() const; - virtual String GetAltText() const; - virtual String GetDesc() const; - virtual String GetTarget() const; - virtual String GetName() const; + virtual OUString GetURL() const; + virtual OUString GetAltText() const; + virtual OUString GetDesc() const; + virtual OUString GetTarget() const; + virtual OUString GetName() const; }; class SvxHlinkDlgMarkWnd; @@ -277,15 +277,15 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd { DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd) virtual void Hide( sal_uInt16 nFlags = 0 ); - virtual sal_Bool IsVisible() const ; + virtual sal_Bool IsVisible() const ; virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void SetSizePixel( const Size& rNewSize ); virtual Size GetSizePixel() const; - virtual sal_Bool MoveTo ( Point aNewPos )const; - virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const; - virtual void RefreshTree ( String aStrURL ) ; - virtual void SelectEntry ( String aStrMark ); - virtual sal_uInt16 SetError( sal_uInt16 nError) ; + virtual sal_Bool MoveTo ( Point aNewPos )const; + virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const; + virtual void RefreshTree ( OUString aStrURL ) ; + virtual void SelectEntry ( OUString aStrMark ); + virtual sal_uInt16 SetError( sal_uInt16 nError) ; }; @@ -387,33 +387,33 @@ class SvxMessDialog; class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog { DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog) - virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ); + virtual void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); }; class SvxMultiPathDialog; class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl,SvxMultiPathDialog) - virtual String GetPath() const; - virtual void SetPath( const String& rPath ); + virtual OUString GetPath() const; + virtual void SetPath( const OUString& rPath ); virtual void EnableRadioButtonMode(); - virtual void SetTitle( const String& rNewTitle ); + virtual void SetTitle( const OUString& rNewTitle ); }; class SvxMultiFileDialog; class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl,SvxMultiFileDialog) - virtual String GetFiles() const ; - virtual void SetFiles( const String& rPath ) ; + virtual OUString GetFiles() const ; + virtual void SetFiles( const OUString& rPath ) ; //from SvxMultiPathDialog - virtual String GetPath() const; - virtual void SetPath( const String& rPath ); + virtual OUString GetPath() const; + virtual void SetPath( const OUString& rPath ); virtual void SetClassPathMode(); virtual void EnableRadioButtonMode(); - virtual void SetTitle( const String& rNewTitle ); + virtual void SetTitle( const OUString& rNewTitle ); //From Class Window - virtual void SetHelpId( const OString& ) ; + virtual void SetHelpId( const OString& ) ; }; @@ -431,7 +431,7 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog) virtual void SetFoundHandler(const Link& lnk) ; virtual void SetCanceledNotFoundHdl(const Link& lnk); - virtual void SetActiveField(const String& strField); + virtual void SetActiveField(const OUString& strField); }; class GraphicFilterDialog; @@ -489,13 +489,13 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog virtual void SetPrevHdl( const Link& rLink ) ; virtual void SetNextHdl( const Link& rLink ) ; virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) ; - virtual String GetNote() ; - virtual void SetNote(const String& rTxt) ; - virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) ; + virtual OUString GetNote() ; + virtual void SetNote(const OUString& rTxt) ; + virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) ; virtual void DontChangeAuthor() ; virtual void HideAuthor() ; virtual void SetReadonlyPostIt(sal_Bool bDisable) ; - virtual sal_Bool IsOkEnabled() const ; + virtual sal_Bool IsOkEnabled() const ; virtual Window * GetWindow(); private: Link aNextHdl; @@ -604,15 +604,15 @@ public: const INetURLObject& rStartURL); virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ); virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, - const String& rOldText); + const OUString& rOldText); virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, GalleryTheme* pThm); virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); virtual AbstractURLDlg * CreateURLDialog( Window* pParent, - const String& rURL, const String& rAltText, const String& rDescription, - const String& rTarget, const String& rName, + const OUString& rURL, const OUString& rAltText, const OUString& rDescription, + const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); @@ -631,23 +631,23 @@ public: virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, - const String& rName, + const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId); virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, - const String& rName, const String& rDesc ); + const OUString& rName, const OUString& rDesc ); // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ); - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription); + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ); + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription); virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, - const String& rText, const String& rDesc, - Image* pImg = NULL ); + const OUString& rText, const OUString& rDesc, + Image* pImg = NULL ); virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, - SfxBindings* pBindings, - sal_uInt32 nResId); + SfxBindings* pBindings, + sal_uInt32 nResId); virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, |