another merge error

916afbea · Markus Mohrhard · 99832677 · 916afbea
Kaydet (Commit) 916afbea authored Haz 02, 2013 tarafından Markus Mohrhard
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

output2.cxx sc/source/ui/view/output2.cxx +1 -1

No files found.
--- 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;