summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-13 17:49:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-13 17:54:26 +0200
commite45366826cf4a5b01163403e384ead8c818d8a1e (patch)
treed71190ca7308b2974d70a363306a8ddd17a18a44
parent6e3d5efd4e363eb79c07189ba8f2009b1fcfc9d8 (diff)
loplugin:staticcall
Change-Id: If6fca7f7761877b5642eddb800de46efb59aa6dc
-rw-r--r--editeng/source/editeng/eertfpar.cxx2
-rw-r--r--editeng/source/misc/hangulhanja.cxx8
-rw-r--r--editeng/source/uno/unofdesc.cxx14
-rw-r--r--editeng/source/uno/unoipset.cxx2
-rw-r--r--editeng/source/uno/unotext.cxx2
5 files changed, 14 insertions, 14 deletions
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 611295a6d5f1..3662a4ceac48 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -313,7 +313,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
{
sal_uInt32 nHeight = ((SvxFontHeightItem*)pItem)->GetHeight();
long nNewHeight;
- nNewHeight = mpEditEngine->GetRefDevice()->LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit );
+ nNewHeight = OutputDevice::LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit );
SvxFontHeightItem aFntHeightItem( nNewHeight, ((SvxFontHeightItem*)pItem)->GetProp(), aFntHeightIems[i] );
rSet.GetAttrSet().Put( aFntHeightItem );
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 2c1460009d36..b0287ce342b2 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -650,7 +650,7 @@ namespace editeng
// something went wrong, has already been asserted
return;
- if (m_pAntiImpl->IsUseSavedConversionDirectionState())
+ if (HangulHanjaConversion::IsUseSavedConversionDirectionState())
{
m_ePrimaryConversionDirection = m_pAntiImpl->m_ePrimaryConversionDirectionSave;
m_bTryBothDirections = m_pAntiImpl->m_bTryBothDirectionsSave;
@@ -670,7 +670,7 @@ namespace editeng
{
//always open dialog if at least having a hangul or hanja text portion
createDialog();
- if(m_pAntiImpl->IsUseSavedConversionDirectionState())
+ if(HangulHanjaConversion::IsUseSavedConversionDirectionState())
ContinueConversion( false );
else
implUpdateData();
@@ -743,10 +743,10 @@ namespace editeng
{
// check if language needs to be changed
if ( m_pAntiImpl->GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL &&
- !m_pAntiImpl->IsTraditional( m_nCurrentPortionLang ))
+ !HangulHanjaConversion::IsTraditional( m_nCurrentPortionLang ))
nNewUnitLang = LANGUAGE_CHINESE_TRADITIONAL;
else if ( m_pAntiImpl->GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED &&
- !m_pAntiImpl->IsSimplified( m_nCurrentPortionLang ))
+ !HangulHanjaConversion::IsSimplified( m_nCurrentPortionLang ))
nNewUnitLang = LANGUAGE_CHINESE_SIMPLIFIED;
if (nNewUnitLang != LANGUAGE_NONE)
pNewUnitLang = &nNewUnitLang;
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 9faefabbd589..ac3324477954 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -201,13 +201,13 @@ uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool )
uno::Any aAny;
- if(!pPool->IsWhich(EE_CHAR_FONTINFO)||
- !pPool->IsWhich(EE_CHAR_FONTHEIGHT)||
- !pPool->IsWhich(EE_CHAR_ITALIC)||
- !pPool->IsWhich(EE_CHAR_UNDERLINE)||
- !pPool->IsWhich(EE_CHAR_WEIGHT)||
- !pPool->IsWhich(EE_CHAR_STRIKEOUT)||
- !pPool->IsWhich(EE_CHAR_WLM))
+ if(!SfxItemPool::IsWhich(EE_CHAR_FONTINFO)||
+ !SfxItemPool::IsWhich(EE_CHAR_FONTHEIGHT)||
+ !SfxItemPool::IsWhich(EE_CHAR_ITALIC)||
+ !SfxItemPool::IsWhich(EE_CHAR_UNDERLINE)||
+ !SfxItemPool::IsWhich(EE_CHAR_WEIGHT)||
+ !SfxItemPool::IsWhich(EE_CHAR_STRIKEOUT)||
+ !SfxItemPool::IsWhich(EE_CHAR_WLM))
return aAny;
aSet.Put(pPool->GetDefaultItem(EE_CHAR_FONTINFO));
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index e0b66fce0d0d..c8c66b8127b3 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -212,7 +212,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
if( (pMap->nWID < OWN_ATTR_VALUE_START) && (pMap->nWID > OWN_ATTR_VALUE_END ) )
{
// Get Default from ItemPool
- if(mrItemPool.IsWhich(pMap->nWID))
+ if(SfxItemPool::IsWhich(pMap->nWID))
aSet.Put(mrItemPool.GetDefaultItem(pMap->nWID));
}
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 9c75c28fb9f8..c384ef579449 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1293,7 +1293,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
default:
{
// Get Default from ItemPool
- if(pPool->IsWhich(pMap->nWID))
+ if(SfxItemPool::IsWhich(pMap->nWID))
{
SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID);
aSet.Put(pPool->GetDefaultItem(pMap->nWID));