DEV300: merge 000330 till r. b727f1beb700

17 files changed, 199 insertions, 51 deletions

diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 598295797ea6..5492759d4d36 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -520,6 +520,15 @@ public:
                           String& sOutString, Color** ppColor,
                           LanguageType eLnge = LANGUAGE_DONTKNOW );
 
+    /** Format a string according to a format code string to be scanned.
+        @return
+            <FALSE/> if format code contains an error
+            <TRUE/> else, in which case the string and color are returned.
+     */
+    BOOL GetPreviewString( const String& sFormatString, const String& sPreviewString,
+                          String& sOutString, Color** ppColor,
+                          LanguageType eLnge = LANGUAGE_DONTKNOW );
+
     /** Test whether the format code string is already present in container
         @return
             NUMBERFORMAT_ENTRY_NOT_FOUND if not found, else the format index.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cb66a75558c2..7343a0a9c0e6 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1697,6 +1697,58 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
     return FALSE;
 }
 
+BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString,
+                                          const String& sPreviewString,
+                                          String& sOutString,
+                                          Color** ppColor,
+                                          LanguageType eLnge )
+{
+    if (sFormatString.Len() == 0)               // no empty string
+        return FALSE;
+
+    xub_StrLen nCheckPos = STRING_NOTFOUND;
+    sal_uInt32 nKey;
+    if (eLnge == LANGUAGE_DONTKNOW)
+        eLnge = IniLnge;
+    ChangeIntl(eLnge);                          // switch if needed
+    eLnge = ActLnge;
+    String sTmpString = sFormatString;
+    SvNumberformat* p_Entry = new SvNumberformat( sTmpString,
+                                                  pFormatScanner,
+                                                  pStringScanner,
+                                                  nCheckPos,
+                                                  eLnge);
+    if (nCheckPos == 0)                          // String ok
+    {
+        String aNonConstPreview( sPreviewString);
+        // May have to create standard formats for this locale.
+        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);
+        nKey = ImpIsEntry( p_Entry->GetFormatstring(), CLOffset, eLnge);
+        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)       // already present
+            GetOutputString( aNonConstPreview, nKey, sOutString, ppColor);
+        else
+        {
+            // If the format is valid but not a text format and does not
+            // include a text subformat, an empty string would result. Same as
+            // in SvNumberFormatter::GetOutputString()
+            if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat())
+                p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor);
+            else
+            {
+                *ppColor = NULL;
+                sOutString = sPreviewString;
+            }
+        }
+        delete p_Entry;
+        return TRUE;
+    }
+    else
+    {
+        delete p_Entry;
+        return FALSE;
+    }
+}
+
 sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString,
                                       LanguageType eLnge)
 {
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 707b2362f0ed..97f06171a4fc 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2057,7 +2057,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
             OutString = rScan.GetFalseString();
         return FALSE;
     }
-    if (eType & NUMBERFORMAT_TEXT && bStandard)
+    if (eType & NUMBERFORMAT_TEXT)
     {
         ImpGetOutputStandard(fNumber, OutString);
         return FALSE;
@@ -2086,7 +2086,9 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
                         if (!nLen)
                             return false;
 
-                        if (nLen > 11)
+                        // #i112250# With the 10-decimal limit, small numbers are formatted as "0".
+                        // Switch to scientific in that case, too:
+                        if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0))
                         {
                             sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
                             nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 70d9d1623ef2..1551361f252f 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -316,6 +316,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 
     sal_Bool bMenuIcons = true;
     sal_Bool bSystemMenuIcons = true;
+    sal_Bool bMenuSettingsChanged = false;
 
     // Step over list of property names and get right value from coreesponding value list to set it on internal members!
     sal_Int32 nCount = seqPropertyNames.getLength();
@@ -334,12 +335,12 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
         {
             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
-            seqValues[nProperty] >>= bMenuIcons;
+            bMenuSettingsChanged = seqValues[nProperty] >>= bMenuIcons;
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
         {
             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
-            seqValues[nProperty] >>= bSystemMenuIcons;
+            bMenuSettingsChanged = seqValues[nProperty] >>= bSystemMenuIcons;
         }
 
         #if OSL_DEBUG_LEVEL > 1
@@ -347,7 +348,8 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
         #endif
     }
 
-    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+    if ( bMenuSettingsChanged )
+        m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
 
     for ( USHORT n=0; n<aList.Count(); n++ )
         aList.GetObject(n)->Call( this );
@@ -377,11 +379,13 @@ void SvtMenuOptions_Impl::Commit()
                                                             break;
             //Output cache of current setting as possibly modified by System Theme for older version
             case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
-                                                                seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+                                                                sal_Bool bValue = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+                                                                seqValues[nProperty] <<= bValue;
                                                             }
                                                             break;
             case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
-                                                                seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+                                                                sal_Bool bValue = (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+                                                                seqValues[nProperty] <<= bValue;
                                                             }
                                                             break;
         }
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index fb71f64772ad..a69253c69629 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1518,6 +1518,13 @@ void SvLBox::MakeVisible( SvLBoxEntry* )
 void SvLBox::Command( const CommandEvent& i_rCommandEvent )
 {
     DBG_CHKTHIS(SvLBox,0);
+
+    if ( COMMAND_STARTDRAG == i_rCommandEvent.GetCommand() )
+    {
+        Point aEventPos( i_rCommandEvent.GetMousePosPixel() );
+        MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
+        MouseButtonUp( aMouseEvt );
+    }
     Control::Command( i_rCommandEvent );
 }
 
@@ -1775,6 +1782,10 @@ void SvLBox::StartDrag( sal_Int8, const Point& rPosPixel )
 {
     DBG_CHKTHIS(SvLBox,0);
 
+    Point aEventPos( rPosPixel );
+    MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
+    MouseButtonUp( aMouseEvt );
+
     nOldDragMode = GetDragDropMode();
     if ( !nOldDragMode )
         return;
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index de2bef64ba6e..6abab2626516 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.cxx
@@ -1201,7 +1201,7 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
         nFormat = GFF_PCT;
     else
     {
-        BYTE sBuf[4];
+        BYTE sBuf[3]={0};
 
         rStm.Seek( nStmPos + 522 );
         rStm.Read( sBuf, 3 );
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index f7c4f51ce1e2..cea1ab490b04 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -1081,6 +1081,8 @@ void WMFReader::ReadWMF()
     nEMFRec         = 0;
     nEMFSize        = 0;
 
+    sal_Bool bEMFAvailable = sal_False;
+
     pOut->SetMapMode( MM_ANISOTROPIC );
     pOut->SetWinOrg( Point() );
     pOut->SetWinExt( Size( 1, 1 ) );
@@ -1117,50 +1119,53 @@ void WMFReader::ReadWMF()
 
                     break;
                 }
-                if( aBmpSaveList.Count() &&
-                    ( nFunction != W_META_STRETCHDIB ) &&
-                    ( nFunction != W_META_DIBBITBLT ) &&
-                    ( nFunction != W_META_DIBSTRETCHBLT ) )
-                {
-                    pOut->ResolveBitmapActions( aBmpSaveList );
-                }
-                if ( !nSkipActions )
-                    ReadRecordParams( nFunction );
-                else
-                    nSkipActions--;
-
-                if( pEMFStream && nEMFRecCount == nEMFRec )
+                if ( !bEMFAvailable )
                 {
-                    GDIMetaFile aMeta;
-                    pEMFStream->Seek( 0 );
-                    EnhWMFReader* pEMFReader = new EnhWMFReader ( *pEMFStream, aMeta );
-                    BOOL bRead = pEMFReader->ReadEnhWMF();
-                    delete pEMFReader; // destroy first!!!
-
-                    if( bRead )
+                    if( aBmpSaveList.Count() &&
+                        ( nFunction != W_META_STRETCHDIB ) &&
+                        ( nFunction != W_META_DIBBITBLT ) &&
+                        ( nFunction != W_META_DIBSTRETCHBLT ) )
                     {
-                       pOut->AddFromGDIMetaFile( aMeta );
-                       pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
-                       // we have successfully read the embedded EMF data
-                       // no need to process WMF data further
-                       break;
+                        pOut->ResolveBitmapActions( aBmpSaveList );
                     }
+                    if ( !nSkipActions )
+                        ReadRecordParams( nFunction );
                     else
+                        nSkipActions--;
+
+                    if( pEMFStream && nEMFRecCount == nEMFRec )
                     {
-                        // something went wrong
-                        // continue with WMF, don't try this again
-                        delete pEMFStream;
-                        pEMFStream = NULL;
-                    }
+                        GDIMetaFile aMeta;
+                        pEMFStream->Seek( 0 );
+                        EnhWMFReader* pEMFReader = new EnhWMFReader ( *pEMFStream, aMeta );
+                        bEMFAvailable = pEMFReader->ReadEnhWMF();
+                        delete pEMFReader; // destroy first!!!
 
+                        if( bEMFAvailable )
+                        {
+                            pOut->AddFromGDIMetaFile( aMeta );
+                            pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
+
+                            // the stream needs to be set to the wmf end position,
+                            // otherwise the GfxLink that is created will be incorrect
+                            // (leading to graphic loss after swapout/swapin).
+                            // so we will proceed normally, but are ignoring further wmf
+                            // records
+                        }
+                        else
+                        {
+                            // something went wrong
+                            // continue with WMF, don't try this again
+                            delete pEMFStream;
+                            pEMFStream = NULL;
+                        }
+                    }
                 }
-
                 nPos += nRecSize * 2;
                 if ( nPos <= nEndPos )
                     pWMF->Seek( nPos  );
                 else
                     pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
-
             }
         }
         else
diff --git a/vcl/source/window/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx
index 5b91bd0713ec..5b91bd0713ec 100644
--- a/vcl/source/window/dndevdis.hxx
+++ b/vcl/inc/vcl/dndevdis.hxx
diff --git a/vcl/source/window/dndlcon.hxx b/vcl/inc/vcl/dndlcon.hxx
index 5a41a20e4271..5a41a20e4271 100644
--- a/vcl/source/window/dndlcon.hxx
+++ b/vcl/inc/vcl/dndlcon.hxx
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 33f60a1e8a2f..ac278f76f65b 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -396,6 +396,7 @@ private:
                         mbHScroll       : 1,    // HScroll an oder aus
                         mbAutoHScroll   : 1;    // AutoHScroll an oder aus
     Link                maScrollHdl;    // Weil der vom ImplListBoxWindow selbst benoetigt wird.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 
 protected:
     virtual void        GetFocus();
@@ -500,6 +501,7 @@ public:
 
     // pb: #106948# explicit mirroring for calc
     inline void     EnableMirroring()   { maLBWindow.EnableMirroring(); }
+    inline void     SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
 };
 
 // -----------------------------
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index eb8c20d1d803..03527bf083a7 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -44,9 +44,10 @@
 
 #include "tools/debug.hxx"
 
+#include <vcl/dndevdis.hxx>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 
-
-// =======================================================================
+// =======================================================================
 
 ListBox::ListBox( WindowType nType ) : Control( nType )
 {
@@ -119,6 +120,8 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     Control::ImplInit( pParent, nStyle, NULL );
     SetBackground();
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this);
+
     if( nStyle & WB_DROPDOWN )
     {
         sal_Int32 nLeft, nTop, nRight, nBottom;
@@ -145,16 +148,19 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
         mpFloatWin = new ImplListBoxFloatingWindow( this );
         mpFloatWin->SetAutoWidth( TRUE );
         mpFloatWin->SetPopupModeEndHdl( LINK( this, ListBox, ImplPopupModeEndHdl ) );
+        mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpImplWin = new ImplWin( this, (nStyle & (WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
         mpImplWin->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
         mpImplWin->Show();
+        mpImplWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
         ImplInitDropDownButton( mpBtn );
         mpBtn->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpBtn->Show();
+        mpBtn->GetDropTarget()->addDropTargetListener(xDrop);
 
     }
 
@@ -170,6 +176,9 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     mpImplLB->SetPosPixel( Point() );
     mpImplLB->Show();
 
+    mpImplLB->GetDropTarget()->addDropTargetListener(xDrop);
+    mpImplLB->SetDropTraget(xDrop);
+
     if ( mpFloatWin )
     {
         mpFloatWin->SetImplListBox( mpImplLB );
@@ -1612,7 +1621,6 @@ const Wallpaper& ListBox::GetDisplayBackground() const
 }
 
 // =======================================================================
-
 MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
     ListBox( WINDOW_MULTILISTBOX )
 {
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index efc49be6fbf8..e4d5a8c4c0eb 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <dndevdis.hxx>
-#include <dndlcon.hxx>
+#include <vcl/dndevdis.hxx>
+#include <vcl/dndlcon.hxx>
 #include <vcl/window.h>
 
 #include <vos/mutex.hxx>
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index c5d78dd6bae3..07819e76f957 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include<dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 35641ab8d6f9..adedbde4c0f2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -88,8 +88,8 @@
 
 #include "vcl/dialog.hxx"
 #include "vcl/unowrap.hxx"
-#include "dndlcon.hxx"
-#include "dndevdis.hxx"
+#include "vcl/dndlcon.hxx"
+#include "vcl/dndevdis.hxx"
 #include "vcl/impbmpconv.hxx"
 #include "unotools/confignode.hxx"
 #include "vcl/gdimtf.hxx"
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7b0512a1320b..c964ad0d739b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -62,7 +62,7 @@
 #include <vcl/salgdi.hxx>
 #include <vcl/menu.hxx>
 
-#include <dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 7f205407b21b..4bb24e03917b 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -28,15 +28,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "saldisp.hxx"
+#include "saldata.hxx"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+
 #include "tools/prex.h"
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <X11/Xlib.h>
-#include <X11/X.h>
 #include <X11/Xutil.h>
 #include "tools/postx.h"
 #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
@@ -3259,6 +3261,8 @@ void SelectionManager::startDrag(
         return;
     }
 
+    SalFrame* pCaptureFrame = NULL;
+
     {
         ClearableMutexGuard aGuard(m_aMutex);
 
@@ -3327,6 +3331,32 @@ void SelectionManager::startDrag(
                           None,
                           None,
                           CurrentTime );
+        /* if we could not grab the pointer here, there is a chance
+           that the pointer is grabbed by the other vcl display (the main loop)
+           so let's break that grab an reset it later
+
+           remark: this whole code should really be molten into normal vcl so only
+           one display is used ....
+        */
+        if( nPointerGrabSuccess != GrabSuccess )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+            {
+                pCaptureFrame = GetX11SalData()->GetDisplay()->GetCaptureFrame();
+                if( pCaptureFrame )
+                {
+                    GetX11SalData()->GetDisplay()->CaptureMouse( NULL );
+                    nPointerGrabSuccess =
+                                XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True,
+                                              DRAG_EVENT_MASK,
+                                              GrabModeAsync, GrabModeAsync,
+                                              None,
+                                              None,
+                                              CurrentTime );
+                }
+            }
+        }
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "%d\n", nPointerGrabSuccess );
 #endif
