summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-18 12:07:18 +0200
committerNoel Grandin <noel@peralex.com>2013-09-19 10:14:20 +0200
commit589e157cdad3b38271096c86943747b3b4f7bf41 (patch)
treed759b5168622356aec82e398a0904d3f57e6bece /sd
parent126906303e8ad010d7d1de9645e3360bd6ca9b9f (diff)
convert sd/.../slideshowimpl.hxx from String to OUString
Change-Id: Ia3fbe38ccd4abc6d5fc87d83af1e6af3d1474a4e
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx16
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx6
2 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8db58e2dd5e6..5f47c708baa6 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1724,7 +1724,7 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex )
// ---------------------------------------------------------
-void SlideshowImpl::jumpToBookmark( const String& sBookmark )
+void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
{
sal_Int32 nSlideNumber = getSlideNumberForBookmark( sBookmark );
if( nSlideNumber != -1 )
@@ -1977,14 +1977,14 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_RETURN:
{
- if( maCharBuffer.Len() )
+ if( !maCharBuffer.isEmpty() )
{
if( mpSlideController.get() )
{
- if( mpSlideController->jumpToSlideNumber( maCharBuffer.ToInt32() - 1 ) )
+ if( mpSlideController->jumpToSlideNumber( maCharBuffer.toInt32() - 1 ) )
displayCurrentSlide();
}
- maCharBuffer.Erase();
+ maCharBuffer = "";
}
else
{
@@ -2004,7 +2004,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_7:
case KEY_8:
case KEY_9:
- maCharBuffer.Append( rKEvt.GetCharCode() );
+ maCharBuffer += OUString( rKEvt.GetCharCode() );
break;
case KEY_PAGEUP:
@@ -2462,7 +2462,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
// ---------------------------------------------------------
-void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide )
+void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide )
{
const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
@@ -2490,7 +2490,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
// normal presentation
- if( rPresSlide.Len() )
+ if( !rPresSlide.isEmpty() )
{
sal_Int32 nSlide;
sal_Bool bTakeNextAvailable = sal_False;
@@ -2526,7 +2526,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
}
else
{
- if( meAnimationMode != ANIMATIONMODE_SHOW && rPresSlide.Len() )
+ if( meAnimationMode != ANIMATIONMODE_SHOW && !rPresSlide.isEmpty() )
{
sal_Int32 nSlide;
for( nSlide = 0; nSlide < nSlideCount; nSlide++ )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 2768e9681485..b0cbcf1249c8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -267,7 +267,7 @@ private:
double update();
- void createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide );
+ void createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide );
void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false);
@@ -278,7 +278,7 @@ private:
sal_Int32 getLastSlideNumber();
inline bool isInputFreezed() const { return mbInputFreeze; }
- void jumpToBookmark( const String& sBookmark );
+ void jumpToBookmark( const OUString& sBookmark );
void hideChildWindows();
void showChildWindows();
@@ -357,7 +357,7 @@ private:
Size maSlideSize;
Size maPresSize;
AnimationMode meAnimationMode;
- String maCharBuffer;
+ OUString maCharBuffer;
Pointer maOldPointer;
Pointer maPencil;
std::vector< ::sd::Window* > maDrawModeWindows;