CWS-TOOLING: integrate CWS vcl103

2009-07-24 Jens-Heiner Rechtien #i10000#: merge with m53
2009-07-10 Philipp Lohmann merge
2009-07-10 hdu #i103417# ignore non-standard font styles
2009-07-07 Philipp Lohmann #i98789# add: Invalidate on StateChanged( STATE_CHANGE_ENABLE )
2009-07-07 Philipp Lohmann #i102501# ExportFormFields should be persistent
2009-07-07 Philipp Lohmann merge
2009-07-07 Philipp Lohmann #i103319# there is no platform currently where we should beep on disabled controls
2009-07-02 Philipp Lohmann merge
2009-07-01 Philipp Lohmann #i93100# handle ListBox with no border a little more graceful on MacOSX
2009-07-01 Philipp Lohmann #i101307# don't crash due to unfortunate timing
2009-07-03 thb #i103145# Swapped HINT_DOCK for HINT_TOOLBAR for the presentation fullscreen window; anecdotal evidence suggests it works much better then for wide-spread window managers
2009-06-30 Philipp Lohmann #i103102# evaluate Cmd-Option key combinations
2009-06-29 Philipp Lohmann #i103148# catch exception from missing UCB (thanks thb)
2009-06-29 hdu #i102378# fix PDF-export on PPC (thanks cloph!)
2009-06-25 Philipp Lohmann fix another link problem
2009-06-24 Philipp Lohmann use correct method signature
2009-06-24 Philipp Lohmann fix a warning
2009-06-24 Philipp Lohmann fix a warning
2009-06-24 Philipp Lohmann #i100357# add: GDIMetaFile::GetBoundRect
2009-06-24 Philipp Lohmann merge
2009-06-24 hdu #i100357# extend GetTextBoundRect() to measure justified text too
2009-06-23 Philipp Lohmann #i101108# protect writer from itself, no one could ever use paper of size (0,0)
2009-06-22 Philipp Lohmann merge
2009-06-22 Philipp Lohmann #i92356# treat windows running a popup menu as modal
2009-06-22 hdu #i100000# remove sft.h again (CWS dba32b accidentially reintroduced it)
2009-06-17 Philipp Lohmann merge
2009-06-17 Philipp Lohmann remove warnings (thanks ericb)
2009-06-17 Philipp Lohmann merge
2009-06-17 Philipp Lohmann #i102133# free cursors (thanks cmc)
2009-06-17 Philipp Lohmann #i97293# catch exception
2009-06-17 Philipp Lohmann #i91240# fix images in menus, again
2009-06-15 Philipp Lohmann #i100586# fix a pure virtual method (thanks cmc)
2009-06-15 Philipp Lohmann fix an array delete issue
2009-06-15 Philipp Lohmann #i102228# fix a cleanup issue
2009-06-15 Philipp Lohmann #i97218# solve duplicate accelerator
2009-06-12 hdu #i102219# avoid void*->oslGenericFunction cast for MingW (thanks tono!)

1 files changed, 9 insertions, 8 deletions

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 537964582ceb..9d876c7bdcb5 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7919,8 +7919,8 @@ BOOL OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr,
 // -----------------------------------------------------------------------
 
 BOOL OutputDevice::GetTextBoundRect( Rectangle& rRect,
-    const String& rStr, xub_StrLen nBase, xub_StrLen nIndex,
-    xub_StrLen nLen ) const
+    const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen,
+    ULONG nLayoutWidth, const sal_Int32* pDXAry ) const
 {
     DBG_TRACE( "OutputDevice::GetTextBoundRect()" );
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -7929,13 +7929,14 @@ BOOL OutputDevice::GetTextBoundRect( Rectangle& rRect,
     rRect.SetEmpty();
 
     SalLayout* pSalLayout = NULL;
+    const Point aPoint;
     // calculate offset when nBase!=nIndex
     long nXOffset = 0;
     if( nBase != nIndex )
     {
         xub_StrLen nStart = Min( nBase, nIndex );
         xub_StrLen nOfsLen = Max( nBase, nIndex ) - nStart;
-        pSalLayout = ImplLayout( rStr, nStart, nOfsLen );
+        pSalLayout = ImplLayout( rStr, nStart, nOfsLen, aPoint, nLayoutWidth, pDXAry );
         if( pSalLayout )
         {
             nXOffset = pSalLayout->GetTextWidth();
@@ -7947,7 +7948,7 @@ BOOL OutputDevice::GetTextBoundRect( Rectangle& rRect,
         }
     }
 
-    pSalLayout = ImplLayout( rStr, nIndex, nLen );
+    pSalLayout = ImplLayout( rStr, nIndex, nLen, aPoint, nLayoutWidth, pDXAry );
     Rectangle aPixelRect;
     if( pSalLayout )
     {
@@ -7997,7 +7998,7 @@ BOOL OutputDevice::GetTextBoundRect( Rectangle& rRect,
     aVDev.SetTextAlign( ALIGN_TOP );
 
     // layout the text on the virtual device
-    pSalLayout = aVDev.ImplLayout( rStr, nIndex, nLen );
+    pSalLayout = aVDev.ImplLayout( rStr, nIndex, nLen, aPoint, nLayoutWidth, pDXAry );
     if( !pSalLayout )
         return false;
 
@@ -8097,7 +8098,7 @@ BOOL OutputDevice::GetTextBoundRect( Rectangle& rRect,
 
 BOOL OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
     const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen,
-    BOOL bOptimize, const ULONG nTWidth, const sal_Int32* pDXArray ) const
+    BOOL bOptimize, ULONG nTWidth, const sal_Int32* pDXArray ) const
 {
     // the fonts need to be initialized
     if( mbNewFont )
@@ -8326,7 +8327,7 @@ BOOL OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
 
 BOOL OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector,
     const String& rStr, xub_StrLen nBase, xub_StrLen nIndex,
-    xub_StrLen nLen, BOOL bOptimize, const ULONG nTWidth, const sal_Int32* pDXArray ) const
+    xub_StrLen nLen, BOOL bOptimize, ULONG nTWidth, const sal_Int32* pDXArray ) const
 {
     rResultVector.clear();
 
@@ -8349,7 +8350,7 @@ BOOL OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector,
 
 BOOL OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly,
     const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen,
-    BOOL bOptimize, const ULONG nTWidth, const sal_Int32* pDXArray ) const
+    BOOL bOptimize, ULONG nTWidth, const sal_Int32* pDXArray ) const
 {
     rPolyPoly.Clear();