Attachment #77511 for issue #119308

View | Details | Raw Unified | Return to issue 119308
Collapse All | Expand All

Lines 244-250 Link Here

(-)main/slideshow/source/engine/slide/layermanager.hxx (-1 / +1 lines)
244	::com::sun::star::uno::Reference<	244	::com::sun::star::uno::Reference<
245	::com::sun::star::drawing::XShape >,	245	::com::sun::star::drawing::XShape >,
246	ShapeSharedPtr,	246	ShapeSharedPtr,
247	hash< ::com::sun::star::uno::Reference<	247	boost::hash< ::com::sun::star::uno::Reference<
248	::com::sun::star::drawing::XShape > > > XShapeHash;	248	::com::sun::star::drawing::XShape > > > XShapeHash;
249		249
250	class ShapeComparator	250	class ShapeComparator





#include <boost/shared_ptr.hpp>
#include <boost/current_function.hpp>
#include <boost/functional/hash.hpp>

#include <functional>
#include <cstdlib>


        typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;

        // xxx todo: remove with boost::hash when 1.33 is available
        template <typename T>
        struct hash : ::std::unary_function<T, ::std::size_t>
        {
            ::std::size_t operator()( T const& val ) const {
                return hash_value(val);
            }
        };
        template <typename T>
        inline ::std::size_t hash_value( T * const& p )
        {
            ::std::size_t d = static_cast< ::std::size_t >(
                reinterpret_cast< ::std::ptrdiff_t >(p) );
            return d + (d >> 3);
        }
    }    
}

namespace com { namespace sun { namespace star { namespace uno {
        template <typename T>
        inline ::std::size_t hash_value(
            ::com::sun::star::uno::Reference<T> const& x )

            ::com::sun::star::uno::Reference<
                  ::com::sun::star::uno::XInterface> const xRoot(
                      x, ::com::sun::star::uno::UNO_QUERY );
            return boost::hash<void *>()(xRoot.get());
        }
} } } }

namespace slideshow {

    namespace internal {
        /** Cycle mode of intrinsic animations
         */
        enum CycleMode


        basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector&         rSize,
                                              const boost::shared_ptr<UnoView>& pView );
    }
}

    } // namespace internal
} //namespace slideshow

#endif /* INCLUDED_SLIDESHOW_TOOLS_HXX */

Lines 12-18 Link Here

(-)main/boost/prj/d.lst (+11 lines)
12	mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail	12	mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail
13	mkdir: %_DEST%\inc%_EXT%\boost\exception	13	mkdir: %_DEST%\inc%_EXT%\boost\exception
14	mkdir: %_DEST%\inc%_EXT%\boost\exception\detail	14	mkdir: %_DEST%\inc%_EXT%\boost\exception\detail
		15	mkdir: %_DEST%\inc%_EXT%\boost\functional
		16	mkdir: %_DEST%\inc%_EXT%\boost\functional\detail
		17	mkdir: %_DEST%\inc%_EXT%\boost\functional
		18	mkdir: %_DEST%\inc%_EXT%\boost\functional\hash
		19	mkdir: %_DEST%\inc%_EXT%\boost\functional\hash\detail
15	mkdir: %_DEST%\inc%_EXT%\boost\function	20	mkdir: %_DEST%\inc%_EXT%\boost\function
		21	mkdir: %_DEST%\inc%_EXT%\boost\integer
16	mkdir: %_DEST%\inc%_EXT%\boost\mpl	22	mkdir: %_DEST%\inc%_EXT%\boost\mpl
17	mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_	23	mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_
18	mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config	24	mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config
Lines 310-312 Link Here
310	..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail	316	..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
311	..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant	317	..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
312	..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail	318	..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
		319	..\%__SRC%\misc\build\boost_1_39_0\boost\integer\* %_DEST%\inc%_EXT%\boost\integer
		320	..\%__SRC%\misc\build\boost_1_39_0\boost\functional\* %_DEST%\inc%_EXT%\boost\functional
		321	..\%__SRC%\misc\build\boost_1_39_0\boost\functional\hash\* %_DEST%\inc%_EXT%\boost\functional\hash
		322	..\%__SRC%\misc\build\boost_1_39_0\boost\functional\hash\detail\* %_DEST%\inc%_EXT%\boost\functional\hash\detail
		323

Return to issue 119308

Lines 36-41 Link Here

(-)main/slideshow/source/inc/tools.hxx (-14 / +13 lines)
36		36
37	#include <boost/shared_ptr.hpp>	37	#include <boost/shared_ptr.hpp>
38	#include <boost/current_function.hpp>	38	#include <boost/current_function.hpp>
		39	#include <boost/functional/hash.hpp>
39		40
40	#include <functional>	41	#include <functional>
41	#include <cstdlib>	42	#include <cstdlib>
Lines 71-94 Link Here
71		72
72	typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;	73	typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
73		74
74	// xxx todo: remove with boost::hash when 1.33 is available
75	template <typename T>	75	template <typename T>
76	struct hash : ::std::unary_function<T, ::std::size_t>
77	{
78	::std::size_t operator()( T const& val ) const {
79	return hash_value(val);
80	}
81	};
82	template <typename T>
83	inline ::std::size_t hash_value( T * const& p )	76	inline ::std::size_t hash_value( T * const& p )
84	{	77	{
85	::std::size_t d = static_cast< ::std::size_t >(	78	::std::size_t d = static_cast< ::std::size_t >(
86	reinterpret_cast< ::std::ptrdiff_t >(p) );	79	reinterpret_cast< ::std::ptrdiff_t >(p) );
87	return d + (d >> 3);	80	return d + (d >> 3);
88	}	81	}
89		82	}
90	// xxx todo: shift to namespace com::sun::star::uno when	83	}
91	// 1.33 is available	84
		85	namespace com { namespace sun { namespace star { namespace uno {
92	template <typename T>	86	template <typename T>
93	inline ::std::size_t hash_value(	87	inline ::std::size_t hash_value(
94	::com::sun::star::uno::Reference<T> const& x )	88	::com::sun::star::uno::Reference<T> const& x )
Lines 98-106 Link Here
98	::com::sun::star::uno::Reference<	92	::com::sun::star::uno::Reference<
99	::com::sun::star::uno::XInterface> const xRoot(	93	::com::sun::star::uno::XInterface> const xRoot(
100	x, ::com::sun::star::uno::UNO_QUERY );	94	x, ::com::sun::star::uno::UNO_QUERY );
101	return hash<void *>()(xRoot.get());	95	return boost::hash<void *>()(xRoot.get());
102	}	96	}
		97	} } } }
103		98
		99	namespace slideshow {
		100
		101	namespace internal {
104	/** Cycle mode of intrinsic animations	102	/** Cycle mode of intrinsic animations
105	*/	103	*/
106	enum CycleMode	104	enum CycleMode
Lines 394-400 Link Here
394		392
395	basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize,	393	basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize,
396	const boost::shared_ptr<UnoView>& pView );	394	const boost::shared_ptr<UnoView>& pView );
397	}
398	}
399		395
		396	} // namespace internal
		397	} //namespace slideshow
		398
400	#endif /* INCLUDED_SLIDESHOW_TOOLS_HXX */	399	#endif /* INCLUDED_SLIDESHOW_TOOLS_HXX */