Skip to content

C
core
Kaydet (Commit) 99832677 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

fix warnings after merge

üst 3b6734d1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sc/source/ui/view/output2.cxx
Dosyayı görüntüle @ 99832677
...@@ -155,7 +155,7 @@ public: ...@@ -155,7 +155,7 @@ public:
const Size& GetTextSize() const { return aTextSize; } const Size& GetTextSize() const { return aTextSize; }
long GetOriginalWidth() const { return nOriginalWidth; } long GetOriginalWidth() const { return nOriginalWidth; }
sal_uLong GetResultValueFormat( const ScRefCellValue& rCell ) const; sal_uLong GetResultValueFormat() const;
sal_uLong GetValueFormat() const { return nValueFormat; } sal_uLong GetValueFormat() const { return nValueFormat; }
sal_Bool GetLineBreak() const { return bLineBreak; } sal_Bool GetLineBreak() const { return bLineBreak; }
...@@ -598,7 +598,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScRefCellValue& rCell, long nWidth ...@@ -598,7 +598,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScRefCellValue& rCell, long nWidth
return; return;
} }
sal_uLong nFormat = GetResultValueFormat(rCell); sal_uLong nFormat = GetResultValueFormat();
if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0) if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
{ {
// Not 'General' number format. Set hash text and bail out. // Not 'General' number format. Set hash text and bail out.
...@@ -784,7 +784,7 @@ sal_Bool ScDrawStringsVars::HasEditCharacters() const ...@@ -784,7 +784,7 @@ sal_Bool ScDrawStringsVars::HasEditCharacters() const
return aString.SearchChar( pChars ) != STRING_NOTFOUND; return aString.SearchChar( pChars ) != STRING_NOTFOUND;
} }
sal_uLong ScDrawStringsVars::GetResultValueFormat( const ScRefCellValue& rCell ) const sal_uLong ScDrawStringsVars::GetResultValueFormat() const
{ {
// Get the effective number format, including formula result types. // Get the effective number format, including formula result types.
// This assumes that a formula cell has already been calculated. // This assumes that a formula cell has already been calculated.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment