diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-15 12:23:06 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-15 12:23:06 +0100 |
| commit | 09f0985c1b86f2e9622738491f98dab7616ac4d7 (patch) | |
| tree | c48a78416869d35fcc5008a06812cea1b214bbf6 | |
| parent | 635a1b4328c281225bdf10eb9dff53dd2953c68c (diff) | |
| parent | f24f8aa1aa2d1eb3eae7a19e120f48375d682f9b (diff) | |
CWS-TOOLING: integrate CWS communitypatches320_DEV300
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 5 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 6f2f7cdd2ebd..a07cf1f254d2 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2761,8 +2761,9 @@ void SvxRuler::EvalModifier() case KEY_MOD1: { const RulerType eType = GetDragType(); nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL; - if(RULER_TYPE_BORDER == eType || RULER_TYPE_TAB == eType|| - RULER_TYPE_MARGIN1&&pColumnItem) + if( RULER_TYPE_TAB == eType || + ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) && + pColumnItem ) ) PrepareProportional_Impl(eType); break; } diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index f0441def1b0c..ca19c8594e2f 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -556,7 +556,7 @@ namespace drawinglayer const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue(); const sal_uInt8 nStartLuminance(rGradient.GetStartColor().GetLuminance()); const sal_uInt8 nEndLuminance(rGradient.GetEndColor().GetLuminance()); - const bool bCompletelyTransparent(0xff == nStartLuminance == nEndLuminance); + const bool bCompletelyTransparent(0xff == nStartLuminance && 0xff == nEndLuminance); if(!bCompletelyTransparent) { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index db8c2f2fc314..ebd8f83e00f0 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -837,7 +837,9 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, if ( aGraphic.GetType() == GRAPHIC_BITMAP ) { Size aSizePixel( aGraphic.GetSizePixel() ); - if ( rSettings.mnWidth && rSettings.mnHeight && ( rSettings.mnWidth != aSizePixel.Width() ) || ( rSettings.mnHeight != aSizePixel.Height() ) ) + if( rSettings.mnWidth && rSettings.mnHeight && + ( ( rSettings.mnWidth != aSizePixel.Width() ) || + ( rSettings.mnHeight != aSizePixel.Height() ) ) ) { BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); aBmpEx.Scale( Size( rSettings.mnWidth, rSettings.mnHeight ) ); |