diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-13 22:53:00 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-15 09:21:47 +0100 |
commit | 5c3b0251b137c5d695d670c643fac1ee8049fb17 (patch) | |
tree | 5031e0e9ffe85b4381a9dd2d98c45a87a2ec9abb | |
parent | 684d499a42215bc50fcbce3e233a16c3282d9eb6 (diff) |
callcatcher: remove code, hide's erAcks to-do code behind an ifdef
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 12 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.hxx | 2 | ||||
-rw-r--r-- | svl/inc/svl/zformat.hxx | 9 | ||||
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zformat.cxx | 5 | ||||
-rw-r--r-- | unusedcode.easy | 41 |
6 files changed, 20 insertions, 51 deletions
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 0d57b1dc9e7b..9637e89c0bce 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -795,16 +795,4 @@ LwpTabOverride* LwpParaStyle::GetTabOverride() const return NULL; } -sal_Bool LwpParaStyle::IsNumberRight() -{ - LwpAlignmentOverride* pAlign = GetAlignment(); - if (pAlign) - { - LwpAlignmentOverride::AlignType type; - type = pAlign->GetAlignType(); - if (type == LwpAlignmentOverride::ALIGN_NUMERICRIGHT) - return sal_True; - } - return sal_False; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index b078cc96adc5..40e4c615c08f 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -105,8 +105,6 @@ public: LwpTabOverride* GetTabOverride() const; LwpBulletOverride* GetBulletOverride() const; LwpNumberingOverride* GetNumberingOverride() const; - - sal_Bool IsNumberRight(); public: static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders); //end diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index b534f97be002..9ad2895aa2f7 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -101,14 +101,18 @@ class SvNumberNatNum public: static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, bool bDate ); +#ifdef THE_FUTURE static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate ); +#endif SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0), bDBNum(0), bDate(0), bSet(0) {} bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; } sal_uInt8 GetRawNum() const { return nNum; } sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; } +#ifdef THE_FUTURE sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); } +#endif LanguageType GetLang() const { return eLang; } void SetLang( LanguageType e ) { eLang = e; } void SetNum( sal_uInt8 nNumber, bool bDBNumber ) @@ -434,6 +438,7 @@ public: calling this method. */ void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const; +#ifdef THE_FUTURE /** Switches to the first specified calendar, if any, in subformat nNumFor (0..3). Original calendar name and date/time returned, but only if calendar switched and rOrgCalendar was empty. @@ -450,7 +455,7 @@ public: fOrgDateTime, NumFor[nNumFor] ); return false; } - +#endif private: ImpSvNumFor NumFor[4]; // Array for the 4 subformats String sFormatstring; // The format code string @@ -471,8 +476,10 @@ private: SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; +#ifdef THE_FUTURE SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const; +#endif #ifdef _ZFORMAT_CXX // ----- private implementation methods ----- diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index ad63f02d1469..f241f79bb24b 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1028,7 +1028,6 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter, } if ( bFormatTurn ) { -#if 0 /* TODO: We are currently not able to fully support a switch to another calendar during input for the following reasons: @@ -1055,6 +1054,7 @@ input for the following reasons: calendar would have to be implemented. No problem. */ +#ifdef THE_FUTURE if ( pFormat->IsOtherCalendar( nStringScanNumFor ) ) pFormat->SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime ); else diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 0a5e823b8a53..9784d4d9b9c1 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -246,7 +246,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang return nNatNum; } - +#ifdef THE_FUTURE /* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please * don't remove it in case we'd have to use it for some obscure exports to * Excel. */ @@ -329,6 +329,7 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan } return nDBNum; } +#endif /***********************Funktionen SvNumFor******************************/ @@ -3032,6 +3033,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl } +#ifdef THE_FUTURE /* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently * unused please don't remove it, it would be needed by * SwitchToSpecifiedCalendar(), see comment in @@ -3059,6 +3061,7 @@ bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, } return false; } +#endif // static void SvNumberformat::ImpAppendEraG( String& OutString, diff --git a/unusedcode.easy b/unusedcode.easy index 217286683bb2..3e6a5579d803 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2386,16 +2386,13 @@ binfilter::ScMultipleWriteHeader::~ScMultipleWriteHeader() binfilter::ScMyContentAction::~ScMyContentAction() binfilter::ScMyDelAction::~ScMyDelAction() binfilter::ScMyMoveAction::~ScMyMoveAction() -binfilter::ScRangeData::IsBeyond(unsigned short) const binfilter::ScRangeFindList::~ScRangeFindList() -binfilter::ScValidationDataList::ResetUsed() binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const&, unsigned short&) binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*, unsigned short) binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationEntries_Impl const*, unsigned short, unsigned short) binfilter::ScValidationEntries_Impl::Remove(binfilter::ScValidationData* const&, unsigned short) binfilter::ScValidationEntries_Impl::Remove(unsigned short, unsigned short) binfilter::ScViewData::ReadUserDataSequence(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -binfilter::ScViewData::WriteUserData(String&) binfilter::ScXMLImportWrapper::Export(unsigned char) binfilter::ScXMLImportWrapper::Import(unsigned char) binfilter::ScXMLImportWrapper::ScXMLImportWrapper(binfilter::ScDocument&, binfilter::SfxMedium*, binfilter::SvStorage*) @@ -2405,15 +2402,11 @@ binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsi binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsigned short, unsigned short) binfilter::ScriptTypePosInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::ScriptTypePosInfo const&, void*), void*) binfilter::SdXMLFilter::SdXMLFilter(binfilter::SfxMedium&, binfilter::SdDrawDocShell&, unsigned char, binfilter::SdXMLFilterMode) -binfilter::SdrObjSurrogate::SdrObjSurrogate(binfilter::SdrObject*, binfilter::SdrObject const*) -binfilter::SdrPageView::IsLayer(String const&, binfilter::SetOfByte const&) const binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&, unsigned short&) binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short) binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short) binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short) -binfilter::SfxConfigManagerImExport_Impl::Export(SotStorage*, SotStorage*) -binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*) binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short) binfilter::SfxItemModifyArr_Impl::Remove(unsigned short, unsigned short) @@ -2422,9 +2415,6 @@ binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, u binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*) binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*) binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*) -binfilter::SfxMultiMixRecordWriter::NewContent(unsigned short, unsigned char) -binfilter::SfxMultiVarRecordWriter::NewContent() -binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(SvStream*, unsigned short, unsigned char) binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char) binfilter::SfxObjectShell::GetBaseURL() const binfilter::SfxPtrArr::Insert(unsigned short, void*) @@ -2547,8 +2537,6 @@ binfilter::Sw3Bytes::Insert(binfilter::Sw3Bytes const*, unsigned short, unsigned binfilter::Sw3Bytes::Replace(unsigned char const&, unsigned short) binfilter::Sw3Bytes::Replace(unsigned char const*, unsigned short, unsigned short) binfilter::Sw3Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*) -binfilter::Sw3IoImp::ExportTxtAttrs(binfilter::Sw3ExportTxtAttrs const*, unsigned short, unsigned short) -binfilter::Sw3IoImp::ExportTxtNode(binfilter::SwTxtNode const&, unsigned short, unsigned short, unsigned short, binfilter::SwInsHardBlankSoftHyph&) binfilter::Sw3Marks::GetPos(binfilter::Sw3Mark const*) const binfilter::Sw3Marks::Insert(binfilter::Sw3Mark*) binfilter::Sw3Marks::Remove(binfilter::Sw3Mark*) @@ -2573,18 +2561,20 @@ binfilter::SwBookmarks::Insert(binfilter::SwBookmarks const*, unsigned short, un binfilter::SwBookmarks::Remove(binfilter::SwBookmark* const&, unsigned short) binfilter::SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short) +binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&) binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&, unsigned short&) binfilter::SwCurrShells::Insert(binfilter::CurrShell* const*, unsigned short) binfilter::SwCurrShells::Insert(binfilter::SwCurrShells const*, unsigned short, unsigned short) +binfilter::SwCurrShells::Remove(binfilter::CurrShell* const&, unsigned short) binfilter::SwCurrShells::Remove(unsigned short, unsigned short) binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwDestroyList::Insert(binfilter::SwDestroyList const*, unsigned short, unsigned short) +binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const&) binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const&, unsigned short&) binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const*, unsigned short) binfilter::SwDestroyList::Remove(binfilter::SwSectionFrm* const&, unsigned short) -binfilter::SwDoc::Replace(binfilter::SwPaM&, String const&, unsigned char) -binfilter::SwInsHardBlankSoftHyph::OutAttr(binfilter::Sw3IoImp&, unsigned short, unsigned short) +binfilter::SwDestroyList::Remove(unsigned short, unsigned short) binfilter::SwInsHardBlankSoftHyph::~SwInsHardBlankSoftHyph() binfilter::SwOLELRUCache::Remove(binfilter::SwOLEObj&) binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const&, unsigned short&) @@ -2593,7 +2583,6 @@ binfilter::SwOutlineNodes::Insert(binfilter::SwOutlineNodes const*, unsigned sho binfilter::SwRects::Replace(binfilter::SwRect const&, unsigned short) binfilter::SwRects::Replace(binfilter::SwRect const*, unsigned short, unsigned short) binfilter::SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwRect const&, void*), void*) -binfilter::SwRootFrm::SwRootFrm(binfilter::SwFrmFmt*, binfilter::ViewShell*) binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwSelBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&) binfilter::SwSelBoxes::Remove(binfilter::SwTableBox* const&, unsigned short) @@ -2612,7 +2601,6 @@ binfilter::SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&) binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const*, unsigned short) binfilter::SwTableSortBoxes::Insert(binfilter::SwTableSortBoxes const*, unsigned short, unsigned short) -binfilter::SwTblBoxFormula::GetTableBox() binfilter::SwXBookmarkPortionArr::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*, unsigned short, unsigned short) binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short&) @@ -3280,6 +3268,7 @@ oox::core::FilterBase::getInteractionHandler() const oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>) oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>) oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const +oox::core::XmlFilterBase::getChartConverter() oox::drawingml::ChartExport::GetXmlNamespace() const oox::drawingml::ChartExport::SetXmlNamespace(int) oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int) @@ -3290,6 +3279,7 @@ oox::drawingml::ColorPropertySet::setColor(int) oox::drawingml::CustomShapeProperties::apply(boost::shared_ptr<oox::drawingml::CustomShapeProperties> const&) oox::drawingml::CustomShapeProperties::getValue(std::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const oox::drawingml::Diagram::getLayoutId() const +oox::drawingml::DiagramLayout::layout(std::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&) oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) oox::drawingml::GetTextMargin(rtl::OUString const&) oox::drawingml::GetTextVerticalAdjust(int) @@ -3743,24 +3733,7 @@ svx::SearchToolbarControllersManager::~SearchToolbarControllersManager() svx::SvxShowCharSetItem::~SvxShowCharSetItem() svx::ToolboxButtonColorUpdater::DrawChar(VirtualDevice&, Color const&) svx::WrapField::WrapField(Window*, long) -svx::frame::Array::Array(unsigned long, unsigned long) -svx::frame::Array::Clear() -svx::frame::Array::DrawCell(OutputDevice&, unsigned long, unsigned long, Color const*) const -svx::frame::Array::GetColFromIndex(unsigned long) const -svx::frame::Array::GetColWidth(unsigned long) const -svx::frame::Array::GetMergedSize(unsigned long&, unsigned long&, unsigned long, unsigned long) const -svx::frame::Array::GetRowFromIndex(unsigned long) const -svx::frame::Array::GetRowHeight(unsigned long) const -svx::frame::Array::GetUseDiagDoubleClipping() const -svx::frame::Array::IsInClipRange(unsigned long, unsigned long) const -svx::frame::Array::IsMergedOrigin(unsigned long, unsigned long) const -svx::frame::Array::IsMergedOverlapped(unsigned long, unsigned long) const -svx::frame::Array::IsMergedOverlappedBottom(unsigned long, unsigned long) const -svx::frame::Array::IsMergedOverlappedTop(unsigned long, unsigned long) const -svx::frame::Array::MirrorSelfY(bool, bool) -svx::frame::Array::RemoveClipRange() -svx::frame::Array::RemoveMergedRange(unsigned long, unsigned long) -svx::frame::ArrayImpl::GetMergedOriginCellAcc(unsigned long, unsigned long) +svx::frame::Cell::MirrorSelfY(bool, bool) svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*) svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*) svx::frame::DrawVerFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*) |