[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/ui/view/output2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 916afbea4f20a72e7c3defee17676d8ec23841c1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jun 2 03:40:40 2013 +0200

    another merge error

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b572cb9..356d981 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;