new Drag&Drop interface/cleanup

19 files changed, 96 insertions, 94 deletions

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 7a3888f6a96e..6fc4c0618b56 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdmod.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2001-01-19 19:15:01 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:03:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,8 +134,6 @@ public:
                         SdModule(SvFactory* pDrawObjFact, SvFactory* pGraphicObjFact);
     virtual             ~SdModule();
 
-    SvDataObject*       pDragData;
-    SvDataObject*       pClipboardData;
     SdTransferable*     pTransferClip;
     SdTransferable*     pTransferDrag;
 
diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src
index b80d3c6432c3..f6c11687087c 100644
--- a/sd/source/ui/app/app.src
+++ b/sd/source/ui/app/app.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dl $ $Date: 2001-02-07 09:15:46 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -430,7 +430,7 @@ ImageList RID_DEFAULTIMAGELIST_SC
         File[ korean ] = "sc_out82.bmp" ;
 
     };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR ;
     IMAGE_ID_LIST
 };
 
@@ -459,7 +459,7 @@ ImageList RID_DEFAULTIMAGELIST_LC
         File[ japanese ] = "lc_out81.bmp" ;
         File[ korean ] = "lc_out82.bmp" ;
     };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
     IMAGE_ID_LIST
 };
 
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index 96133271f60c..b4dc8b7bb024 100644
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ka $ $Date: 2001-01-19 19:10:22 $
+#   last change: $Author: ka $ $Date: 2001-03-08 11:04:21 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -108,7 +108,6 @@ SLOFILES =	\
         $(SLO)$/sddll1.obj      \
         $(SLO)$/sddll2.obj      \
         $(SLO)$/tbxww.obj		\