@@ -3349,6 +3379,16 @@ void SelectionManager::startDrag(
             aGuard.clear();
             if( listener.is() )
                 listener->dragDropEnd( aDragFailedEvent );
+            if( pCaptureFrame )
+            {
+                vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+                if( rSolarMutex.tryToAcquire() )
+                    GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+                else
+                    OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+            }
             return;
         }
 
@@ -3428,6 +3468,17 @@ void SelectionManager::startDrag(
         XUngrabKeyboard( m_pDisplay, CurrentTime );
         XFlush( m_pDisplay );
 
+        if( pCaptureFrame )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+                GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+            else
+                OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+        }
+
         m_aDragRunning.reset();
 
         if( listener.is() )
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index ae21c3aa9f7b..c0658c162489 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1127,6 +1127,8 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
     basegfx::B2DTrapezoidVector aB2DTrapVector;
     basegfx::tools::trapezoidSubdivide( aB2DTrapVector, aPolyPoly );
     const int nTrapCount = aB2DTrapVector.size();
+    if( !nTrapCount )
+        return true;
     const bool bDrawn = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
     return bDrawn;
 }
@@ -1239,6 +1241,8 @@ bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, double
 
         // draw tesselation result
         const int nTrapCount = aB2DTrapVector.size();
+        if( !nTrapCount )
+            return true;
         const bool bDrawOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
 
         // restore the original brush GC