diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-14 14:53:05 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-14 15:35:56 -0400 |
| commit | 23075c27b5cf99d8415a304f9ab151a73938edcb (patch) | |
| tree | 55154b5eff1a779f14457262b41c9214339523f6 /sc | |
| parent | fa5473bb69ff04f362c1f0f14b112e533cfa501a (diff) | |
Remove a local inline function that's used from only one call site.
Change-Id: I73954b8a1de436b9c4881d803f4f33cff1b79c4f
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 6caa4e26202f..5f537df190d9 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1073,13 +1073,6 @@ static inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument* } } -inline sal_uInt8 GetScriptType( ScDocument* pDoc, ScBaseCell* pCell, - const ScPatternAttr* pPattern, - const SfxItemSet* pCondSet ) -{ - return pDoc->GetCellScriptType( pCell, pPattern->GetNumberFormat( pDoc->GetFormatTable(), pCondSet ) ); -} - inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript ) { return ( nScript != SCRIPTTYPE_LATIN && @@ -1604,8 +1597,12 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) pPattern = pAltPattern; } - sal_uInt8 nScript = GetScriptType( mpDoc, pCell, pPattern, pCondSet ); - if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); + sal_uInt8 nScript = mpDoc->GetCellScriptType( + pCell, pPattern->GetNumberFormat(mpDoc->GetFormatTable(), pCondSet)); + + if (nScript == 0) + nScript = ScGlobal::GetDefaultScriptType(); + if ( pPattern != pOldPattern || pCondSet != pOldCondSet || nScript != nOldScript || mbSyntaxMode ) { |