summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-13 14:49:33 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-13 14:49:33 +0000
commit525a82c8694c4f8c6815818fdb04e1c39a7aba26 (patch)
tree4909059af5a860313d87dfaa761946fb41796a81
parent401ccf7faa5fc131f513c2686ad745ba20fda2d1 (diff)
INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED
2006/10/18 20:00:27 thb 1.3.18.3: RESYNC: (1.3-1.4); FILE MERGED 2006/04/24 13:25:36 thb 1.3.18.2: #i53194# Unified include statements (local headers always have double quotes; external headers angle brackets); reverted EventMultiplexer pause events to shared_ptr; removed EventMultiplexer::removeViewHandler(), since the handler is held weakly, anyway. 2006/03/24 18:23:28 thb 1.3.18.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
-rw-r--r--slideshow/source/engine/transitions/zigzagwipe.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx
index c5706506cdcb..255df72ca58d 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.cxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: zigzagwipe.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 08:43:38 $
+ * last change: $Author: kz $ $Date: 2006-12-13 15:49:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,15 +36,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_slideshow.hxx"
-#include "zigzagwipe.hxx"
-#include "canvas/debug.hxx"
+#include <canvas/debug.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/numeric/ftools.hxx>
#include "transitiontools.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include "basegfx/point/b2dpoint.hxx"
-// #include "basegfx/numeric/ftools.hxx"
+#include "zigzagwipe.hxx"
-namespace presentation {
+namespace slideshow {
namespace internal {
ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs )