diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 13:22:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:42 +0200 |
| commit | 6b8a2089f9fe1a74f697982d64cb9deed9ec0a46 (patch) | |
| tree | b20a19cb9378c5a60bf78802d6d696c5085ba6f9 /svx | |
| parent | 9a915d1114f814ff8d8ba4fb0d2b9b2589ea0833 (diff) | |
convert include/svx/galtheme.hxx from String to OUString
Change-Id: I7a592768f85fd2bd95435a29ca8c368e5f2ca81a
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galctrl.cxx | 14 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index a96a34e02661..4a85e5a3f36a 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -329,14 +329,14 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) const Size aSize(rRect.GetWidth(), rRect.GetHeight()); BitmapEx aBitmapEx; Size aPreparedSize; - String aItemTextTitle; - String aItemTextPath; + OUString aItemTextTitle; + OUString aItemTextPath; mpTheme->GetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aPreparedSize, aItemTextTitle, aItemTextPath); bool bNeedToCreate(aBitmapEx.IsEmpty()); - if(!bNeedToCreate && !aItemTextTitle.Len()) + if(!bNeedToCreate && aItemTextTitle.isEmpty()) { bNeedToCreate = true; } @@ -629,19 +629,19 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa const Size aSize(rRect.GetHeight(), rRect.GetHeight()); BitmapEx aBitmapEx; Size aPreparedSize; - String aItemTextTitle; - String aItemTextPath; + OUString aItemTextTitle; + OUString aItemTextPath; mpTheme->GetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aPreparedSize, aItemTextTitle, aItemTextPath); bool bNeedToCreate(aBitmapEx.IsEmpty()); - if(!bNeedToCreate && GALLERY_BRWBOX_TITLE == nColumnId && !aItemTextTitle.Len()) + if(!bNeedToCreate && GALLERY_BRWBOX_TITLE == nColumnId && aItemTextTitle.isEmpty()) { bNeedToCreate = true; } - if(!bNeedToCreate && GALLERY_BRWBOX_PATH == nColumnId && !aItemTextPath.Len()) + if(!bNeedToCreate && GALLERY_BRWBOX_PATH == nColumnId && aItemTextPath.isEmpty()) { bNeedToCreate = true; } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 3311fe9be011..bf825657a3f7 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -444,7 +444,7 @@ SgaObject* GalleryTheme::AcquireObject( size_t nPos ) // ------------------------------------------------------------------------ -void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, String& rTitle, String& rPath) const +void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const { const GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL; @@ -463,7 +463,7 @@ void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBit // ------------------------------------------------------------------------ -void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const String& rTitle, const String& rPath) +void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath) { GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL; @@ -1405,7 +1405,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const } } - if ( m_aDestDir.Len() > 0 ) + if ( !m_aDestDir.isEmpty() ) { if ( aPath.SearchAndReplace(m_aDestDir, String()) != STRING_NOTFOUND ) bRel = m_bDestDirRelative; |