unusedcode.easy | 4 --- writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 9 ------ writerfilter/source/resourcemodel/resourcemodel.cxx | 26 -------------------- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 --- writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3 -- 5 files changed, 46 deletions(-)
New commits: commit ed2d5968fa43f68bd5cd531c393d5176a791ffc6 Author: Miklos Vajna <[email protected]> Date: Wed Feb 26 21:52:58 2014 +0100 Unused writerfilter::dump() Change-Id: I226d4338e22585a9a03377feb9d39788346316be diff --git a/unusedcode.easy b/unusedcode.easy index 15d9659..edd7f8e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -327,7 +327,3 @@ std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std:: svl::SharedStringPool::SharedStringPool() svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short) vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) -writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >) -writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >) -writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&) -writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, unsigned int) diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx index 01106ae..48b8fa9 100644 --- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx +++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx @@ -397,15 +397,6 @@ protected: ~Sprm() {} }; -/** - Creates handler for a stream. -*/ - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - const OUString & /*str*/); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); - } #endif // INCLUDED_WW8RESOURCEMODEL_HXX diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx index bb07526..23abf4c 100644 --- a/writerfilter/source/resourcemodel/resourcemodel.cxx +++ b/writerfilter/source/resourcemodel/resourcemodel.cxx @@ -41,32 +41,6 @@ public: ResourceModelOutputWithDepth output; -void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - writerfilter::Reference<Properties>::Pointer_t /*props*/) -{ -} - -void dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n) -{ - char sBuffer[256]; - snprintf(sBuffer, sizeof(sBuffer), "%" SAL_PRIuUINT32, n); - string tmpStr = name; - tmpStr += "="; - tmpStr += sBuffer; - - o.addItem(tmpStr); -} - -void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - const OUString & /*str*/) -{ -} - -void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - writerfilter::Reference<BinaryObj>::Pointer_t /*binary*/) -{ -} - string gInfo = ""; // ------- WW8TableDataHandler --------- commit 05e7456b00bf976e889f9e5414a7c46c4bf35ac2 Author: Miklos Vajna <[email protected]> Date: Wed Feb 26 21:46:20 2014 +0100 rtftok: bHasTableStyle is never read Change-Id: Iad287d3f619d7c912aa6c2dc059b1aa63c3c0053 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 174d31c..cc1ceef 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3891,9 +3891,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapNone, RTFValue::Pointer_t(new RTFValue())); } break; - case RTF_TS: - m_aStates.top().bHasTableStyle = true; - break; case RTF_CLPADB: case RTF_CLPADL: case RTF_CLPADR: @@ -5143,7 +5140,6 @@ RTFParserState::RTFParserState(RTFDocumentImpl *pDocumentImpl) nMinute(0), nCurrentStyleIndex(-1), pCurrentBuffer(0), - bHasTableStyle(false), bInListpicture(false), bInBackground(false), bHadShapeText(false), diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index b6985e9..3a7e3ed 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -272,9 +272,6 @@ namespace writerfilter { /// Points to the active buffer, if there is one. RTFBuffer_t* pCurrentBuffer; - /// If a table style was requested to be used. - bool bHasTableStyle; - /// If we're inside a \listpicture group. bool bInListpicture; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
