[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/dump/dumperbase.hxx | 18 -- oox/inc/oox/dump/oledumper.hxx | 21 --- oox/source/dump/dumperbase.cxx | 107 - oox/source/dump/oledumper.cxx | 114 unusedcode.easy | 17 - 5 files changed, 277 deletions(-) New commits: commit 07ff032c805835355ff0dff75b8ad534dfb770e9 Author: Petr Vorel petr.vo...@gmail.com Date: Mon Apr 2 11:40:06 2012 +0200 remove unused code (oox) diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 7f18220..a099886 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -395,7 +395,6 @@ public: // token list - static void appendToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); -static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendIndex( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rIdx ); static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64 nIdx ); @@ -1074,9 +1073,6 @@ public: voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32 nColRow2 ); voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 ); voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 ); -voidwriteAddress( const Address rPos ); -voidwriteRange( const Range rRange ); -voidwriteRangeList( const RangeList rRanges ); template typename Type inline void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ) @@ -1349,17 +1345,6 @@ protected: voidwriteArrayItem( const String rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); voidwriteDateTimeItem( const String rName, const ::com::sun::star::util::DateTime rDateTime ); voidwriteGuidItem( const String rName, const ::rtl::OUString rGuid ); -voidwriteColIndexItem( const String rName, sal_Int32 nCol ); -voidwriteRowIndexItem( const String rName, sal_Int32 nRow ); -voidwriteColRangeItem( const String rName, sal_Int32 nCol1, sal_Int32 nCol2 ); -voidwriteRowRangeItem( const String rName, sal_Int32 nRow1, sal_Int32 nRow2 ); -voidwriteAddressItem( const String rName, const Address rPos ); -voidwriteRangeItem( const String rName, const Range rRange ); -voidwriteRangeListItem( const String rName, const RangeList rRanges ); -voidwriteTokenAddressItem( const String rName, const TokenAddress rPos, bool bNameMode ); -voidwriteTokenAddress3dItem( const String rName, const ::rtl::OUString rRef, const TokenAddress rPos, bool bNameMode ); -voidwriteTokenRangeItem( const String rName, const TokenRange rRange, bool bNameMode ); -voidwriteTokenRange3dItem( const String rName, const ::rtl::OUString rRef, const TokenRange rRange, bool bNameMode ); template typename Type voidaddNameToItem( Type nData, const NameListWrapper rListWrp ); @@ -1753,9 +1738,6 @@ protected: const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm, rtl_TextEncoding eTextEnc ); -voidconstruct( -const InputObjectBase rParent, -rtl_TextEncoding eTextEnc ); virtual boolimplIsValid() const; virtual voidimplDump(); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 4d3ceaa..64d3d5c 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -84,27 +84,6 @@ protected: }; // - -class StdHlinkObject : public OleInputObjectBase -{ -public: -explicitStdHlinkObject( const InputObjectBase rParent ); - -protected: -virtual voidimplDump(); - -private: -::rtl::OUString dumpHyperlinkString( const String rName, bool bUnicode ); - -booldumpGuidAndMoniker(); -voiddumpUrlMoniker(); -voiddumpFileMoniker(); -voiddumpItemMoniker(); -voiddumpAntiMoniker(); -voiddumpCompositeMoniker(); -}; - -// // class OleStreamObject : public OleInputObjectBase
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/xls/drawingmanager.hxx |3 --- oox/source/xls/drawingmanager.cxx |5 - unusedcode.easy|1 - 3 files changed, 9 deletions(-) New commits: commit d4c467f7d37d47a798ac3880ad30ceca6e60ea8c Author: Santiago Martinez smvar...@gmail.com Date: Mon Feb 27 20:07:47 2012 +0100 Remove unused code in BiffObjLineModel. diff --git a/oox/inc/oox/xls/drawingmanager.hxx b/oox/inc/oox/xls/drawingmanager.hxx index 4ec80d7..758c60e 100644 --- a/oox/inc/oox/xls/drawingmanager.hxx +++ b/oox/inc/oox/xls/drawingmanager.hxx @@ -59,9 +59,6 @@ struct BiffObjLineModel boolmbAuto; /// True = automatic line format. explicitBiffObjLineModel(); - -/** Returns true, if the line formatting is visible (automatic or explicit). */ -boolisVisible() const; }; // diff --git a/oox/source/xls/drawingmanager.cxx b/oox/source/xls/drawingmanager.cxx index d8cf3b1..afadd1f 100644 --- a/oox/source/xls/drawingmanager.cxx +++ b/oox/source/xls/drawingmanager.cxx @@ -191,11 +191,6 @@ BiffObjLineModel::BiffObjLineModel() : { } -bool BiffObjLineModel::isVisible() const -{ -return mbAuto || (mnStyle != BIFF_OBJ_LINE_NONE); -} - BiffInputStream operator( BiffInputStream rStrm, BiffObjLineModel rModel ) { sal_uInt8 nFlags; diff --git a/unusedcode.easy b/unusedcode.easy index b7e4e92..14cd110 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1060,7 +1060,6 @@ oox::xls::BiffHelper::calcRkFromDouble(int, double) oox::xls::BiffInputStream::sizeBase() const oox::xls::BiffInputStream::skipByteString(bool) oox::xls::BiffInputStream::skipUniString() -oox::xls::BiffObjLineModel::isVisible() const oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream, unsigned short) oox::xls::BiffOutputStream::endRecord() oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/helper/attributelist.hxx | 14 --- oox/inc/oox/helper/propertymap.hxx |5 --- oox/inc/oox/xls/commentsbuffer.hxx |2 - oox/inc/oox/xls/drawingbase.hxx |2 - oox/inc/oox/xls/formulaparser.hxx|6 oox/inc/oox/xls/sheetdatabuffer.hxx | 14 --- oox/inc/oox/xls/stylesbuffer.hxx |4 --- oox/source/helper/attributelist.cxx | 24 --- oox/source/helper/propertymap.cxx| 35 --- oox/source/xls/commentsbuffer.cxx| 44 --- oox/source/xls/drawingbase.cxx |9 --- oox/source/xls/formulaparser.cxx | 27 - oox/source/xls/sheetdatabuffer.cxx | 41 oox/source/xls/stylesbuffer.cxx | 12 - unusedcode.easy | 15 --- 15 files changed, 254 deletions(-) New commits: commit 660cb78cd6900ffebe215ad4b3913bbe35ac9883 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Feb 23 21:22:21 2012 +0100 unusedcode: remove something from oox diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx index bf6524c..d0a0600 100644 --- a/oox/inc/oox/helper/attributelist.hxx +++ b/oox/inc/oox/helper/attributelist.hxx @@ -122,12 +122,6 @@ public: /** Returns the 32-bit signed integer value of the specified attribute (hexadecimal). */ OptValue sal_Int32 getIntegerHex( sal_Int32 nAttrToken ) const; -/** Returns the 32-bit unsigned integer value of the specified attribute (hexadecimal). */ -OptValue sal_uInt32 getUnsignedHex( sal_Int32 nAttrToken ) const; - -/** Returns the 64-bit signed integer value of the specified attribute (hexadecimal). */ -OptValue sal_Int64 getHyperHex( sal_Int32 nAttrToken ) const; - /** Returns the boolean value of the specified attribute. */ OptValue bool getBool( sal_Int32 nAttrToken ) const; @@ -168,14 +162,6 @@ public: or the passed default value if the attribute is missing or not convertible. */ sal_Int32 getIntegerHex( sal_Int32 nAttrToken, sal_Int32 nDefault ) const; -/** Returns the 32-bit unsigned integer value of the specified attribute (hexadecimal), -or the passed default value if the attribute is missing or not convertible. */ -sal_uInt32 getUnsignedHex( sal_Int32 nAttrToken, sal_uInt32 nDefault ) const; - -/** Returns the 64-bit signed integer value of the specified attribute (hexadecimal), -or the passed default value if the attribute is missing or not convertible. */ -sal_Int64 getHyperHex( sal_Int32 nAttrToken, sal_Int64 nDefault ) const; - /** Returns the boolean value of the specified attribute, or the passed default value if the attribute is missing or not convertible to bool. */ boolgetBool( sal_Int32 nAttrToken, bool bDefault ) const; diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx index 37b723e..0542de6 100644 --- a/oox/inc/oox/helper/propertymap.hxx +++ b/oox/inc/oox/helper/propertymap.hxx @@ -68,9 +68,6 @@ public: inline bool hasProperty( sal_Int32 nPropId ) const { return find( nPropId ) != end(); } -/** Returns the property value of the specified property, or 0 if not found. */ -const ::com::sun::star::uno::Any* getProperty( sal_Int32 nPropId ) const; - /** Sets the specified property to the passed value. Does nothing, if the identifier is invalid. */ inline bool setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any rValue ) @@ -103,8 +100,6 @@ public: makePropertySet() const; #if OSL_DEBUG_LEVEL 0 - static void dump( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet); - void dump(); static void dumpCode( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet); void dumpCode(); #endif diff --git a/oox/inc/oox/xls/commentsbuffer.hxx b/oox/inc/oox/xls/commentsbuffer.hxx index a0017ef..b873193 100644 --- a/oox/inc/oox/xls/commentsbuffer.hxx +++ b/oox/inc/oox/xls/commentsbuffer.hxx @@ -71,8 +71,6 @@ public: voidimportComment( const AttributeList rAttribs ); /** Imports a cell comment Properties from the passed attributes of the comment element. */ voidimportCommentPr( const AttributeList rAttribs ); -/** Imports the anchor points in CommentPr */ -voidimportAnchor( bool bFrom, sal_Int32 nWhich, const ::rtl::OUString rChars ); /** Imports a cell comment from the passed stream of a COMMENT record. */ voidimportComment( SequenceInputStream rStrm ); /** Imports a cell comment from the passed stream of a NOTE record. */ diff --git a/oox/inc/oox/xls/drawingbase.hxx
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/xls/formulabase.hxx | 38 -- oox/source/xls/formulabase.cxx | 39 --- oox/source/xls/formulaparser.cxx | 13 - unusedcode.easy |5 - 4 files changed, 95 deletions(-) New commits: commit 731a8d7d5bd47bc17f21065f195170da711f3277 Author: Elton Chung el...@layerjet.com Date: Fri Feb 10 22:16:49 2012 +0800 Remove unused code diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx index b3e403a..0a3b35a 100644 --- a/oox/inc/oox/xls/formulabase.hxx +++ b/oox/inc/oox/xls/formulabase.hxx @@ -705,14 +705,6 @@ public: // -/** Generates a cell address string in Calc's absolute $Sheet.$A$1 notation -from the passed cell address. - -@param rAddress The cell address to be converted to a string. - */ -::rtl::OUString generateApiAddressString( -const ::com::sun::star::table::CellAddress rAddress ) const; - /** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$ notation from the passed cell range address. @@ -721,13 +713,6 @@ public: ::rtl::OUString generateApiRangeString( const ::com::sun::star::table::CellRangeAddress rRange ) const; -/** Generates a cell range list string in Calc's absolute $Sheet.$A$1:$A$1 -notation from the passed cell range addresses. - -@param rRanges The list of cell ranges to be converted to a string. - */ -::rtl::OUString generateApiRangeListString( const ApiCellRangeList rRanges ) const; - /** Generates a string in Calc formula notation from the passed string. @param rString The string value. @@ -760,29 +745,6 @@ public: ::com::sun::star::uno::Any extractReference( const ApiTokenSequence rTokens ) const; -/** Tries to extract a single cell address from a formula token sequence. - -@param orAddress (output parameter) If the token sequence is valid, -this parameter will contain the extracted cell address. If the -token sequence contains unexpected tokens, nothing meaningful is -inserted, and the function returns false. - -@param rTokens The token sequence to be parsed. Should contain exactly -one cell address token. The token sequence may contain whitespace -tokens. - -@param bAllowRelative True = it is allowed that rTokens contains -relative references (based on cell A1 of the current sheet). -False = only real absolute references will be accepted. - -@return True, if the token sequence contains a valid cell address -which has been extracted to orAddress, false otherwise. - */ -boolextractCellAddress( -::com::sun::star::table::CellAddress orAddress, -const ApiTokenSequence rTokens, -bool bAllowRelative ) const; - /** Tries to extract a cell range address from a formula token sequence. @param orAddress (output parameter) If the token sequence is valid, diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx index 477a8f9..e9ffa95 100644 --- a/oox/source/xls/formulabase.cxx +++ b/oox/source/xls/formulabase.cxx @@ -1494,15 +1494,6 @@ OUString FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList // -OUString FormulaProcessorBase::generateApiAddressString( const CellAddress rAddress ) const -{ -OUString aCellName; -PropertySet aCellProp( getCellFromDoc( rAddress ) ); -aCellProp.getProperty( aCellName, PROP_AbsoluteName ); -OSL_ENSURE( !aCellName.isEmpty(), FormulaProcessorBase::generateApiAddressString - cannot create cell address string ); -return aCellName; -} - OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress rRange ) const { OUString aRangeName; @@ -1512,22 +1503,6 @@ OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress r return aRangeName; } -OUString FormulaProcessorBase::generateApiRangeListString( const ApiCellRangeList rRanges ) const -{ -OUStringBuffer aBuffer; -for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt ) -{ -OUString aRangeName = generateApiRangeString( *aIt ); -if( !aRangeName.isEmpty() ) -{ -if( aBuffer.getLength() 0 ) -aBuffer.append( API_TOKEN_SEP ); -aBuffer.append( aRangeName ); -} -} -return aBuffer.makeStringAndClear(); -} - OUString FormulaProcessorBase::generateApiString( const OUString rString ) {