diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-07 15:53:56 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-07 15:54:16 +0100 |
commit | aefbfc7101bb9b4ef20968d45306ab97573f6597 (patch) | |
tree | 314a80042f59b05443276d6e311d0cbc71684087 /oox | |
parent | 3f2b771e5f53a7f079416ae6fc42625420b725d7 (diff) |
callcatcher: update and remove newly unused methods
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/oox/dump/dumperbase.hxx | 2 | ||||
-rw-r--r-- | oox/inc/oox/ole/olehelper.hxx | 8 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 10 | ||||
-rw-r--r-- | oox/source/ole/olehelper.cxx | 97 |
4 files changed, 0 insertions, 117 deletions
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 68df688268bb..fb1ede5e9a0a 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -1067,8 +1067,6 @@ public: void writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeBool( bool bData ); void writeDateTime( const ::com::sun::star::util::DateTime& rDateTime ); - void writeColIndex( sal_Int32 nCol ); - void writeRowIndex( sal_Int32 nRow ); template< typename Type > inline void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ) diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx index 933d4a518423..c7f3960fe397 100644 --- a/oox/inc/oox/ole/olehelper.hxx +++ b/oox/inc/oox/ole/olehelper.hxx @@ -148,14 +148,6 @@ public: BinaryInputStream& rInStrm, bool bWithGuid ); - /** Imports an OLE StdHlink from the current position of the passed binary - stream. - */ - static bool importStdHlink( - StdHlinkInfo& orHlinkInfo, - BinaryInputStream& rInStrm, - bool bWithGuid ); - private: OleHelper(); // not implemented ~OleHelper(); // not implemented diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 1f1cbc22b1d4..0d8039d684ac 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1828,16 +1828,6 @@ void Output::writeDateTime( const DateTime& rDateTime ) writeDec( rDateTime.Seconds, 2, '0' ); } -void Output::writeColIndex( sal_Int32 nCol ) -{ - StringHelper::appendAddrCol( maLine, nCol, true ); -} - -void Output::writeRowIndex( sal_Int32 nRow ) -{ - StringHelper::appendAddrRow( maLine, nRow, true ); -} - // ---------------------------------------------------------------------------- bool Output::implIsValid() const diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index dd9676ede726..dcd398248a65 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -236,25 +236,6 @@ void lclAppendHex( OUStringBuffer& orBuffer, Type nValue ) orBuffer[nCharIdx] = spcHexChars[ nValue & 0xF ]; } -OUString lclReadStdHlinkString( BinaryInputStream& rInStrm, bool bUnicode ) -{ - OUString aRet; - sal_Int32 nChars = rInStrm.readInt32(); - if( nChars > 0 ) - { - sal_Int32 nReadChars = getLimitedValue< sal_Int32, sal_Int32 >( nChars, 0, SAL_MAX_UINT16 ); - // byte strings are always in ANSI (Windows 1252) encoding - aRet = bUnicode ? rInStrm.readUnicodeArray( nReadChars, true ) : rInStrm.readCharArrayUC( nReadChars, RTL_TEXTENCODING_MS_1252, true ); - // strings are NUL terminated, remove trailing NUL and possible other garbage - sal_Int32 nNulPos = aRet.indexOf( '\0' ); - if( nNulPos >= 0 ) - aRet = aRet.copy( 0, nNulPos ); - // skip remaining chars - rInStrm.skip( (bUnicode ? 2 : 1) * (nChars - nReadChars) ); - } - return aRet; -} - } // namespace // ============================================================================ @@ -370,84 +351,6 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, return !rInStrm.isEof() && (nStdPicId == OLE_STDPIC_ID) && (nBytes > 0) && (rInStrm.readData( orGraphicData, nBytes ) == nBytes); } -/*static*/ bool OleHelper::importStdHlink( StdHlinkInfo& orHlinkInfo, BinaryInputStream& rInStrm, bool bWithGuid ) -{ - if( bWithGuid ) - { - bool bIsStdHlink = importGuid( rInStrm ) == OLE_GUID_STDHLINK; - OSL_ENSURE( bIsStdHlink, "OleHelper::importStdHlink - unexpected header GUID, expected StdHlink" ); - if( !bIsStdHlink ) - return false; - } - - sal_uInt32 nVersion, nFlags; - rInStrm >> nVersion >> nFlags; - OSL_ENSURE( nVersion == OLE_STDHLINK_VERSION, "OleHelper::importStdHlink - unexpected header version" ); - if( rInStrm.isEof() || (nVersion != OLE_STDHLINK_VERSION) ) - return false; - - // display string - if( getFlag( nFlags, OLE_STDHLINK_HASDISPLAY ) ) - orHlinkInfo.maDisplay = lclReadStdHlinkString( rInStrm, true ); - // frame string - if( getFlag( nFlags, OLE_STDHLINK_HASFRAME ) ) - orHlinkInfo.maFrame = lclReadStdHlinkString( rInStrm, true ); - - // target - if( getFlag( nFlags, OLE_STDHLINK_HASTARGET ) ) - { - if( getFlag( nFlags, OLE_STDHLINK_ASSTRING ) ) - { - OSL_ENSURE( getFlag( nFlags, OLE_STDHLINK_ABSOLUTE ), "OleHelper::importStdHlink - link not absolute" ); - orHlinkInfo.maTarget = lclReadStdHlinkString( rInStrm, true ); - } - else // hyperlink moniker - { - OUString aGuid = importGuid( rInStrm ); - if ( aGuid == OLE_GUID_FILEMONIKER ) - { - // file name, maybe relative and with directory up-count - sal_Int16 nUpLevels; - rInStrm >> nUpLevels; - OSL_ENSURE( (nUpLevels == 0) || !getFlag( nFlags, OLE_STDHLINK_ABSOLUTE ), "OleHelper::importStdHlink - absolute filename with upcount" ); - orHlinkInfo.maTarget = lclReadStdHlinkString( rInStrm, false ); - rInStrm.skip( 24 ); - sal_Int32 nBytes = rInStrm.readInt32(); - if( nBytes > 0 ) - { - sal_Int64 nEndPos = rInStrm.tell() + ::std::max< sal_Int32 >( nBytes, 0 ); - sal_uInt16 nChars = getLimitedValue< sal_uInt16, sal_Int32 >( rInStrm.readInt32() / 2, 0, SAL_MAX_UINT16 ); - rInStrm.skip( 2 ); // key value - orHlinkInfo.maTarget = rInStrm.readUnicodeArray( nChars ); // NOT null terminated - rInStrm.seek( nEndPos ); - } - if( !getFlag( nFlags, OLE_STDHLINK_ABSOLUTE ) ) - for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel ) - orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget; - } - else if ( aGuid == OLE_GUID_URLMONIKER ) - { - // URL, maybe relative and with leading '../' - sal_Int32 nBytes = rInStrm.readInt32(); - sal_Int64 nEndPos = rInStrm.tell() + ::std::max< sal_Int32 >( nBytes, 0 ); - orHlinkInfo.maTarget = rInStrm.readNulUnicodeArray(); - rInStrm.seek( nEndPos ); - } - else - { - OSL_FAIL( "OleHelper::importStdHlink - unsupported hyperlink moniker" ); - return false; - } - } - } - - // target location - if( getFlag( nFlags, OLE_STDHLINK_HASLOCATION ) ) - orHlinkInfo.maLocation = lclReadStdHlinkString( rInStrm, true ); - - return !rInStrm.isEof(); -} - Reference< ::com::sun::star::frame::XFrame > lcl_getFrame( const Reference< ::com::sun::star::frame::XModel >& rxModel ) { |