summaryrefslogtreecommitdiff
path: root/lotuswordpro/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-10-03 22:16:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-10-04 09:00:05 +0100
commit3ad0070790b86c099ac9ccf8013ed7c619cf0a3c (patch)
tree87d98379098d1238dbb8bdc0d6c16aec20f9f214 /lotuswordpro/source
parent04723baf6e87fb8d3c097f41529e388bf48df43c (diff)
SetDfltFont doesn't do anything
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r--lotuswordpro/source/filter/lwpfont.cxx28
-rw-r--r--lotuswordpro/source/filter/lwpfont.hxx4
2 files changed, 0 insertions, 32 deletions
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 87f279df79c8..01b1e2d60d68 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -481,7 +481,6 @@ Create XFFont based on the fotID
XFFont* LwpFontManager::CreateFont(sal_uInt32 fontID)
{
XFFont* pFont = new XFFont();
- SetDfltFont(pFont);
m_FNMgr.Override(GetFontNameIndex(fontID), pFont);
m_AttrMgr.Override(GetFontAttrIndex(fontID), pFont);
return pFont;
@@ -495,7 +494,6 @@ Refer to CFontManager::OverrideID
XFFont* LwpFontManager::CreateOverrideFont(sal_uInt32 fontID, sal_uInt32 overID)
{
XFFont* pFont = new XFFont(); //To be deleted by XFFontFactory
- SetDfltFont(pFont);
if(fontID)
{
Override(fontID, pFont);
@@ -513,32 +511,6 @@ void LwpFontManager::Override(sal_uInt32 fontID, XFFont* pFont)
m_AttrMgr.Override(GetFontAttrIndex(fontID), pFont);
}
-
-/*
-Called by VO_PARA to get style name based on the Para Style ID
-1) Get style from LwpParaStyleMap based on the LwpObjectID of VO_PARASTYLE.
-2) Prerequisite: VO_PARASTYLE should call AddStyle first.
-3) Return empty string if no style found.
-//To be replaced by OUString LwpStyleManager::GetStyle(const LwpObjectID &styleID)
-*/
-/*OUString LwpFontManager::GetParaStyle(const LwpObjectID &styleID)
-{
- LwpParaStyleMap::const_iterator it = m_StyleList.find(styleID);
- if (it != m_StyleList.end()) {
- return((*it).second);
- }
- return OUString();
-}*/
-
-void LwpFontManager::SetDfltFont(XFFont* /*pFont*/)
-{
- // TODO: Set default XFFont values in lwp filter
- //color:black, background color: transparent, Orientation: left to right, top to bottom, others: 0
- //Refer to CFontDescription::CFontDescription(void)
- //Did not find anything special
- //pFont->SetColor(XFColor(0,0,0));
-}
-
OUString LwpFontManager::GetNameByID(sal_uInt32 fontID)
{
return ( m_FNMgr.GetNameByIndex(GetFontNameIndex(fontID)) );//use font id for bullet?
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 5ed214219d7c..7cf5da1a5986 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -260,15 +260,11 @@ public:
XFFont* CreateOverrideFont(sal_uInt32 fontID, sal_uInt32 overID);
XFFont* CreateFont(sal_uInt32 fontID);
OUString GetNameByID(sal_uInt32 fontID);
- //void AddStyle(LwpObjectID styleObjID, sal_uInt32 fontID, OUString styleName);
- //void AddStyle(LwpObjectID styleObjID, sal_uInt32 fontID, OUString styleName, XFTextStyle* pStyle);
- //OUString GetOverrideStyle(sal_uInt32 fontID, sal_uInt32 overID);
private:
void Override(sal_uInt32 fontID, XFFont* pFont);
inline sal_uInt16 GetFontNameIndex(sal_uInt32 fontID);
inline sal_uInt16 GetFontAttrIndex(sal_uInt32 fontID);
- void SetDfltFont(XFFont* pFont);
};
sal_uInt16 LwpFontManager::GetFontNameIndex(sal_uInt32 fontID)