Kaydet (Commit) 99af8b07 authored tarafından Noel Grandin's avatar Noel Grandin

convert include/sfx2/opengrf.hxx from String to OUString

Change-Id: Id9295f92d6cd80f3f53d9b521d536910104856cd
üst 2e60444c
...@@ -28,14 +28,14 @@ struct SvxOpenGrf_Impl; ...@@ -28,14 +28,14 @@ struct SvxOpenGrf_Impl;
class SFX2_DLLPUBLIC SvxOpenGraphicDialog class SFX2_DLLPUBLIC SvxOpenGraphicDialog
{ {
public: public:
SvxOpenGraphicDialog ( const String& rTitle ); SvxOpenGraphicDialog ( const OUString& rTitle );
~SvxOpenGraphicDialog (); ~SvxOpenGraphicDialog ();
short Execute(); short Execute();
void SetPath( const String& rPath ); void SetPath( const OUString& rPath );
void SetPath( const String& rPath, sal_Bool bLinkState ); void SetPath( const OUString& rPath, sal_Bool bLinkState );
String GetPath() const; OUString GetPath() const;
int GetGraphic(Graphic&) const; int GetGraphic(Graphic&) const;
...@@ -43,8 +43,8 @@ public: ...@@ -43,8 +43,8 @@ public:
void AsLink(sal_Bool); void AsLink(sal_Bool);
sal_Bool IsAsLink() const; sal_Bool IsAsLink() const;
String GetCurrentFilter() const; OUString GetCurrentFilter() const;
void SetCurrentFilter(const String&); void SetCurrentFilter(const OUString&);
private: private:
// disable copy and assignment // disable copy and assignment
SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&);
......
...@@ -95,7 +95,7 @@ SvxOpenGrf_Impl::SvxOpenGrf_Impl() ...@@ -95,7 +95,7 @@ SvxOpenGrf_Impl::SvxOpenGrf_Impl()
} }
SvxOpenGraphicDialog::SvxOpenGraphicDialog( const String& rTitle ) : SvxOpenGraphicDialog::SvxOpenGraphicDialog( const OUString& rTitle ) :
mpImpl( new SvxOpenGrf_Impl ) mpImpl( new SvxOpenGrf_Impl )
{ {
mpImpl->aFileDlg.SetTitle(rTitle); mpImpl->aFileDlg.SetTitle(rTitle);
...@@ -115,7 +115,7 @@ short SvxOpenGraphicDialog::Execute() ...@@ -115,7 +115,7 @@ short SvxOpenGraphicDialog::Execute()
while( bQuitLoop == sal_False && while( bQuitLoop == sal_False &&
mpImpl->aFileDlg.Execute() == ERRCODE_NONE ) mpImpl->aFileDlg.Execute() == ERRCODE_NONE )
{ {
if( GetPath().Len() ) if( !GetPath().isEmpty() )
{ {
GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
INetURLObject aObj( GetPath() ); INetURLObject aObj( GetPath() );
...@@ -181,12 +181,12 @@ short SvxOpenGraphicDialog::Execute() ...@@ -181,12 +181,12 @@ short SvxOpenGraphicDialog::Execute()
} }
void SvxOpenGraphicDialog::SetPath( const String& rPath ) void SvxOpenGraphicDialog::SetPath( const OUString& rPath )
{ {
mpImpl->aFileDlg.SetDisplayDirectory(rPath); mpImpl->aFileDlg.SetDisplayDirectory(rPath);
} }
void SvxOpenGraphicDialog::SetPath( const String& rPath, sal_Bool bLinkState ) void SvxOpenGraphicDialog::SetPath( const OUString& rPath, sal_Bool bLinkState )
{ {
SetPath(rPath); SetPath(rPath);
AsLink(bLinkState); AsLink(bLinkState);
...@@ -258,19 +258,19 @@ int SvxOpenGraphicDialog::GetGraphic(Graphic& rGraphic) const ...@@ -258,19 +258,19 @@ int SvxOpenGraphicDialog::GetGraphic(Graphic& rGraphic) const
} }
String SvxOpenGraphicDialog::GetPath() const OUString SvxOpenGraphicDialog::GetPath() const
{ {
return mpImpl->aFileDlg.GetPath(); return mpImpl->aFileDlg.GetPath();
} }
String SvxOpenGraphicDialog::GetCurrentFilter() const OUString SvxOpenGraphicDialog::GetCurrentFilter() const
{ {
return mpImpl->aFileDlg.GetCurrentFilter(); return mpImpl->aFileDlg.GetCurrentFilter();
} }
void SvxOpenGraphicDialog::SetCurrentFilter(const String& rStr) void SvxOpenGraphicDialog::SetCurrentFilter(const OUString& rStr)
{ {
mpImpl->aFileDlg.SetCurrentFilter(rStr); mpImpl->aFileDlg.SetCurrentFilter(rStr);
} }
......
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