diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-28 10:09:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-28 10:09:57 +0100 |
| commit | 2af9040d38af7c7353855415dbea0134585058f3 (patch) | |
| tree | 40c8b64ffeb722ac96efc9a99800be9091cbce13 /svtools | |
| parent | ab5b77536b6814b5eb66bc862bfd0610f4f3b56c (diff) | |
Cleaned up utl::UCBContentHelper.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/templwin.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 00623c3a6437..3792826ee571 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -236,10 +236,9 @@ void ODocumentInfoPreview::fill( // size if ( i_rURL.Len() > 0 ) { - sal_uLong nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL ); m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_SIZE ), - CreateExactSizeText_Impl( nDocSize ) ); + CreateExactSizeText_Impl( utl::UCBContentHelper::GetSize( i_rURL ) ) ); } // MIMEType @@ -749,8 +748,8 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String& rURL ) const String SvtFileViewWindow_Impl::GetFolderTitle() const { - String aTitle; - ::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle ); + rtl::OUString aTitle; + ::utl::UCBContentHelper::GetTitle( aFolderURL, &aTitle ); return aTitle; } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 9ed13a1c674d..21547e3389c2 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1200,7 +1200,7 @@ String SvtURLBox::GetURL() Any aAny = UCBContentHelper::GetProperty(aURL,aPropName); sal_Bool success = (aAny >>= aFileURL); - String aTitle; + rtl::OUString aTitle; if(success) aTitle = String( INetURLObject(aFileURL).getName( @@ -1209,12 +1209,11 @@ String SvtURLBox::GetURL() INetURLObject::DECODE_WITH_CHARSET )); else success = - UCBContentHelper::GetTitle(aURL,aTitle); + UCBContentHelper::GetTitle(aURL,&aTitle); if( success && - ( aTitle.Len() > 1 || - (aTitle.CompareToAscii("/") != 0 && - aTitle.CompareToAscii(".") != 0) ) ) + !(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/")) + || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) ) { aObj.SetName( aTitle ); if ( bSlash ) |