diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
92 files changed, 577 insertions, 577 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 9791ce43f8b4..fdf1aaf101d3 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.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 @@ -94,8 +94,8 @@ class CacheEntry; class CacheHash { public: - size_t operator()(const BitmapCache::CacheKey& p) const - { return (size_t)p; } + size_t operator()(const BitmapCache::CacheKey& p) const + { return (size_t)p; } }; class BitmapCache::CacheBitmapContainer @@ -296,7 +296,7 @@ void BitmapCache::InvalidateCache (void) void BitmapCache::SetBitmap ( - const CacheKey& rKey, + const CacheKey& rKey, const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious) { @@ -318,7 +318,7 @@ void BitmapCache::SetBitmap ( CacheEntry (rpPreview, mnCurrentAccessTime++, bIsPrecious)) ).first; } - + if (iEntry != mpBitmapContainer->end()) UpdateCacheSize(iEntry->second, ADD); } @@ -428,7 +428,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache) if ( ! bIncludeNoPreview && ! iEntry->second.HasPreview()) continue; - + aSortedContainer.push_back(SortableBitmapContainer::value_type( iEntry->first,iEntry->second)); } @@ -477,7 +477,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if ( ! rEntry.IsPrecious() && mnNormalCacheSize>mnMaximalNormalCacheSize) { mbIsFull = true; -#ifdef VERBOSE +#ifdef VERBOSE OSL_TRACE("cache size is %d > %d", mnNormalCacheSize,mnMaximalNormalCacheSize); #endif mpCacheCompactor->RequestCompaction(); @@ -489,7 +489,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if (mnNormalCacheSize < mnMaximalNormalCacheSize) mbIsFull = false; break; - + default: OSL_ASSERT(false); break; @@ -515,10 +515,10 @@ BitmapCache::CacheEntry::CacheEntry( BitmapCache::CacheEntry::CacheEntry( - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, sal_Int32 nLastAccessTime, bool bIsPrecious) - : mpPreview(rpPreview), + : mpPreview(rpPreview), mbIsUpToDate(true), mnLastAccessTime(nLastAccessTime), mbIsPrecious(bIsPrecious) @@ -577,7 +577,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress nNewSize, nRatio); #endif - + mpCompressor = rpCompressor; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 00783cea7209..bedf563c7b91 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -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 @@ -117,7 +117,7 @@ public: */ void SetBitmap ( const CacheKey& rKey, - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious); /** Mark the specified preview bitmap as precious, i.e. that it must not @@ -130,7 +130,7 @@ public: bitmaps. */ void ReCalculateTotalCacheSize (void); - + /** Use the previews in the given cache to initialize missing previews. */ void Recycle (const BitmapCache& rCache); @@ -196,7 +196,7 @@ private: size to the allowed value. */ bool mbIsFull; - + /** Update mnNormalCacheSize or mnPreciousCacheSize according to the precious flag of the specified preview bitmap and the specified operation. diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index 06effadf2bcf..1ee3d50b1512 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.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 @@ -133,7 +133,7 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - + virtual sal_Int32 GetMemorySize (void) const; }; @@ -172,7 +172,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void const BitmapReplacement& rBitmapData) const { ::boost::shared_ptr<BitmapEx> pResult; - + const ResolutionReducedReplacement* pData ( dynamic_cast<const ResolutionReducedReplacement*>(&rBitmapData)); @@ -182,7 +182,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void if (pData->maOriginalSize.Width() > mnWidth) pResult->Scale(pData->maOriginalSize); } - + return pResult; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index cbfeff086260..af1b0a223d82 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index cd656a7b589f..912a4ea102fc 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.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 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index ff39fdc2675d..5073774155e2 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 4e48d5ac2510..2eb3d5495aa7 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.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 @@ -109,7 +109,7 @@ namespace sd { namespace slidesorter { namespace cache { static const ::rtl::OUString sErase (RTL_CONSTASCII_USTRINGPARAM("Erase")); static const ::rtl::OUString sResolution (RTL_CONSTASCII_USTRINGPARAM("ResolutionReduction")); static const ::rtl::OUString sPNGCompression (RTL_CONSTASCII_USTRINGPARAM("PNGCompression")); - + ::boost::shared_ptr<BitmapCompressor> pCompressor; ::rtl::OUString sCompressionPolicy(sPNGCompression); Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue( @@ -124,7 +124,7 @@ namespace sd { namespace slidesorter { namespace cache { pCompressor.reset(new ResolutionReduction()); else pCompressor.reset(new PngCompression()); - + ::std::auto_ptr<CacheCompactor> pCompactor (NULL); ::rtl::OUString sCompactionPolicy(sCompress); Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue( @@ -169,14 +169,14 @@ CacheCompactor::CacheCompactor( IMPL_LINK(CacheCompactor, CompactionCallback, Timer*, EMPTYARG) { mbIsCompactionRunning = true; - + try { Run(); } catch(::com::sun::star::uno::RuntimeException e) { } catch(::com::sun::star::uno::Exception e) { } - + mbIsCompactionRunning = false; return 1; } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 90a2932ad501..cd8067056005 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -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 @@ -39,7 +39,7 @@ class BitmapCache; class BitmapCompressor; /** This is an interface class whose implementations are created via the - Create() factory method. + Create() factory method. */ class CacheCompactor { @@ -70,7 +70,7 @@ public: cache. This calls via a timer the Run() method. */ virtual void RequestCompaction (void); - + protected: BitmapCache& mrCache; sal_Int32 mnMaximalCacheSize; @@ -83,7 +83,7 @@ protected: by the off-screen preview bitmaps. */ virtual void Run (void) = 0; - + private: /** This timer is used to collect calles to RequestCompaction() and eventually call Run(). diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 092c69fcd08f..f1159b2811e3 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.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 @@ -146,7 +146,7 @@ CacheConfiguration::CacheConfiguration (void) Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) { Any aResult; - + if (mxCacheNode != NULL) { try diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 00a7ad71bdca..27d788867378 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -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 @@ -54,7 +54,7 @@ public: does not exist then an empty Any is returned. */ ::com::sun::star::uno::Any GetValue (const ::rtl::OUString& rName); - + private: static ::boost::shared_ptr<CacheConfiguration> mpInstance; /** When a caller holds a reference after we have released ours we use diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 48480d11bd80..ede73b79025b 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.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 @@ -207,7 +207,7 @@ void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey) // Suspend the queue processing temporarily to avoid the reinsertion // of the request that is to be deleted. mpQueueProcessor->Stop(); - + maRequestQueue.RemoveRequest(aKey); mpQueueProcessor->RemoveRequest(aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 734b39a3a5a4..17074a0db6b0 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -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 @@ -52,7 +52,7 @@ public: GenericPageCache ( const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); - + ~GenericPageCache (void); /** Change the size of the preview bitmaps. This may be caused by a @@ -108,7 +108,7 @@ public: /** Call this method when all preview bitmaps have to be generated anew. This is the case when the size of the page objects on the screen has - changed or when the model has changed. + changed or when the model has changed. */ void InvalidateCache (bool bUpdateCache); @@ -130,7 +130,7 @@ private: ::boost::scoped_ptr<QueueProcessor> mpQueueProcessor; SharedCacheContext mpCacheContext; - + /** The current size of preview bitmaps. */ Size maPreviewSize; diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 06bd132975e7..9558267ab7d0 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.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 diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index c62b4ea31a60..2fdf0bc7b117 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.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 @@ -48,7 +48,7 @@ class CacheDescriptor public: ::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument; Size maPreviewSize; - + CacheDescriptor( ::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument, const Size& rPreviewSize) @@ -120,7 +120,7 @@ public: return (rElement1.first.Width()*rElement1.first.Height() > rElement2.first.Width()*rElement2.first.Height()); } - + private: Size maPreferredSize; }; @@ -182,7 +182,7 @@ public: ::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) { ::boost::shared_ptr<PageCacheManager> pInstance; - + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); pInstance = mpInstance.lock(); @@ -193,7 +193,7 @@ public: PageCacheManager::Deleter()); mpInstance = pInstance; } - + return pInstance; } @@ -241,7 +241,7 @@ PageCacheManager::~PageCacheManager (void) // contain previews that are not up-to-date. Recycle previews from // other caches to fill in the holes. Recycle(pResult, pDocument,rPreviewSize); - + // Put the new (or old) cache into the container. if (pResult.get() != NULL) mpPageCaches->insert(PageCacheContainer::value_type(aKey, pResult)); @@ -296,13 +296,13 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) mpPageCaches->begin(), mpPageCaches->end(), PageCacheContainer::CompareWithCache(rpCache))); - + if (iCache != mpPageCaches->end()) { OSL_ASSERT(iCache->second == rpCache); PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache); - + mpPageCaches->erase(iCache); } } @@ -316,7 +316,7 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) const Size& rNewPreviewSize) { (void)rOldPreviewSize; - + ::boost::shared_ptr<Cache> pResult; if (rpCache.get() != NULL) @@ -400,7 +400,7 @@ void PageCacheManager::InvalidateAllCaches (void) const Size& rPreviewSize) { ::boost::shared_ptr<Cache> pCache; - + // Look for the cache in the list of recently used caches. RecentlyUsedPageCaches::iterator iQueue (mpRecentlyUsedPageCaches->find(pDocument)); if (iQueue != mpRecentlyUsedPageCaches->end()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index f3115b1b46b5..925da9d14ce0 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.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 @@ -60,7 +60,7 @@ QueueProcessor::QueueProcessor ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenHighPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; - + aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenLowPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index d79f2267346c..ba25b8b3a14b 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -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 @@ -39,7 +39,7 @@ #include "SlsBitmapCache.hxx" #include "sdpage.hxx" #include "Window.hxx" - + #include <svx/svdpagv.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -64,12 +64,12 @@ class RequestQueue; timer is started that eventually calls ProcessRequest(). This is repeated until the queue is empty or Stop() is called. */ -class QueueProcessor +class QueueProcessor { public: typedef ::boost::function<bool()> IdleDetectionCallback; QueueProcessor ( - RequestQueue& rQueue, + RequestQueue& rQueue, const ::boost::shared_ptr<BitmapCache>& rpCache, const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx index 349d2813c0cb..b42a34102128 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx @@ -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 @@ -41,17 +41,17 @@ class SlideSorterView; namespace sd { namespace slidesorter { namespace cache { -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> -class QueueProcessorThread +class QueueProcessorThread : public ::osl::Thread { public: QueueProcessorThread ( - view::SlideSorterView& rView, - Queue& rQueue, + view::SlideSorterView& rView, + Queue& rQueue, BitmapCache& rCache); ~QueueProcessorThread (void); @@ -81,19 +81,19 @@ public: void SAL_CALL Terminate (void); protected: - /** This virutal method is called (among others?) from the + /** This virutal method is called (among others?) from the inherited create method and acts as the main function of this thread. */ virtual void SAL_CALL run (void); - /** Called after the thread is terminated via the terminate + /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. - */ + */ virtual void SAL_CALL onTerminated (void); private: - /** Flag that indicates wether the onTerminated method has been already + /** Flag that indicates wether the onTerminated method has been already called. If so then a subsequent call to detach deletes the thread. */ volatile bool mbIsTerminated; @@ -169,7 +169,7 @@ void SAL_CALL QueueProcessorThread<Queue, Request, Cache, Factory>::run (void) TimeValue aTimeToWait; aTimeToWait.Seconds = 0; aTimeToWait.Nanosec = 50*1000*1000; - OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", + OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", aTimeToWait.Nanosec); wait (aTimeToWait); } @@ -194,7 +194,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> Request* pRequest = NULL; int nPriorityClass; bool bRequestIsValid = false; - + do { OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): testing for mbIsTerminated %p", this); @@ -215,7 +215,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> break; OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): have mutexes %p", this); - + // Get the requeuest with the highest priority from the queue. nPriorityClass = mrQueue.GetFrontPriorityClass(); pRequest = &mrQueue.GetFront(); @@ -224,7 +224,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():using request %p for creating bitmap", pRequest); - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", + OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", pRequest->GetPage()->GetPageNum(), nPriorityClass); try { @@ -253,9 +253,9 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -268,9 +268,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -283,9 +283,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -299,9 +299,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -323,9 +323,9 @@ void QueueProcessorThread< /** This callback method is called when the run() method terminates. */ -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void SAL_CALL QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index 28794967281e..75963ea38cb9 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.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 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx index 94ca566a66da..f908598de2ee 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx index f710ab1a8c62..077940a82cfb 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx @@ -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 @@ -39,14 +39,14 @@ namespace sd { namespace slidesorter { namespace cache { enum RequestPriorityClass { MIN__CLASS = 0, - + // The slide is visible. A preview does not yet exist. VISIBLE_NO_PREVIEW = MIN__CLASS, // The slide is visible. A preview exists but is not up-to-date anymore. VISIBLE_OUTDATED_PREVIEW, // The slide is not visible. NOT_VISIBLE, - + MAX__CLASS = NOT_VISIBLE }; diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index e92b1c90bc67..3004dddf7a85 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.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 @@ -214,7 +214,7 @@ CacheKey RequestQueue::GetFront (void) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RequestQueue::GetFront(): queue is empty")), NULL); - + return mpRequestQueue->begin()->maKey; } diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index e59f7e3ab3bd..5b9c0cdb27fb 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -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 @@ -63,7 +63,7 @@ public: with lowest priority. */ void AddRequest ( - CacheKey aKey, + CacheKey aKey, RequestPriorityClass eRequestClass, bool bInsertWithHighestPriority = false); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index baccbfd51a1e..4dc825808c06 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.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 @@ -162,7 +162,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) void SlideSorterController::Init (void) { mrView.HandleModelChange(); - + mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); mpFocusManager.reset(new FocusManager(mrSlideSorter)); @@ -353,7 +353,7 @@ bool SlideSorterController::Command ( bool bEventHasBeenHandled = false; ViewShell* pViewShell = mrSlideSorter.GetViewShell(); - + switch (rEvent.GetCommand()) { case COMMAND_CONTEXTMENU: @@ -495,7 +495,7 @@ void SlideSorterController::PreModelChange (void) if (mbPostModelChangePending) return; mbPreModelChangeDone = true; - + if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->Broadcast( ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START)); @@ -598,7 +598,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) if (pActiveWindow != NULL) pActiveWindow->SetDrawMode(nDrawMode); mrView.HandleDrawModeChange(); - + // When the system font has changed a layout has to be done. mrView.Resize(); FontProvider::Instance().Invalidate(); @@ -628,7 +628,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); } - else // MI sagt: kein MDIFrame --> disablen + else // MI sagt: kein MDIFrame --> disablen { rSet.DisableItem(SID_RELOAD); } @@ -948,7 +948,7 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex { ModelChangeLock aLock (*this); PreModelChange(); - + mrModel.SetDocumentSlides(rxSlides); mrView.Layout(); } diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 92853fddb7e6..67a06164c3b7 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.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 @@ -128,7 +128,7 @@ bool Animator::ServeAnimations (void) void Animator::CleanUpAnimationList (void) { AnimationList aActiveAnimations; - + AnimationList::const_iterator iAnimation; for (iAnimation=maAnimations.begin(); iAnimation!=maAnimations.end(); ++iAnimation) { @@ -174,7 +174,7 @@ Animator::Animation::Animation ( maAnimation(mnValue); mnValue = mnDelta; - + } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 662ba4293c95..a15d10f67ecd 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.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 @@ -228,7 +228,7 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) // b) When the focus indicator is visible, then before or after the // focused page, depending on user input to a dialog. // c) When there is a selection but no focus, then after the - // selection. + // selection. // d) After the last page when there is no selection and no focus. view::InsertionIndicatorOverlay& rInsertionIndicatorOverlay ( @@ -269,18 +269,18 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) { const List& rBookmarkList = pClipTransferable->GetPageBookmarks(); const SolarMutexGuard aGuard; - + nInsertPageCount = (USHORT) rBookmarkList.Count(); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( const_cast<List*>(&rBookmarkList), - NULL, - FALSE, - FALSE, - nInsertIndex, - FALSE, - pClipTransferable->GetPageDocShell(), - TRUE, - bMergeMasterPages, + NULL, + FALSE, + FALSE, + nInsertIndex, + FALSE, + pClipTransferable->GetPageDocShell(), + TRUE, + bMergeMasterPages, FALSE); } else @@ -289,23 +289,23 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) DrawDocShell* pDataDocSh = (DrawDocShell*)pShell; SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); - if (pDataDoc!=NULL + if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD)) { const SolarMutexGuard aGuard; - + bMergeMasterPages = (pDataDoc != mrSlideSorter.GetModel().GetDocument()); nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD ); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( - NULL, - NULL, - FALSE, - FALSE, + NULL, + NULL, + FALSE, + FALSE, nInsertIndex, - FALSE, - pDataDocSh, - TRUE, - bMergeMasterPages, + FALSE, + pDataDocSh, + TRUE, + bMergeMasterPages, FALSE); } } @@ -343,7 +343,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag) { List aBookmarkList; @@ -395,7 +395,7 @@ void Clipboard::CreateSlideTransferable ( if (pViewShell != NULL) pActionWindow = pViewShell->GetActiveWindow(); } - + pTransferable->SetStartPos (pActionWindow->PixelToLogic( pActionWindow->GetPointerPosPixel())); pTransferable->SetObjectDescriptor (aObjDesc); @@ -455,8 +455,8 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) // in the same document.) rSelector.DeselectAllPages(); PageList::iterator aDraggedPage; - for (aDraggedPage=maPagesToRemove.begin(); - aDraggedPage!=maPagesToRemove.end(); + for (aDraggedPage=maPagesToRemove.begin(); + aDraggedPage!=maPagesToRemove.end(); aDraggedPage++) { rSelector.SelectPage (*aDraggedPage); @@ -487,10 +487,10 @@ void Clipboard::SelectPages (void) sal_Int8 Clipboard::AcceptDrop ( - const AcceptDropEvent& rEvent, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + const AcceptDropEvent& rEvent, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -515,7 +515,7 @@ sal_Int8 Clipboard::AcceptDrop ( { nResult = DND_ACTION_COPY; } - + // Show the insertion marker and the substitution for a drop. Point aPosition = pTargetWindow->PixelToLogic (rEvent.maPosPixel); view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); @@ -549,10 +549,10 @@ sal_Int8 Clipboard::AcceptDrop ( sal_Int8 Clipboard::ExecuteDrop ( - const ExecuteDropEvent& rEvent, + const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -564,14 +564,14 @@ sal_Int8 Clipboard::ExecuteDrop ( const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; const Point aEventModelPosition ( pTargetWindow->PixelToLogic (rEvent.maPosPixel)); - long int nXOffset = labs (pDragTransferable->GetStartPos().X() + long int nXOffset = labs (pDragTransferable->GetStartPos().X() - aEventModelPosition.X()); - long int nYOffset = labs (pDragTransferable->GetStartPos().Y() + long int nYOffset = labs (pDragTransferable->GetStartPos().Y() - aEventModelPosition.Y()); - const bool bContinue = - ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) + const bool bContinue = + ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) || ( nXOffset >= 2 && nYOffset >= 2 ); - + // Get insertion position and then turn off the insertion indicator. view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); rOverlay.GetInsertionIndicatorOverlay().SetPosition( @@ -580,7 +580,7 @@ sal_Int8 Clipboard::ExecuteDrop ( OSL_TRACE ("Clipboard::AcceptDrop() called for index %d", nIndex); rOverlay.GetInsertionIndicatorOverlay().setVisible(false); - + if (bContinue) { SlideSorterController::ModelChangeLock aModelChangeLock (mrController); @@ -650,7 +650,7 @@ USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) // This is now converted that to an SdModel index that also starts with 1. if (nInsertionIndex >= 0) nInsertPosition = (USHORT)nInsertionIndex * 2 + 1; - + return nInsertPosition; } @@ -758,7 +758,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( nPage, nLayer); break; - + case DC_EXECUTE: nResult = pDrawViewShell->ExecuteDrop( *reinterpret_cast<const ExecuteDropEvent*>(pDropEvent), diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx index 7198e0a2b211..d6dee9911742 100644 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsCommand.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 0f9cb1b1becb..546d25906a72 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.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 diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 83f34270c1b3..4e6af1de67ed 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.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 @@ -85,7 +85,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) SetFocusToToolBox(); } break; - + case FMD_RIGHT: mnPageIndex += 1; if (mnPageIndex >= mrSlideSorter.GetModel().GetPageCount()) @@ -108,7 +108,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) if (nCandidateColumn > nColumn) mnPageIndex = nCandidate - (nCandidateColumn-nColumn); else if (nCandidateColumn < nColumn) - mnPageIndex = nCandidate + mnPageIndex = nCandidate - nColumnCount + (nColumn - nCandidateColumn); else @@ -330,9 +330,9 @@ void FocusManager::NotifyFocusChangeListeners (void) const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); - + // Tell the slection change listeners that the selection has changed. - ::std::vector<Link>::iterator iListener (aListeners.begin()); + ::std::vector<Link>::iterator iListener (aListeners.begin()); ::std::vector<Link>::iterator iEnd (aListeners.end()); for (; iListener!=iEnd; ++iListener) { diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index 46917e48c1c2..8f776432738f 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.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 @@ -85,7 +85,7 @@ void HideSlideFunction::DoExecute (SfxRequest& rRequest) model::PageEnumeration aSelectedPages ( model::PageEnumerationProvider::CreateSelectedPagesEnumeration(mrSlideSorter.GetModel())); - + ExclusionState eState (UNDEFINED); switch (rRequest.GetSlot()) @@ -144,14 +144,14 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( break; case EXCLUDED: - // The pages before where all not part of the show, + // The pages before where all not part of the show, // this one is. if ( ! bState) eState = MIXED; break; case INCLUDED: - // The pages before where all part of the show, + // The pages before where all part of the show, // this one is not. if (bState) eState = MIXED; diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx index 6bdf37e4c249..9fb32c2c088f 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx @@ -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 @@ -40,14 +40,14 @@ namespace sd { namespace slidesorter { namespace controller { hidden. When all selected pages have the same state this state is toggled for all of them */ -class HideSlideFunction +class HideSlideFunction : public SlideFunction { public: TYPEINFO(); virtual ~HideSlideFunction (void); - + static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); virtual void DoExecute( SfxRequest& rReq ); @@ -59,7 +59,7 @@ public: excluded from the slide show. */ static ExclusionState GetExclusionState (model::PageEnumeration& rPageSet); - + protected: HideSlideFunction ( SlideSorter& rSlideSorter, diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 176dd8a9fc8a..c3b470143303 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.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 @@ -130,7 +130,7 @@ Listener::Listener ( { StartListening (*pMainViewShell); } - + Link aLink (LINK(this, Listener, EventMultiplexerCallback)); mpBase->GetEventMultiplexer()->AddEventListener( aLink, @@ -213,13 +213,13 @@ void Listener::ReleaseListeners (void) void Listener::ConnectToController (void) { ViewShell* pShell = mrSlideSorter.GetViewShell(); - + // Register at the controller of the main view shell (if we are that not // ourself). if (pShell==NULL || ! pShell->IsMainViewShell()) { Reference<frame::XController> xController (mrSlideSorter.GetXController()); - + // Listen to changes of certain properties. Reference<beans::XPropertySet> xSet (xController, UNO_QUERY); if (xSet.is()) @@ -270,10 +270,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - String::CreateFromAscii("CurrentPage"), + String::CreateFromAscii("CurrentPage"), this); xSet->removePropertyChangeListener ( - String::CreateFromAscii("IsMasterPageMode"), + String::CreateFromAscii("IsMasterPageMode"), this); } @@ -372,11 +372,11 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: mbIsMainViewChangePending = true; break; - + case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED: if (mbIsMainViewChangePending && mpBase != NULL) { @@ -398,7 +398,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED: DisconnectFromController(); break; @@ -421,7 +421,7 @@ void SAL_CALL Listener::disposing ( { if ((mbListeningToDocument || mbListeningToUNODocument) && mrSlideSorter.GetModel().GetDocument()!=NULL - && rEventObject.Source + && rEventObject.Source == mrSlideSorter.GetModel().GetDocument()->getUnoModel()) { mbListeningToDocument = false; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 23faf53128b5..3a9f511d05b6 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -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 @@ -58,7 +58,7 @@ class SlideSorter; namespace sd { namespace slidesorter { namespace controller { -typedef cppu::WeakComponentImplHelper4< +typedef cppu::WeakComponentImplHelper4< ::com::sun::star::document::XEventListener, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::accessibility::XAccessibleEventListener, @@ -105,7 +105,7 @@ public: const SfxHint& rHint); //===== lang::XEventListener ============================================ - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -117,7 +117,7 @@ public: throw (::com::sun::star::uno::RuntimeException); //===== beans::XPropertySetListener ===================================== - virtual void SAL_CALL + virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -125,7 +125,7 @@ public: //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( - const ::com::sun::star::accessibility::AccessibleEventObject& + const ::com::sun::star::accessibility::AccessibleEventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ public: frame it is listening to. This usually happens when the view shell in the center pane is replaced by another view shell. */ - virtual void SAL_CALL + virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx index 726371d6ea7d..7e49d884bedf 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.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 @@ -72,26 +72,26 @@ view::PageObject* PageObjectFactory::CreatePageObject ( -::sdr::contact::ViewContact* +::sdr::contact::ViewContact* PageObjectFactory::CreateViewContact ( view::PageObject* pPageObject, const model::SharedPageDescriptor& rpDescriptor) const { return new view::PageObjectViewContact ( - *pPageObject, + *pPageObject, rpDescriptor); } -::sdr::contact::ViewObjectContact* +::sdr::contact::ViewObjectContact* PageObjectFactory::CreateViewObjectContact ( ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact) const { return new view::PageObjectViewObjectContact ( - rObjectContact, + rObjectContact, rViewContact, mpPageCache, mpProperties); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 30b1db5998fa..52c5b3d54de7 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.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 @@ -85,7 +85,7 @@ void PageSelector::DeselectAllPages (void) int nPageCount = mrModel.GetPageCount(); for (int nPageIndex=0; nPageIndex<nPageCount; nPageIndex++) DeselectPage (nPageIndex); - DBG_ASSERT (mnSelectedPageCount==0, + DBG_ASSERT (mnSelectedPageCount==0, "PageSelector::DeselectAllPages: the selected pages counter is not 0"); mnSelectedPageCount = 0; mpMostRecentlySelectedPage.reset(); diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 02168ca4eb2d..1dedfe74b8d9 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.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 diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 0785f786366f..70dad4a5c8ee 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.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 @@ -95,13 +95,13 @@ void ScrollBarManager::Connect (void) mpVerticalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, VerticalScrollBarHandler)); if (mpHorizontalScrollBar != NULL) mpHorizontalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, HorizontalScrollBarHandler)); } @@ -121,14 +121,14 @@ void ScrollBarManager::Disconnect (void) /** Placing the scroll bars is an iterative process. The visibility of one scroll bar affects the remaining size and thus may lead to the other - scroll bar becoming visible. + scroll bar becoming visible. First we determine the visibility of the horizontal scroll bar. After that we do the same for the vertical scroll bar. To have an initial value for the required size we call the layouter before that. When one of the two scroll bars is made visible then the size of the browser window changes and a second call to the layouter becomes necessary. - That call is made anyway after this method returns. + That call is made anyway after this method returns. */ Rectangle ScrollBarManager::PlaceScrollBars (const Rectangle& rAvailableArea) { @@ -155,11 +155,11 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea // Place the scroll bar. Size aScrollBarSize (mpHorizontalScrollBar->GetSizePixel()); mpHorizontalScrollBar->SetPosSizePixel ( - Point(aAvailableArea.Left(), + Point(aAvailableArea.Left(), aAvailableArea.Bottom()-aScrollBarSize.Height()+1), - Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), + Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), aScrollBarSize.Height())); - + // Restore the relative position. mpHorizontalScrollBar->SetThumbPos( (long)(0.5 + mnHorizontalPosition * mpHorizontalScrollBar->GetRange().Len())); @@ -168,13 +168,13 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea - + void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) { if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible()) { - view::Layouter::DoublePoint aLayouterPosition + view::Layouter::DoublePoint aLayouterPosition = mrSlideSorter.GetView().GetLayouter().ConvertModelToLayouterCoordinates ( Point (0, mpVerticalScrollBar->GetThumbPos())); @@ -239,10 +239,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnHorizontalPosition = 0; } else - mnHorizontalPosition = + mnHorizontalPosition = double(mpHorizontalScrollBar->GetThumbPos()) / double(mpHorizontalScrollBar->GetRange().Len()); - + mpHorizontalScrollBar->SetVisibleSize (aWindowModelSize.Width()); const long nWidth (mpContentWindow->PixelToLogic( @@ -268,10 +268,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnVerticalPosition = 0; } else - mnVerticalPosition = + mnVerticalPosition = double(mpVerticalScrollBar->GetThumbPos()) / double(mpVerticalScrollBar->GetRange().Len()); - + mpVerticalScrollBar->SetVisibleSize (aWindowModelSize.Height()); const long nHeight (mpContentWindow->PixelToLogic( @@ -313,7 +313,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) / double(pScrollBar->GetRange().Len()); mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); mrSlideSorter.GetView().GetWindow()->SetVisibleXY ( - -1, + -1, nRelativePosition); } return TRUE; @@ -324,7 +324,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) { - if (pScrollBar!=NULL + if (pScrollBar!=NULL && pScrollBar==mpHorizontalScrollBar.get() && pScrollBar->IsVisible() && mrSlideSorter.GetView().GetWindow()!=NULL) @@ -542,15 +542,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.X() < maScrollBorder.Width() && aWindowArea.Left() > aViewPixelArea.Left()) { - nDx = -1 + (int)(mnHorizontalScrollFactor + nDx = -1 + (int)(mnHorizontalScrollFactor * (rMouseWindowPosition.X() - maScrollBorder.Width())); } if (rMouseWindowPosition.X() >= (aWindowSize.Width() - maScrollBorder.Width()) && aWindowArea.Right() < aViewPixelArea.Right()) { - nDx = 1 + (int)(mnHorizontalScrollFactor - * (rMouseWindowPosition.X() - aWindowSize.Width() + nDx = 1 + (int)(mnHorizontalScrollFactor + * (rMouseWindowPosition.X() - aWindowSize.Width() + maScrollBorder.Width())); } } @@ -561,15 +561,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.Y() < maScrollBorder.Height() && aWindowArea.Top() > aViewPixelArea.Top()) { - nDy = -1 + (int)(mnVerticalScrollFactor + nDy = -1 + (int)(mnVerticalScrollFactor * (rMouseWindowPosition.Y() - maScrollBorder.Height())); } if (rMouseWindowPosition.Y() >= (aWindowSize.Height() - maScrollBorder.Height()) && aWindowArea.Bottom() < aViewPixelArea.Bottom()) { - nDy = 1 + (int)(mnVerticalScrollFactor - * (rMouseWindowPosition.Y() - aWindowSize.Height() + nDy = 1 + (int)(mnVerticalScrollFactor + * (rMouseWindowPosition.Y() - aWindowSize.Height() + maScrollBorder.Height())); } } @@ -609,7 +609,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) if (mrSlideSorter.GetViewShell() != NULL) { mrSlideSorter.GetViewShell()->ScrollLines( - maAutoScrollOffset.Width(), + maAutoScrollOffset.Width(), maAutoScrollOffset.Height()); return true; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 905c3c3a7557..a6228a75df21 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.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 @@ -68,10 +68,10 @@ void SelectionCommand::operator() (void) OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); mrPageSelector.DeselectAllPages(); - + if (mnCurrentPageIndex >= 0) mpCurrentSlideManager->SwitchCurrentSlide(mnCurrentPageIndex); - + PageList::iterator iPage = maPagesToSelect.begin(); PageList::iterator iEnd = maPagesToSelect.end(); for (; iPage!=iEnd; ++iPage) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 8ca7f727ffa1..e42138a4f813 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c55e3dcc38b0..1a4f14be656c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.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 @@ -147,7 +147,7 @@ public: sal_uInt32 mnEventCode; EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter); EventDescriptor ( @@ -170,7 +170,7 @@ SelectionFunction::SelectionFunction ( mbProcessingMouseButtonDown(false), mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { - //af aDelayToScrollTimer.SetTimeout(50); + //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); } @@ -231,7 +231,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) else aDragTimer.Stop(); } - + Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel()); if ( ! aRectangle.IsInside(aMousePosition) && rOverlay.GetSubstitutionOverlay().isVisible()) @@ -239,7 +239,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) // Mouse left the window with pressed left button. Make it a drag. StartDrag(); } - else + else { // Call ProcessMouseEvent() only when one of the buttons is // pressed. This prevents calling the method on every motion. @@ -265,7 +265,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) if (aDragTimer.IsActive()) aDragTimer.Stop(); - + ProcessMouseEvent(BUTTON_UP, rEvent); mbProcessingMouseButtonDown = false; @@ -373,7 +373,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (mrController.GetProperties()->IsUIReadOnly()) break; - int nSelectedPagesCount = 0; + int nSelectedPagesCount = 0; // Count the selected pages and look if there any objects on any // of the selected pages so that we can warn the user and @@ -398,7 +398,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (rEvent.GetKeyCode().IsShift()) ProcessKeyEvent(rEvent); break; - + default: break; } @@ -579,7 +579,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) PageSelector& rSelector (mrController.GetPageSelector()); rOverlay.GetSelectionRectangleOverlay().setVisible(false); - + // Select all pages whose page object lies completly inside the drag // rectangle. const Rectangle& rSelectionRectangle ( @@ -592,7 +592,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) model::SharedPageDescriptor pDescriptor (aPages.GetNextElement()); Rectangle aPageBox (mrSlideSorter.GetView().GetPageBoundingBox( pDescriptor, - view::SlideSorterView::CS_MODEL, + view::SlideSorterView::CS_MODEL, view::SlideSorterView::BBT_SHAPE)); if (rSelectionRectangle.IsOver(aPageBox)) { @@ -773,7 +773,7 @@ void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent) // 1. Compute some frequently used values relating to the event. ::std::auto_ptr<EventDescriptor> pEventDescriptor ( new EventDescriptor(rEvent, mrSlideSorter)); - + // 2. Encode the event. pEventDescriptor->mnEventCode = EncodeKeyEvent(*pEventDescriptor, rEvent); @@ -904,7 +904,7 @@ bool SelectionFunction::EventProcessing (const EventDescriptor& rDescriptor) case BUTTON_UP | LEFT_BUTTON | SINGLE_CLICK | OVER_UNSELECTED_PAGE | CONTROL_MODIFIER: SelectHitPage(pHitDescriptor); PrepareMouseMotion(mpWindow->PixelToLogic(rDescriptor.maMousePosition)); - + break; // Range selection with the shift modifier. @@ -1090,7 +1090,7 @@ void SelectionFunction::SwitchView (const model::SharedPageDescriptor& rpDescrip //===== EventDescriptor ======================================================= SelectionFunction::EventDescriptor::EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter) : maMousePosition(), diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index e42bc19bb3cf..77e39f48156b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.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 diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index fdcb02f35946..800586e3a1ef 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.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 @@ -47,7 +47,7 @@ SlideFunction::SlideFunction ( SfxRequest& rRequest) : FuPoor ( rSlideSorter.GetViewShell(), - rSlideSorter.GetView().GetWindow(), + rSlideSorter.GetView().GetWindow(), &rSlideSorter.GetView(), rSlideSorter.GetModel().GetDocument(), rRequest) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index fd90023c6b92..6fb08e4e24f7 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.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 @@ -293,7 +293,7 @@ void SlotManager::FuPermanent (SfxRequest& rRequest) } //! das ist nur bis das ENUM-Slots sind - // Invalidate( SID_OBJECT_SELECT ); + // Invalidate( SID_OBJECT_SELECT ); } void SlotManager::FuSupport (SfxRequest& rRequest) @@ -615,7 +615,7 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) break; } } - + PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); if( (eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT ) ) { @@ -760,10 +760,10 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - SdPage* pPage = NULL; + SdPage* pPage = NULL; SdPage* pFirstPage = NULL; - USHORT nFirstPage; - USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); + USHORT nFirstPage; + USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); String aPageStr; String aLayoutStr; @@ -1025,7 +1025,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) = mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() - 1; rSelector.SelectPage(nInsertionIndex); } - + // Select the last page when there is at least one page. else if (rSelector.GetPageCount() > 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx index d39033ab67a5..a2da21e383d8 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.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 @@ -37,8 +37,8 @@ namespace sd { namespace slidesorter { namespace controller { Transferable::Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell) : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData), diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx index 84b522b5a3b7..1cf448511b9e 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx @@ -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 @@ -32,10 +32,10 @@ #include "sdxfer.hxx" class SdDrawDocument; -namespace sd +namespace sd { class pWorkView; - namespace slidesorter + namespace slidesorter { class SlideSorterViewShell; } @@ -49,10 +49,10 @@ namespace sd { namespace slidesorter { namespace controller { class Transferable : public SdTransferable { -public: +public: Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell); diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index de5fec6dadd8..fe70b2461658 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 0eadb8beec1c..95d9bf1be815 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index a3150ff65df5..2416c99295b0 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -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 @@ -92,7 +92,7 @@ public: /** This is an information to the cache manager that the size of preview bitmaps in the specified cache has changed. - + */ ::boost::shared_ptr<Cache> ChangeSize ( const ::boost::shared_ptr<Cache>& rpCache, @@ -135,7 +135,7 @@ private: slide sorter. */ const sal_uInt32 mnMaximalRecentlyCacheCount; - + PageCacheManager (void); ~PageCacheManager (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index be2f09b58f73..4c7c8ac8edf5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -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 @@ -79,7 +79,7 @@ public: */ SlideSorterController (SlideSorter& rSlideSorter); - /** Late initialization. Call this method once a new new object has been + /** Late initialization. Call this method once a new new object has been created. */ virtual void Init (void); @@ -139,7 +139,7 @@ public: void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); bool Command ( - const CommandEvent& rEvent, + const CommandEvent& rEvent, ::sd::Window* pWindow); void GetCtrlState (SfxItemSet &rSet); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 3fa16dee7f65..75660b90f174 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index a475b7a7166b..20d0e788f31e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -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 @@ -85,16 +85,16 @@ public: sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); protected: @@ -129,7 +129,7 @@ private: bool mbUpdateSelectionPending; void CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag); /** Select the pages stored in the maPagesToSelect member. The list in diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 6bc502be4768..769cb2372cca 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -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 @@ -75,7 +75,7 @@ public: /** Release all references to model data. */ void PrepareModelChange (void); - + /** Modify inner state in reaction to a change of the SlideSorterModel. */ void HandleModelChange (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 9a3df93f5f96..f647f914e318 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -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 @@ -48,7 +48,7 @@ namespace sd { namespace slidesorter { namespace controller { focused state of the focus page can be toggled with the ToggleFocus() method. */ -class FocusManager +class FocusManager { public: /** Create a new focus manager that operates on the pages of the model @@ -174,7 +174,7 @@ public: typically the tool bar with the close button. */ void SetFocusToToolBox (void); - + /** Create an instance of this class to temporarily hide the focus indicator. It is restored to its former visibility state when the FocusHider is destroyed. @@ -203,7 +203,7 @@ private: bool mbPageIsFocused; ::std::vector<Link> maFocusChangeListeners; - + /** Reset the focus state of the given descriptor and request a repaint so that the focus indicator is hidden. @param pDescriptor diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx index db39444aea1f..fef75520ca22 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx @@ -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 @@ -56,7 +56,7 @@ class Properties; /** This class is a factory for the creation of objects that represent page objects (shapes). This includes the contact objects of the drawing layer. - + <p>The factory methods are called by the model::PageDescriptor and the standard implementations of the contact objects.</p> diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 58c44698c7ec..11594a03a493 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -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 @@ -86,7 +86,7 @@ public: method is a subsitute for SlideSorterModel::GetPageDescriptor(i)->IsSelected() is included here to make this class more self contained. - */ + */ bool IsPageSelected (int nPageIndex); /** Deselect the descriptor that is associated with the given page. @@ -123,7 +123,7 @@ public: works only when the page has not been de-selected in the mean time. This method helps the view when it scrolls the selection into the visible area. - @return + @return When the selection is empty or when the most recently selected page has been deselected already (but other pages are still selected) then NULL is returned, even when a selection did exist @@ -173,7 +173,7 @@ private: /// Anchor for a range selection. model::SharedPageDescriptor mpSelectionAnchor; model::SharedPageDescriptor mpCurrentPage; - + void CountSelectedPages (void); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 7a6eeac00eba..905f5aeccc72 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 1f9e0552f1fb..d3c25c81025e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -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 @@ -53,7 +53,7 @@ namespace sd { namespace slidesorter { namespace controller { /** Manage the horizontal and vertical scroll bars. Listen for events, set their sizes, place them in the window, determine their visibilities. - + <p>Handle auto scrolling, i.e. the scrolling of the window when the mouse comes near the window border while dragging a selection.</p> @@ -93,7 +93,7 @@ public: into a cache for later reuse. */ void Disconnect (void); - + /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages were inserted or deleted, the layout or the zoom factor has @@ -170,7 +170,7 @@ private: objects of this class. It is given to the constructor. */ ::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar; - + /** The vertical scroll bar. Note that is used but not owned by objects of this class. It is given to the constructor. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index f0ff0e1dea52..f69f6e1fefa2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -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 @@ -48,24 +48,24 @@ namespace sd { namespace slidesorter { namespace controller { class SlideSorterController; -class SelectionFunction +class SelectionFunction : public SlideFunction { public: TYPEINFO(); static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - + // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren - + + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren + virtual void ScrollStart(); virtual void ScrollEnd(); @@ -82,7 +82,7 @@ public: This is used when a function gets a KEY_ESCAPE but can also be called directly. - @returns + @returns true if a active function was aborted */ virtual bool cancel(); @@ -110,7 +110,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/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 344adf3e8775..70cfc409214b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -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 @@ -58,7 +58,7 @@ public: /** Create a new SelectionManger for the given slide sorter. */ SelectionManager (SlideSorter& rSlideSorter); - + ~SelectionManager (void); /** Delete the currently selected slides. When this method returns the @@ -80,7 +80,7 @@ public: moved to the visible area of the slide sorter view. */ bool IsMakeSelectionVisiblePending (void) const; - + enum SelectionHint { SH_FIRST, SH_LAST, SH_RECENT }; /** Try to make all currently selected page objects visible, i.e. set diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index ca7ee78c957d..3a1b46675673 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 083267da5c07..d56fc1b44388 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -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 @@ -49,7 +49,7 @@ class Command; /** This manager takes over the work of handling slot calls from the controller of the slide sorter. */ -class SlotManager +class SlotManager { public: /** Create a new slot manager that handles slot calls for the controller diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index cef44ec61ac3..9cb743ffc174 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -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 @@ -126,7 +126,7 @@ public: */ sal_Int32 GetIndex ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& rxSlide) const; - + /** Call this method after the document has changed its structure. This will get the model in sync with the SdDrawDocument. This method tries not to throw away to much information already gathered. This diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index fe4b1cc12506..ff3e45018957 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -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 @@ -47,7 +47,7 @@ public: virtual T GetNextElement (void) = 0; virtual void Rewind (void) = 0; virtual ::std::auto_ptr<Enumeration<T> > Clone (void) = 0; -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index d184777fa605..892b3b8171d3 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -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 @@ -59,9 +59,9 @@ class SlideRenderer; namespace css = ::com::sun::star; -/** Each PageDescriptor object represents the preview of one draw page, +/** Each PageDescriptor object represents the preview of one draw page, slide, or master page of a Draw or Impress document as they are displayed - in the slide sorter. This class gives access to some associated + in the slide sorter. This class gives access to some associated information like prerendered preview or position on the screen. <p>Bounding boxes of page objects come in four varieties: @@ -79,7 +79,7 @@ public: @param pPage The page pointer can in some situations not be detected from rxPage, e.g. after undo of page deletion. Therefore supply it - seperately. + seperately. @param nIndex This index is displayed in the view as page number. It is not necessaryily the page index (not even when you add or subtract 1 @@ -109,8 +109,8 @@ public: /** Return <TRUE/> when the page object is fully or parially visible. */ bool IsVisible (void) const; - /** Set the visible state that is returned by the IsVisible() method. - This method is typically called by the view who renders the object + /** Set the visible state that is returned by the IsVisible() method. + This method is typically called by the view who renders the object onto the screen. */ void SetVisible (bool bVisible); @@ -184,9 +184,9 @@ private: /// The factory that is used to create PageObject objects. const controller::PageObjectFactory* mpPageObjectFactory; - + /** The page object will be destroyed by the page into which it has - been inserted. + been inserted. */ view::PageObject* mpPageObject; diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 36a49f720589..abbd121c1d16 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -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 @@ -120,7 +120,7 @@ private: PageEnumeration (::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration (void); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx index 6f9923308374..f587586e5b60 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx @@ -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 @@ -49,12 +49,12 @@ public: selected slides of the given model. */ static PageEnumeration CreateSelectedPagesEnumeration (const SlideSorterModel& rModel); - + /** The returned enumeration of slides iterates over the slides (partially) inside the visible area. */ static PageEnumeration CreateVisiblePagesEnumeration (const SlideSorterModel& rModel); -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx index 93bcf89215e6..746681530e9c 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b4cdfecbcd2e..d9ccff6451f4 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -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 @@ -77,7 +77,7 @@ public: @param rViewShell This reference is simply passed to the base class and not used by this class. - + */ SlideSorterView (SlideSorter& rSlideSorter); @@ -187,7 +187,7 @@ public: view::ViewOverlay& GetOverlay (void); /** Set the bounding box of the insertion marker in model coordinates. - + It will be painted as a dark rectangle that fills the given box. */ void SetInsertionMarker (const Rectangle& rBBox); @@ -197,7 +197,7 @@ public: void SetInsertionMarkerVisibility (bool bVisible); /** Set the size and position of the selection rectangle. - + It will be painted as a dashed rectangle. */ void SetSelectionRectangle (const Rectangle& rBox); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 82487471edb0..bef3a05c5706 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 22a614d65fe6..e5ed8f553799 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -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 @@ -41,7 +41,7 @@ class Size; namespace sd { namespace slidesorter { namespace view { -/** Calculate the size and position of page objects displayed by a slide +/** Calculate the size and position of page objects displayed by a slide sorter. The layouter takes into account various input values: 1.) Size of the window in which the slide sorter is displayed. 2.) Desired and minimal and maximal widths of page objects. @@ -55,7 +55,7 @@ namespace sd { namespace slidesorter { namespace view { 2.) The number of columns. 3.) The size of the enclosing page. - <p>Sizes and lengths are all in pixel except where explicitly stated + <p>Sizes and lengths are all in pixel except where explicitly stated otherwise.</p> <p>The GetIndex... methods may return indices that are larger than or @@ -115,7 +115,7 @@ public: @param nMaximalColumnCount The default value is 5. */ - void SetColumnCount (sal_Int32 nMinimalColumnCount, + void SetColumnCount (sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount); /** Central method of this class. It takes the input values and @@ -134,12 +134,12 @@ public: used to obtain valid values (<TRUE/>). */ bool RearrangeHorizontal ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice, const sal_uInt32 nPageCount); bool RearrangeVertical ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice); @@ -187,7 +187,7 @@ public: the right of the page object. */ Rectangle GetInsertionMarkerBox ( - sal_Int32 nIndex, + sal_Int32 nIndex, bool bVertical, bool bLeftOrTop) const; @@ -268,12 +268,12 @@ public: const DoublePoint&rLayouterPoint) const; typedef ::std::vector<Rectangle> BackgroundRectangleList; - + private: - class ScreenAndModelValue {public: + class ScreenAndModelValue {public: sal_Int32 mnScreen,mnModel; explicit ScreenAndModelValue (sal_Int32 nScreen, sal_Int32 nModel = 0) - : mnScreen(nScreen),mnModel(nModel) {} + : mnScreen(nScreen),mnModel(nModel) {} }; ScreenAndModelValue mnRequestedLeftBorder; ScreenAndModelValue mnRequestedRightBorder; @@ -322,7 +322,7 @@ private: row above or below respectively. */ sal_Int32 GetRowAtPosition ( - sal_Int32 nYPosition, + sal_Int32 nYPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; @@ -342,13 +342,13 @@ private: gap area with the column to the left or right respectively. */ sal_Int32 GetColumnAtPosition ( - sal_Int32 nXPosition, + sal_Int32 nXPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; /** This method is typically called from GetRowAtPosition() and GetColumnAtPosition() to handle a position that lies inside the gap - between two adjacent rows or columns. + between two adjacent rows or columns. @param nDistanceIntoGap Vertical distance from the bottom of the upper row down into the gap or or horizontal distance from the right edge right into the diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx index 27207ed9570b..e58e48ca701c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx @@ -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,7 @@ class PageObject { public: PageObject ( - const Rectangle& rRect, + const Rectangle& rRect, SdrPage* pPage, const model::SharedPageDescriptor& rpDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index 815a9382b682..59033cd101c7 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -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 @@ -53,16 +53,16 @@ class PageObjectViewContact { public: PageObjectViewContact ( - SdrPageObj& rPageObj, + SdrPageObj& rPageObj, const model::SharedPageDescriptor& rpDescriptor); ~PageObjectViewContact (void); /** Create a ViewObjectContact object that buffers its output in a - bitmap. + bitmap. @return Ownership of the new object passes to the caller. */ - virtual ::sdr::contact::ViewObjectContact& + virtual ::sdr::contact::ViewObjectContact& CreateObjectSpecificViewObjectContact( ::sdr::contact::ObjectContact& rObjectContact); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 4040d31aa694..df3d69f14cc0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx @@ -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 @@ -78,7 +78,7 @@ public: preview is created every time when requested. */ PageObjectViewObjectContact ( - ::sdr::contact::ObjectContact& rObjectContact, + ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact, const ::boost::shared_ptr<cache::PageCache>& rpCache, const ::boost::shared_ptr<controller::Properties>& rpProperties); @@ -158,7 +158,7 @@ public: enum CoordinateSystem { ModelCoordinateSystem, PixelCoordinateSystem }; /** Return the bounding box of the page object or one of its graphical - parts. + parts. @param rDevice This device is used to translate between model and window coordinates. diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx index f4a0fbba4693..bebaf347726b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx @@ -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 @@ -193,7 +193,7 @@ protected: private: sal_Int32 mnInsertionIndex; Rectangle maBoundingBox; - + void SetPositionAndSize (const Rectangle& rBoundingBox); }; @@ -242,7 +242,7 @@ private: The view overlay itself simply gives access to the more specialized classes that handle individual indicators. - + */ class ViewOverlay { diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index d0fdf848f06f..27cb286cbd8f 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.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 @@ -186,7 +186,7 @@ SharedPageDescriptor SlideSorterModel::GetPageDescriptor ( sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSlide) const { ::osl::MutexGuard aGuard (maMutex); - + // First try to guess the right index. Reference<beans::XPropertySet> xSet (rxSlide, UNO_QUERY); if (xSet.is()) @@ -216,7 +216,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex) { SharedPageDescriptor pDescriptor (maPageDescriptors[nIndex]); - + // Make sure that the descriptor exists. Without it the given slide // can not be found. if (pDescriptor.get() == NULL) @@ -224,7 +224,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli // Call GetPageDescriptor() to create the missing descriptor. pDescriptor = GetPageDescriptor(nIndex,true); } - + if (pDescriptor->GetXDrawPage() == rxSlide) return nIndex; } @@ -307,7 +307,7 @@ void SlideSorterModel::SetPageObjectFactory( -const controller::PageObjectFactory& +const controller::PageObjectFactory& SlideSorterModel::GetPageObjectFactory (void) const { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 9a3ddc3ac8a0..a1a166c4f112 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.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 @@ -204,7 +204,7 @@ void PageDescriptor::RemoveFocus (void) -view::PageObjectViewObjectContact* +view::PageObjectViewObjectContact* PageDescriptor::GetViewObjectContact (void) const { return mpViewObjectContact; diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 3eac80cbd5b0..797175cb85a1 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.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 @@ -72,7 +72,7 @@ private: inline void AdvanceToNextValidElement (void); // Default constructor not implemented. - PageEnumerationImpl (void); + PageEnumerationImpl (void); // Assignment operator not implemented. PageEnumerationImpl& operator= (const PageEnumerationImpl&); }; @@ -92,10 +92,10 @@ PageEnumeration PageEnumeration::Create ( return PageEnumeration(::std::auto_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(rModel, rPredicate))); } - - - - + + + + PageEnumeration::PageEnumeration ( ::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl) : mpImpl(pImpl) @@ -199,7 +199,7 @@ PageEnumerationImpl::PageEnumerationImpl ( PageEnumerationImpl::PageEnumerationImpl ( - const SlideSorterModel& rModel, + const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate, int nIndex) : mrModel(rModel), diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx index 8d6ccdd0530a..15b44b1754ba 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.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 @@ -57,7 +57,7 @@ class SelectedPagesPredicate public: bool operator() (const SharedPageDescriptor& rpDescriptor) { - return rpDescriptor->IsSelected(); + return rpDescriptor->IsSelected(); } }; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 47f3f56bc1c9..7fa314ae34fb 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.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 @@ -352,18 +352,18 @@ void SlideSorter::SetupListeners (void) pParentWindow->AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); pWindow->AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } Application::AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); mpSlideSorterController->GetScrollBarManager().Connect(); @@ -382,19 +382,19 @@ void SlideSorter::ReleaseListeners (void) pWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); ::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } Application::RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } @@ -409,7 +409,7 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView.reset(CreateView()); DBG_ASSERT (mpSlideSorterView.get()!=NULL, - "Can not create view for slide browser"); + "Can not create view for slide browser"); mpSlideSorterController.reset(CreateController()); DBG_ASSERT (mpSlideSorterController.get()!=NULL, @@ -511,7 +511,7 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow) if (mpViewShell != NULL) mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); - + SetupControls(mpViewShell->GetParentWindow()); SetupListeners(); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx index 79b14e6f4ccd..28334244ca5a 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.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 @@ -41,18 +41,18 @@ namespace sd { namespace slidesorter { SlideSorterChildWindow::SlideSorterChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : SfxChildWindow (pParentWindow, nId) { pWindow = new SlideSorter ( - pBindings, - this, + pBindings, + this, pParentWindow); eChildAlignment = SFX_ALIGN_LEFT; static_cast<SfxDockingWindow*>(pWindow)->Initialize (pInfo); - // SetHideNotDelete (TRUE); + // SetHideNotDelete (TRUE); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src index 829b18d63a97..490e9dde1c2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src @@ -1,7 +1,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 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index e24da73862e1..16c60e9f213f 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.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 @@ -141,7 +141,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) try { mxViewId = Reference<XResourceId>(rArguments[0], UNO_QUERY_THROW); - + // Get the XController. Reference<frame::XController> xController (rArguments[1], UNO_QUERY_THROW); @@ -295,7 +295,7 @@ Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlide { return mpSlideSorter->GetModel().GetDocumentSlides(); } - + @@ -307,7 +307,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } - + @@ -421,7 +421,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen return mpSlideSorter->GetController().GetProperties() ->IsSuspendPreviewUpdatesDuringFullScreenPresentation(); } - + @@ -434,7 +434,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres mpSlideSorter->GetController().GetProperties() ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } - + @@ -447,7 +447,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) else return mpSlideSorter->GetView().GetOrientation() == SlideSorterView::VERTICAL; } - + @@ -473,7 +473,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) else return mpSlideSorter->GetController().GetProperties()->IsSmoothSelectionScrolling(); } - + diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 12f6d629266c..cbbee0e1c94a 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -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 @@ -72,7 +72,7 @@ public: // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -87,7 +87,7 @@ public: // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -117,48 +117,48 @@ public: // Attributes - + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsHighlightCurrentSlide (::sal_Bool bIsHighlightCurrentSlide) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsShowSelection (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsCenterSelection (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsOrientationVertical (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException); @@ -203,7 +203,7 @@ private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; css::uno::Reference<css::awt::XWindow> mxParentWindow; ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; - + void Resize (void); /** This method throws a DisposedException when the object has already been diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 61efa5ebd1a3..afdc634c54d2 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.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 @@ -71,7 +71,7 @@ #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> -using namespace ::sd::slidesorter; +using namespace ::sd::slidesorter; #define SlideSorterViewShell #include "sdslots.hxx" @@ -95,7 +95,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument) @@ -120,7 +120,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); SlideSorterViewShell::SlideSorterViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument) @@ -216,7 +216,7 @@ void SlideSorterViewShell::Init (bool bIsMainViewShell) SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase) { SlideSorterViewShell* pViewShell = NULL; - + // Test the center, left, and then the right pane for showing a slide sorter. ::rtl::OUString aPaneURLs[] = { FrameworkHelper::msCenterPaneURL, @@ -257,7 +257,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController *mpSlideSorter, *GetView())); } - + return xSubController; } @@ -363,10 +363,10 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const -SdPage* SlideSorterViewShell::GetActualPage (void) +SdPage* SlideSorterViewShell::GetActualPage (void) { SdPage* pCurrentPage = NULL; - + // 1. Try to get the current page from the view shell in the center pane // (if we are that not ourself). if ( ! IsMainViewShell()) @@ -375,7 +375,7 @@ SdPage* SlideSorterViewShell::GetActualPage (void) if (pMainViewShell.get() != NULL) pCurrentPage = pMainViewShell->GetActualPage(); } - + if (pCurrentPage == NULL) { model::SharedPageDescriptor pDescriptor ( @@ -383,7 +383,7 @@ SdPage* SlideSorterViewShell::GetActualPage (void) if (pDescriptor.get() != NULL) pCurrentPage = pDescriptor->GetPage(); } - + return pCurrentPage; } @@ -514,7 +514,7 @@ void SlideSorterViewShell::PrePaint() void SlideSorterViewShell::Paint ( - const Rectangle& rBBox, + const Rectangle& rBBox, ::sd::Window* pWindow) { SetActiveWindow (pWindow); @@ -547,7 +547,7 @@ SvBorder SlideSorterViewShell::GetBorder (bool ) void SlideSorterViewShell::Command ( - const CommandEvent& rEvent, + const CommandEvent& rEvent, ::sd::Window* pWindow) { OSL_ASSERT(mpSlideSorter.get()!=NULL); @@ -577,7 +577,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) else rView.GetLayouter().SetColumnCount(nSlidesPerRow,nSlidesPerRow); mpSlideSorter->GetController().Rearrange(true); - + // DrawMode for 'main' window if (GetActiveWindow()->GetDrawMode() != pFrameView->GetDrawMode() ) GetActiveWindow()->SetDrawMode( pFrameView->GetDrawMode() ); @@ -688,7 +688,7 @@ void SlideSorterViewShell::StartDrag ( { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetClipboard().StartDrag ( - rDragPt, + rDragPt, pWindow); } @@ -707,14 +707,14 @@ void SlideSorterViewShell::DragFinished ( sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().AcceptDrop ( - rEvt, + rEvt, rTargetHelper, pTargetWindow, nPage, @@ -725,15 +725,15 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( sal_Int8 SlideSorterViewShell::ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().ExecuteDrop ( - rEvt, + rEvt, rTargetHelper, pTargetWindow, nPage, diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 50ac6db334c7..134b59e6192a 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.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 @@ -85,8 +85,8 @@ TYPEINIT1(SlideSorterView, ::sd::View); SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) : ::sd::View ( - rSlideSorter.GetModel().GetDocument(), - NULL, + rSlideSorter.GetModel().GetDocument(), + NULL, rSlideSorter.GetViewShell()), mrSlideSorter(rSlideSorter), mrModel(rSlideSorter.GetModel()), @@ -140,7 +140,7 @@ SlideSorterView::~SlideSorterView (void) } mpPreviewCache.reset(); - // hide the page to avoid problems in the view when deleting + // hide the page to avoid problems in the view when deleting // visualized objects HideSdrPage(); @@ -154,7 +154,7 @@ SlideSorterView::~SlideSorterView (void) sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rPosition) const { sal_Int32 nIndex (-1); - + ::sd::Window* pWindow = GetWindow(); if (pWindow != NULL) { @@ -204,8 +204,8 @@ void SlideSorterView::LocalModelHasChanged(void) // Initialize everything that depends on a page view, now that we have // one. - // SetApplicationDocumentColor( - // Application::GetSettings().GetStyleSettings().GetWindowColor()); + // SetApplicationDocumentColor( + // Application::GetSettings().GetStyleSettings().GetWindowColor()); UpdatePageBorders(); } @@ -284,7 +284,7 @@ void SlideSorterView::HandleDrawModeChange (void) new controller::PageObjectFactory( GetPreviewCache(), mrSlideSorter.GetController().GetProperties()))); - + RequestRepaint(); } @@ -354,13 +354,13 @@ void SlideSorterView::Layout () SdrPageObj* pPageObject = pDescriptor->GetPageObject(); Rectangle aPageObjectBox (mpLayouter->GetPageObjectBox (nIndex)); pPageObject->SetSnapRect(aPageObjectBox); - + nIndex += 1; } // Set the page so that it encloses all page objects. mpPage->SetSize (aViewBox.GetSize()); } - + InvalidatePageObjectVisibilities (); } @@ -388,14 +388,14 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) Point(0,0), pWindow->GetSizePixel()); aViewArea = pWindow->PixelToLogic (aViewArea); - int nFirstIndex = + int nFirstIndex = mpLayouter->GetIndexOfFirstVisiblePageObject (aViewArea); - int nLastIndex = + int nLastIndex = mpLayouter->GetIndexOfLastVisiblePageObject (aViewArea); // For page objects that just dropped off the visible area we // decrease the priority of pending requests for preview bitmaps. - + int nMinIndex = ::std::min (mnFirstVisiblePageIndex, nFirstIndex); int nMaxIndex = ::std::max (mnLastVisiblePageIndex, nLastIndex); if (mnFirstVisiblePageIndex!=nFirstIndex || mnLastVisiblePageIndex!=nLastIndex) @@ -433,7 +433,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) // Tell the listeners that the visibility of some objects has changed. ::std::vector<Link> aChangeListeners (maVisibilityChangeListeners); - for (::std::vector<Link>::const_iterator + for (::std::vector<Link>::const_iterator iListener=aChangeListeners.begin(), iEnd=aChangeListeners.end(); iListener!=iEnd; @@ -442,7 +442,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) iListener->Call(NULL); } } - } + } } @@ -457,7 +457,7 @@ void SlideSorterView::UpdatePreciousFlags (void) model::SharedPageDescriptor pDescriptor; ::boost::shared_ptr<cache::PageCache> pCache = GetPreviewCache(); sal_Int32 nPageCount (mrModel.GetPageCount()); - + for (int nIndex=0; nIndex<=nPageCount; ++nIndex) { pDescriptor = mrModel.GetPageDescriptor(nIndex); @@ -599,7 +599,7 @@ void SlideSorterView::CompleteRedraw(OutputDevice* pDevice, const Region& rPaint void SlideSorterView::InvalidateOneWin (::Window& rWindow) { - // if ( IsInvalidateAllowed() ) + // if ( IsInvalidateAllowed() ) View::InvalidateOneWin (rWindow); } @@ -607,10 +607,10 @@ void SlideSorterView::InvalidateOneWin (::Window& rWindow) void SlideSorterView::InvalidateOneWin ( - ::Window& rWindow, + ::Window& rWindow, const Rectangle& rPaintArea) { - // if( IsInvalidateAllowed() ) + // if( IsInvalidateAllowed() ) View::InvalidateOneWin (rWindow, rPaintArea); } @@ -642,7 +642,7 @@ void SlideSorterView::AdaptBoundingBox ( { // The relevant offsets are given in pixel values. Therefore // transform the box first into screen coordinates. - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->LogicToPixel (rModelPageObjectBoundingBox); aCurrentCoordinateSystem = CS_SCREEN; } @@ -657,10 +657,10 @@ void SlideSorterView::AdaptBoundingBox ( if (eCoordinateSystem != aCurrentCoordinateSystem) { if (eCoordinateSystem == CS_MODEL) - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->PixelToLogic (rModelPageObjectBoundingBox); else - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->LogicToPixel (rModelPageObjectBoundingBox); } } @@ -721,7 +721,7 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint void SlideSorterView::UpdatePageBorders (void) -{ +{ maPagePixelBorder = SvBorder(); ::sd::Window* pWindow = GetWindow(); if (mrModel.GetPageCount()>0 && pWindow!=NULL) @@ -746,7 +746,7 @@ void SlideSorterView::UpdatePageBorders (void) maModelBorder.Top() += aBorderSize.Height(); maModelBorder.Bottom() += aBorderSize.Height(); } - + // Set the border at all page descriptors so that the contact // objects have access to them. model::PageEnumeration aPageEnumeration ( diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index de4a42483a37..faaad4c3baed 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.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 @@ -114,11 +114,11 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont())); maFont->SetTransparent(TRUE); maFont->SetWeight(WEIGHT_NORMAL); - + // Transform the point size to pixel size. MapMode aFontMapMode (MAP_POINT); Size aFontSize (rDevice.LogicToPixel(maFont->GetSize(), aFontMapMode)); - + // Transform the font size to the logical coordinates of the device. maFont->SetSize (rDevice.PixelToLogic(aFontSize)); @@ -126,7 +126,7 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi // devices or modified zoom scales on future calls. maMapMode = rDevice.GetMapMode(); } - + return maFont; } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 698693b1be0d..d967a191df2b 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.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 @@ -73,9 +73,9 @@ Layouter::~Layouter (void) void Layouter::SetBorders ( - sal_Int32 nLeftBorder, + sal_Int32 nLeftBorder, sal_Int32 nRightBorder, - sal_Int32 nTopBorder, + sal_Int32 nTopBorder, sal_Int32 nBottomBorder) { if (nLeftBorder >= 0) @@ -92,9 +92,9 @@ void Layouter::SetBorders ( void Layouter::SetPageBorders ( - sal_Int32 nLeftBorder, + sal_Int32 nLeftBorder, sal_Int32 nRightBorder, - sal_Int32 nTopBorder, + sal_Int32 nTopBorder, sal_Int32 nBottomBorder) { if (nLeftBorder >= 0) @@ -111,7 +111,7 @@ void Layouter::SetPageBorders ( void Layouter::SetColumnCount ( - sal_Int32 nMinimalColumnCount, + sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount) { if (nMinimalColumnCount <= nMaximalColumnCount) @@ -171,11 +171,11 @@ bool Layouter::RearrangeHorizontal ( sal_uInt32 nTargetHeight = 0; sal_uInt32 nRowCount = 1; if (mnColumnCount > 0) - nTargetHeight = (rWindowSize.Height() + nTargetHeight = (rWindowSize.Height() - mnTopBorder.mnScreen - mnBottomBorder.mnScreen - - nRowCount * (mnTopPageBorder.mnScreen - + mnBottomPageBorder.mnScreen) + - nRowCount * (mnTopPageBorder.mnScreen + + mnBottomPageBorder.mnScreen) - (nRowCount-1) * mnTotalVerticalGap.mnScreen ) / nRowCount; @@ -197,7 +197,7 @@ bool Layouter::RearrangeHorizontal ( pDevice->SetMapMode (aMapMode); // Calculate the resulting scale factor and the page object size in - // pixels. + // pixels. maPageObjectModelSize = rPageObjectSize; int nPagePixelHeight (pDevice->LogicToPixel(maPageObjectModelSize).Height()); @@ -232,7 +232,7 @@ bool Layouter::RearrangeVertical ( + mnTopPageBorder.mnScreen + mnBottomPageBorder.mnScreen; // Calculate the column count. - mnColumnCount = (rWindowSize.Width() + mnColumnCount = (rWindowSize.Width() - mnRequestedLeftBorder.mnScreen - mnRequestedRightBorder.mnScreen) / (mnPreferredWidth + mnTotalHorizontalGap.mnScreen); if (mnColumnCount < mnMinimalColumnCount) @@ -267,11 +267,11 @@ bool Layouter::RearrangeVertical ( // Calculate the width of each page object. sal_Int32 nTargetWidth = 0; if (mnColumnCount > 0) - nTargetWidth = (rWindowSize.Width() + nTargetWidth = (rWindowSize.Width() - mnLeftBorder.mnScreen - mnRightBorder.mnScreen - - mnColumnCount * (mnRightPageBorder.mnScreen - + mnLeftPageBorder.mnScreen) + - mnColumnCount * (mnRightPageBorder.mnScreen + + mnLeftPageBorder.mnScreen) - (mnColumnCount-1) * mnTotalHorizontalGap.mnScreen ) / mnColumnCount; @@ -289,7 +289,7 @@ bool Layouter::RearrangeVertical ( pDevice->SetMapMode (aMapMode); // Calculate the resulting scale factor and the page object size in - // pixels. + // pixels. maPageObjectModelSize = rPageObjectSize; int nPagePixelWidth (pDevice->LogicToPixel (maPageObjectModelSize).Width()); @@ -354,7 +354,7 @@ void Layouter::SetZoom (Fraction nZoomFactor, OutputDevice* pDevice) mnRightPageBorder.mnModel = aBottomRightPageBorder.Width(); mnBottomPageBorder.mnModel = aBottomRightPageBorder.Height(); - mnInsertionMarkerThickness.mnModel = pDevice->PixelToLogic ( + mnInsertionMarkerThickness.mnModel = pDevice->PixelToLogic ( Size(mnInsertionMarkerThickness.mnScreen,0)).Width(); } @@ -382,7 +382,7 @@ Rectangle Layouter::GetPageObjectBox (sal_Int32 nIndex) const int nColumn = nIndex % mnColumnCount; int nRow = nIndex / mnColumnCount; return Rectangle ( - Point (mnLeftBorder.mnModel + Point (mnLeftBorder.mnModel + nColumn * maPageObjectModelSize.Width() + mnLeftPageBorder.mnModel + (nColumn>0 ? nColumn : 0) * mnTotalHorizontalGap.mnModel, @@ -403,20 +403,20 @@ Rectangle Layouter::GetPageBox (sal_Int32 nObjectCount) const if (mnColumnCount > 0) { sal_Int32 nRowCount = (nObjectCount+mnColumnCount-1) / mnColumnCount; - nHorizontalSize = + nHorizontalSize = mnLeftBorder.mnModel + mnRightBorder.mnModel + mnColumnCount * maPageObjectModelSize.Width() + mnLeftPageBorder.mnModel + mnRightPageBorder.mnModel; if (mnColumnCount > 1) - nHorizontalSize + nHorizontalSize += (mnColumnCount-1) * mnTotalHorizontalGap.mnModel; - nVerticalSize = + nVerticalSize = mnTopBorder.mnModel + mnBottomBorder.mnModel + nRowCount * maPageObjectModelSize.Height() + mnTopPageBorder.mnModel + mnBottomPageBorder.mnModel; - if (nRowCount > 1) + if (nRowCount > 1) nVerticalSize += (nRowCount-1) * mnTotalVerticalGap.mnModel; } @@ -430,7 +430,7 @@ Rectangle Layouter::GetPageBox (sal_Int32 nObjectCount) const Rectangle Layouter::GetInsertionMarkerBox ( - sal_Int32 nIndex, + sal_Int32 nIndex, bool bVertical, bool bLeftOrTop) const { @@ -443,14 +443,14 @@ Rectangle Layouter::GetInsertionMarkerBox ( if (bLeftOrTop) { // Left. - aBox.Left() -= mnLeftPageBorder.mnModel + aBox.Left() -= mnLeftPageBorder.mnModel + mnHorizontalGap.mnModel - nHorizontalInsertionMarkerOffset; } else { // Right. - aBox.Left() = aBox.Right() + aBox.Left() = aBox.Right() + mnRightPageBorder.mnModel + nHorizontalInsertionMarkerOffset; } @@ -470,8 +470,8 @@ Rectangle Layouter::GetInsertionMarkerBox ( else { // Below. - aBox.Top() = aBox.Bottom() - + mnBottomPageBorder.mnModel + aBox.Top() = aBox.Bottom() + + mnBottomPageBorder.mnModel + nVerticalInsertionMarkerOffset; } aBox.Bottom() = aBox.Top() + mnInsertionMarkerThickness.mnModel; @@ -496,7 +496,7 @@ sal_Int32 Layouter::GetIndexOfFirstVisiblePageObject ( sal_Int32 Layouter::GetIndexOfLastVisiblePageObject ( const Rectangle& aVisibleArea) const { - sal_Int32 nRow = GetRowAtPosition (aVisibleArea.Bottom(), + sal_Int32 nRow = GetRowAtPosition (aVisibleArea.Bottom(), true, GM_BOTH); return (nRow+1) * mnColumnCount - 1; } @@ -508,13 +508,13 @@ sal_Int32 Layouter::GetIndexAtPoint ( const Point& rPosition, bool bIncludePageBorders) const { - sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), + sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), bIncludePageBorders, bIncludePageBorders ? GM_PAGE_BORDER : GM_NONE); - sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), + sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), bIncludePageBorders, bIncludePageBorders ? GM_PAGE_BORDER : GM_NONE); - + if (nRow >= 0 && nColumn >= 0) return nRow * mnColumnCount + nColumn; else @@ -532,7 +532,7 @@ sal_Int32 Layouter::GetIndexAtPoint ( will yield valid return values. The horizontal positions between the center of page objects in column i and the center of page objects in column i+1 will return column i+1 as insertion index. - + When there is only one column and bAllowVerticalPosition is true than take the vertical areas between rows into account as well. */ @@ -542,34 +542,34 @@ sal_Int32 Layouter::GetInsertionIndex ( { sal_Int32 nIndex = -1; - sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), true, + sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), true, (mnColumnCount==1 && bAllowVerticalPosition) ? GM_BOTH : GM_BOTH); sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), true, GM_BOTH); if (nRow >= 0 && nColumn >= 0) nIndex = nRow * mnColumnCount + nColumn; - + return nIndex; } -Layouter::DoublePoint +Layouter::DoublePoint Layouter::ConvertModelToLayouterCoordinates ( const Point& rModelPoint) const { sal_Int32 nColumn = GetColumnAtPosition (rModelPoint.X(), true, GM_BOTH); - sal_Int32 nColumnWidth + sal_Int32 nColumnWidth = maPageObjectModelSize.Width() + mnTotalHorizontalGap.mnModel; - sal_Int32 nDistanceIntoColumn = + sal_Int32 nDistanceIntoColumn = rModelPoint.X() - mnLeftBorder.mnModel - mnLeftPageBorder.mnModel - nColumn * nColumnWidth; sal_Int32 nRow = GetRowAtPosition (rModelPoint.Y(), true, GM_BOTH); - sal_Int32 nRowHeight + sal_Int32 nRowHeight = maPageObjectModelSize.Height() + mnTotalVerticalGap.mnModel; - sal_Int32 nDistanceIntoRow = + sal_Int32 nDistanceIntoRow = rModelPoint.Y() - mnTopBorder.mnModel - mnTopPageBorder.mnModel - nRow * nRowHeight; @@ -586,18 +586,18 @@ Point Layouter::ConvertLayouterToModelCoordinates ( { sal_Int32 nColumn = (sal_Int32) ::rtl::math::round(rLayouterPoint.first, 0,rtl_math_RoundingMode_Floor); - sal_Int32 nColumnWidth + sal_Int32 nColumnWidth = maPageObjectModelSize.Width() + mnTotalHorizontalGap.mnModel; - sal_Int32 nDistanceIntoColumn + sal_Int32 nDistanceIntoColumn = (sal_Int32)((rLayouterPoint.first - nColumn) * nColumnWidth); sal_Int32 nRow = (sal_Int32) ::rtl::math::round(rLayouterPoint.second, 0,rtl_math_RoundingMode_Floor); - sal_Int32 nRowHeight + sal_Int32 nRowHeight = maPageObjectModelSize.Height() + mnTotalVerticalGap.mnModel; - sal_Int32 nDistanceIntoRow + sal_Int32 nDistanceIntoRow = (sal_Int32)((rLayouterPoint.second - nRow) * nRowHeight); - + return Point ( mnLeftBorder.mnModel + mnLeftPageBorder.mnModel + nColumn * nColumnWidth + nDistanceIntoColumn, @@ -609,13 +609,13 @@ Point Layouter::ConvertLayouterToModelCoordinates ( sal_Int32 Layouter::GetRowAtPosition ( - sal_Int32 nYPosition, + sal_Int32 nYPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership) const { sal_Int32 nRow = -1; - const sal_Int32 nY = nYPosition + const sal_Int32 nY = nYPosition - mnTopBorder.mnModel - mnTopPageBorder.mnModel; if (nY >= 0) { @@ -652,13 +652,13 @@ sal_Int32 Layouter::GetRowAtPosition ( sal_Int32 Layouter::GetColumnAtPosition ( - sal_Int32 nXPosition, + sal_Int32 nXPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership) const { sal_Int32 nColumn = -1; - sal_Int32 nX = nXPosition + sal_Int32 nX = nXPosition - mnLeftBorder.mnModel - mnLeftPageBorder.mnModel; if (nX >= 0) { @@ -720,11 +720,11 @@ sal_Int32 Layouter::ResolvePositionInGap ( nIndex ++; break; } - + case GM_PREVIOUS: // Row or column already at correct value. break; - + case GM_NEXT: // The complete gap belongs to the next row or column. nIndex ++; @@ -745,7 +745,7 @@ sal_Int32 Layouter::ResolvePositionInGap ( } } break; - + default: nIndex = -1; } diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx index 3e9b0aa94b35..a9508e4065e1 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObject.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObject.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 diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx index af9d85cf1b82..a5a74c939e52 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.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 @@ -61,15 +61,15 @@ PageObjectViewContact::~PageObjectViewContact (void) -ViewObjectContact& +ViewObjectContact& PageObjectViewContact::CreateObjectSpecificViewObjectContact( ObjectContact& rObjectContact) { OSL_ASSERT(mpDescriptor.get()!=NULL); - - ViewObjectContact* pResult + + ViewObjectContact* pResult = mpDescriptor->GetPageObjectFactory().CreateViewObjectContact ( - rObjectContact, + rObjectContact, *this); DBG_ASSERT (pResult!=NULL, "PageObjectViewContact::CreateObjectSpecificViewObjectContact() was not able to create object."); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 8cde7b0dfdbd..903d60674ece 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.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 @@ -83,7 +83,7 @@ const sal_Int32 PageObjectViewObjectContact::mnMouseOverEffectOffset = 3; const sal_Int32 PageObjectViewObjectContact::mnMouseOverEffectThickness = 1; PageObjectViewObjectContact::PageObjectViewObjectContact ( - ObjectContact& rObjectContact, + ObjectContact& rObjectContact, ViewContact& rViewContact, const ::boost::shared_ptr<cache::PageCache>& rpCache, const ::boost::shared_ptr<controller::Properties>& rpProperties) @@ -201,7 +201,7 @@ Rectangle PageObjectViewObjectContact::GetBoundingBox ( case NameBoundingBox: break; - + case FadeEffectIndicatorBoundingBox: Size aModelOffset = rDevice.PixelToLogic(Size (0, mnFadeEffectIndicatorOffset)); // Flush left just outside the selection rectangle. @@ -259,7 +259,7 @@ class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufferedDeco { private: // the inner range of the SdPageObject visualisation - basegfx::B2DRange maRange; + basegfx::B2DRange maRange; public: // constructor and destructor @@ -274,7 +274,7 @@ public: }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), +: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maRange(rRange) { } @@ -301,7 +301,7 @@ class SdPageObjectPageBitmapPrimitive : public SdPageObjectBasePrimitive { private: // the bitmap containing the PagePreview - BitmapEx maBitmapEx; + BitmapEx maBitmapEx; protected: // method which is to be used to implement the local decomposition of a 2D primitive. @@ -330,7 +330,7 @@ Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const // to avoid scaling, use the Bitmap pixel size as primitive size basegfx::B2DHomMatrix aBitmapTransform; const Size aBitmapSize(getBitmapEx().GetSizePixel()); - const basegfx::B2DVector aBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1)); // short form for scale and translate transformation @@ -348,7 +348,7 @@ Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const SdPageObjectPageBitmapPrimitive::SdPageObjectPageBitmapPrimitive( const basegfx::B2DRange& rRange, const BitmapEx& rBitmapEx) -: SdPageObjectBasePrimitive(rRange), +: SdPageObjectBasePrimitive(rRange), maBitmapEx(rBitmapEx) { } @@ -452,7 +452,7 @@ Primitive2DSequence SdPageObjectSelectPrimitive::create2DDecomposition(const dra } SdPageObjectSelectPrimitive::SdPageObjectSelectPrimitive(const basegfx::B2DRange& rRange) -: SdPageObjectBasePrimitive(rRange) +: SdPageObjectBasePrimitive(rRange) { } @@ -494,14 +494,14 @@ Primitive2DSequence SdPageObjectBorderPrimitive::create2DDecomposition(const dra static bool bTestWithBrightColors(false); const svtools::ColorConfig aColorConfig; const basegfx::BColor aBorderColor(bTestWithBrightColors ? basegfx::BColor(1,0,0) : Color(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor).getBColor()); - + const Primitive2DReference xReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(basegfx::tools::createPolygonFromRect(aAdaptedInnerRange), aBorderColor)); return Primitive2DSequence(&xReference, 1); } SdPageObjectBorderPrimitive::SdPageObjectBorderPrimitive(const basegfx::B2DRange& rRange) -: SdPageObjectBasePrimitive(rRange) +: SdPageObjectBasePrimitive(rRange) { } @@ -575,7 +575,7 @@ Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const draw const drawinglayer::attribute::LineAttribute aLineAttribute(aLineColor.getBColor()); const drawinglayer::attribute::StrokeAttribute aStrokeAttribute( aDotDashArray, 2.0 * nFocusIndicatorWidth * aDiscretePixel.getX()); - + xRetval[1] = Primitive2DReference( new drawinglayer::primitive2d::PolygonStrokePrimitive2D(aIndicatorPolygon, aLineAttribute, aStrokeAttribute)); @@ -584,7 +584,7 @@ Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const draw } SdPageObjectFocusPrimitive::SdPageObjectFocusPrimitive(const basegfx::B2DRange& rRange, const bool bContrast) - : SdPageObjectBasePrimitive(rRange), + : SdPageObjectBasePrimitive(rRange), mbContrastToSelected(bContrast) { } @@ -612,14 +612,14 @@ private: /// the indicator bitmaps. Static since it is usable outside this primitive /// for size comparisons - static BitmapEx* mpFadeEffectIconBitmap; - static BitmapEx* mpCommentsIconBitmap; + static BitmapEx* mpFadeEffectIconBitmap; + static BitmapEx* mpCommentsIconBitmap; /// page name, number and needed infos - String maPageName; - sal_uInt32 mnPageNumber; - Font maPageNameFont; - Size maPageNumberAreaModelSize; + String maPageName; + sal_uInt32 mnPageNumber; + Font maPageNameFont; + Size maPageNumberAreaModelSize; // bitfield bool mbShowFadeEffectIcon : 1; @@ -713,7 +713,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c basegfx::B2DVector aTextSizeAttribute; const drawinglayer::attribute::FontAttribute aFontAttribute( drawinglayer::primitive2d::getFontAttributeFromVclFont( - aTextSizeAttribute, + aTextSizeAttribute, getPageNameFont(), false, false)); @@ -727,12 +727,12 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c if(getShowFadeEffectIcon()) { // prepare fFadeEffect Sizes - const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector( - getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, + getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, getFadeEffectIconBitmap().GetSizePixel().getHeight() - 1)); - // Paint_FadeEffectIndicator replacement. + // Paint_FadeEffectIndicator replacement. // create transformation. To avoid bitmap scaling, use bitmap size as size basegfx::B2DHomMatrix aBitmapTransform; @@ -749,9 +749,9 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c if(nTextLength) { // prepare fFadeEffect Sizes since it consumes from text size - const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector( - getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, + getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, getFadeEffectIconBitmap().GetSizePixel().getHeight() - 1)); // Paint_PageName replacement. Get text size @@ -763,11 +763,11 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // calculate text start position double fStartX( - aAdaptedInnerRange.getMaxX() + aAdaptedInnerRange.getMaxX() - fTextWidth + (aDiscretePixel.getX() * 3.0)); const double fStartY( - aAdaptedInnerRange.getMaxY() + aAdaptedInnerRange.getMaxY() + fTextHeight + fFadeEffectTextGap); const bool bNeedClipping(fStartX < aAdaptedInnerRange.getMinX() + fFadeEffectWidth); @@ -813,13 +813,13 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // create Text primitive and add to target xRetval[nInsert++] = Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aPageName, - 0, - aPageName.Len(), - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aPageName, + 0, + aPageName.Len(), + aDXArray, + aFontAttribute, + aLocale, aFontColor)); } @@ -827,7 +827,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // Paint_PageNumber replacement. Get the range where it shall be centered and prepare the string const double fLeft(aAdaptedInnerRange.getMinX() - (mnPageNumberOffset * aDiscretePixel.getX()) - getPageNumberAreaModelSize().Width()); const double fTop(aAdaptedInnerRange.getMinY()); - const basegfx::B2DRange aNumberRange(fLeft, fTop, + const basegfx::B2DRange aNumberRange(fLeft, fTop, fLeft + getPageNumberAreaModelSize().Width(), fTop + getPageNumberAreaModelSize().Height()); const String aPageNumber(String::CreateFromInt32(getPageNumber())); const xub_StrLen nNumberLen(aPageNumber.Len()); @@ -854,13 +854,13 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // create Text primitive xRetval[nInsert++] = Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aPageNumber, - 0, - nNumberLen, - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aPageNumber, + 0, + nNumberLen, + aDXArray, + aFontAttribute, + aLocale, aFontColor)); if(getExcluded()) @@ -892,7 +892,7 @@ SdPageObjectFadeNameNumberPrimitive::SdPageObjectFadeNameNumberPrimitive( bool bShowFadeEffectIcon, bool bShowCommentsIcon, bool bExcluded) -: SdPageObjectBasePrimitive(rRange), +: SdPageObjectBasePrimitive(rRange), maPageName(rPageName), mnPageNumber(nPageNumber), maPageNameFont(rPageNameFont), @@ -939,8 +939,8 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const // get primitive vector from parent class. Do remember the contents for later use; this // is done to create the page content renderer (see PagePrimitiveExtractor in svx) at the - // original object and to setup the draw hierarchy there so that changes to VCs of displayed - // objects will lead to InvalidatePartOfView-calls which will be forwarded from the helper-OC + // original object and to setup the draw hierarchy there so that changes to VCs of displayed + // objects will lead to InvalidatePartOfView-calls which will be forwarded from the helper-OC // to this VOC in calling a ActionChanged(). // // This already produces the displayable page content as a primitive sequence, complete with @@ -966,7 +966,7 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const // (just hand over the local member to the cache) // // For the moment i will use (1) and disable primitive creation for SdrPageObj contents here - + // const_cast< PageObjectViewObjectContact* >(this)->mxCurrentPageContents = ViewObjectContactOfPageObj::createPrimitive2DSequence(rDisplayInfo); // assert when this call is issued indirectly from the destructor of @@ -985,14 +985,14 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const && !mbInDestructor) { // get inner and outer logic rectangles. Use model data directly for creation. Do NOT use getBoundRect()/ - // getSnapRect() functionality; these will use the sequence of primitives in the long run itself. SdrPageObj + // getSnapRect() functionality; these will use the sequence of primitives in the long run itself. SdrPageObj // is a SdrObject, so use SdrObject::aOutRect as model data. Access using GetLastBoundRect() to not execute anything PageObjectViewContact& rPaObVOC(static_cast< PageObjectViewContact& >(GetViewContact())); const Rectangle aInnerLogic(rPaObVOC.GetPageObject().GetLastBoundRect()); - + // get BitmapEx from cache. Do exactly the same as Paint_Preview() to avoid a repaint loop // caused by slightly different pixel sizes of what the cache sees as pixel size and what is - // calculated here in discrete coordinates. This includes to not use LogicToPiyel on the Rectangle, + // calculated here in discrete coordinates. This includes to not use LogicToPiyel on the Rectangle, // but to do the same as the GetBoundingBox() implementation const Rectangle aInnerPixel(Rectangle(pDevice->LogicToPixel(aInnerLogic.TopLeft()), pDevice->LogicToPixel(aInnerLogic.GetSize()))); BitmapEx aBitmapEx(const_cast< PageObjectViewObjectContact* >(this)->GetPreview(rDisplayInfo, aInnerPixel)); @@ -1012,13 +1012,13 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const if(GetPage()) { const SdPage* pPage = static_cast<const SdPage*>(GetPage()); - + // decide if fade effect indicator will be painted if(pPage->getTransitionType() > 0) { bShowFadeEffectIcon = true; } - + bShowCommentsIcon = !pPage->getAnnotations().empty(); // prepare PageName, PageNumber, font and AreaModelSize @@ -1043,11 +1043,11 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const const bool bCreateSelected(GetPageDescriptor()->IsSelected()); const sal_uInt32 nCount( - (bCreateBitmap ? 1 : 0) + // bitmap itself - 1 + // border around bitmap (always) + (bCreateBitmap ? 1 : 0) + // bitmap itself + 1 + // border around bitmap (always) 1 + // FadeEffect, PageName and PageNumber visualisation (always) - (bCreateFocused ? 1 : 0) + // create focused - (bCreateSelected ? 1 : 0) // create selected + (bCreateFocused ? 1 : 0) + // create focused + (bCreateSelected ? 1 : 0) // create selected ); sal_uInt32 nInsert(0); Primitive2DSequence xRetval(nCount); @@ -1136,7 +1136,7 @@ BitmapEx PageObjectViewObjectContact::GetPreview ( // assert when this call is issued indirectly from the destructor of // this instance. This is not allowed and needs to be looked at OSL_ENSURE(!mbInDestructor, "Higher call inside PageObjectViewObjectContact in destructor (!)"); - + if (!mbInDestructor) { if (mpCache != NULL) @@ -1335,7 +1335,7 @@ SvBorder PageObjectViewObjectContact::CalculatePageModelBorder ( aBottomRightBorders.Width(), aBottomRightBorders.Height()); - + // 2. Add the device dependent values. // Calculate the area of the page number. diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index be9a7c2c23b7..77c89b846102 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.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 diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 25911b9ae80f..2c2c476f7f56 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -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 @@ -57,7 +57,7 @@ public: virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible); virtual sal_Int32 GetPriority (cache::CacheKey aKey); virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void); - + private: model::SlideSorterModel& mrModel; SlideSorterView& mrView; diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 2e22e85803f6..029e65197854 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.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 @@ -135,7 +135,7 @@ SlideSorter& ViewOverlay::GetSlideSorter (void) const OverlayManager* ViewOverlay::GetOverlayManager (void) const { OverlayManager* pOverlayManager = NULL; - + SlideSorterView& rView (mrSlideSorter.GetView()); SdrPageView* pPageView = rView.GetSdrPageView(); if (pPageView != NULL && pPageView->PageWindowCount()>0) @@ -222,7 +222,7 @@ void SubstitutionOverlay::Create ( EnsureRegistration(); maPosition = rPosition; - + maShapes.clear(); while (rSelection.HasMoreElements()) { @@ -259,7 +259,7 @@ void SubstitutionOverlay::Move (const Point& rOffset) maShapes.transform(aTranslation); maPosition += rOffset; - + objectChange(); } @@ -432,10 +432,10 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) { static const bool bAllowHorizontalInsertMarker = true; Layouter& rLayouter (mrViewOverlay.GetSlideSorter().GetView().GetLayouter()); - USHORT nPageCount + USHORT nPageCount = (USHORT)mrViewOverlay.GetSlideSorter().GetModel().GetPageCount(); - sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, + sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, bAllowHorizontalInsertMarker); if (nInsertionIndex >= nPageCount) nInsertionIndex = nPageCount-1; @@ -452,13 +452,13 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) // column. // 2. The vertical (standard) insert marker may be painted left to // the insert page or right of the previous one. When both pages - // are in the same row this makes no difference. Otherwise the + // are in the same row this makes no difference. Otherwise the // posiotions are at the left and right ends of two rows. Point aPageCenter (rLayouter.GetPageObjectBox ( nInsertionIndex).Center()); - if (bAllowHorizontalInsertMarker + if (bAllowHorizontalInsertMarker && rLayouter.GetColumnCount() == 1) { bVertical = false; @@ -481,7 +481,7 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) Rectangle aBox; if (mnInsertionIndex >= 0) aBox = rLayouter.GetInsertionMarkerBox ( - nDrawIndex, + nDrawIndex, bVertical, bLeftOrTop); SetPositionAndSize (aBox); @@ -556,7 +556,7 @@ void MouseOverIndicatorOverlay::SetSlideUnderMouse ( { } } - + if (pDescriptor != rpDescriptor) { // Switch to the new (possibly empty) descriptor. |