CWS-TOOLING: integrate CWS impress167_OOO310

2009-02-02 16:32:46 +0100 sj  r267276 : build problem, removing build dependency to vcl
2009-01-30 16:45:22 +0100 sj  r267210 : CWS-TOOLING: rebase CWS impress167 to trunk@267171 (milestone: DEV300:m41)
2009-01-23 16:14:11 +0100 sj  r266833 : #98331# fixed: crop information is not saved and not read on loading
2009-01-23 10:45:11 +0100 af  r266780 : #158592# Made processing of slidesorter queue entries more robust.
2009-01-23 09:58:16 +0100 af  r266773 : #i93848# Fixed termination of timer thread.

3 files changed, 13 insertions, 6 deletions

diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 8d40adb..63a4777 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -35,7 +35,7 @@
 #include "pdfihelper.hxx"
 
 #include <rtl/ustrbuf.hxx>
-#include <vcl/canvastools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 
 using namespace pdfi;
 using namespace com::sun::star;
@@ -43,9 +43,9 @@ using namespace com::sun::star;
 rtl::OUString pdfi::getColorString( const rendering::ARGBColor& rCol )
 {
     rtl::OUStringBuffer aBuf( 7 );
-    const sal_uInt8 nRed  ( vcl::unotools::toByteColor(rCol.Red)   );
-    const sal_uInt8 nGreen( vcl::unotools::toByteColor(rCol.Green) );
-    const sal_uInt8 nBlue ( vcl::unotools::toByteColor(rCol.Blue)  );
+    const sal_uInt8 nRed  ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Red * 255.0 ) ) );
+    const sal_uInt8 nGreen( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Green * 255.0 ) ) );
+    const sal_uInt8 nBlue ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Blue * 255.0 ) ) );
     aBuf.append( sal_Unicode('#') );
     if( nRed < 10 )
         aBuf.append( sal_Unicode('0') );
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index f4f4814..c26bc3b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -32,7 +32,6 @@
 #ifndef SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX
 #define SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX
 
-#include <vcl/bitmap.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp>
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index cd2651c..c29e3b9 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -76,7 +76,6 @@ class TimerScheduler
 {
 public:
     static ::boost::shared_ptr<TimerScheduler> Instance (void);
-    static void Release (void);
     static SharedTimerTask CreateTimerTask (
         const PresenterTimer::Task& rTask,
         const TimeValue& rDueTime,
@@ -107,12 +106,15 @@ private:
     ::osl::Mutex maCurrentTaskMutex;
     SharedTimerTask mpCurrentTask;
 
+    static void Release (void);
+
     TimerScheduler (void);
     virtual ~TimerScheduler (void);
     class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } };
     friend class Deleter;
     
     virtual void SAL_CALL run (void);
+    virtual void SAL_CALL onTerminated (void);
 };
 
 
@@ -380,7 +382,13 @@ void SAL_CALL TimerScheduler::run (void)
             mpCurrentTask.reset();
         }
     }
+}
 
+
+
+
+void SAL_CALL TimerScheduler::onTerminated (void)
+{
     Release();
 }