-        $(SLO)$/dragserv.obj	\
         $(SLO)$/optsitem.obj	\
         $(SLO)$/sdresid.obj		\
         $(SLO)$/sdpopup.obj		\
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 1abb45b64cf2..0a799e13929b 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: res_bmp.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: dl $ $Date: 2001-02-19 10:43:35 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -652,47 +652,47 @@ Bitmap BMP_EFFECT_ROTATE_VERTICAL
 Image IMG_EMBEDDED
 {
     ImageBitmap = Bitmap { File = "kopie.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_LINK
 {
     ImageBitmap = Bitmap { File = "verknpf.bmp" ; };  // Bitmaps getauscht
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_HYPERLINK
 {
     ImageBitmap = Bitmap { File = "link.bmp" ; };  // Bitmaps getauscht
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_EFFECT
 {
     ImageBitmap = Bitmap { File = "objekt.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_EFFECT_ACTIVE
 {
     ImageBitmap = Bitmap { File = "objekt2.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_EXTRAS
 {
     ImageBitmap = Bitmap { File = "vtextras.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_TEXT
 {
     ImageBitmap = Bitmap { File = "text.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_TEXT_ACTIVE
 {
     ImageBitmap = Bitmap { File = "text2.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 Image IMG_ORDER
 {
     ImageBitmap = Bitmap { File = "vtextras.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
+    MaskColor = IMAGE_MASK_STDCOLOR;
 };
 SfxStyleFamilies DLG_STYLE_DESIGNER
 {
@@ -724,7 +724,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleImage = Image
             {
                 ImageBitmap = Bitmap { File = "sco206.bmp" ; };
-                MaskColor = IMAGE_STDBTN_COLOR ;
+                MaskColor = IMAGE_MASK_STDCOLOR;
             };
             FilterList =
             {
@@ -759,7 +759,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleImage = Image
             {
                 ImageBitmap = Bitmap { File = "presobjs.bmp" ; };
-                MaskColor = IMAGE_STDBTN_COLOR ;
+                MaskColor = IMAGE_MASK_STDCOLOR;
             };
             FilterList =
             {
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index b346b35baef4..76fe70309982 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdmod.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ka $ $Date: 2001-01-19 19:10:22 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,8 +139,6 @@ SdModule::SdModule(SvFactory* pDrawObjFact, SvFactory* pGraphicObjFact)
 :   SdModuleDummy(SFX_APP()->CreateResManager("sd"), FALSE,
                   pDrawObjFact, pGraphicObjFact),
     bWaterCan(FALSE),
-    pDragData(NULL),
-    pClipboardData(NULL),
     pTransferClip(NULL),
     pTransferDrag(NULL),
     pImpressOptions(NULL),
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 547a97bb35dd..570ac51d2e5f 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdmod2.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: ka $ $Date: 2001-01-19 19:10:22 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,6 @@
 #include "docshell.hxx"
 #include "drawdoc.hxx"
 #include "sdoutl.hxx"
-#include "dragserv.hxx"
 #include "sdresid.hxx"
 #include "pres.hxx"
 #include "drviewsh.hxx"
@@ -261,7 +260,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
 
                     for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos >= 0; pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- )
                     {
-                        if( pOutl->GetDepth( nParaPos ) == 0 )
+                        if( pOutl->GetDepth( (USHORT) nParaPos ) == 0 )
                             nPgNum++;
                     }
                 }
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index aa61e094b88a..5f5352fc6358 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxfer.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2001-02-19 12:49:33 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:05:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -539,7 +539,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
             rxOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
             rxOStm->SetBufferSize( 16348 );
             pDoc->PreSave();
-            pDoc->GetItemPool().SetFileFormatVersion( rxOStm->GetVersion() );
+            pDoc->GetItemPool().SetFileFormatVersion( (USHORT) rxOStm->GetVersion() );
             pDoc->GetItemPool().Store( *rxOStm );
             *rxOStm << *pDoc;
             pDoc->PostSave();
@@ -577,6 +577,14 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
 
 // -----------------------------------------------------------------------------
 
+void SdTransferable::DragFinished( sal_Int8 nDropAction )
+{
+    if( pSdView )
+        ( (SdView*) pSdView )->DragFinished( nDropAction );
+}
+
+// -----------------------------------------------------------------------------
+
 void SdTransferable::ObjectReleased()
 {
     if( this == SD_MOD()->pTransferClip )
diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
index 30f31415f1f5..a880707b4831 100644
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: copydlg.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2001-02-09 20:32:11 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:05:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,7 @@ ModalDialog DLG_COPY
         ButtonImage = Image
         {
             ImageBitmap = Bitmap { File = "pipette.bmp" ; };
-            MaskColor = IMAGE_STDBTN_COLOR ;
+            MaskColor = IMAGE_MASK_STDCOLOR;
         };
         TabStop = TRUE ;
         QuickHelpText [ english_us ] = "Values from Selection" ;
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 2cb2b5286bfb..7af64f79ab89 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgassim.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-14 18:07:51 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:05:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,8 +94,6 @@ SdPageListControl::SdPageListControl( Window* pParent, const ResId& rResId ) :
     EnableCheckButton( m_pCheckButton );
 
     SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) );
-    // Drag&Drop im Navigator zulassen
-    // EnableDrop( TRUE );
 }
 
 IMPL_LINK( SdPageListControl, CheckButtonClickHdl, SvLBoxButtonData *, EMPTYARG )
@@ -193,7 +191,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc )
                     for (ULONG nPara = 0; nPara < nCount; nPara++)
                     {
                         pPara = pOutliner->GetParagraph(nPara);
-                        if(pPara && pOutliner->GetDepth( nPara ) == 1 )
+                        if(pPara && pOutliner->GetDepth( (USHORT) nPara ) == 1 )
                         {
                             String aParaText = pOutliner->GetText(pPara);
                             if(aParaText.Len() != 0)
@@ -399,7 +397,7 @@ void TemplateCache::Save()
     UINT16 nCheck = nMagic;
     *pStream << nCheck;
 
-    const UINT16 nDirs = m_aDirs.Count();
+    const UINT16 nDirs = (UINT16) m_aDirs.Count();
     *pStream << nDirs;
 
     for( TemplateCacheDirEntry* pDir = m_aDirs.First();
@@ -408,7 +406,7 @@ void TemplateCache::Save()
     {
         pStream->WriteByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 );
 
-        const UINT16 nFiles = pDir->m_aFiles.Count();
+        const UINT16 nFiles = (UINT16) pDir->m_aFiles.Count();
         *pStream << nFiles;
 
         for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First();
diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src
index c81467533a3a..676bc0a2e597 100644
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsnap.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2001-01-26 21:26:13 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:05:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -253,7 +253,7 @@ ModalDialog DLG_SNAPLINE
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_STDBTN_COLOR ;
+            MaskColor = IMAGE_MASK_STDCOLOR;
             ImageBitmap = Bitmap { File = "hlppoint.bmp" ; };
         };
         Text[ chinese_simplified ] = "��(~P)";
@@ -287,7 +287,7 @@ ModalDialog DLG_SNAPLINE
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_STDBTN_COLOR ;
+            MaskColor = IMAGE_MASK_STDCOLOR;
             ImageBitmap = Bitmap { File = "hlplvert.bmp" ; };
         };
         Text[ chinese_simplified ] = "����(~V)";
@@ -321,7 +321,7 @@ ModalDialog DLG_SNAPLINE
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_STDBTN_COLOR ;
+            MaskColor = IMAGE_MASK_STDCOLOR;
             ImageBitmap = Bitmap { File = "hlplhorz.bmp" ; };
         };
         Text[ chinese_simplified ] = "����(~H)";
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index 920d4e46897a..4e77a018eb16 100644
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: navigatr.src,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2001-02-09 20:55:59 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:07:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,7 +95,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "live.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 Text = "Livemodus" ;
                 Text [ ENGLISH ] = "Live mode" ;
@@ -127,7 +127,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "pen.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 Text = "Stift" ;
                 Text [ ENGLISH ] = "Pen" ;
@@ -163,7 +163,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "first.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 Text = "Erste Seite" ;
                 Text [ ENGLISH ] = "First page" ;
@@ -195,7 +195,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "prev.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 Text = "vorherige Seite" ;
                 Text [ ENGLISH ] = "Previous page" ;
@@ -227,7 +227,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "next.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 /* ### ACHTUNG: Neuer Text in Resource? N�chste Seite : N�chste Seite */
                 Text = "N�chste Seite" ;
@@ -261,7 +261,7 @@ Window FLT_NAVIGATOR
                 ItemImage = Image
                 {
                     ImageBitmap = Bitmap { File = "last.bmp" ; };
-                    MaskColor = IMAGE_STDBTN_COLOR ;
+                    MaskColor = IMAGE_MASK_STDCOLOR ;
                 };
                 Text = "Letzte Seite" ;
                 Text [ ENGLISH ] = "Last page" ;
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index c21253403118..1147a79c219b 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: present.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:33 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:07:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,7 +134,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
 
     if( pCustomShowList )
     {
-        USHORT nPosToSelect = pCustomShowList->GetCurPos();
+        USHORT nPosToSelect = (USHORT) pCustomShowList->GetCurPos();
         SdCustomShow* pCustomShow;
         // Listbox mit CustomShows fuellen
         for( pCustomShow = (SdCustomShow*) pCustomShowList->First();
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index ac2131f41e52..44e5980ba5e2 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prltempl.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dl $ $Date: 2000-11-27 08:15:40 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:07:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -425,8 +425,8 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet()
                 {
                     SvxNumberFormat aFrmt( pNumRule->GetLevel( GetOutlineLevel() ));
 
-                    aFrmt.SetLSpace( rLRItem.GetTxtLeft() );
-                    aFrmt.SetAbsLSpace( rLRItem.GetTxtLeft() );
+                    aFrmt.SetLSpace( (short) rLRItem.GetTxtLeft() );
+                    aFrmt.SetAbsLSpace( (short) rLRItem.GetTxtLeft() );
                     aFrmt.SetFirstLineOffset( rLRItem.GetTxtFirstLineOfst() );
                     pNumRule->SetLevel( GetOutlineLevel(), aFrmt );
                 }
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index ae34773e79f2..2e5f8bc7dafd 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fucopy.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -332,9 +332,9 @@ FuCopy::FuCopy(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
             {
                 // Koennte man sicher noch optimieren, wuerde aber u.U.
                 // zu Rundungsfehlern fuehren
-                USHORT nRed = aStartColor.GetRed() + (USHORT) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber  );
-                USHORT nGreen = aStartColor.GetGreen() + (USHORT) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) *  (long) i / (long) nNumber );
-                USHORT nBlue = aStartColor.GetBlue() + (USHORT) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
+                BYTE nRed = aStartColor.GetRed() + (BYTE) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber  );
+                BYTE nGreen = aStartColor.GetGreen() + (BYTE) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) *  (long) i / (long) nNumber );
+                BYTE nBlue = aStartColor.GetBlue() + (BYTE) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
                 Color aNewColor( nRed, nGreen, nBlue );
                 SfxItemSet aNewSet( pViewSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
                 aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 1ad2ae60888a..b53d7b996750 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuinsert.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2001-02-13 12:14:55 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,7 +200,7 @@ FuInsertGraphic::FuInsertGraphic(SdViewShell* pViewSh, SdWindow* pWin, SdView* p
 
             if ( nError == 0 && pViewSh->ISA(SdDrawViewShell) )
             {
-                DropAction eAction = DROP_COPY;    // Objekt einfuegen
+                sal_Int8    nAction = DND_ACTION_COPY;
                 SdrGrafObj* pEmptyGrafObj = NULL;
 
                 if ( pView->HasMarkedObj() )
@@ -218,7 +218,7 @@ FuInsertGraphic::FuInsertGraphic(SdViewShell* pViewSh, SdWindow* pWin, SdView* p
                         if (pObj->GetObjInventor() == SdrInventor &&
                             pObj->GetObjIdentifier() == OBJ_GRAF)
                         {
-                            eAction = DROP_LINK;   // Attribute austauschen
+                            nAction = DND_ACTION_LINK;
                             pEmptyGrafObj = (SdrGrafObj*) pObj;
                         }
                     }
@@ -228,8 +228,7 @@ FuInsertGraphic::FuInsertGraphic(SdViewShell* pViewSh, SdWindow* pWin, SdView* p
                 Rectangle aRect(aPos, pWindow->GetOutputSizePixel() );
                 aPos = aRect.Center();
                 aPos = pWindow->PixelToLogic(aPos);
-                SdrGrafObj* pGrafObj = pView->InsertGraphic(aGraphic, eAction, aPos,
-                                                            pEmptyGrafObj, NULL);
+                SdrGrafObj* pGrafObj = pView->InsertGraphic(aGraphic, nAction, aPos, pEmptyGrafObj, NULL);
 
                 if (pGrafObj && pDlg->AsLink())
                 {
@@ -299,11 +298,11 @@ FuInsertClipboard::FuInsertClipboard(SdViewShell* pViewSh, SdWindow* pWin, SdVie
 
         if( aDataHelper.GetTransferable().is() )
         {
-            DropAction eAction = DROP_COPY;
+            sal_Int8 nAction = DND_ACTION_COPY;
 
             pView->InsertData( aDataHelper.GetTransferable(),
                                pWindow->PixelToLogic( Rectangle( Point(), pWindow->GetOutputSizePixel() ).Center() ),
-                               eAction, FALSE, nFormatId );
+                               nAction, FALSE, nFormatId );
         }
     }
 
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 8e2ddb0e87da..ab4799ff6ce0 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fumorph.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -157,9 +157,9 @@ FuMorph::FuMorph(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                     aPolyPoly2.FlipDirections();
 
                 // force same point counts
-                for(sal_uInt32 a(0L); a < aPolyPoly1.Count(); a++)
+                for( USHORT a = 0; a < aPolyPoly1.Count(); a++ )
                 {
-                    if(aPolyPoly1[a].GetPointCount() < aPolyPoly2[a].GetPointCount())
+                    if(aPolyPoly1[ a].GetPointCount() < aPolyPoly2[ a].GetPointCount())
                         ImpEqualizePolyPointCount(aPolyPoly1[a], aPolyPoly2[a]);
                     else if(aPolyPoly2[a].GetPointCount() < aPolyPoly1[a].GetPointCount())
                         ImpEqualizePolyPointCount(aPolyPoly2[a], aPolyPoly1[a]);
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index 27cfcc3a06b9..12d0da1b6109 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuzoom.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2000-09-21 16:11:55 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:09:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -259,7 +259,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
         Size aZoomSizePixel = pWindow->LogicToPixel(aZoomRect).GetSize();
         ULONG nTol = DRGPIX + DRGPIX;
 
-        if ( aZoomSizePixel.Width() < nTol && aZoomSizePixel.Height() < nTol )
+        if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() < (long) nTol )
         {
             // Klick auf der Stelle: Zoomfaktor verdoppeln
             Point aPos = pWindow->PixelToLogic(aPosPix);
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 1109ff9297d2..0916cf4a534e 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: res_bmp.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dl $ $Date: 2001-02-19 10:43:47 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:11:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,6 +60,13 @@
  ************************************************************************/
 #include "sfx2/sfx.hrc"
 #include "cfgids.hxx"
+
+// -----------
+// - Defines -
+// -----------
+
+#define IMAGE_MASK_STDCOLOR Color{ Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
+
 #define RID_TIME_BUTTON           RID_APP_START
 #define RID_ALIGNMENT             RID_APP_START+1
 #define RID_ZOOM                  RID_APP_START+2
@@ -356,8 +363,3 @@
 #define RID_DRAW_GLUEPOINT_POPUP            RID_APP_START+392
 #define RID_DRAW_CONTROL_POPUP              RID_APP_START+393
 #define RID_FORM_CONTROL_POPUP              RID_APP_START+394
-
-#ifndef IMAGE_STDBTN_COLOR
-#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-#endif
-
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index de0e30149d4b..4cfd4061aab3 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxfer.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: ka $ $Date: 2001-01-19 19:08:37 $
+ *  last change: $Author: ka $ $Date: 2001-03-08 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,6 +118,7 @@ protected:
     virtual void                    AddSupportedFormats();
     virtual sal_Bool                GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
     virtual sal_Bool                WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    virtual void                    DragFinished( sal_Int8 nDropAction );
     virtual void                    ObjectReleased();
 
 public: