[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sd/source slideshow/source
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Mar 11 06:48:28 PST 2011
sd/source/core/stlpool.cxx | 6
sd/source/filter/eppt/pptexanimations.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 26 +-
sd/source/ui/app/tbxww.cxx | 6
sd/source/ui/controller/slidelayoutcontroller.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 8
sd/source/ui/dlg/filedlg.cxx | 4
sd/source/ui/dlg/navigatr.cxx | 8
sd/source/ui/dlg/sdtreelb.cxx | 22 -
sd/source/ui/func/fupoor.cxx | 2
sd/source/ui/inc/res_bmp.hrc | 2
sd/source/ui/inc/sdtreelb.hxx | 22 -
sd/source/ui/slideshow/slideshowimpl.cxx | 62 ++---
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 2
sd/source/ui/toolpanel/TitleBar.cxx | 8
sd/source/ui/unoidl/unopage.cxx | 8
sd/source/ui/view/DocumentRenderer.cxx | 114 +++++-----
sd/source/ui/view/drviewsc.cxx | 4
sd/source/ui/view/outlview.cxx | 2
slideshow/source/engine/slideshowimpl.cxx | 86 +++----
21 files changed, 199 insertions(+), 199 deletions(-)
New commits:
commit 3f7098fed64d3ba5e12b959bad81653f1bb7f01a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Mar 11 15:47:25 2011 +0100
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to
performing the m101 merge from OOo.
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 9ff94f2..5f99e82 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -96,12 +96,12 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD
// create graphics family
mxGraphicFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_GRAPHICS );
mxCellFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_CELL );
-
+
mxTableFamily = sdr::table::CreateTableDesignFamily();
Reference< XNamed > xNamed( mxTableFamily, UNO_QUERY );
if( xNamed.is() )
msTableFamilyName = xNamed->getName();
-
+
// create presentation families, one for each master page
const sal_uInt16 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD);
for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage )
@@ -1231,7 +1231,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl
Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException)
{
throwIfDisposed();
-
+
Sequence< OUString > aNames( maStyleFamilyMap.size() + 3 );
OUString* pNames = aNames.getArray();
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 1fe95db..e15967d 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -506,7 +506,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
sal_Int16 nFillDefault = GetFillMode( xNode, nFDef );
bool bSkipChildren = false;
-
+
Reference< XAnimationNode > xAudioNode;
static sal_uInt32 nAudioGroup;
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 7ca25f3..c684ce4 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -290,7 +290,7 @@ void Ppt97Animation::UpdateCacheData() const
return;
ClearCacheData();
-
+
if( !HasEffect() )
{
m_bDirtyCache = false;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 4d6f30d..5c261db 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -169,7 +169,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData();
com::sun::star::util::DateTime aDateTime( xAnnotation->getDateTime() );
-
+
Date aDate = Date( aDateTime.Day, aDateTime.Month, aDateTime.Year );
if (aDate==Date())
sRet = sRet + String(SdResId(STR_ANNOTATION_TODAY));
@@ -257,7 +257,7 @@ void SAL_CALL AnnotationManagerImpl::disposing ()
}
// --------------------------------------------------------------------
-
+
// XEventListener
void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
{
@@ -330,7 +330,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq)
ShowAnnotations( true );
const SfxItemSet* pArgs = rReq.GetArgs();
-
+
switch( rReq.GetSlot() )
{
case SID_DELETEALL_POSTIT:
@@ -405,14 +405,14 @@ void AnnotationManagerImpl::InsertAnnotation()
aTagRect.nTop = sal::static_int_cast< long >( aPoint.Y * 100.0 );
aTagRect.nRight = aTagRect.nLeft + width - 1;
aTagRect.nBottom = aTagRect.nTop + height - 1;
-
+
if( aNewRect.IsOver( aTagRect ) )
{
bFree = false;
break;
}
}
-
+
if( bFree == false)
{
x += width;
@@ -469,7 +469,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
if( pTextApi )
{
std::auto_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) );
-
+
mpDoc->SetCalcFieldValueHdl( pOutliner.get() );
pOutliner->SetUpdateMode( TRUE );
@@ -477,7 +477,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
OUString sAuthor( xAnnotation->getAuthor() );
if( sAuthor.getLength() == 0 )
sAuthor = String( SdResId( STR_ANNOTATION_NOAUTHOR ) );
-
+
aStr.SearchAndReplaceAscii("%1", sAuthor);
aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) );
@@ -843,7 +843,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron )
{
if( mnUpdateTagsEvent )
Application::RemoveUserEvent( mnUpdateTagsEvent );
-
+
UpdateTagsHdl(0);
}
else
@@ -878,7 +878,7 @@ void AnnotationManagerImpl::CreateTags()
maFont = Application::GetSettings().GetStyleSettings().GetAppFont();
rtl::Reference< AnnotationTag > xSelectedTag;
-
+
Reference< XAnnotationEnumeration > xEnum( mxCurrentPage->createAnnotationEnumeration() );
while( xEnum->hasMoreElements() )
{
@@ -922,7 +922,7 @@ void AnnotationManagerImpl::DisposeTags()
(*iter++)->Dispose();
}
while( iter != maTagVector.end() );
-
+
maTagVector.clear();
}
}
@@ -1015,18 +1015,18 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
else
{
SfxItemSet aSet(pAnnotationWindow->getView()->GetAttribs());
-
+
if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_ON )
{
if( ((const SvxWeightItem&)aSet.Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD )
pMenu->CheckItem( SID_ATTR_CHAR_WEIGHT );
}
-
+
if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_ON )
{
if( ((const SvxPostureItem&)aSet.Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE )
pMenu->CheckItem( SID_ATTR_CHAR_POSTURE );
-
+
}
if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_ON )
{
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index a32f290..67d4014 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -38,7 +38,7 @@
#include <sfx2/imagemgr.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-
+
#include "sddll.hxx"
#include "GraphicDocShell.hxx"
@@ -137,10 +137,10 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow()
aToolBarResStr = aTbxResName.makeStringAndClear();
break;
}
-
+
if ( aToolBarResStr.getLength() > 0 )
createAndPositionSubToolBar( aToolBarResStr );
-
+
return( pWin );
}
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 569b91f..876cf5a 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -200,7 +200,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
-
+
SvtLanguageOptions aLanguageOptions;
const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 472dba1..cd56394 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -226,7 +226,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
AnimationWindow::~AnimationWindow()
{
ULONG i, nCount;
-
+
delete pControllerItem;
// Bitmapliste bereinigen
@@ -942,7 +942,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ )
{
SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject );
-
+
pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() );
aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 );
@@ -952,7 +952,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
// Clone
pPage->InsertObject( pSnapShot->Clone(), aBmpExList.GetCurPos() + 1 );
-
+
// Weiterschalten der BitmapListe
aBmpExList.Next();
}
@@ -1135,7 +1135,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
AnimationBitmap aAnimBmp;
long nLoopCount = 0L;
USHORT nPos = aLbLoopCount.GetSelectEntryPos();
-
+
if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich
nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32();
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ecd0492..2e0496e 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -80,13 +80,13 @@ private:
BOOL mbLabelPlaying;
void CheckSelectionState();
-
+
DECL_LINK( PlayMusicHdl, void * );
Timer maUpdateTimer;
DECL_LINK( IsMusicStoppedHdl, void * );
-
+
public:
SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection );
~SdFileDialog_Imp();
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 77d9f15..bd78616 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -108,7 +108,7 @@ SdNavigatorWin::SdNavigatorWin(
// Shape filter drop down menu.
maToolbox.SetItemBits(TBI_SHAPE_FILTER,
maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY);
-
+
// TreeListBox
// set position below toolbox
long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4;
@@ -186,7 +186,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE);
else
maToolbox.EnableItem(TBI_SHAPE_FILTER);
-
+
if( !maTlbObjects.IsEqualToDoc( pDoc ) )
{
String aDocName = pDocShell->GetMedium()->GetName();
@@ -339,7 +339,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
//pBox->Invalidate();
}
break;
-
+
case TBI_SHAPE_FILTER:
{
PopupMenu *pMenu = new PopupMenu;
@@ -533,7 +533,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
}
}
}
-
+
return 0;
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 3268edd..32630c1 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -57,7 +57,7 @@
#include <svtools/embedtransfer.hxx>
#include <tools/diagnose_ex.h>
#include <ViewShell.hxx>
-
+
using namespace com::sun::star;
class SdPageObjsTLB::IconProvider
@@ -924,10 +924,10 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
{
(void)nAction;
(void)rPosPixel;
-
+
SdNavigatorWin* pNavWin = NULL;
SvLBoxEntry* pEntry = GetEntry(rPosPixel);
-
+
if( mpFrame->HasChildWindow( SID_NAVIGATOR ) )
pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) );
@@ -1009,7 +1009,7 @@ void SdPageObjsTLB::DoDrag()
::com::sun::star::uno::Sequence<sal_Int8> aSequence (sizeof(SvLBoxDDInfo));
memcpy(aSequence.getArray(), (sal_Char*)&aDDInfo, sizeof(SvLBoxDDInfo));
::com::sun::star::uno::Any aTreeListBoxData (aSequence);
-
+
// object is destroyed by internal reference mechanism
SdTransferable* pTransferable = new SdPageObjsTLB::SdPageObjsTransferable(
*this, aBookmark, *pDocShell, eDragType, aTreeListBoxData);
@@ -1090,7 +1090,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 )
sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
{
sal_Int8 nResult (DND_ACTION_NONE);
-
+
if ( !bIsInDrag && IsDropFormatSupported( FORMAT_FILE ) )
{
nResult = rEvent.mnAction;
@@ -1119,11 +1119,11 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
}
}
}
-
+
// Hide emphasis when there is no valid drop action.
if (nResult == DND_ACTION_NONE)
ImplShowTargetEmphasis(pTargetEntry, FALSE);
-
+
return nResult;
}
@@ -1143,15 +1143,15 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
SdNavigatorWin* pNavWin = NULL;
USHORT nId = SID_NAVIGATOR;
-
+
if( mpFrame->HasChildWindow( nId ) )
pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) );
-
+
if( pNavWin && ( pNavWin == mpParent ) )
{
TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable );
String aFile;
-
+
if( aDataHelper.GetString( FORMAT_FILE, aFile ) &&
( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) )
{
@@ -1322,7 +1322,7 @@ bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry)
{
if (pEntry == NULL)
return false;
-
+
if ( ! IsDropFormatSupported(SdPageObjsTransferable::GetListBoxDropFormatId()))
return false;
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 2f15f3e..fe64b05 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -819,7 +819,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
mpView->MovAction(aEndPoint);
mpView->EndDragObj();
-
+
// restore snap
if(!bWasNoSnap)
((SdrDragStat&)rDragStat).SetNoSnap(bWasNoSnap);
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 33e2acf..d51a79c 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -128,7 +128,7 @@
#define BMP_FOIL_22 RID_APP_START+157
#define BMP_FOIL_23 RID_APP_START+158
#define BMP_FOIL_24 RID_APP_START+159
-
+
#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165
#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166
#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index b792a2d..2953cbd 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -66,7 +66,7 @@ SV_DECL_REF(DrawDocShell)
class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
{
private:
-
+
static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
public:
@@ -91,7 +91,7 @@ public:
lifetime ends with the office application.
*/
static sal_uInt32 GetListBoxDropFormatId (void);
-
+
private:
/** Temporary drop flavor id that is used internally in the
navigator.
@@ -105,7 +105,7 @@ public:
const ::com::sun::star::uno::Any maTreeListBoxData;
SD_DLLPRIVATE virtual ~SdPageObjsTransferable();
-
+
SD_DLLPRIVATE virtual void AddSupportedFormats();
SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction );
@@ -127,7 +127,7 @@ public:
bool PageBelongsToCurrentShow (const SdPage* pPage) const;
protected:
-
+
Window* mpParent;
const SdDrawDocument* mpDoc;
SdDrawDocument* mpBookmarkDoc;
@@ -151,7 +151,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void RequestingChilds( SvLBoxEntry* pParent );
-
+
void DoDrag();
void OnDragFinished( sal_uInt8 nDropAction );
@@ -183,21 +183,21 @@ protected:
SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent,
ULONG& rNewChildPos);
-
+
using Window::GetDropTarget;
virtual SvLBoxEntry* GetDropTarget (const Point& rLocation);
public:
-
+
SdPageObjsTLB( Window* pParent, const SdResId& rSdResId );
~SdPageObjsTLB();
virtual void SelectHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
-
+
void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; }
SfxViewFrame* GetViewFrame() const { return mpFrame; }
-
+
void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName );
void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName );
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
@@ -209,9 +209,9 @@ public:
List* GetSelectEntryList( USHORT nDepth );
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
-
+
BOOL IsLinkableSelected() const { return mbLinkableSelected; }
-
+
static BOOL IsInDrag();
using SvLBox::ExecuteDrop;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8db1fe0..e494005 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -400,7 +400,7 @@ sal_Int32 AnimationSlideController::getNextSlideIndex() const
case FROM:
case CUSTOM:
return mnHiddenSlideNumber == -1 ? mnCurrentSlideIndex + 1 : mnCurrentSlideIndex;
-
+
default:
case PREVIEW:
return -1;
@@ -474,7 +474,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
Reference< XDrawPage > xSlide;
Reference< XAnimationNode > xAnimNode;
::std::vector<PropertyValue> aProperties;
-
+
const sal_Int32 nNextSlideNumber = getNextSlideNumber();
if( getSlideAPI( nNextSlideNumber, xSlide, xAnimNode ) )
{
@@ -512,7 +512,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
Sequence< PropertyValue > aPropertySequence (aProperties.size());
for (int nIndex=0,nCount=aProperties.size();nIndex<nCount; ++nIndex)
aPropertySequence[nIndex] = aProperties[nIndex];
-
+
if( getSlideAPI( nCurrentSlideNumber, xSlide, xAnimNode ) )
xShow->displaySlide( xSlide, xDrawPages, xAnimNode, aPropertySequence );
}
@@ -571,7 +571,7 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
mpOldActiveWindow = mpViewShell->GetActiveWindow();
maUpdateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, updateHdl));
-
+
maDeactivateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, deactivateHdl));
maDeactivateTimer.SetTimeout( 20 );
@@ -677,7 +677,7 @@ void SAL_CALL SlideshowImpl::disposing()
mpViewShell->SetActiveWindow(mpOldActiveWindow);
mpShowWindow->SetViewShell( NULL );
}
-
+
if( mpView )
mpView->InvalidateAllWin();
@@ -725,7 +725,7 @@ void SAL_CALL SlideshowImpl::disposing()
delete mpTimeButton;
mpTimeButton = 0;
}
-
+
if( mpShowWindow )
mpShowWindow->Hide();
@@ -792,7 +792,7 @@ bool SlideshowImpl::startPreview(
}
}
}
-
+
mxPreviewDrawPage = xDrawPage;
mxPreviewAnimationNode = xAnimationNode;
meAnimationMode = ANIMATIONMODE_PREVIEW;
@@ -895,7 +895,7 @@ bool SlideshowImpl::startPreview(
bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
{
const rtl::Reference<SlideshowImpl> this_(this);
-
+
DBG_ASSERT( !mxShow.is(), "sd::SlideshowImpl::startShow(), called twice!" );
if( mxShow.is() )
return true;
@@ -904,7 +904,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
return false;
bool bRet = false;
-
+
try
{
if( pPresSettings )
@@ -1104,7 +1104,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
-1, Any( static_cast<sal_Int32>(0x00000000L) ),
beans::PropertyState_DIRECT_VALUE ) );
}
-
+
if (mbRehearseTimings) {
aProperties.push_back(
beans::PropertyValue(
@@ -1346,7 +1346,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
Reference< XPropertySet > xSet( xShape, UNO_QUERY );
if( !xSet.is() )
continue;
-
+
Reference< XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() );
if( !xSetInfo.is() || !xSetInfo->hasPropertyByName( msOnClick ) )
continue;
@@ -1888,7 +1888,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
double fUpdate = 0.0;
if( !xShow->update(fUpdate) )
fUpdate = -1.0;
-
+
if (mxShow.is() && (fUpdate >= 0.0))
{
if (::basegfx::fTools::equalZero(fUpdate))
@@ -1914,7 +1914,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
// too high (only then conversion to milliseconds and long
// integer may lead to zero value.)
OSL_ASSERT(static_cast<ULONG>(fUpdate * 1000.0) > 0);
-
+
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
@@ -2250,7 +2250,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
#ifdef ENABLE_PRESENTER_EXTRA_UI
PopupMenu* pWidthMenu = pMenu->GetPopupMenu( CM_WIDTH_PEN);
-
+
// populate color width list
if( pWidthMenu )
{
@@ -2262,7 +2262,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
{
sal_Int32 nIterator;
double nWidth;
-
+
nWidth = 4.0;
for( nIterator = 1; nIterator < 6; nIterator++)
{
@@ -2286,18 +2286,18 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
default:
break;
}
-
+
pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE);
if( nWidth == mdUserPaintStrokeWidth)
pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) );
-
+
}
}
}
PopupMenu* pEraseWidthMenu = pMenu->GetPopupMenu( CM_ERASE_INK_PEN);
-
+
// populate eraser width list
if( pEraseWidthMenu )
{
@@ -2309,7 +2309,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
{
sal_Int32 nEIterator;
double nEWidth;
-
+
nEWidth = 100.0;
for( nEIterator = 1; nEIterator < 6; nEIterator++)
{
@@ -2418,7 +2418,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
::Color aColor( mnUserPaintColor );
SvColorDialog aColorDlg( mpShowWindow);
aColorDlg.SetColor( aColor );
-
+
if (aColorDlg.Execute() )
{
aColor = aColorDlg.GetColor();
@@ -2487,7 +2487,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
mbWasPaused = false;
}
break;
-
+
case CM_ERASE_INK_PEN_THIN:
{
setEraseInk(200);
@@ -2501,7 +2501,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
mbWasPaused = false;
}
break;
-
+
case CM_ERASE_INK_PEN_THICK:
{
setEraseInk(400);
@@ -2544,7 +2544,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
break;
}
}
-
+
return 0;
}
@@ -2974,7 +2974,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
util::URL aURL;
aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/setAutoSaveState"));
xParser->parseStrict(aURL);
-
+
Sequence< beans::PropertyValue > aArgs(1);
aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
aArgs[0].Value <<= bOn ? sal_True : sal_False;
@@ -3045,7 +3045,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index
{
if( (mpSlideController.get() == 0 ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) )
throw IndexOutOfBoundsException();
-
+
return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) );
}
@@ -3126,11 +3126,11 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
Any aValueWidth;
if( maPresSettings.mbMouseAsPen )
aValueWidth <<= mdUserPaintStrokeWidth;
-
+
beans::PropertyValue aPenPropWidth;
aPenPropWidth.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserPaintStrokeWidth" ));
aPenPropWidth.Value = aValueWidth;
-
+
mxShow->setProperty( aPenPropWidth );
// for Pen Mode
@@ -3224,7 +3224,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx
}
#endif
// --------------------------------------------------------------------
-
+
sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -3252,7 +3252,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc
{
SolarMutexGuard aSolarGuard;
mbSwitchPenMode = bSwitchPenMode;
-
+
if(mbSwitchPenMode == true){
mbSwitchEraserMode = false;
}else{
@@ -3275,7 +3275,7 @@ void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (Runti
if( maPresSettings.mbMouseAsPen )
setUseEraser( sal_True ); // Switch to EraseMode
-
+
}
@@ -3653,7 +3653,7 @@ Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeExc
}
// --------------------------------------------------------------------
-
+
PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r )
: PresentationSettings( r )
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index cf7bd43..fe8006d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -109,7 +109,7 @@ private:
/// Box of the insert marker in model coordinates.
Rectangle maInsertionMarkerBox;
-
+
/** We use this flag to filter out the cases where MouseMotion() is called
with a pressed mouse button but without a prior MouseButtonDown()
call. This is an indication that the mouse button was pressed over
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index 4e4d6da..d89696a 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -59,7 +59,7 @@
namespace sd { namespace toolpanel {
const int TitleBar::snIndentationWidth = 16;
-
+
TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable)
: ::Window (pParent, WB_TABSTOP)
, TreeNode(this)
@@ -346,7 +346,7 @@ Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox)
if (meType == TBT_SUB_CONTROL_HEADLINE)
aPosition.X() += 3;
mpDevice->DrawImage (aPosition, aImage);
-
+
aExpansionIndicatorArea = Rectangle (
aPosition, aImage.GetSizePixel());
}
@@ -524,7 +524,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent)
mpDevice.reset(new VirtualDevice (*this));
// fall through.
-
+
case DATACHANGED_FONTS:
case DATACHANGED_FONTSUBSTITUTION:
{
@@ -535,7 +535,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent)
if (IsControlFont())
aFont.Merge(GetControlFont());
SetZoomedPointFont(aFont);
-
+
// Color.
Color aColor;
if (IsControlForeground())
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 39bc5b0..db00329 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -210,7 +210,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{
DRAW_PAGE_NOTES_PROPERTIES
};
-
+
#define GRAPHIC_PAGE_PROPERTIES \
{ MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \
{ MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \
@@ -733,7 +733,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
break;
}
}
-
+
throw lang::IllegalArgumentException();
}
@@ -2058,7 +2058,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
if( mbIsImpressDocument )
{
const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD;
-
+
if( ePageKind != PK_HANDOUT && rType == ITYPE( presentation::XPresentationPage ) )
{
return makeAny( Reference< presentation::XPresentationPage >( this ) );
@@ -2563,7 +2563,7 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation()
{
if( !GetPage() )
throw DisposedException();
-
+
Reference< XAnnotation > xRet;
GetPage()->createAnnotation(xRet);
return xRet;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 0628f1c..dcb0613 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -92,7 +92,7 @@ namespace {
maSlidesPerPage(rSlidesPerPage)
{
}
-
+
bool IsWarningOrientation (void) const
{
return GetBoolValue(NULL, true);
@@ -138,7 +138,7 @@ namespace {
{
return GetBoolValue("PageContentType", sal_Int32(0));
}
-
+
bool IsHandout (void) const
{
return GetBoolValue("PageContentType", sal_Int32(1));
@@ -282,7 +282,7 @@ namespace {
{
return mbIsShapeSelection;
}
-
+
/** Call with a 0 based page index.
*/
bool IsSelected (const sal_Int32 nIndex) const
@@ -296,7 +296,7 @@ namespace {
else
return false;
}
-
+
private:
const bool mbAreAllPagesSelected;
const bool mbIsShapeSelection;
@@ -326,7 +326,7 @@ namespace {
maSelection(rsPrinterSelection, pView ? pView->getCurrentPage() : NULL),
mbPrintMarkedOnly(maSelection.IsMarkedOnly())
{}
-
+
const Printer* mpPrinter;
ULONG mnDrawMode;
::rtl::OUString msTimeDate;
@@ -417,7 +417,7 @@ namespace {
maProperties.size());
}
}
-
+
::std::vector<sal_Int32> GetSlidesPerPage (void) const
{
return maSlidesPerPage;
@@ -449,7 +449,7 @@ namespace {
rtl::OUString(),
aPrintOpt )
);
-
+
AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ),
CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_HELP),
@@ -720,7 +720,7 @@ namespace {
}
virtual ~PrinterPage (void) {}
-
+
virtual void Print (
Printer& rPrinter,
SdDrawDocument& rDocument,
@@ -733,7 +733,7 @@ namespace {
ULONG GetDrawMode (void) const { return mnDrawMode; }
Orientation GetOrientation (void) const { return meOrientation; }
USHORT GetPaperTray (void) const { return mnPaperTray; }
-
+
protected:
const PageKind mePageKind;
const MapMode maMap;
@@ -797,7 +797,7 @@ namespace {
msPageString,
maPageStringOffset);
}
-
+
private:
const USHORT mnPageIndex;
};
@@ -847,7 +847,7 @@ namespace {
const Size aPageSize (pPageToPrint->GetSize());
const Size aPrintSize (rPrinter.GetOutputSize());
-
+
const sal_Int32 nPageWidth (aPageSize.Width() + mnGap
- pPageToPrint->GetLftBorder() - pPageToPrint->GetRgtBorder());
const sal_Int32 nPageHeight (aPageSize.Height() + mnGap
@@ -882,7 +882,7 @@ namespace {
msPageString,
maPageStringOffset);
}
-
+
private:
const USHORT mnPageIndex;
const sal_Int32 mnGap;
@@ -915,7 +915,7 @@ namespace {
}
virtual ~BookletPrinterPage (void) {}
-
+
virtual void Print (
Printer& rPrinter,
SdDrawDocument& rDocument,
@@ -957,7 +957,7 @@ namespace {
rPrintableLayers);
}
}
-
+
private:
const USHORT mnFirstPageIndex;
const USHORT mnSecondPageIndex;
@@ -988,7 +988,7 @@ namespace {
maPageIndices(rPageIndices)
{
}
-
+
virtual void Print (
Printer& rPrinter,
SdDrawDocument& rDocument,
@@ -1030,7 +1030,7 @@ namespace {
SdrPageObj* pPageObj = (*aPageObjIter++);
pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PK_STANDARD));
}
-
+
// if there are more page objects than pages left, set the rest to invisible
int nHangoverCount = 0;
while (aPageObjIter != aHandoutPageObjects.end())
@@ -1104,7 +1104,7 @@ namespace {
}
}
-
+
private:
const USHORT mnHandoutPageIndex;
const ::std::vector<USHORT> maPageIndices;
@@ -1162,7 +1162,7 @@ namespace {
const USHORT nSavedOutlMode (pOutliner->GetMode());
const BOOL bSavedUpdateMode (pOutliner->GetUpdateMode());
const Size aSavedPaperSize (pOutliner->GetPaperSize());
-
+
pOutliner->Init(OUTLINERMODE_OUTLINEVIEW);
pOutliner->SetPaperSize(aOutRect.GetSize());
pOutliner->SetUpdateMode(TRUE);
@@ -1187,7 +1187,7 @@ namespace {
::boost::scoped_ptr<OutlinerParaObject> mpParaObject;
};
}
-
+
//===== DocumentRenderer::Implementation ======================================
@@ -1222,7 +1222,7 @@ public:
-
+
virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint)
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
@@ -1235,7 +1235,7 @@ public:
}
-
+
/** Process the sequence of properties given to one of the XRenderable
methods.
*/
@@ -1244,7 +1244,7 @@ public:
OSL_ASSERT(!mbIsDisposed);
if (mbIsDisposed)
return;
-
+
bool bIsValueChanged = processProperties( rOptions );
// The RenderDevice property is handled specially: its value is
@@ -1268,7 +1268,7 @@ public:
}
-
+
/** Return the number of pages that are to be printed.
*/
sal_Int32 GetPrintPageCount (void)
@@ -1289,7 +1289,7 @@ public:
const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
{
(void)rOptions;
-
+
css::uno::Sequence<css::beans::PropertyValue> aProperties (3);
aProperties[0].Name = A2S("ExtraPrintUIOptions");
@@ -1297,7 +1297,7 @@ public:
aProperties[1].Name = A2S("PageSize");
aProperties[1].Value <<= maPrintSize;
-
+
// FIXME: is this always true ?
aProperties[2].Name = A2S("PageIncludesNonprintableArea");
aProperties[2].Value = makeAny( sal_True );
@@ -1306,7 +1306,7 @@ public:
}
-
+
/** Print one of the prepared pages.
*/
@@ -1317,14 +1317,14 @@ public:
return;
Printer& rPrinter (*mpPrinter);
-
+
::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
if ( ! pViewShell)
return;
-
+
SdDrawDocument* pDocument = pViewShell->GetDoc();
OSL_ASSERT(pDocument!=NULL);
-
+
::boost::shared_ptr<DrawViewShell> pDrawViewShell(
::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
@@ -1333,12 +1333,12 @@ public:
if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size())
return;
-
+
const ::boost::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]);
OSL_ASSERT(pPage);
if ( ! pPage)
return;
-
+
const Orientation eSavedOrientation (rPrinter.GetOrientation());
const ULONG nSavedDrawMode (rPrinter.GetDrawMode());
const MapMode aSavedMapMode (rPrinter.GetMapMode());
@@ -1389,7 +1389,7 @@ public:
-
+
private:
ViewShellBase& mrBase;
bool mbIsDisposed;
@@ -1439,12 +1439,12 @@ private:
{
maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
}
-
+
return true;
}
-
+
/** Top most method for preparing printer pages. In this and the other
Prepare... methods the various special cases are detected and
handled.
@@ -1469,7 +1469,7 @@ private:
aMap.SetMapUnit(MAP_100TH_MM);
aInfo.maMap = aMap;
mpPrinter->SetMapMode(aMap);
-
+
::Outliner& rOutliner = mrBase.GetDocument()->GetDrawOutliner();
const ULONG nSavedControlWord (rOutliner.GetControlWord());
ULONG nCntrl = nSavedControlWord;
@@ -1487,7 +1487,7 @@ private:
aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date() );
aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' ');
}
-
+
if (mpOptions->IsTime())
aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE );
aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
@@ -1502,13 +1502,13 @@ private:
| DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP
| DRAWMODE_GRAYGRADIENT;
break;
-
+
case 2:
aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT
| DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP
| DRAWMODE_WHITEGRADIENT;
break;
-
+
default:
aInfo.mnDrawMode = DRAWMODE_DEFAULT;
}
@@ -1567,7 +1567,7 @@ private:
SdDrawDocument& rModel = *mrBase.GetDocument();
// first, prepare handout page (not handout master)
-
+
SdPage* pHandout = rModel.GetSdPage(0, PK_HANDOUT);
if( !pHandout )
return;
@@ -1589,11 +1589,11 @@ private:
while( iter != aAreas.end() )
{
pHandout->NbcInsertObject( new SdrPageObj((*iter++)) );
-
+
if( bDrawLines && (iter != aAreas.end()) )
{
Rectangle aRect( (*iter++) );
-
+
basegfx::B2DPolygon aPoly;
aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) );
aPoly.insert(1, basegfx::B2DPoint( aRect.Right(), aRect.Top() ) );
@@ -1691,7 +1691,7 @@ private:
aMap.SetScaleX(Fraction(1,2));
aMap.SetScaleY(Fraction(1,2));
mpPrinter->SetMapMode(aMap);
-
+
Rectangle aOutRect(aPageOfs, rInfo.mpPrinter->GetOutputSize());
if( aOutRect.GetWidth() > aOutRect.GetHeight() )
{
@@ -1731,7 +1731,7 @@ private:
++nIndex;
if (pPage == NULL)
continue;
-
+
SdrTextObj* pTextObj = NULL;
sal_uInt32 nObj (0);
@@ -1784,7 +1784,7 @@ private:
{
pOutliner->AddText(*(pTextObj->GetOutlinerParaObject()));
}
-
+
if (bSubTitle )
{
const sal_Int32 nParaCount2 (pOutliner->GetParagraphCount());
@@ -1826,7 +1826,7 @@ private:
rInfo.meOrientation,
rInfo.mpPrinter->GetPaperBin())));
}
-
+
pOutliner->SetRefMapMode(aSavedMapMode);
pOutliner->SetUpdateMode(bSavedUpdateMode);
pOutliner->SetPaperSize(aSavedPaperSize);
@@ -1834,7 +1834,7 @@ private:
}
-
+
/** Prepare handout pages for slides that are to be printed.
*/
@@ -1843,7 +1843,7 @@ private:
SdDrawDocument* pDocument = mrBase.GetDocument();
OSL_ASSERT(pDocument != NULL);
SdPage& rHandoutPage (*pDocument->GetSdPage(0, PK_HANDOUT));
-
+
const bool bScalePage (mpOptions->IsPageSize());
USHORT nPaperBin;
@@ -1851,7 +1851,7 @@ private:
nPaperBin = rHandoutPage.GetPaperBin();
else
nPaperBin = rInfo.mpPrinter->GetPaperBin();
-
+
// Change orientation?
SdPage& rMaster (dynamic_cast<SdPage&>(rHandoutPage.TRG_GetMasterPage()));
rInfo.meOrientation = rMaster.GetOrientation();
@@ -1962,7 +1962,7 @@ private:
PrintInfo& rInfo)
{
OSL_ASSERT(rInfo.mpPrinter != NULL);
-
+
// Fill in page kind specific data.
SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
if (pDocument->GetSdPageCount(ePageKind) == 0)
@@ -1972,7 +1972,7 @@ private:
if ( ! SetupPaperOrientation(ePageKind, rInfo))
return;
-
+
MapMode aMap (rInfo.maMap);
// aMap.SetOrigin(Point() - rInfo.mpPrinter->GetPageOffset());
rInfo.maMap = aMap;
@@ -2006,7 +2006,7 @@ private:
SdPage* pPage = GetFilteredPage(nIndex, ePageKind, rInfo);
if (pPage == NULL)
continue;
-
+
MapMode aMap (rInfo.maMap);
// Kann sich die Seitengroesse geaendert haben?
const Size aPageSize = pPage->GetSize();
@@ -2067,7 +2067,7 @@ private:
}
-
+
/** Put two slides on one printer page.
*/
@@ -2239,7 +2239,7 @@ private:
nPaperBin = rPage.GetPaperBin();
else
nPaperBin = rInfo.mpPrinter->GetPaperBin();
-
+
// For pages larger then the printable area there
// are three options:
// 1. Scale down to the page to the printable area.
@@ -2253,7 +2253,7 @@ private:
if (bScalePage || bCutPage)
{
// Handle 1 and 2.
-
+
// if CutPage is set then do not move it, otherwise move the
// scaled page to printable area
maPrinterPages.push_back(
@@ -2320,7 +2320,7 @@ DocumentRenderer::DocumentRenderer (ViewShellBase& rBase)
mpImpl(new Implementation(rBase))
{
}
-
+
@@ -2342,7 +2342,7 @@ sal_Int32 SAL_CALL DocumentRenderer::getRendererCount (
mpImpl->ProcessProperties(rOptions);
return mpImpl->GetPrintPageCount();
}
-
+
@@ -2357,7 +2357,7 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer (
mpImpl->ProcessProperties(rOptions);
return mpImpl->GetProperties(rOptions);
}
-
+
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 28a14b2..c6ec337 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -120,7 +120,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
OSL_ENSURE(pFact, "Dialogdiet fail!");
AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
-
+
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
if(RET_OK == pDlg->Execute())
@@ -199,7 +199,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
rReq.Done ();
}
break;
-
+
case SID_COMBINE: // BASIC
{
// End text edit to avoid conflicts
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 1dbd13c..b583326 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1256,7 +1256,7 @@ void OutlineView::FillOutliner()
if (!pTO) // if no subtile found, try outline
pTO = GetOutlineTextObject(pPage);
-
+
if(pTO && !(pTO->IsEmptyPresObj())) // found some text
{
OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject();
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 7c31ff7..a286aed 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -138,7 +138,7 @@ public:
seconds.
*/
FrameSynchronization (const double nFrameDuration);
-
+
/** Set the current time as the time at which the current frame is
displayed. From this the target time of the next frame is derived.
*/
@@ -211,18 +211,18 @@ private:
affairs (I've actually tried threading here, but failed
miserably when using the VCL canvas as the render backend -
deadlocked).
-
+
******************************************************************************/
typedef cppu::WeakComponentImplHelper1<presentation::XSlideShow> SlideShowImplBase;
typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector;
-
+
/// Maps XDrawPage for annotations persistence
typedef ::std::map< ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage>,
PolyPolygonVector> PolygonMap;
-
+
class SlideShowImpl : private cppu::BaseMutex,
public CursorManager,
public SlideShowImplBase
@@ -272,7 +272,7 @@ public:
phase, when shape effects are running, and the phase
after the last shape animation has ended, but before
the next slide transition starts.
-
+
This method notifies the end of the third phase.
*/
void notifySlideEnded (const bool bReverse);
@@ -281,7 +281,7 @@ public:
has been clicked.
*/
bool notifyHyperLinkClicked( rtl::OUString const& hyperLink );
-
+
/** Notification from eventmultiplexer that an animation event has occoured.
This will be forewarded to all registered XSlideShowListener
*/
@@ -386,19 +386,19 @@ private:
else
return (!xSlide.is() && !xNode.is());
}
-
+
/// Resets the current slide transition sound object with a new one:
SoundPlayerSharedPtr resetSlideTransitionSound(
uno::Any const& url = uno::Any(), bool bLoopSound = false );
-
+
/// stops the current slide transition sound
void stopSlideTransitionSound();
/** Prepare a slide transition
-
+
This method registers all necessary events and
activities for a slide transition.
-
+
@return the slide change activity, or NULL for no transition effect
*/
ActivitySharedPtr createSlideTransition(
@@ -406,11 +406,11 @@ private:
const SlideSharedPtr& rLeavingSlide,
const SlideSharedPtr& rEnteringSlide,
const EventSharedPtr& rTransitionEndEvent );
-
+
/** Request/release the wait symbol. The wait symbol is displayed when
there are more requests then releases. Locking the wait symbol
helps to avoid intermediate repaints.
-
+
Do not call this method directly. Use WaitSymbolLock instead.
*/
void requestWaitSymbol (void);
@@ -434,29 +434,29 @@ private:
/// all registered views
UnoViewContainer maViewContainer;
-
+
/// all registered slide show listeners
cppu::OInterfaceContainerHelper maListenerContainer;
-
+
/// map of vectors, containing all registered listeners for a shape
ShapeEventListenerMap maShapeEventListeners;
/// map of sal_Int16 values, specifying the mouse cursor for every shape
ShapeCursorMap maShapeCursors;
-
+
//map of vector of Polygons, containing polygons drawn on each slide.
PolygonMap maPolygons;
-
+
boost::optional<RGBColor> maUserPaintColor;
-
+
boost::optional<double> maUserPaintStrokeWidth;
-
+
//changed for the eraser project
boost::optional<bool> maEraseAllInk;
boost::optional<bool> maSwitchPenMode;
boost::optional<bool> maSwitchEraserMode;
boost::optional<sal_Int32> maEraseInk;
//end changed
-
+
boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
ScreenUpdater maScreenUpdater;
EventQueue maEventQueue;
@@ -472,7 +472,7 @@ private:
/// the current slide transition sound object:
SoundPlayerSharedPtr mpCurrentSlideTransitionSound;
-
+
uno::Reference<uno::XComponentContext> mxComponentContext;
uno::Reference<
presentation::XTransitionFactory> mxOptionalTransitionFactory;
@@ -491,7 +491,7 @@ private:
uno::Reference<animations::XAnimationNode> mxPrefetchAnimationNode;
sal_Int16 mnCurrentCursor;
-
+
sal_Int32 mnWaitSymbolRequestCount;
bool mbAutomaticAdvancementMode;
bool mbImageAnimationsAllowed;
@@ -651,7 +651,7 @@ void SlideShowImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
maEffectRewinder.dispose();
-
+
// stop slide transition sound, if any:
stopSlideTransitionSound();
@@ -758,12 +758,12 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
"createSlideTransition(): No views" );
ENSURE_OR_THROW( rEnteringSlide,
"createSlideTransition(): No entering slide" );
-
+
// return empty transition, if slide transitions
// are disabled.
if (mbNoSlideTransitions)
return ActivitySharedPtr();
-
+
// retrieve slide change parameters from XDrawPage
uno::Reference< beans::XPropertySet > xPropSet( xDrawPage,
uno::UNO_QUERY );
@@ -784,7 +784,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
"Could not extract slide transition type from XDrawPage - assuming no transition\n" );
return ActivitySharedPtr();
}
-
+
sal_Int16 nTransitionSubType(0);
if( !getPropertyValue( nTransitionSubType,
xPropSet,
@@ -794,7 +794,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
"Could not extract slide transition subtype from XDrawPage - assuming no transition\n" );
return ActivitySharedPtr();
}
-
+
bool bTransitionDirection(false);
if( !getPropertyValue( bTransitionDirection,
xPropSet,
@@ -803,7 +803,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition direction from XDrawPage - assuming default direction\n" );
}
-
+
sal_Int32 aUnoColor(0);
if( !getPropertyValue( aUnoColor,
xPropSet,
@@ -823,7 +823,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
if( !getPropertyValue( bLoopSound, xPropSet, OUSTR("LoopSound") ) )
OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound\n" );
-
+
NumberAnimationSharedPtr pTransition(
TransitionFactory::createSlideTransition(
rLeavingSlide,
@@ -853,7 +853,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
"Could not extract slide transition duration from XDrawPage - assuming no transition\n" );
return ActivitySharedPtr();
}
-
+
sal_Int32 nMinFrames(5);
if( !getPropertyValue( nMinFrames,
xPropSet,
@@ -965,7 +965,7 @@ void SlideShowImpl::requestWaitSymbol (void)
mpWaitSymbol->show();
}
}
-
+
void SlideShowImpl::releaseWaitSymbol (void)
{
--mnWaitSymbolRequestCount;
@@ -1116,7 +1116,7 @@ void SlideShowImpl::displaySlide(
std::for_each( rProperties.getConstArray(),
rProperties.getConstArray() + rProperties.getLength(),
PrefetchPropertiesFunc(this, bSkipAllMainSequenceEffects, bSkipSlideTransition) );
-
+
OSL_ENSURE( !maViewContainer.empty(), "### no views!" );
if (maViewContainer.empty())
return;
@@ -1251,7 +1251,7 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException)
if (isDisposed())
return false;
-
+
// precondition: must only be called from the main thread!
DBG_TESTSOLARMUTEX();
@@ -1292,12 +1292,12 @@ void SlideShowImpl::rewindEffectToPreviousSlide (void)
// effect because there are no effects on the current slide or none has
// yet been displayed. Go to the previous slide.
notifySlideEnded(true);
-
+
// Process pending events once more in order to have the following
// screen update show the last effect. Not sure whether this should be
// necessary.
maEventQueue.forceEmpty();
-
+
// We have to call the screen updater before the wait symbol is turned
// off. Otherwise the wait symbol would force the display of an
// intermediate state of the slide (before the effects are replayed.)
@@ -1361,7 +1361,7 @@ uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide()
if (isDisposed())
return uno::Reference<drawing::XDrawPage>();
-
+
// precondition: must only be called from the main thread!
DBG_TESTSOLARMUTEX();
@@ -1379,7 +1379,7 @@ sal_Bool SlideShowImpl::addView(
if (isDisposed())
return false;
-
+
// precondition: must only be called from the main thread!
DBG_TESTSOLARMUTEX();
@@ -1771,7 +1771,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
return true;
}
-
+
if (rProperty.Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("MouseVisible") ))
{
@@ -1904,7 +1904,7 @@ void SlideShowImpl::addShapeEventListener(
if (isDisposed())
return;
-
+
// precondition: must only be called from the main thread!
DBG_TESTSOLARMUTEX();
@@ -1934,7 +1934,7 @@ void SlideShowImpl::removeShapeEventListener(
throw (uno::RuntimeException)
{
osl::MutexGuard const guard( m_aMutex );
-
+
// precondition: must only be called from the main thread!
DBG_TESTSOLARMUTEX();
@@ -1948,7 +1948,7 @@ void SlideShowImpl::removeShapeEventListener(
aIter->second.get(),
"SlideShowImpl::removeShapeEventListener(): "
"listener map contains NULL broadcast helper" );
-
+
aIter->second->removeInterface( xListener );
}
@@ -2091,7 +2091,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
// that to the next round, no updated static slide
// content. In short, the last shape animation of a slide
// tends to blink at its end.
-
+
// process dequeued activities _after_ commit to screen
maActivitiesQueue.processDequeued();
@@ -2179,7 +2179,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
mbSlideShowIdle = true;
}
#endif
-
+
return bRet;
}
}
@@ -2374,7 +2374,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse)
if (bReverse)
maEventMultiplexer.notifySlideEndEvent();
-
+
stopShow(); // MUST call that: results in
// maUserEventQueue.clear(). What's more,
// stopShow()'s currSlide->hide() call is
More information about the Libreoffice-commits
mailing list