[Libreoffice-commits] .: writerfilter/source
Marc-André Laverdière
malaverdiere at kemper.freedesktop.org
Fri Jul 22 02:28:25 PDT 2011
writerfilter/source/dmapper/FFDataHandler.cxx | 200 --------------------------
writerfilter/source/dmapper/FFDataHandler.hxx | 56 -------
writerfilter/source/doctok/WW8StructBase.cxx | 11 -
writerfilter/source/doctok/WW8StructBase.hxx | 16 --
writerfilter/source/doctok/WW8Sttbf.cxx | 6
writerfilter/source/doctok/WW8Sttbf.hxx | 7
writerfilter/source/doctok/WW8StyleSheet.cxx | 5
writerfilter/source/doctok/WW8Table.cxx | 42 -----
writerfilter/source/doctok/WW8Text.cxx | 5
9 files changed, 1 insertion(+), 347 deletions(-)
New commits:
commit d2d49d3389ea6698daafbffc7943d035b9fc3469
Author: Marc-Andre Laverdiere <marc-andre at atc.tcs.com / marcandre.laverdiere at tcs.com>
Date: Thu Jul 21 18:12:40 2011 +0530
Removed dead code
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index 5f656a7..91a3c98 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -39,16 +39,9 @@ namespace dmapper {
FFDataHandler::FFDataHandler() :
LoggedProperties(dmapper_logger, "FFDataHandler"),
-m_bEnabled(false),
-m_bCalcOnExit(false),
-m_nHelpTextType(0),
-m_nStatusTextType(0),
m_nCheckboxHeight(0),
m_bCheckboxAutoHeight(false),
-m_bCheckboxDefault(false),
-m_bCheckboxChecked(false),
-m_nTextType(0),
-m_nTextMaxLength(0)
+m_bCheckboxChecked(false)
{
}
@@ -57,187 +50,51 @@ FFDataHandler::~FFDataHandler()
{
}
-// member: FFDataHandler::name
-void FFDataHandler::setName(const rtl::OUString & r_sName)
-{
- m_sName = r_sName;
-}
-
const rtl::OUString & FFDataHandler::getName() const
{
return m_sName;
}
-// member: FFDataHandler::enabled
-void FFDataHandler::setEnabled(bool r_enabled)
-{
- m_bEnabled = r_enabled;
-}
-
-bool FFDataHandler::getEnabled() const
-{
- return m_bEnabled;
-}
-
-// member: FFDataHandler::calcOnExit
-void FFDataHandler::setCalcOnExit(bool r_calcOnExit)
-{
- m_bCalcOnExit = r_calcOnExit;
-}
-
-// member: FFDataHandler::entryMacro
-void FFDataHandler::setEntryMacro(const rtl::OUString & r_sEntryMacro)
-{
- m_sEntryMacro = r_sEntryMacro;
-}
-
-// member: FFDataHandler::exitMacro
-void FFDataHandler::setExitMacro(const rtl::OUString & r_sExitMacro)
-{
- m_sExitMacro = r_sExitMacro;
-}
-
-// member: FFDataHandler::helpTextType
-void FFDataHandler::setHelpTextType(sal_uInt32 r_helpTextType)
-{
- m_nHelpTextType = r_helpTextType;
-}
-
-// member: FFDataHandler::helpText
-void FFDataHandler::setHelpText(const rtl::OUString & r_sHelpText)
-{
- m_sHelpText = r_sHelpText;
-}
-
const rtl::OUString & FFDataHandler::getHelpText() const
{
return m_sHelpText;
}
-// member: FFDataHandler::statusTextType
-void FFDataHandler::setStatusTextType(sal_uInt32 r_statusTextType)
-{
- m_nStatusTextType = r_statusTextType;
-}
-
-// member: FFDataHandler::statusText
-void FFDataHandler::setStatusText(const rtl::OUString & r_sStatusText)
-{
- m_sStatusText = r_sStatusText;
-}
-
const rtl::OUString & FFDataHandler::getStatusText() const
{
return m_sStatusText;
}
-// member: FFDataHandler::checkboxHeight
-void FFDataHandler::setCheckboxHeight(sal_uInt32 r_checkboxHeight)
-{
- m_nCheckboxHeight = r_checkboxHeight;
-}
-
sal_uInt32 FFDataHandler::getCheckboxHeight() const
{
return m_nCheckboxHeight;
}
-// member: FFDataHandler::checkboxAutoHeight
-void FFDataHandler::setCheckboxAutoHeight(bool r_checkboxAutoHeight)
-{
- m_bCheckboxAutoHeight = r_checkboxAutoHeight;
-}
-
bool FFDataHandler::getCheckboxAutoHeight() const
{
return m_bCheckboxAutoHeight;
}
-// member: FFDataHandler::checkboxDefault
-void FFDataHandler::setCheckboxDefault(bool r_checkboxDefault)
-{
- m_bCheckboxDefault = r_checkboxDefault;
-}
-
-// member: FFDataHandler::checkboxChecked
-void FFDataHandler::setCheckboxChecked(bool r_checkboxChecked)
-{
- m_bCheckboxChecked = r_checkboxChecked;
-}
-
bool FFDataHandler::getCheckboxChecked() const
{
return m_bCheckboxChecked;
}
-// member: FFDataHandler::dropDownResult
-void FFDataHandler::setDropDownResult(const rtl::OUString & r_sDropDownResult)
-{
- m_sDropDownResult = r_sDropDownResult;
-}
-
const rtl::OUString & FFDataHandler::getDropDownResult() const
{
return m_sDropDownResult;
}
-// member: FFDataHandler::dropDownDefault
-void FFDataHandler::setDropDownDefault(const rtl::OUString & r_sDropDownDefault)
-{
- m_sDropDownDefault = r_sDropDownDefault;
-}
-
-const rtl::OUString & FFDataHandler::getDropDownDefault() const
-{
- return m_sDropDownDefault;
-}
-
-// member: FFDataHandler::dropDownEntries
-void FFDataHandler::setDropDownEntries(const FFDataHandler::DropDownEntries_t & r_dropDownEntries)
-{
- m_DropDownEntries = r_dropDownEntries;
-}
-
const FFDataHandler::DropDownEntries_t & FFDataHandler::getDropDownEntries() const
{
return m_DropDownEntries;
}
-// member: FFDataHandler::textType
-void FFDataHandler::setTextType(sal_uInt32 r_textType)
-{
- m_nTextType = r_textType;
-}
-
-sal_uInt32 FFDataHandler::getTextType() const
-{
- return m_nTextType;
-}
-
-// member: FFDataHandler::textMaxLength
-void FFDataHandler::setTextMaxLength(sal_uInt32 r_textMaxLength)
-{
- m_nTextMaxLength = r_textMaxLength;
-}
-
-// member: FFDataHandler::textDefault
-void FFDataHandler::setTextDefault(const rtl::OUString & r_sTextDefault)
-{
- m_sTextDefault = r_sTextDefault;
-}
-
const rtl::OUString & FFDataHandler::getTextDefault() const
{
return m_sTextDefault;
}
-// member: FFDataHandler::textFormat
-void FFDataHandler::setTextFormat(const rtl::OUString & r_sTextFormat)
-{
- m_sTextFormat = r_sTextFormat;
-}
-
-
void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
{
switch(r_Sprm.getId())
@@ -247,26 +104,6 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
m_sName = r_Sprm.getValue()->getString();
}
break;
- case NS_ooxml::LN_CT_FFData_enabled:
- {
- m_bEnabled = r_Sprm.getValue()->getInt();
- }
- break;
- case NS_ooxml::LN_CT_FFData_calcOnExit:
- {
- m_bCalcOnExit = r_Sprm.getValue()->getInt();
- }
- break;
- case NS_ooxml::LN_CT_FFData_entryMacro:
- {
- m_sEntryMacro = r_Sprm.getValue()->getString();
- }
- break;
- case NS_ooxml::LN_CT_FFData_exitMacro:
- {
- m_sExitMacro = r_Sprm.getValue()->getString();
- }
- break;
case NS_ooxml::LN_CT_FFData_helpText:
{
resolveSprm(r_Sprm);
@@ -287,11 +124,6 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
m_bCheckboxAutoHeight = r_Sprm.getValue()->getInt();
}
break;
- case NS_ooxml::LN_CT_FFCheckBox_default:
- {
- m_bCheckboxDefault = r_Sprm.getValue()->getInt();
- }
- break;
case NS_ooxml::LN_CT_FFCheckBox_checked:
{
m_bCheckboxChecked = r_Sprm.getValue()->getInt();
@@ -307,11 +139,6 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
m_sDropDownResult = r_Sprm.getValue()->getString();
}
break;
- case NS_ooxml::LN_CT_FFDDList_default:
- {
- m_sDropDownDefault = r_Sprm.getValue()->getString();
- }
- break;
case NS_ooxml::LN_CT_FFDDList_listEntry:
{
m_DropDownEntries.push_back(r_Sprm.getValue()->getString());;
@@ -322,26 +149,11 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
resolveSprm(r_Sprm);
}
break;
- case NS_ooxml::LN_CT_FFTextInput_type:
- {
- m_nTextType = r_Sprm.getValue()->getInt();
- }
- break;
case NS_ooxml::LN_CT_FFTextInput_default:
{
m_sTextDefault = r_Sprm.getValue()->getString();
}
break;
- case NS_ooxml::LN_CT_FFTextInput_maxLength:
- {
- m_nTextMaxLength = r_Sprm.getValue()->getInt();
- }
- break;
- case NS_ooxml::LN_CT_FFTextInput_format:
- {
- m_sTextFormat = r_Sprm.getValue()->getString();
- }
- break;
case NS_ooxml::LN_CT_FFData_textInput:
{
resolveSprm(r_Sprm);
@@ -366,21 +178,11 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
{
switch (name)
{
- case NS_ooxml::LN_CT_FFHelpText_type:
- {
- m_nHelpTextType = val.getInt();
- }
- break;
case NS_ooxml::LN_CT_FFHelpText_val:
{
m_sHelpText = val.getString();
}
break;
- case NS_ooxml::LN_CT_FFStatusText_type:
- {
- m_nStatusTextType = val.getInt();
- }
- break;
case NS_ooxml::LN_CT_FFStatusText_val:
{
m_sStatusText = val.getString();
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index 99f369f..ef1efbd 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -44,101 +44,45 @@ public:
virtual ~FFDataHandler();
// member: name
- void setName(const rtl::OUString & r_sName);
const rtl::OUString & getName() const;
- // member: enabled
- void setEnabled(bool r_enabled);
- bool getEnabled() const;
-
- // member: calcOnExit
- void setCalcOnExit(bool r_calcOnExit);
-
- // member: entryMacro
- void setEntryMacro(const rtl::OUString & r_sEntryMacro);
-
- // member: exitMacro
- void setExitMacro(const rtl::OUString & r_sExitMacro);
-
- // member: helpTextType
- void setHelpTextType(sal_uInt32 r_helpTextType);
-
// member: helpText
- void setHelpText(const rtl::OUString & r_sHelpText);
const rtl::OUString & getHelpText() const;
- // member: statusTextType
- void setStatusTextType(sal_uInt32 r_statusTextType);
-
// member: statusText
- void setStatusText(const rtl::OUString & r_sStatusText);
const rtl::OUString & getStatusText() const;
// member: checkboxHeight
- void setCheckboxHeight(sal_uInt32 r_checkboxHeight);
sal_uInt32 getCheckboxHeight() const;
// member: checkboxAutoHeight
- void setCheckboxAutoHeight(bool r_checkboxAutoHeight);
bool getCheckboxAutoHeight() const;
- // member: checkboxDefault
- void setCheckboxDefault(bool r_checkboxDefault);
-
// member: checkboxChecked
- void setCheckboxChecked(bool r_checkboxChecked);
bool getCheckboxChecked() const;
// member: dropDownResult
- void setDropDownResult(const rtl::OUString & r_sDropDownResult);
const rtl::OUString & getDropDownResult() const;
- // member: dropDownDefault
- void setDropDownDefault(const rtl::OUString & r_sDropDownDefault);
- const rtl::OUString & getDropDownDefault() const;
-
// member: dropDownEntries
- void setDropDownEntries(const DropDownEntries_t & r_dropDownEntries);
const DropDownEntries_t & getDropDownEntries() const;
- // member: textType
- void setTextType(sal_uInt32 r_textType);
- sal_uInt32 getTextType() const;
-
- // member: textMaxLength
- void setTextMaxLength(sal_uInt32 r_textMaxLength);
-
// member: textDefault
- void setTextDefault(const rtl::OUString & r_sTextDefault);
const rtl::OUString & getTextDefault() const;
- // member: textFormat
- void setTextFormat(const rtl::OUString & r_sTextFormat);
-
// sprm
void resolveSprm(Sprm & r_sprm);
private:
rtl::OUString m_sName;
- bool m_bEnabled;
- bool m_bCalcOnExit;
- rtl::OUString m_sEntryMacro;
- rtl::OUString m_sExitMacro;
- sal_uInt32 m_nHelpTextType;
rtl::OUString m_sHelpText;
- sal_uInt32 m_nStatusTextType;
rtl::OUString m_sStatusText;
sal_uInt32 m_nCheckboxHeight;
bool m_bCheckboxAutoHeight;
- bool m_bCheckboxDefault;
bool m_bCheckboxChecked;
rtl::OUString m_sDropDownResult;
- rtl::OUString m_sDropDownDefault;
DropDownEntries_t m_DropDownEntries;
- sal_uInt32 m_nTextType;
- sal_uInt32 m_nTextMaxLength;
rtl::OUString m_sTextDefault;
- rtl::OUString m_sTextFormat;
// sprm
void lcl_sprm(Sprm & r_sprm);
diff --git a/writerfilter/source/doctok/WW8StructBase.cxx b/writerfilter/source/doctok/WW8StructBase.cxx
index 53b9c7e..6040bda 100644
--- a/writerfilter/source/doctok/WW8StructBase.cxx
+++ b/writerfilter/source/doctok/WW8StructBase.cxx
@@ -76,17 +76,6 @@ sal_uInt32 WW8StructBase::getU32(sal_uInt32 nOffset) const
return doctok::getU32(mSequence, nOffset);
}
-sal_Bool WW8StructBase::getBit(sal_uInt32 nValue, sal_uInt16 nBit) const
-{
- return (nValue & (1 << nBit)) != 0;
-}
-
-sal_uInt8 WW8StructBase::getNibble(sal_uInt32 nValue,
- sal_uInt16 nShift) const
-{
- return sal::static_int_cast<sal_uInt8>((nValue >> nShift) & 0xf);
-}
-
sal_uInt8 getU8(const WW8StructBase::Sequence & rSeq,
sal_uInt32 nOffset)
{
diff --git a/writerfilter/source/doctok/WW8StructBase.hxx b/writerfilter/source/doctok/WW8StructBase.hxx
index 7192e6c..5b6afa1 100644
--- a/writerfilter/source/doctok/WW8StructBase.hxx
+++ b/writerfilter/source/doctok/WW8StructBase.hxx
@@ -213,22 +213,6 @@ public:
{ return (sal_Int32) getU32(nOffset); }
/**
- Return bit value from a 32-bit unsigned value.
-
- @param nValue value to retreive bit from
- @param nBit number of bit to retreive (0 = least significant)
- */
- sal_Bool getBit(sal_uInt32 nValue, sal_uInt16 nBit) const;
-
- /**
- Return nibble from a 32-bit unsigned value.
-
- @param nValue value to retreive nibble from (most significant bit left)
- @param nShift amount of bits to shift right before returning least significant nibble
- */
- sal_uInt8 getNibble(sal_uInt32 nValue, sal_uInt16 nShift) const;
-
- /**
Returns byte at an index.
@param nIndex index in this part of the byte to return
diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx
index f7b8ff5..3212ff5 100644
--- a/writerfilter/source/doctok/WW8Sttbf.cxx
+++ b/writerfilter/source/doctok/WW8Sttbf.cxx
@@ -82,12 +82,6 @@ rtl::OUString WW8Sttbf::getEntry(sal_uInt32 nPos) const
return getString(getEntryOffset(nPos));
}
-WW8StructBase::Pointer_t WW8Sttbf::getExtraData(sal_uInt32 nPos)
-{
- return WW8StructBase::Pointer_t
- (new WW8StructBase(*this, getExtraOffset(nPos), mnExtraDataCount));
-}
-
WW8SttbTableResource::WW8SttbTableResource(WW8Sttbf::Pointer_t pSttbf)
: mpSttbf(pSttbf)
{
diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx
index 9431f77..7cea6a9 100644
--- a/writerfilter/source/doctok/WW8Sttbf.hxx
+++ b/writerfilter/source/doctok/WW8Sttbf.hxx
@@ -93,13 +93,6 @@ public:
@param nPos the index of the entry
*/
rtl::OUString getEntry(sal_uInt32 nPos) const;
-
- /**
- Return the extra data of an entry.
-
- @param nPos the index of the entry
- */
- WW8StructBase::Pointer_t getExtraData(sal_uInt32 nPos);
};
class WW8SttbTableResource : public ::writerfilter::Reference<Table>
diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx b/writerfilter/source/doctok/WW8StyleSheet.cxx
index 88ebe9d..30919fa 100644
--- a/writerfilter/source/doctok/WW8StyleSheet.cxx
+++ b/writerfilter/source/doctok/WW8StyleSheet.cxx
@@ -47,11 +47,6 @@ void WW8StyleSheet::initPayload()
entryOffsets.push_back(nOffset);
}
-sal_uInt32 WW8StyleSheet::calcSize()
-{
- return getCount();
-}
-
sal_uInt32 WW8StyleSheet::getEntryCount()
{
return get_cstd();
diff --git a/writerfilter/source/doctok/WW8Table.cxx b/writerfilter/source/doctok/WW8Table.cxx
index 4f17ca0..9523457 100644
--- a/writerfilter/source/doctok/WW8Table.cxx
+++ b/writerfilter/source/doctok/WW8Table.cxx
@@ -72,11 +72,6 @@ WW8sprmTTableBorders::get_rgbbrc(sal_uInt32 pos)
/* WW8sprmTCellBottomColor */
-sal_uInt32 WW8sprmTCellBottomColor::calcSize()
-{
- return get_cellBottomColor_count() * 4 + 3;
-}
-
sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor_count()
{
return getU8(0x2) / 4;
@@ -89,11 +84,6 @@ sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor(sal_uInt32 pos)
/* WW8sprmTCellLeftColor */
-sal_uInt32 WW8sprmTCellLeftColor::calcSize()
-{
- return get_cellLeftColor_count() * 4 + 3;
-}
-
sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor_count()
{
return getU8(0x2) / 4;
@@ -106,11 +96,6 @@ sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor(sal_uInt32 pos)
/* WW8sprmTCellTopColor */
-sal_uInt32 WW8sprmTCellTopColor::calcSize()
-{
- return get_cellTopColor_count() * 4 + 3;
-}
-
sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor_count()
{
return getU8(0x2) / 4;
@@ -123,11 +108,6 @@ sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor(sal_uInt32 pos)
/* WW8sprmTCellRightColor */
-sal_uInt32 WW8sprmTCellRightColor::calcSize()
-{
- return get_cellRightColor_count() * 4 + 3;
-}
-
sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor_count()
{
return getU8(0x2) / 4;
@@ -138,20 +118,8 @@ sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor(sal_uInt32 pos)
return getU32(0x3 + 4 * pos);
}
-/* WW8sprmTGridLineProps */
-
-sal_uInt32 WW8sprmTGridLineProps::calcSize()
-{
- return getSize();
-}
-
/* WW8sprmTDefTableShd */
-sal_uInt32 WW8sprmTDefTableShd::calcSize()
-{
- return get_shd_count() * WW8SHD::getSize() + 3;
-}
-
sal_uInt32 WW8sprmTDefTableShd::get_shd_count()
{
return getU8(0x2) / WW8SHD::getSize();
@@ -166,11 +134,6 @@ WW8sprmTDefTableShd::get_shd(sal_uInt32 pos)
/* WW8sprmTCellShd */
-sal_uInt32 WW8sprmTCellShd::calcSize()
-{
- return get_shd_count() * WW8CellShd::getSize();
-}
-
sal_uInt32 WW8sprmTCellShd::get_shd_count()
{
return getU8(0x2) / WW8CellShd::getSize();
@@ -185,11 +148,6 @@ WW8sprmTCellShd::get_shd(sal_uInt32 pos)
/* WW8sprmTCellShadow */
-sal_uInt32 WW8sprmTCellShadow::calcSize()
-{
- return get_cellShadow_count() * WW8CellShd::getSize();
-}
-
sal_uInt32 WW8sprmTCellShadow::get_cellShadow_count()
{
return getU8(0x2) / WW8CellShd::getSize();
diff --git a/writerfilter/source/doctok/WW8Text.cxx b/writerfilter/source/doctok/WW8Text.cxx
index 6477cd9..39e9db8 100644
--- a/writerfilter/source/doctok/WW8Text.cxx
+++ b/writerfilter/source/doctok/WW8Text.cxx
@@ -30,11 +30,6 @@
namespace writerfilter {
namespace doctok {
-sal_uInt32 WW8sprmPChgTabsPapx::calcSize()
-{
- return getS8(0x2) + 3;
-}
-
sal_uInt32 WW8sprmPChgTabsPapx::get_dxaDel_count()
{
return getS8(0x3);
More information about the Libreoffice-commits
mailing list