sw/source/core/doc/doclay.cxx | 2 -
vcl/aqua/source/gdi/salbmp.cxx | 2 -
vcl/aqua/source/gdi/salgdi.cxx | 6 +--
vcl/aqua/source/gdi/salnativewidgets.cxx | 6 +--
vcl/aqua/source/window/salframe.cxx | 2 -
vcl/inc/aqua/salgdi.h | 45 ++++++++++++++++----------
vcl/source/control/menubtn.cxx | 4 +-
writerfilter/source/dmapper/GraphicImport.hxx | 2 -
8 files changed, 42 insertions(+), 27 deletions(-)
New commits:
commit 8209527470c4f327f8050d66b07ba46f206f44bd
Author: Herbert Dürr <h...@apache.org>
Date: Wed Jan 8 13:57:53 2014 +0000
#i123895# make the Mac code 64bit clean regarding CGFloat/float mismatches
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 834eeab..df7759d 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -772,7 +772,7 @@ CGImageRef AquaSalBitmap::CreateWithMask( const
AquaSalBitmap& rMask,
CFRelease( xMask );
CGDataProviderRef xDataProvider( CGDataProviderCreateWithData( NULL,
pMaskMem, nHeight * nMaskBytesPerRow, &CFRTLFree ) );
- static const float* pDecode = NULL;
+ static const CGFloat* pDecode = NULL;
xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow,
xDataProvider, pDecode, false );
CFRelease( xDataProvider );
CFRelease( xMaskContext );
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 6c4c933..672c33a 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1368,7 +1368,7 @@ static void DrawPattern50( void*, CGContextRef rContext )
void AquaSalGraphics::Pattern50Fill()
{
- static const float aFillCol[4] = { 1,1,1,1 };
+ static const CGFloat aFillCol[4] = { 1,1,1,1 };
static const CGPatternCallbacks aCallback = { 0, &DrawPattern50, NULL };
if( ! GetSalData()->mxP50Space )
GetSalData()->mxP50Space = CGColorSpaceCreatePattern(
GetSalData()->mxRGBSpace );
@@ -1392,7 +1392,7 @@ void AquaSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalIn
if ( nFlags & SAL_INVERT_TRACKFRAME )
{
- const float dashLengths[2] = { 4.0, 4.0 }; // for drawing
dashed line
+ const CGFloat dashLengths[2] = { 4.0, 4.0 }; // for drawing
dashed line
CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
CGContextSetRGBStrokeColor ( mrContext, 1.0, 1.0, 1.0, 1.0 );
CGContextSetLineDash ( mrContext, 0, dashLengths, 2 );
@@ -1429,7 +1429,7 @@ void AquaSalGraphics::invert( sal_uInt32 nPoints, const
SalPoint* pPtAry, SalInv
CGContextAddLines ( mrContext, CGpoints, nPoints );
if ( nSalFlags & SAL_INVERT_TRACKFRAME )
{
- const float dashLengths[2] = { 4.0, 4.0 }; // for drawing
dashed line
+ const CGFloat dashLengths[2] = { 4.0, 4.0 }; // for drawing
dashed line
CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
CGContextSetRGBStrokeColor ( mrContext, 1.0, 1.0, 1.0, 1.0 );
CGContextSetLineDash ( mrContext, 0, dashLengths, 2 );
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx
b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 63d9a72..f49e56b 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -710,11 +710,11 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType
nType,
// Perhaps some other HIThemeButtonDrawInfo setting would do
the trick ?
CGContextSetShouldAntialias( mrContext, true );
- float aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
+ CGFloat aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
CGContextSetFillColor( mrContext, aGrey );
CGContextBeginPath( mrContext );
- float x = rc.origin.x + rc.size.width;
- float y = rc.origin.y;
+ CGFloat x = rc.origin.x + rc.size.width;
+ CGFloat y = rc.origin.y;
CGContextMoveToPoint( mrContext, x, y );
y += rc.size.height;
CGContextAddLineToPoint( mrContext, x, y );
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 715a6fd..25d60be 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1191,7 +1191,7 @@ static Color getColor( NSColor* pSysColor, const Color&
rDefault, NSWindow* pWin
NSColor* pRBGColor = [pSysColor colorUsingColorSpaceName:
NSDeviceRGBColorSpace device: [pWin deviceDescription]];
if( pRBGColor )
{
- float r = 0, g = 0, b = 0, a = 0;
+ CGFloat r = 0, g = 0, b = 0, a = 0;
[pRBGColor getRed: &r green: &g blue: &b alpha: &a];
aRet = Color( int(r*255.999), int(g*255.999), int(b*255.999) );
/*
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 4c97752..6bff81b 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -40,8 +40,13 @@
class AquaSalFrame;
class AquaSalBitmap;
class ImplDevFontAttributes;
+class ImplMacTextStyle;
-class CGRect;
+struct CGRect;
+
+#ifndef CGFLOAT_TYPE
+typedef float CGFloat;
+#endif
// mac specific physically available font face
class ImplMacFontData : public ImplFontData
@@ -77,11 +82,16 @@ class RGBAColor
public:
RGBAColor( SalColor );
RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha );
//NOTUSEDYET
- const float* AsArray() const { return &mfRed; }
- bool IsVisible() const { return (mfAlpha > 0); }
- void SetAlpha( float fAlpha ) { mfAlpha = fAlpha; }
-private:
- float mfRed, mfGreen, mfBlue, mfAlpha;
+ void SetAlpha( float fAlpha ) { mfRGBA[3] = fAlpha; }
+
+ bool IsVisible() const { return (mfRGBA[3] > 0); }
+ const CGFloat* AsArray() const { return mfRGBA; }
+ CGFloat GetRed() const { return mfRGBA[0]; }
+ CGFloat GetGreen() const { return mfRGBA[1]; }
+ CGFloat GetBlue() const { return mfRGBA[2]; }
+ CGFloat GetAlpha() const { return mfRGBA[3]; }
+ private:
+ CGFloat mfRGBA[4]; // RGBA
};
// -------------------
@@ -402,17 +412,20 @@ inline void AquaSalGraphics::RefreshRect( const NSRect&
rRect )
}
inline RGBAColor::RGBAColor( SalColor nSalColor )
-: mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-, mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-, mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-, mfAlpha( 1.0 ) // opaque
-{}
+{
+ mfRGBA[0] = SALCOLOR_RED( nSalColor) * (1.0/255);
+ mfRGBA[1] = SALCOLOR_GREEN(nSalColor) * (1.0/255);
+ mfRGBA[2] = SALCOLOR_BLUE( nSalColor) * (1.0/255);
+ mfRGBA[3] = 1.0; // default to opaque
+}
inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float
fAlpha )
-: mfRed( fRed )
-, mfGreen( fGreen )
-, mfBlue( fBlue )
-, mfAlpha( fAlpha )
-{}
+{
+ mfRGBA[0] = fRed;
+ mfRGBA[1] = fGreen;
+ mfRGBA[2] = fBlue;
+ mfRGBA[3] = fAlpha;
+}
#endif // _SV_SALGDI_H
+
commit 521a37188a6a6a5a520e449e6572c2896ee37d54
Author: Tsutomu Uchino <ha...@apache.org>
Date: Wed Jan 8 13:51:46 2014 +0000
#i118357# allow to open recent list of documents in the hole right part of
the open button separated by the vertical line on the Start Center
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index aec1895..f277c2a 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -161,7 +161,9 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
{
// if the separated dropdown symbol is hit,
// execute the popup immediately
- if( ! ImplGetSymbolRect().IsInside( rMEvt.GetPosPixel() ) )
+ if ( ImplGetSymbolRect().IsEmpty() ||
+ ( PushButton::ImplHitTestPushButton( this, rMEvt.GetPosPixel() ) &&
+ rMEvt.GetPosPixel().X() < ImplGetSymbolRect().Left() ) )
{
if ( !mpMenuTimer )
{
commit 08efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528
Author: Herbert Dürr <h...@apache.org>
Date: Wed Jan 8 13:07:25 2014 +0000
#i123948# fix struct/class mismatch from PropertyValue forward declaration
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 252a039..1091697 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -46,7 +46,7 @@ namespace com{ namespace sun { namespace star {
}
namespace beans
{
- class PropertyValue;
+ struct PropertyValue;
typedef ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > PropertyValues;
}
}}}
commit 0681d4e0cd7425349600672964e48a5dbbb3c7db
Author: Tsutomu Uchino <ha...@apache.org>
Date: Wed Jan 8 12:38:09 2014 +0000
#i51453# avoid relative sizing for the picture and formula wrapped by
inserted frame when caption is added
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index bd30d3f..ba7e59b 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1422,7 +1422,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const
pTxtFmtCollTbl,
pNewSet->Put( SwFmtHoriOrient( 0,
text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
aFrmSize = pOldFmt->GetFrmSize();
- aFrmSize.SetWidthPercent( 100 );
+ aFrmSize.SetWidthPercent( 0 );
aFrmSize.SetHeightPercent( 255 );
pNewSet->Put( aFrmSize );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
