fix patch post BOOL, etc. changes

f41
Caolán McNamara 14 years ago
parent 483f98e3cc
commit 0d335152ee

@ -40,18 +40,18 @@ diff -u -r1.54.216.1 output2.cxx
} }
Rectangle aLogicClip; Rectangle aLogicClip;
+ if ( + if (
+ ((nAttrRotate == 9000) || (nAttrRotate == 27000)) && + ((nAttrRotate == 9000) || (nAttrRotate == 27000)) &&
+ (!(aAlignParam.meOrient==SVX_ORIENTATION_STANDARD && + (!(rParam.meOrient==SVX_ORIENTATION_STANDARD &&
+ !aAlignParam.mbAsianVertical)) && + !rParam.mbAsianVertical)) &&
+ (!(bClip || bSimClip)) + (!(bClip || bSimClip))
+ ) + )
+ { + {
+ if (UseNormalClip(nCellY, pCondSet)) + if (UseNormalClip(rParam.mnCellY, rParam.mpCondSet))
+ bClip = TRUE; + bClip = true;
+ else + else
+ bSimClip = TRUE; + bSimClip = true;
+ } + }
+ +
if (bClip || bSimClip) if (bClip || bSimClip)
{ {
@ -100,8 +100,8 @@ diff -u -r1.54.216.1 output2.cxx
+ if ( eType != OUTTYPE_PRINTER || + if ( eType != OUTTYPE_PRINTER ||
+ ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || + ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
+ ( pCondSet && SFX_ITEM_SET == + ( pCondSet && SFX_ITEM_SET ==
+ pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) ) + pCondSet->GetItemState(ATTR_FONT_HEIGHT, sal_True) ) )
+ bNormalClip = TRUE; + bNormalClip = true;
+ return bNormalClip; + return bNormalClip;
+} +}
+ +

Loading…
Cancel
Save