diff options
author | Jan Holesovsky <kendy@collabora.com> | 2013-10-04 09:12:07 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2013-10-04 11:23:10 +0200 |
commit | 2997d7d10a79917495a310135f863bd71541b304 (patch) | |
tree | a9224aeef22df6faaf259c57ca9aa0c928472328 /lotuswordpro/source | |
parent | fdo#69384 fix impress -> writer copy&paste (diff) | |
download | core-2997d7d10a79917495a310135f863bd71541b304.tar.gz core-2997d7d10a79917495a310135f863bd71541b304.zip |
HighLight -> Highlight.
Change-Id: I2db5102fbc441c0b79d8c28023f3e3bb5613b3cf
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/lwpfrib.cxx | 16 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfrib.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpglobalmgr.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpglobalmgr.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpoverride.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpoverride.hxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index d801d42ae038..9ef736dec302 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -111,7 +111,7 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt pModInfo->RevisionFlag = sal_False; pModInfo->HasCharStyle = sal_False; pModInfo->HasLangOverride = sal_False; - pModInfo->HasHighLight = sal_False; + pModInfo->HasHighlight = sal_False; ReadModifiers( pObjStrm, pModInfo ); } @@ -230,7 +230,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) { if (!m_pModifiers) return; - if (!m_pModifiers->FontID && !m_pModifiers->HasCharStyle && !m_pModifiers->HasHighLight) + if (!m_pModifiers->FontID && !m_pModifiers->HasCharStyle && !m_pModifiers->HasHighlight) { m_ModFlag = sal_False; return; @@ -271,9 +271,9 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) } } - if (m_pModifiers->HasHighLight) + if (m_pModifiers->HasHighlight) { - XFColor aColor = GetHighLightColor();//right yellow + XFColor aColor = GetHighlightColor();//right yellow if (pStyle)//change the style directly pStyle->GetFont()->SetBackColor(aColor); else //register a new style @@ -347,8 +347,8 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo) break; case FRIB_MTAG_ATTRIBUTE: pModInfo->aTxtAttrOverride.Read(pObjStrm); - if (pModInfo->aTxtAttrOverride.IsHighLight()) - pModInfo->HasHighLight = sal_True; + if (pModInfo->aTxtAttrOverride.IsHighlight()) + pModInfo->HasHighlight = sal_True; break; case FRIB_MTAG_REVISION: pModInfo->RevisionType = pObjStrm->QuickReaduInt8(); @@ -424,10 +424,10 @@ OUString LwpFrib::GetEditor() return pGlobal->GetEditorName(m_nEditor); } -XFColor LwpFrib::GetHighLightColor() +XFColor LwpFrib::GetHighlightColor() { LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); - return pGlobal->GetHighLightColor(m_nEditor); + return pGlobal->GetHighlightColor(m_nEditor); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx index 24d1e37afb23..6f9cd40a9c1d 100644 --- a/lotuswordpro/source/filter/lwpfrib.hxx +++ b/lotuswordpro/source/filter/lwpfrib.hxx @@ -81,7 +81,7 @@ struct ModifierInfo sal_uInt16 CodePage; sal_Bool HasCharStyle; sal_Bool HasLangOverride; - sal_Bool HasHighLight; + sal_Bool HasHighlight; sal_uInt8 RevisionType; sal_Bool RevisionFlag; }; @@ -102,7 +102,7 @@ public: void SetType(sal_uInt8 type) { m_nFribType = type;} void SetEditor(sal_uInt8 editor) { m_nEditor = editor;} OUString GetEditor(); - XFColor GetHighLightColor(); + XFColor GetHighlightColor(); protected: LwpPara* m_pPara; LwpFrib* m_pNext; diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx index b3eb7e02f631..dfded6bc5de0 100644 --- a/lotuswordpro/source/filter/lwpglobalmgr.cxx +++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx @@ -146,7 +146,7 @@ OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID) return A2OUSTR(""); } -XFColor LwpGlobalMgr::GetHighLightColor(sal_uInt8 nID) +XFColor LwpGlobalMgr::GetHighlightColor(sal_uInt8 nID) { std::map<sal_uInt16,LwpEditorAttr*>::iterator iter; diff --git a/lotuswordpro/source/filter/lwpglobalmgr.hxx b/lotuswordpro/source/filter/lwpglobalmgr.hxx index 42cef4c08341..228d53428b78 100644 --- a/lotuswordpro/source/filter/lwpglobalmgr.hxx +++ b/lotuswordpro/source/filter/lwpglobalmgr.hxx @@ -88,7 +88,7 @@ public: XFStyleManager* GetXFStyleManager(){return m_pXFStyleManager;} void SetEditorAttrMap(sal_uInt16 nID, LwpEditorAttr* pAttr); OUString GetEditorName(sal_uInt8 nID); - XFColor GetHighLightColor(sal_uInt8 nID); + XFColor GetHighlightColor(sal_uInt8 nID); private: LwpGlobalMgr(LwpSvStream* pSvStream); private: diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx index 30ea479cd798..2feb62b507f6 100644 --- a/lotuswordpro/source/filter/lwpoverride.cxx +++ b/lotuswordpro/source/filter/lwpoverride.cxx @@ -168,7 +168,7 @@ void LwpTextAttributeOverride::Read(LwpObjectStream* pStrm) pStrm->SkipExtra(); } -sal_Bool LwpTextAttributeOverride::IsHighLight() +sal_Bool LwpTextAttributeOverride::IsHighlight() { return (m_nValues & TAO_HIGHLIGHT); } diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx index 71a9385d6349..c01d2ae56cc9 100644 --- a/lotuswordpro/source/filter/lwpoverride.hxx +++ b/lotuswordpro/source/filter/lwpoverride.hxx @@ -138,7 +138,7 @@ public: inline sal_uInt16 GetHideLevels() const; - sal_Bool IsHighLight(); + sal_Bool IsHighlight(); protected: LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther); |