[Libreoffice-commits] .: sd/inc sd/source
Joseph Powers
jpowers at kemper.freedesktop.org
Fri May 20 06:09:14 PDT 2011
sd/inc/pch/precompiled_sd.hxx | 1 -
sd/source/ui/animations/CustomAnimationList.cxx | 17 ++++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit e534b079f7c6ccc169f40b2c07223f7084ee6fd9
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri May 20 06:05:55 2011 -0700
Remove some un-needed #include <svtools/treelist.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 8c8f7f0..c9a612d 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -548,7 +548,6 @@
#include "svl/svstdarr.hxx"
#include "unotools/syslocale.hxx"
#include "svtools/tabbar.hxx"
-#include "svtools/treelist.hxx"
#include "svl/undo.hxx"
#include "svtools/unoimap.hxx"
#include "svl/urihelper.hxx"
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 13c54b5..a1e64d2 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,6 @@
#include "CustomAnimationPane.hrc"
#include "CustomAnimation.hrc"
#include "CustomAnimationPreset.hxx"
-#include <svtools/treelist.hxx>
#include <vcl/svapp.hxx>
#include "sdresid.hxx"
@@ -190,7 +189,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true )
{
Reference< XTextRange > xParagraph;
xEnumeration->nextElement() >>= xParagraph;
-
+
if( xParagraph.is() )
aDescription = xParagraph->getString();
}
@@ -288,7 +287,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_u
{
case EffectCommands::TOGGLEPAUSE: nImage = IMG_CUSTOMANIMATION_MEDIA_PAUSE; break;
case EffectCommands::STOP: nImage = IMG_CUSTOMANIMATION_MEDIA_STOP; break;
- case EffectCommands::PLAY:
+ case EffectCommands::PLAY:
default: nImage = IMG_CUSTOMANIMATION_MEDIA_PLAY; break;
}
break;
@@ -479,7 +478,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
const Image& CustomAnimationList::getImage( sal_uInt16 nId )
{
- DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
+ DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
Image& rImage = maImages[nId - IMG_CUSTOMANIMATION_ON_CLICK];
@@ -509,14 +508,14 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt )
{
case KEY_DELETE: mpController->onContextMenu( CM_REMOVE ); return;
case KEY_INSERT: mpController->onContextMenu( CM_CREATE ); return;
- case KEY_SPACE:
+ case KEY_SPACE:
{
const Point aPos;
- const CommandEvent aCEvt( aPos, COMMAND_CONTEXTMENU );
+ const CommandEvent aCEvt( aPos, COMMAND_CONTEXTMENU );
Command( aCEvt );
return;
}
-
+
}
::SvTreeListBox::KeyInput( rKEvt );
@@ -532,7 +531,7 @@ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect
while( pEntry )
{
if( pEntry->getEffect() == pEffect )
- {
+ {
Select( pEntry, bSelect );
break;
}
More information about the Libreoffice-commits
mailing list