Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

4 files changed, 19 insertions, 18 deletions

diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index e8c8f5d93fbe..6ea1d3a5ec0a 100644..100755
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -71,7 +71,7 @@ private:
     static RequesterMap maRequesterMap;
 
     css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas;
-    ULONG mnUserEventId;
+    sal_uLong mnUserEventId;
     sal_Bool mbUpdateFlag;
     DECL_LINK(Callback, void*);
 };
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 493c3c5a4bed..f7e06c2f89ff 100644..100755
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -136,7 +136,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
         // Make the frame window transparent and make the parent able to
         // draw behind it.
         if (pParentWindow != NULL)
-            pParentWindow->EnableChildTransparentMode(TRUE);
+            pParentWindow->EnableChildTransparentMode(sal_True);
     }
 
     if (pWindow != NULL)
@@ -148,12 +148,12 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
         if ( ! bEnableParentClip)
         {
             pWindow->SetParentClipMode(PARENTCLIPMODE_NOCLIP);
-            pWindow->SetPaintTransparent(TRUE);
+            pWindow->SetPaintTransparent(sal_True);
         }
         else
         {
             pWindow->SetParentClipMode(PARENTCLIPMODE_CLIP);
-            pWindow->SetPaintTransparent(FALSE);
+            pWindow->SetPaintTransparent(sal_False);
         }
 
     }
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index d7c8793a6d63..1d069f40b765 100644..100755
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -65,7 +65,8 @@ public:
 
     // CacheContext
     virtual void NotifyPreviewCreation (
-        CacheKey aKey, const ::boost::shared_ptr<BitmapEx>& rPreview);
+        CacheKey aKey,
+        const Bitmap& rPreview);
     virtual bool IsIdle (void);
     virtual bool IsVisible (CacheKey aKey);
     virtual const SdrPage* GetPage (CacheKey aKey);
@@ -123,7 +124,7 @@ PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext>
     : PresenterPreviewCacheInterfaceBase(m_aMutex),
       maPreviewSize(Size(200,200)),
       mpCacheContext(new PresenterCacheContext()),
-      mpCache(new PageCache(maPreviewSize, mpCacheContext))
+      mpCache(new PageCache(maPreviewSize, false, mpCacheContext))
 {
     (void)rxContext;
 }
@@ -188,7 +189,7 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize (
     OSL_ASSERT(mpCache.get()!=NULL);
 
     maPreviewSize = Size(rSize.Width, rSize.Height);
-    mpCache->ChangeSize(maPreviewSize);
+    mpCache->ChangeSize(maPreviewSize, false);
 }
 
 
@@ -210,7 +211,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview (
     if (pPage == NULL)
         throw RuntimeException();
 
-    const BitmapEx aPreview (mpCache->GetPreviewBitmap(pPage, maPreviewSize));
+    const BitmapEx aPreview (mpCache->GetPreviewBitmap(pPage,true));
     if (aPreview.IsEmpty())
         return NULL;
     else
@@ -369,7 +370,7 @@ void PresenterPreviewCache::PresenterCacheContext::RemovePreviewCreationNotifyLi
 
 void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation (
     CacheKey aKey,
-    const ::boost::shared_ptr<BitmapEx>& rPreview)
+    const Bitmap& rPreview)
 {
     (void)rPreview;
 
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index ec3261686bdf..d8126597b4a2 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -364,10 +364,10 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
         SvtLinguConfig().GetOptions( aOpt );
 
         struct FontDta {
-            INT16       nFallbackLang;
-            INT16       nLang;
-            USHORT      nFontType;
-            USHORT      nFontInfoId;
+            sal_Int16       nFallbackLang;
+            sal_Int16       nLang;
+            sal_uInt16      nFontType;
+            sal_uInt16      nFontInfoId;
             } aTable[3] =
         {
             // info to get western font to be used
@@ -404,8 +404,8 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
 
         pEditEngine = new EditEngine (mpEditEngineItemPool);
 
-        pEditEngine->EnableUndo (TRUE);
-        pEditEngine->SetDefTab (USHORT(
+        pEditEngine->EnableUndo (sal_True);
+        pEditEngine->SetDefTab (sal_uInt16(
             Application::GetDefaultDevice()->GetTextWidth(
                 UniString::CreateFromAscii("XXXX"))));
 
@@ -459,8 +459,8 @@ void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor)
     DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
     DBG_ASSERT(mpEditEngineItemPool!=NULL, "EditEngineItemPool missing");
     mpEditEngine->SetBackgroundColor(aColor);
-    mpEditEngine->EnableAutoColor(FALSE);
-    mpEditEngine->ForceAutoColor(FALSE);
+    mpEditEngine->EnableAutoColor(sal_False);
+    mpEditEngine->ForceAutoColor(sal_False);
 }
 
 
@@ -577,7 +577,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void
             delete mpOutputDevice;
         mpOutputDevice = new VirtualDevice(*Application::GetDefaultDevice(), 0, 0);
         mpOutputDevice->SetMapMode(MAP_PIXEL);
-        mpOutputDevice->SetOutputSizePixel(maSize, TRUE);
+        mpOutputDevice->SetOutputSizePixel(maSize, sal_True);
         mpOutputDevice->SetLineColor();
         mpOutputDevice->SetFillColor();
         mpOutputDevice->SetBackground(Wallpaper());