Modified: openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.hxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.hxx (original) +++ openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.hxx Sun Apr 7 10:50:30 2013 @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/io/XInputStream.hpp> -#include <DAVResource.hxx> +#include "DAVResource.hxx" #include <vector> //////////////////////////////////////////////////////////////////////////////
Modified: openoffice/branches/l10n/main/vcl/aqua/source/gdi/salnativewidgets.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/gdi/salnativewidgets.cxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/aqua/source/gdi/salnativewidgets.cxx (original) +++ openoffice/branches/l10n/main/vcl/aqua/source/gdi/salnativewidgets.cxx Sun Apr 7 10:50:30 2013 @@ -816,7 +816,7 @@ sal_Bool AquaSalGraphics::drawNativeCont case CTRL_SCROLLBAR: { - ScrollbarValue* pScrollbarVal = (ScrollbarValue *)&aValue; + const ScrollbarValue* pScrollbarVal = (aValue.getType() == CTRL_SCROLLBAR) ? static_cast<const ScrollbarValue*>(&aValue) : NULL; if( nPart == PART_DRAW_BACKGROUND_VERT || nPart == PART_DRAW_BACKGROUND_HORZ ) @@ -1085,16 +1085,13 @@ sal_Bool AquaSalGraphics::drawNativeCont if(nState & CTRL_STATE_FOCUSED) HIThemeDrawFocusRect(&rc, true, mrContext, kHIThemeOrientationNormal); //buttons: - SpinbuttonValue* pSpinButtonVal = (SpinbuttonValue *)&aValue; + const SpinbuttonValue* pSpinButtonVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue*>(&aValue) : NULL; ControlState nUpperState = CTRL_STATE_ENABLED;//state of the upper button ControlState nLowerState = CTRL_STATE_ENABLED;//and of the lower button if(pSpinButtonVal) {//pSpinButtonVal is sometimes null nUpperState = (ControlState) pSpinButtonVal->mnUpperState; nLowerState = (ControlState) pSpinButtonVal->mnLowerState; - } - if( pSpinButtonVal ) - { HIThemeButtonDrawInfo aSpinInfo; aSpinInfo.kind = kThemeIncDecButton; aSpinInfo.state = kThemeStateActive; Modified: openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm (original) +++ openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm Sun Apr 7 10:50:30 2013 @@ -175,8 +175,10 @@ static AquaSalFrame* getMouseContainerFr // disable OSX>=10.7 window restoration until we support it directly const SEL setRestorable = @selector(setRestorable:); - if( [pNSWindow respondsToSelector: setRestorable]) - [pNSWindow performSelector:setRestorable withObject:NO]; + if( [pNSWindow respondsToSelector: setRestorable]) { + NSNumber* bNO = [NSNumber numberWithBool:NO]; + [pNSWindow performSelector:setRestorable withObject:bNO]; + } return pNSWindow; } @@ -478,7 +480,13 @@ static AquaSalFrame* getMouseContainerFr -(BOOL)isOpaque { - return mpFrame ? (mpFrame->getClipPath() != 0 ? NO : YES) : YES; + if( !mpFrame) + return YES; + if( !AquaSalFrame::isAlive( mpFrame)) + return YES; + if( !mpFrame->getClipPath()) + return YES; + return NO; } // helper class similar to a vos::OGuard for the SalYieldMutex Modified: openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx (original) +++ openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx Sun Apr 7 10:50:30 2013 @@ -123,9 +123,7 @@ public: inline BitmapColor( const BitmapColor& rBitmapColor ); inline BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ); inline BitmapColor( const Color& rColor ); -#ifndef BINFILTER_COMPAT explicit -#endif // BINFILTER_COMPAT inline BitmapColor( sal_uInt8 cIndex ); inline ~BitmapColor() {}; Modified: openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx (original) +++ openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx Sun Apr 7 10:50:30 2013 @@ -7175,12 +7175,11 @@ void PDFWriterImpl::drawVerticalGlyphs( } aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) ); if( i < rGlyphs.size()-1 ) - // [Bug 120627] the text on the Y axis is reversed when export ppt file to PDF format - { - long nOffsetX = rGlyphs[i+1].m_aPos.X() - rGlyphs[i].m_aPos.X(); - long nOffsetY = rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y(); - nXOffset += (int)sqrt(double(nOffsetX*nOffsetX + nOffsetY*nOffsetY)); - } + { + long nOffsetX = rGlyphs[i+1].m_aPos.X() - rGlyphs[i].m_aPos.X(); + long nOffsetY = rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y(); + nXOffset += (int)sqrt(double(nOffsetX*nOffsetX + nOffsetY*nOffsetY)); + } if( ! rGlyphs[i].m_nGlyphId ) continue; Modified: openoffice/branches/l10n/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx (original) +++ openoffice/branches/l10n/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx Sun Apr 7 10:50:30 2013 @@ -1375,7 +1375,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrol const OUString& ) { OSL_ASSERT( aValue.getType() == CTRL_SCROLLBAR ); - const ScrollbarValue* pScrollbarVal = static_cast<const ScrollbarValue *>(&aValue); + const ScrollbarValue* pScrollbarVal = (aValue.getType() == CTRL_SCROLLBAR) ? static_cast<const ScrollbarValue*>(&aValue) : NULL; GdkPixmap* pixmap = NULL; Rectangle pixmapRect, scrollbarRect; GtkStateType stateType; Modified: openoffice/branches/l10n/main/vcl/unx/kde/salnativewidgets-kde.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/unx/kde/salnativewidgets-kde.cxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/unx/kde/salnativewidgets-kde.cxx (original) +++ openoffice/branches/l10n/main/vcl/unx/kde/salnativewidgets-kde.cxx Sun Apr 7 10:50:30 2013 @@ -514,7 +514,7 @@ sal_Bool WidgetPainter::drawStyledWidget } else if ( strcmp( "QSpinWidget", pClassName ) == 0 ) { - const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue *> ( &aValue ); + const SpinbuttonValue* pValue = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue*>(&aValue) : NULL; // Is any of the buttons pressed? QStyle::SCFlags eActive = QStyle::SC_None; @@ -603,7 +603,7 @@ sal_Bool WidgetPainter::drawStyledWidget } else if ( strcmp( "QScrollBar", pClassName ) == 0 ) { - const ScrollbarValue *pValue = static_cast<const ScrollbarValue *> ( &aValue ); + const ScrollbarValue* pScrollbarVal = (aValue.getType() == CTRL_SCROLLBAR) ? static_cast<const ScrollbarValue*>(&aValue) : NULL; QStyle::SCFlags eActive = QStyle::SC_None; if ( pValue ) @@ -1008,7 +1008,7 @@ QScrollBar *WidgetPainter::scrollBar( co m_pScrollBar->resize( qRect.size() ); m_pScrollBar->setOrientation( bHorizontal? Qt::Horizontal: Qt::Vertical ); - const ScrollbarValue *pValue = static_cast<const ScrollbarValue *> ( &aValue ); + const ScrollbarValue* pScrollbarVal = (aValue.getType() == CTRL_SCROLLBAR) ? static_cast<const ScrollbarValue*>(&aValue) : NULL; if ( pValue ) { m_pScrollBar->setMinValue( pValue->mnMin ); Modified: openoffice/branches/l10n/main/vcl/win/source/gdi/salnativewidgets-luna.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/win/source/gdi/salnativewidgets-luna.cxx?rev=1465361&r1=1465360&r2=1465361&view=diff ============================================================================== --- openoffice/branches/l10n/main/vcl/win/source/gdi/salnativewidgets-luna.cxx (original) +++ openoffice/branches/l10n/main/vcl/win/source/gdi/salnativewidgets-luna.cxx Sun Apr 7 10:50:30 2013 @@ -570,7 +570,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, { if( aValue.getType() == CTRL_SPINBUTTONS ) { - const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue*>(&aValue); + const SpinbuttonValue* pValue = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue*>(&aValue) : NULL; sal_Bool bOk = sal_False; RECT rect; Propchange: openoffice/branches/l10n/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1456677-1465359 Propchange: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1456677-1465359
