summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-14 21:39:57 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-14 22:03:37 +0100
commit5b1470e24f33eb6347d5a5c753885ccd8d877e31 (patch)
tree90392fd33d3dea467c79b19cf352c7b7fab42eff /writerfilter/source/dmapper
parentf95d743edbc91a65861f293b9d10e0d38000db0b (diff)
writerfilter: unused tokens
Change-Id: Id6d87171d13a72dc237a350526d9776a56d725e0
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx37
-rw-r--r--writerfilter/source/dmapper/FontTable.cxx7
-rw-r--r--writerfilter/source/dmapper/FontTable.hxx1
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx1
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.cxx10
7 files changed, 0 insertions, 64 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 8749a7a8c14f..c9280d50ab93 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -68,7 +68,6 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break;
case NS_ooxml::LN_CT_Border_color:
- case NS_rtf::LN_ICO: // 0x2873
m_nLineColor = nIntValue;
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
break;
@@ -80,9 +79,6 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
m_bShadow = nIntValue;
break;
case NS_ooxml::LN_CT_Border_frame:
- case NS_rtf::LN_UNUSED2_15: // 0x2877
- // ignored
- break;
case NS_ooxml::LN_CT_Border_themeTint:
appendGrabBag("themeTint", OUString::number(nIntValue, 16));
break;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 7ae6facbaa1e..e3072805a844 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -185,12 +185,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
switch( nName )
{
- /* attributes to be ignored */
- case NS_rtf::LN_UNUSED1_3:
- case NS_rtf::LN_UNUSED1_7:
- case NS_rtf::LN_UNUSED8_3:
- break;
-
case NS_rtf::LN_ISTD: //index of applied style
{
//search for the style with the given id and apply it
@@ -277,10 +271,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->GetFIB().SetLNCHS( nIntValue );
}
break;
- case NS_rtf::LN_IXCHSZALT:
- break;
- case NS_rtf::LN_PANOSE:
- break;
case NS_rtf::LN_FS:
break;
case NS_rtf::LN_STI:
@@ -314,40 +304,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->GetFIB().SetData( nName, nIntValue );
}
break;
- case NS_rtf::LN_SHDFORECOLOR:
- break;
- case NS_rtf::LN_SHDBACKCOLOR:
- break;
- case NS_rtf::LN_SHDPATTERN:
- break;
case NS_ooxml::LN_CT_Border_sz:
break;
case NS_ooxml::LN_CT_Border_val:
break;
- case NS_rtf::LN_ICO:
- break;
case NS_ooxml::LN_CT_Border_space:
break;
case NS_ooxml::LN_CT_Border_shadow:
break;
case NS_ooxml::LN_CT_Border_frame:
break;
- case NS_rtf::LN_UNUSED2_15:
- break;
- case NS_rtf::LN_FFIRSTMERGED:
- break;
- case NS_rtf::LN_FMERGED:
- break;
- case NS_rtf::LN_FVERTICAL:
- break;
- case NS_rtf::LN_FBACKWARD:
- break;
- case NS_rtf::LN_FROTATEFONT:
- break;
- case NS_rtf::LN_FVERTMERGE:
- break;
- case NS_rtf::LN_FVERTRESTART:
- break;
case NS_rtf::LN_VERTALIGN:
break;
case NS_rtf::LN_FUNUSED:
@@ -481,9 +447,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
//tab justification
m_pImpl->ModifyCurrentTabStop(nName, nIntValue);
break;
- case NS_rtf::LN_UNUSED0_6:
- // really unused
- break;
case NS_ooxml::LN_NUMBERING:
break;
case NS_ooxml::LN_FONTTABLE:
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 1739bd38eba5..f5b14fdc6ad4 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -71,9 +71,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
case NS_rtf::LN_FTRUETYPE:
m_pImpl->pCurrentEntry->bTrueType = nIntValue == 1 ? true : false;
break;
- case NS_rtf::LN_UNUSED1_3: //unused
case NS_rtf::LN_FF: //unused
- case NS_rtf::LN_UNUSED1_7: //unused
break;
case NS_rtf::LN_WWEIGHT:
m_pImpl->pCurrentEntry->nBaseWeight = nIntValue;
@@ -81,11 +79,6 @@ void FontTable::lcl_attribute(Id Name, Value & val)
case NS_rtf::LN_CHS:
m_pImpl->pCurrentEntry->nTextEncoding = nIntValue;
break;
- case NS_rtf::LN_IXCHSZALT:
- break;
- case NS_rtf::LN_PANOSE:
- m_pImpl->pCurrentEntry->sPanose += sValue;
- break;
case NS_rtf::LN_FS:
m_pImpl->pCurrentEntry->sFontSignature += sValue;
break;
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 305dcbc28f9f..2cb7e3f00cd3 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -43,7 +43,6 @@ struct FontEntry
sal_Int32 nFontFamilyId;
sal_Int32 nBaseWeight;
sal_Int32 nAltFontIndex;
- OUString sPanose;
OUString sFontSignature;
FontEntry() :
bTrueType(false),
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index ba0a67ffa1fb..a324faf5d627 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -614,9 +614,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Border_val:
//graphic borders don't support different line types
break;
- case NS_rtf::LN_ICO: // 0x175b
- m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
- break;
case NS_ooxml::LN_CT_Border_space:
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineDistance = nIntValue;
break;
@@ -624,7 +621,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue ? true : false;
break;
case NS_ooxml::LN_CT_Border_frame: // ignored
- case NS_rtf::LN_UNUSED2_15: // ignored
break;
case NS_rtf::LN_SPID:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index f55d804b705b..05648a6c8ced 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -452,7 +452,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
case NS_rtf::LN_BCHUPE:
case NS_rtf::LN_FAUTOREDEF:
case NS_rtf::LN_FHIDDEN:
- case NS_rtf::LN_UNUSED8_3:
//noone seems to care about it
break;
case NS_ooxml::LN_CT_Style_type:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 9f3b58d4b98a..eb03f42e5709 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -283,14 +283,6 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
(void)rName;
switch( rName )
{
- case NS_rtf::LN_FFIRSTMERGED:
- case NS_rtf::LN_FMERGED:
- case NS_rtf::LN_FVERTICAL:
- case NS_rtf::LN_FBACKWARD:
- case NS_rtf::LN_FROTATEFONT:
- case NS_rtf::LN_FVERTMERGE:
- case NS_rtf::LN_FVERTRESTART:
- break;
case NS_rtf::LN_VERTALIGN:
//TODO: m_aCellVertAlign is just a temporary solution! 0 - top 1 - center 2 - bottom
m_aCellVertAlign.push_back( nIntValue );
@@ -317,7 +309,6 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break;
case NS_ooxml::LN_CT_Border_color:
- case NS_rtf::LN_ICO: // 0x2873
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
m_nLineColor = nIntValue;
break;
@@ -328,7 +319,6 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
case NS_ooxml::LN_CT_Border_shadow:
//if 1 then line has shadow - unsupported
case NS_ooxml::LN_CT_Border_frame:
- case NS_rtf::LN_UNUSED2_15: // 0x2877
// ignored
break;
case NS_ooxml::LN_CT_Border_themeColor: