strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED

Browse source 
2006/04/03 16:19:05 thb 1.3.18.5: #i37778# Now passing down ComponentContext to all interested parties; building a second, all-exports version of the slideshow component (to facilitate unit testing also for internal classes) - this made necessary renaming ImportFailedException to ShapeLoadFailedException (because of silly i63703); applied relevant parts of #i63770# (const-correctness); reworked view handling in such a way that views are now kept in one central repository (and are not duplicated across all interested objects); moved code from namespace presentation to namespace slideshow
2006/03/24 18:23:39 thb 1.3.18.4: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/23 17:22:45 thb 1.3.18.3: #i49357# Changed manual noncopyable boiler plate to boost::noncopyable
2006/03/15 15:22:25 thb 1.3.18.2: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
2006/03/06 22:14:37 thb 1.3.18.1: #i53194# #i55294# #i59324# Overhauled IntrinsicAnimationActivity; fixes GIF animation import; corrected rehearse timings sprite size; several cosmetic changes (removed external header guards); prepared scene for sprite prio
This commit is contained in:
Kurt Zenker 2006-12-13 15:06:14 +00:00
parent 5785f45dae
commit 1e34440fa1
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
slideshow/source/inc/unoviewcontainer.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: unoviewcontainer.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-07 21:23:45 $
* last change: $Author: kz $ $Date: 2006-12-13 16:06:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,13 +36,10 @@
#ifndef _SLIDESHOW_UNOVIEWCONTAINER_HXX
#define _SLIDESHOW_UNOVIEWCONTAINER_HXX
#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
#include <com/sun/star/uno/Reference.hxx>
#endif
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
#endif
#include <boost/utility.hpp>
#include <vector>
@ -56,13 +53,13 @@ namespace com { namespace sun { namespace star { namespace presentation
/* Definition of UnoViewContainer class */
namespace presentation
namespace slideshow
{
namespace internal
{
/** Contains UnoViews
*/
class UnoViewContainer
class UnoViewContainer : private boost::noncopyable
{
public:
UnoViewContainer();
@ -91,22 +88,24 @@ namespace presentation
UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference<
::com::sun::star::presentation::XSlideShowView >& xView );
/// Dispose all stored views. Implies clear().
void dispose();
// the following parrots STL container concept methods
// ===================================================
bool empty() const;
void clear();
std::size_t size() const { return maViews.size(); }
bool empty() const { return maViews.empty(); }
UnoViewVector::iterator begin();
UnoViewVector::const_iterator begin() const;
UnoViewVector::iterator end();
UnoViewVector::const_iterator end() const;
void clear() { maViews.clear(); }
UnoViewVector::iterator begin() { return maViews.begin(); }
UnoViewVector::const_iterator begin() const { return maViews.begin(); }
UnoViewVector::iterator end() { return maViews.end(); }
UnoViewVector::const_iterator end() const { return maViews.end(); }
private:
// default: disabled copy/assignment
UnoViewContainer(const UnoViewContainer&);
UnoViewContainer& operator=( const UnoViewContainer& );
/// All added views
UnoViewVector maViews;
};