Kaydet (Commit) 589e157c authored tarafından Noel Grandin's avatar Noel Grandin

convert sd/.../slideshowimpl.hxx from String to OUString

Change-Id: Ia3fbe38ccd4abc6d5fc87d83af1e6af3d1474a4e
üst 12690630
......@@ -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++ )
......
......@@ -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;
......
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