summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-06-02 03:40:40 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-06-02 03:40:40 +0200
commit916afbea4f20a72e7c3defee17676d8ec23841c1 (patch)
tree1474314e249343206ddd973f888c6db7e051c323
parent998326779db3ef3c8915745069bc88ab99fe0c89 (diff)
another merge error
-rw-r--r--sc/source/ui/view/output2.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b572cb91ec7b..356d981e74a5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1673,7 +1673,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK );
// #i111387# #o11817313# disable automatic line breaks only for "General" number format
- if (bBreak && bCellIsValue && (aVars.GetResultValueFormat(aCell) % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+ if (bBreak && bCellIsValue && (aVars.GetResultValueFormat() % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
bBreak = false;
bool bRepeat = aVars.IsRepeat() && !bBreak;