diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /sc/source/ui/view/output2.cxx | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sc/source/ui/view/output2.cxx')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index eb93937d645d..88f70a8e7249 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2747,8 +2747,8 @@ void ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, Outpu void ScOutputData::DrawEditStandard(DrawEditParam& rParam) { - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(!rParam.mbAsianVertical); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(!rParam.mbAsianVertical); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); @@ -3271,7 +3271,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize, void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3532,7 +3532,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3787,7 +3787,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) void ScOutputData::DrawEditStacked(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); @@ -4131,9 +4131,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) { // When in asian vertical orientation, the orientation value is STANDARD, // and the asian vertical boolean is true. - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(rParam.mbAsianVertical); - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(rParam.mbAsianVertical); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); |