summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Ahrens <ka@openoffice.org>2009-12-14 07:15:29 +0000
committerKai Ahrens <ka@openoffice.org>2009-12-14 07:15:29 +0000
commit22be830407a2475fce3fc668594381752d0a3b37 (patch)
treedbcce1a487635f27e406aca8982a9b28b2ef510f
parent12c7dc97e4470d70a9df30429c3dc51343682c07 (diff)
added community patches
-rw-r--r--svx/source/cui/numpages.cxx8
-rw-r--r--svx/source/cui/paragrph.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx5
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx4
5 files changed, 12 insertions, 9 deletions
diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx
index 6069efd2cb..40673c3fcf 100644
--- a/svx/source/cui/numpages.cxx
+++ b/svx/source/cui/numpages.cxx
@@ -311,7 +311,7 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent,
BOOL SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pSaveNum)
+ if( (bPreset || bModified) && pSaveNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -513,7 +513,7 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent,
BOOL SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -750,7 +750,7 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent,
BOOL SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -1110,7 +1110,7 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
// rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
return FALSE;
}
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
diff --git a/svx/source/cui/paragrph.cxx b/svx/source/cui/paragrph.cxx
index 2275e0d8fe..29ec73d233 100644
--- a/svx/source/cui/paragrph.cxx
+++ b/svx/source/cui/paragrph.cxx
@@ -1307,7 +1307,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
aLastLineLB.Hide();
aLastLineFT.Hide();
aExpandCB.Hide();
- if(!(nHtmlMode & HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) )
+ if(!(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE)) )
aJustify.Disable();
aSnapToGridCB.Show(FALSE);
}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 13d479b294..f52b8974d9 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 417445b7d7..b6a8a4e1f7 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 691d23ab43..f360ef2281 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 ) );