Skip to content

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

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

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