Kaydet (Commit) 7df895ab authored tarafından Noel Grandin's avatar Noel Grandin

convert include/svtools/file*.hxx from String to OUString

Change-Id: Ie0e07c61caba1e15475900622c97e0f0426558d6
üst 21745675
...@@ -45,8 +45,8 @@ private: ...@@ -45,8 +45,8 @@ private:
Edit maEdit; Edit maEdit;
PushButton maButton; PushButton maButton;
String maButtonText; OUString maButtonText;
sal_Bool mbOpenDlg; sal_Bool mbOpenDlg;
Link maDialogCreatedHdl; Link maDialogCreatedHdl;
......
...@@ -34,7 +34,7 @@ namespace svt ...@@ -34,7 +34,7 @@ namespace svt
class SVT_DLLPUBLIC FileURLBox : public SvtURLBox class SVT_DLLPUBLIC FileURLBox : public SvtURLBox
{ {
private: private:
String m_sPreservedText; OUString m_sPreservedText;
public: public:
FileURLBox( Window* _pParent, WinBits _nStyle ); FileURLBox( Window* _pParent, WinBits _nStyle );
...@@ -56,7 +56,7 @@ namespace svt ...@@ -56,7 +56,7 @@ namespace svt
@see SvtURLBox::GetURL @see SvtURLBox::GetURL
*/ */
void DisplayURL( const String& _rURL ); void DisplayURL( const OUString& _rURL );
}; };
//......................................................................... //.........................................................................
......
...@@ -83,12 +83,12 @@ public: ...@@ -83,12 +83,12 @@ public:
SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags ); SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags );
~SvtFileView(); ~SvtFileView();
const String& GetViewURL() const; const OUString& GetViewURL() const;
String GetURL( SvTreeListEntry* pEntry ) const; OUString GetURL( SvTreeListEntry* pEntry ) const;
String GetCurrentURL() const; OUString GetCurrentURL() const;
sal_Bool GetParentURL( String& _rParentURL ) const; sal_Bool GetParentURL( OUString& _rParentURL ) const;
void CreatedFolder( const String& rUrl, const String& rNewFolder ); void CreatedFolder( const OUString& rUrl, const OUString& rNewFolder );
void SetHelpId( const OString& rHelpId ); void SetHelpId( const OString& rHelpId );
const OString& GetHelpId( ) const; const OString& GetHelpId( ) const;
...@@ -108,15 +108,15 @@ public: ...@@ -108,15 +108,15 @@ public:
action asynchronously. action asynchronously.
*/ */
FileViewResult Initialize( FileViewResult Initialize(
const String& rFolderURL, const OUString& rFolderURL,
const String& rFilter, const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor, const FileViewAsyncAction* pAsyncDescriptor,
const ::com::sun::star::uno::Sequence< OUString >& rBlackList const ::com::sun::star::uno::Sequence< OUString >& rBlackList
); );
FileViewResult Initialize( FileViewResult Initialize(
const String& rFolderURL, const OUString& rFolderURL,
const String& rFilter, const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor ); const FileViewAsyncAction* pAsyncDescriptor );
/** initialze the view with a sequence of contents, which have already been obtained elsewhere /** initialze the view with a sequence of contents, which have already been obtained elsewhere
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
/** initializes the view with the content of a folder given by an UCB content /** initializes the view with the content of a folder given by an UCB content
*/ */
sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent,
const String& rFilter ); const OUString& rFilter );
/** reads the current content of the current folder again, and applies the given filter to it /** reads the current content of the current folder again, and applies the given filter to it
...@@ -145,7 +145,7 @@ public: ...@@ -145,7 +145,7 @@ public:
action asynchronously. action asynchronously.
*/ */
FileViewResult ExecuteFilter( FileViewResult ExecuteFilter(
const String& rFilter, const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor const FileViewAsyncAction* pAsyncDescriptor
); );
...@@ -188,8 +188,8 @@ public: ...@@ -188,8 +188,8 @@ public:
// EnableContextMenu( sal_True )/EnableDelete(sal_True) disable name replacing! // EnableContextMenu( sal_True )/EnableDelete(sal_True) disable name replacing!
// save and load column size and sort order // save and load column size and sort order
String GetConfigString() const; OUString GetConfigString() const;
void SetConfigString( const String& rCfgStr ); void SetConfigString( const OUString& rCfgStr );
void EndInplaceEditing( bool _bCancel ); void EndInplaceEditing( bool _bCancel );
...@@ -242,7 +242,7 @@ private: ...@@ -242,7 +242,7 @@ private:
public: public:
QueryDeleteDlg_Impl( Window* pParent, QueryDeleteDlg_Impl( Window* pParent,
const String& rName ); const OUString& rName );
void EnableAllButton() { _aAllButton.Enable( sal_True ); } void EnableAllButton() { _aAllButton.Enable( sal_True ); }
QueryDeleteResult_Impl GetResult() const { return _eResult; } QueryDeleteResult_Impl GetResult() const { return _eResult; }
......
...@@ -112,10 +112,10 @@ using namespace svtools; ...@@ -112,10 +112,10 @@ using namespace svtools;
struct FolderHistory struct FolderHistory
{ {
String m_sURL; OUString m_sURL;
sal_uLong m_nGroup; sal_uLong m_nGroup;
FolderHistory( const String& _rURL, sal_Int32 _nGroup ) : FolderHistory( const OUString& _rURL, sal_Int32 _nGroup ) :
m_sURL( _rURL ), m_nGroup( _nGroup ) {} m_sURL( _rURL ), m_nGroup( _nGroup ) {}
}; };
...@@ -546,7 +546,7 @@ void SvtFileViewWindow_Impl::OpenFolder( const String& rURL ) ...@@ -546,7 +546,7 @@ void SvtFileViewWindow_Impl::OpenFolder( const String& rURL )
aNewFolderLink.Call( this ); aNewFolderLink.Call( this );
} }
sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String& rURL ) const sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( OUString& rURL ) const
{ {
INetURLObject aViewObj( aFileView.GetViewURL() ); INetURLObject aViewObj( aFileView.GetViewURL() );
INetURLObject aRootObj( aCurrentRootURL ); INetURLObject aRootObj( aCurrentRootURL );
...@@ -1027,7 +1027,7 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction ) ...@@ -1027,7 +1027,7 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction )
case TI_DOCTEMPLATE_PREV : case TI_DOCTEMPLATE_PREV :
{ {
String aURL; OUString aURL;
if ( pFileWin->HasPreviousLevel( aURL ) ) if ( pFileWin->HasPreviousLevel( aURL ) )
pFileWin->OpenFolder( aURL ); pFileWin->OpenFolder( aURL );
break; break;
...@@ -1035,8 +1035,8 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction ) ...@@ -1035,8 +1035,8 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction )
case TI_DOCTEMPLATE_PRINT : case TI_DOCTEMPLATE_PRINT :
{ {
String sPrintFile( pFileWin->GetSelectedFile() ); OUString sPrintFile( pFileWin->GetSelectedFile() );
if ( sPrintFile.Len() > 0 ) if ( !sPrintFile.isEmpty() )
PrintFile( sPrintFile ); PrintFile( sPrintFile );
break; break;
} }
......
...@@ -146,7 +146,7 @@ public: ...@@ -146,7 +146,7 @@ public:
String GetSelectedFile() const; String GetSelectedFile() const;
void OpenFolder( const String& rURL ); void OpenFolder( const String& rURL );
sal_Bool HasPreviousLevel( String& rURL ) const; sal_Bool HasPreviousLevel( OUString& rURL ) const;
String GetFolderTitle() const; String GetFolderTitle() const;
void SetFocus(); void SetFocus();
}; };
......
...@@ -37,7 +37,7 @@ namespace svt ...@@ -37,7 +37,7 @@ namespace svt
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
void FileURLBox::DisplayURL( const String& _rURL ) void FileURLBox::DisplayURL( const OUString& _rURL )
{ {
String sOldText = GetText(); String sOldText = GetText();
......
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